Merge branch '2.8' into 3.1

fabpot · fabpot · commit 8edf62498a1a · 2016-08-16T07:58:24.000-07:00
* 2.8:
  [Routing] Add missing options in docblock
  [VarDumper] Fix dumping continuations
  [HttpFoundation] fixed Request::getContent() reusage bug
  [Form] Skip CSRF validation on form when POST max size is exceeded
  Enhance the phpDoc return types so IDEs can handle the configuration tree.
  fixes
  Remove 3.0 from branch suggestions for fixes in PR template
  [Process] Strengthen Windows pipe files opening (again...)
  Fix #19531 [Form] DateType fails parsing when midnight is not a valid time
diff --git a/Router.php b/Router.php
@@ -106,9 +106,19 @@ public function __construct(LoaderInterface $loader, $resource, array $options =
      *
      * Available options:
      *
-     *   * cache_dir:     The cache directory (or null to disable caching)
-     *   * debug:         Whether to enable debugging or not (false by default)
-     *   * resource_type: Type hint for the main resource (optional)
+     *   * cache_dir:              The cache directory (or null to disable caching)
+     *   * debug:                  Whether to enable debugging or not (false by default)
+     *   * generator_class:        The name of a UrlGeneratorInterface implementation
+     *   * generator_base_class:   The base class for the dumped generator class
+     *   * generator_cache_class:  The class name for the dumped generator class
+     *   * generator_dumper_class: The name of a GeneratorDumperInterface implementation
+     *   * matcher_class:          The name of a UrlMatcherInterface implementation
+     *   * matcher_base_class:     The base class for the dumped matcher class
+     *   * matcher_dumper_class:   The class name for the dumped matcher class
+     *   * matcher_cache_class:    The name of a MatcherDumperInterface implementation
+     *   * resource_type:          Type hint for the main resource (optional)
+     *   * strict_requirements:    Configure strict requirement checking for generators
+     *                             implementing ConfigurableRequirementsInterface (default is true)
      *
      * @param array $options An array of options
      *

Original file line number	Diff line number	Diff line change
`@@ -106,9 +106,19 @@ public function __construct(LoaderInterface $loader, $resource, array $options =`
`106`	`106`	`*`
`107`	`107`	`* Available options:`
`108`	`108`	`*`
`109`		`- * * cache_dir: The cache directory (or null to disable caching)`
`110`		`- * * debug: Whether to enable debugging or not (false by default)`
`111`		`- * * resource_type: Type hint for the main resource (optional)`
	`109`	`+ * * cache_dir: The cache directory (or null to disable caching)`
	`110`	`+ * * debug: Whether to enable debugging or not (false by default)`
	`111`	`+ * * generator_class: The name of a UrlGeneratorInterface implementation`
	`112`	`+ * * generator_base_class: The base class for the dumped generator class`
	`113`	`+ * * generator_cache_class: The class name for the dumped generator class`
	`114`	`+ * * generator_dumper_class: The name of a GeneratorDumperInterface implementation`
	`115`	`+ * * matcher_class: The name of a UrlMatcherInterface implementation`
	`116`	`+ * * matcher_base_class: The base class for the dumped matcher class`
	`117`	`+ * * matcher_dumper_class: The class name for the dumped matcher class`
	`118`	`+ * * matcher_cache_class: The name of a MatcherDumperInterface implementation`
	`119`	`+ * * resource_type: Type hint for the main resource (optional)`
	`120`	`+ * * strict_requirements: Configure strict requirement checking for generators`
	`121`	`+ * implementing ConfigurableRequirementsInterface (default is true)`
`112`	`122`	`*`
`113`	`123`	`* @param array $options An array of options`
`114`	`124`	`*`