Merge pull request #132 from eloipoch/change-default-strategy-to-404

change default strategy to 404
sampart · Dec 6, 2015 · e6b020f · e6b020f
2 parents 9564083 + f2e3d22
commit e6b020f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -21,8 +21,6 @@
  */
 class Configuration implements ConfigurationInterface
 {
-    const EXCEPTION_STRATEGY_NONE = false;
-
     const EXCEPTION_STRATEGY_TO_HTTP_NOT_FOUND = 'to_http_not_found';
 
     /**
@@ -41,12 +39,12 @@ public function getConfigTreeBuilder()
                 ->arrayNode('exceptions_strategy')
                     ->addDefaultsIfNotSet()
                     ->children()
-                        ->scalarNode('out_of_range_page')->defaultValue(self::EXCEPTION_STRATEGY_NONE)->end()
-                        ->scalarNode('not_valid_current_page')->defaultValue(self::EXCEPTION_STRATEGY_NONE)->end()
+                        ->scalarNode('out_of_range_page')->defaultValue(self::EXCEPTION_STRATEGY_TO_HTTP_NOT_FOUND)->end()
+                        ->scalarNode('not_valid_current_page')->defaultValue(self::EXCEPTION_STRATEGY_TO_HTTP_NOT_FOUND)->end()
                     ->end()
                 ->end()
             ->end();
 
         return $treeBuilder;
     }
-}
+}
diff --git a/...oject/src/WhiteOctober/PagerfantaTestBundle/Tests/Controller/PagerfantaControllerTest.php b/...oject/src/WhiteOctober/PagerfantaTestBundle/Tests/Controller/PagerfantaControllerTest.php
@@ -188,7 +188,7 @@ public function testOutOfRangeExceptionWithNoneStrategy()
         $client->request('GET', $this->buildViewUrl('custom-page?currentPage=51'));
 
         $response = $client->getResponse();
-        $this->assertSame(500, $response->getStatusCode());
+        $this->assertSame(404, $response->getStatusCode());
     }
 
     /**
@@ -221,7 +221,7 @@ public function testWrongMaxPerPageExceptionWithNoneStrategy()
         $client->request('GET', $this->buildViewUrl('custom-page?maxPerPage=invalid'));
 
         $response = $client->getResponse();
-        $this->assertSame(500, $response->getStatusCode());
+        $this->assertSame(404, $response->getStatusCode());
     }
 
     /**