merged branch cordoval/patch-2 (PR symfony#529)

fabpot · fabpot · commit 3c594292bf21 · 2013-04-18T09:17:10.000+02:00
This PR was squashed before being merged into the master branch (closes symfony#529). Discussion ---------- [RFC] strict_requirements = null on production implements changes proposed on and replaces symfony#496 Commits ------- dfdf783 [RFC] strict_requirements = null on production
diff --git a/app/config/config.yml b/app/config/config.yml
@@ -8,7 +8,7 @@ framework:
     secret:          %secret%
     router:
         resource: "%kernel.root_dir%/config/routing.yml"
-        strict_requirements: %kernel.debug%
+        strict_requirements: ~
     form:            ~
     csrf_protection: ~
     validation:      { enable_annotations: true }
diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml
@@ -2,7 +2,9 @@ imports:
     - { resource: config.yml }
 
 framework:
-    router:   { resource: "%kernel.root_dir%/config/routing_dev.yml" }
+    router:
+        resource: "%kernel.root_dir%/config/routing_dev.yml"
+        strict_requirements: true
     profiler: { only_exceptions: false }
 
 web_profiler:
diff --git a/app/config/config_prod.yml b/app/config/config_prod.yml
@@ -1,15 +1,9 @@
 imports:
     - { resource: config.yml }
 
-# In production environment you should know that the parameters for URL generation
-# always pass the requirements. Otherwise it would break your link (or even site with
-# strict_requirements = true). So we can disable the requirements check completely for
-# enhanced performance with strict_requirements = null.
-framework:
-    router:
-        strict_requirements: null
-    #validation:
-    #    cache: apc
+#framework:
+#    validation:
+#        cache: apc
 
 #doctrine:
 #    orm:
