Merge branch '2.7' into 2.8

nicolas-grekas · nicolas-grekas · commit fa9fe1bc7034 · 2017-10-01T23:00:16.000+02:00
* 2.7: (22 commits)
  Tests and fix for issue in array model data in EntityType field with multiple=true
  [Form] Fixed PercentToLocalizedStringTransformer to accept both comma and dot as decimal separator, if possible
  removed useless PHPDoc
  [Form] Fix FormInterface::submit() annotation
  PdoSessionHandler: fix advisory lock for pgsql when session.sid_bits_per_character &gt; 4
  HttpCache does not consider ESI resources in HEAD requests
  Fix translation for "This field was not expected"
  [Routing] Enhance Route(Collection) docblocks
  Added improvement for accuracy in MoneyToLocalizedStringTransformer.
  Removed unused private property
  Use correct verb form in the pull request template
  Use PHP_MAXPATHLEN in Filesystem.
  Added null as explicit return type (?TokenInterface)
  [FrameworkBundle] Fix Routing\DelegatingLoader
  Render all line breaks according to the exception message
  [Form] Fix phpdoc
  [DI] remove confusing code
  [Form] Fixed GroupSequence with "constraints" option
  [Validator] Clarify UUID validator behavior
  [Filesystem] Fixed makePathRelative
  ...
diff --git a/CacheWarmer/RouterCacheWarmer.php b/CacheWarmer/RouterCacheWarmer.php
@@ -25,8 +25,6 @@ class RouterCacheWarmer implements CacheWarmerInterface
     protected $router;
 
     /**
-     * Constructor.
-     *
      * @param RouterInterface $router A Router instance
      */
     public function __construct(RouterInterface $router)
diff --git a/CacheWarmer/TemplateFinder.php b/CacheWarmer/TemplateFinder.php
@@ -30,8 +30,6 @@ class TemplateFinder implements TemplateFinderInterface
     private $templates;
 
     /**
-     * Constructor.
-     *
      * @param KernelInterface             $kernel  A KernelInterface instance
      * @param TemplateNameParserInterface $parser  A TemplateNameParserInterface instance
      * @param string                      $rootDir The directory where global templates can be stored
diff --git a/CacheWarmer/TemplatePathsCacheWarmer.php b/CacheWarmer/TemplatePathsCacheWarmer.php
@@ -25,8 +25,6 @@ class TemplatePathsCacheWarmer extends CacheWarmer
     protected $locator;
 
     /**
-     * Constructor.
-     *
      * @param TemplateFinderInterface $finder  A template finder
      * @param TemplateLocator         $locator The template locator
      */
diff --git a/Console/Application.php b/Console/Application.php
@@ -22,8 +22,6 @@
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 /**
- * Application.
- *
  * @author Fabien Potencier <fabien@symfony.com>
  */
 class Application extends BaseApplication
@@ -32,8 +30,6 @@ class Application extends BaseApplication
     private $commandsRegistered = false;
 
     /**
-     * Constructor.
-     *
      * @param KernelInterface $kernel A KernelInterface instance
      */
     public function __construct(KernelInterface $kernel)
diff --git a/Console/Helper/DescriptorHelper.php b/Console/Helper/DescriptorHelper.php
@@ -24,9 +24,6 @@
  */
 class DescriptorHelper extends BaseDescriptorHelper
 {
-    /**
-     * Constructor.
-     */
     public function __construct()
     {
         $this
diff --git a/Controller/ControllerNameParser.php b/Controller/ControllerNameParser.php
@@ -25,8 +25,6 @@ class ControllerNameParser
     protected $kernel;
 
     /**
-     * Constructor.
-     *
      * @param KernelInterface $kernel A KernelInterface instance
      */
     public function __construct(KernelInterface $kernel)
diff --git a/Controller/ControllerResolver.php b/Controller/ControllerResolver.php
@@ -17,8 +17,6 @@
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 
 /**
- * ControllerResolver.
- *
  * @author Fabien Potencier <fabien@symfony.com>
  */
 class ControllerResolver extends BaseControllerResolver
@@ -27,8 +25,6 @@ class ControllerResolver extends BaseControllerResolver
     protected $parser;
 
     /**
-     * Constructor.
-     *
      * @param ContainerInterface   $container A ContainerInterface instance
      * @param ControllerNameParser $parser    A ControllerNameParser instance
      * @param LoggerInterface      $logger    A LoggerInterface instance
diff --git a/HttpCache/HttpCache.php b/HttpCache/HttpCache.php
@@ -29,8 +29,6 @@ abstract class HttpCache extends BaseHttpCache
     protected $kernel;
 
     /**
-     * Constructor.
-     *
      * @param HttpKernelInterface $kernel   An HttpKernelInterface instance
      * @param string              $cacheDir The cache directory (default used if null)
      */
diff --git a/Routing/DelegatingLoader.php b/Routing/DelegatingLoader.php
@@ -32,8 +32,6 @@ class DelegatingLoader extends BaseDelegatingLoader
     private $loading = false;
 
     /**
-     * Constructor.
-     *
      * Ability to pass a LoggerInterface instance as second argument will be removed in 3.0.
      *
      * @param ControllerNameParser    $parser   A ControllerNameParser instance
@@ -92,7 +90,7 @@ public function load($resource, $type = null)
         $this->loading = false;
 
         foreach ($collection->all() as $route) {
-            if (!$controller = $route->getDefault('_controller')) {
+            if (!is_string($controller = $route->getDefault('_controller')) || !$controller) {
                 continue;
             }
 
diff --git a/Routing/Router.php b/Routing/Router.php
@@ -29,8 +29,6 @@ class Router extends BaseRouter implements WarmableInterface
     private $container;
 
     /**
-     * Constructor.
-     *
      * @param ContainerInterface $container A ContainerInterface instance
      * @param mixed              $resource  The main resource to load
      * @param array              $options   An array of options
diff --git a/Templating/Asset/PathPackage.php b/Templating/Asset/PathPackage.php
@@ -26,8 +26,6 @@
 class PathPackage extends BasePathPackage
 {
     /**
-     * Constructor.
-     *
      * @param Request $request The current request
      * @param string  $version The version
      * @param string  $format  The version format
diff --git a/Templating/Debugger.php b/Templating/Debugger.php
@@ -29,8 +29,6 @@ class Debugger implements DebuggerInterface
     protected $logger;
 
     /**
-     * Constructor.
-     *
      * @param LoggerInterface $logger A LoggerInterface instance
      */
     public function __construct(LoggerInterface $logger = null)
diff --git a/Templating/DelegatingEngine.php b/Templating/DelegatingEngine.php
@@ -25,8 +25,6 @@ class DelegatingEngine extends BaseDelegatingEngine implements EngineInterface
     protected $container;
 
     /**
-     * Constructor.
-     *
      * @param ContainerInterface $container The DI container
      * @param array              $engineIds An array of engine Ids
      */
diff --git a/Templating/Helper/ActionsHelper.php b/Templating/Helper/ActionsHelper.php
@@ -25,8 +25,6 @@ class ActionsHelper extends Helper
     private $handler;
 
     /**
-     * Constructor.
-     *
      * @param FragmentHandler $handler A FragmentHandler instance
      */
     public function __construct(FragmentHandler $handler)
diff --git a/Templating/Helper/CodeHelper.php b/Templating/Helper/CodeHelper.php
@@ -14,8 +14,6 @@
 use Symfony\Component\Templating\Helper\Helper;
 
 /**
- * CodeHelper.
- *
  * @author Fabien Potencier <fabien@symfony.com>
  */
 class CodeHelper extends Helper
@@ -25,8 +23,6 @@ class CodeHelper extends Helper
     protected $charset;
 
     /**
-     * Constructor.
-     *
      * @param string $fileLinkFormat The format for links to source files
      * @param string $rootDir        The project root directory
      * @param string $charset        The charset
diff --git a/Templating/Helper/RequestHelper.php b/Templating/Helper/RequestHelper.php
@@ -26,8 +26,6 @@ class RequestHelper extends Helper
     protected $requestStack;
 
     /**
-     * Constructor.
-     *
      * @param Request|RequestStack $requestStack A RequestStack instance or a Request instance
      *
      * @deprecated since version 2.5, passing a Request instance is deprecated and support for it will be removed in 3.0.
diff --git a/Templating/Helper/RouterHelper.php b/Templating/Helper/RouterHelper.php
@@ -24,8 +24,6 @@ class RouterHelper extends Helper
     protected $generator;
 
     /**
-     * Constructor.
-     *
      * @param UrlGeneratorInterface $router A Router instance
      */
     public function __construct(UrlGeneratorInterface $router)
diff --git a/Templating/Helper/SessionHelper.php b/Templating/Helper/SessionHelper.php
@@ -26,8 +26,6 @@ class SessionHelper extends Helper
     protected $requestStack;
 
     /**
-     * Constructor.
-     *
      * @param Request|RequestStack $requestStack A RequestStack instance or a Request instance
      *
      * @deprecated since version 2.5, passing a Request instance is deprecated and support for it will be removed in 3.0.
diff --git a/Templating/Helper/TranslatorHelper.php b/Templating/Helper/TranslatorHelper.php
@@ -15,17 +15,13 @@
 use Symfony\Component\Translation\TranslatorInterface;
 
 /**
- * TranslatorHelper.
- *
  * @author Fabien Potencier <fabien@symfony.com>
  */
 class TranslatorHelper extends Helper
 {
     protected $translator;
 
     /**
-     * Constructor.
-     *
      * @param TranslatorInterface $translator A TranslatorInterface instance
      */
     public function __construct(TranslatorInterface $translator)
diff --git a/Templating/Loader/FilesystemLoader.php b/Templating/Loader/FilesystemLoader.php
@@ -26,8 +26,6 @@ class FilesystemLoader implements LoaderInterface
     protected $locator;
 
     /**
-     * Constructor.
-     *
      * @param FileLocatorInterface $locator A FileLocatorInterface instance
      */
     public function __construct(FileLocatorInterface $locator)
diff --git a/Templating/Loader/TemplateLocator.php b/Templating/Loader/TemplateLocator.php
@@ -27,8 +27,6 @@ class TemplateLocator implements FileLocatorInterface
     private $cacheHits = array();
 
     /**
-     * Constructor.
-     *
      * @param FileLocatorInterface $locator  A FileLocatorInterface instance
      * @param string               $cacheDir The cache path
      */
diff --git a/Templating/PhpEngine.php b/Templating/PhpEngine.php
@@ -27,8 +27,6 @@ class PhpEngine extends BasePhpEngine implements EngineInterface
     protected $container;
 
     /**
-     * Constructor.
-     *
      * @param TemplateNameParserInterface $parser    A TemplateNameParserInterface instance
      * @param ContainerInterface          $container The DI container
      * @param LoaderInterface             $loader    A loader instance
diff --git a/Templating/TemplateNameParser.php b/Templating/TemplateNameParser.php
@@ -28,8 +28,6 @@ class TemplateNameParser extends BaseTemplateNameParser
     protected $cache = array();
 
     /**
-     * Constructor.
-     *
      * @param KernelInterface $kernel A KernelInterface instance
      */
     public function __construct(KernelInterface $kernel)
diff --git a/Templating/TimedPhpEngine.php b/Templating/TimedPhpEngine.php
@@ -26,8 +26,6 @@ class TimedPhpEngine extends PhpEngine
     protected $stopwatch;
 
     /**
-     * Constructor.
-     *
      * @param TemplateNameParserInterface $parser    A TemplateNameParserInterface instance
      * @param ContainerInterface          $container A ContainerInterface instance
      * @param LoaderInterface             $loader    A LoaderInterface instance
diff --git a/Tests/Functional/Bundle/TestBundle/Resources/config/routing.yml b/Tests/Functional/Bundle/TestBundle/Resources/config/routing.yml
@@ -44,3 +44,7 @@ fragment_home:
 fragment_inlined:
     path:     /fragment_inlined
     defaults: { _controller: TestBundle:Fragment:inlined }
+
+array_controller:
+    path:     /array_controller
+    defaults: { _controller: [ArrayController, someAction] }
diff --git a/Translation/Translator.php b/Translation/Translator.php
@@ -46,8 +46,6 @@ class Translator extends BaseTranslator implements WarmableInterface
     private $resources = array();
 
     /**
-     * Constructor.
-     *
      * Available options:
      *
      *   * cache_dir: The cache directory (or null to disable caching)
diff --git a/Validator/ConstraintValidatorFactory.php b/Validator/ConstraintValidatorFactory.php
@@ -44,8 +44,6 @@ class ConstraintValidatorFactory implements ConstraintValidatorFactoryInterface
     protected $validators;
 
     /**
-     * Constructor.
-     *
      * @param ContainerInterface $container  The service container
      * @param array              $validators An array of validators
      */

Original file line number	Diff line number	Diff line change
`@@ -24,9 +24,6 @@`
`24`	`24`	`*/`
`25`	`25`	`class DescriptorHelper extends BaseDescriptorHelper`
`26`	`26`	`{`
`27`		`- /**`
`28`		`- * Constructor.`
`29`		`- */`
`30`	`27`	`public function __construct()`
`31`	`28`	`{`
`32`	`29`	`$this`
Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,6 @@ class DelegatingLoader extends BaseDelegatingLoader`
`32`	`32`	`private $loading = false;`
`33`	`33`
`34`	`34`	`/**`
`35`		`- * Constructor.`
`36`		`- *`
`37`	`35`	`* Ability to pass a LoggerInterface instance as second argument will be removed in 3.0.`
`38`	`36`	`*`
`39`	`37`	`* @param ControllerNameParser $parser A ControllerNameParser instance`
`@@ -92,7 +90,7 @@ public function load($resource, $type = null)`
`92`	`90`	`$this->loading = false;`
`93`	`91`
`94`	`92`	`foreach ($collection->all() as $route) {`
`95`		`- if (!$controller = $route->getDefault('_controller')) {`
	`93`	`+ if (!is_string($controller = $route->getDefault('_controller')) \|\| !$controller) {`
`96`	`94`	`continue;`
`97`	`95`	`}`
`98`	`96`