Merge branch '3.4'

nicolas-grekas · nicolas-grekas · commit b3b1034eb8ec · 2017-10-02T08:59:24.000+02:00
* 3.4: (33 commits)
  Remove remaining `@experimental` annotations
  Tests and fix for issue in array model data in EntityType field with multiple=true
  [Validator] Add unique entity violation cause
  [Lock] Automaticaly release lock when user forget it
  [Form] Fixed PercentToLocalizedStringTransformer to accept both comma and dot as decimal separator, if possible
  fixed CS
  [FrameworkBundle] Don't clear app pools on cache:clear
  Hide label button when its setted to false
  removed useless PHPDoc
  [HttpFoundation] Return instance in StreamedResponse
  [Form] Fix FormInterface::submit() annotation
  [PHPUnitBridge] don't remove when set to  empty string
  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.
  ...
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -26,6 +26,8 @@ CHANGELOG
 3.4.0
 -----
 
+ * Made the `cache:clear` command to *not* clear "app" PSR-6 cache pools anymore,
+   but to still clear "system" ones; use the `cache:pool:clear` command to clear "app" pools instead
  * Always register a minimalist logger that writes in `stderr`
  * Deprecated `profiler.matcher` option
  * Added support for `EventSubscriberInterface` on `MicroKernelTrait`
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
@@ -26,8 +26,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
@@ -25,8 +25,6 @@
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 /**
- * Application.
- *
  * @author Fabien Potencier <fabien@symfony.com>
  */
 class Application extends BaseApplication
@@ -36,8 +34,6 @@ class Application extends BaseApplication
     private $registrationErrors = array();
 
     /**
-     * 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,17 +17,13 @@
 use Symfony\Component\HttpKernel\Controller\ContainerControllerResolver;
 
 /**
- * ControllerResolver.
- *
  * @author Fabien Potencier <fabien@symfony.com>
  */
 class ControllerResolver extends ContainerControllerResolver
 {
     protected $parser;
 
     /**
-     * Constructor.
-     *
      * @param ContainerInterface   $container A ContainerInterface instance
      * @param ControllerNameParser $parser    A ControllerNameParser instance
      * @param LoggerInterface      $logger    A LoggerInterface instance
diff --git a/DependencyInjection/Compiler/CachePoolPass.php b/DependencyInjection/Compiler/CachePoolPass.php
@@ -106,7 +106,7 @@ public function process(ContainerBuilder $container)
 
         foreach ($clearers as $id => $pools) {
             $clearer = $container->getDefinition($id);
-            if ($clearer instanceof ChilDefinition) {
+            if ($clearer instanceof ChildDefinition) {
                 $clearer->replaceArgument(0, $pools);
             } else {
                 $clearer->setArgument(0, $pools);
diff --git a/DependencyInjection/FrameworkExtension.php b/DependencyInjection/FrameworkExtension.php
@@ -1508,7 +1508,7 @@ private function registerCacheConfiguration(array $config, ContainerBuilder $con
             if (!$container->getParameter('kernel.debug')) {
                 $propertyAccessDefinition->setFactory(array(PropertyAccessor::class, 'createCache'));
                 $propertyAccessDefinition->setArguments(array(null, null, $version, new Reference('logger', ContainerInterface::IGNORE_ON_INVALID_REFERENCE)));
-                $propertyAccessDefinition->addTag('cache.pool', array('clearer' => 'cache.default_clearer'));
+                $propertyAccessDefinition->addTag('cache.pool', array('clearer' => 'cache.system_clearer'));
                 $propertyAccessDefinition->addTag('monolog.logger', array('channel' => 'cache'));
             } else {
                 $propertyAccessDefinition->setClass(ArrayAdapter::class);
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/Resources/config/cache.xml b/Resources/config/cache.xml
@@ -29,7 +29,7 @@
 
         <service id="cache.adapter.system" class="Symfony\Component\Cache\Adapter\AdapterInterface" abstract="true">
             <factory class="Symfony\Component\Cache\Adapter\AbstractAdapter" method="createSystemCache" />
-            <tag name="cache.pool" clearer="cache.default_clearer" />
+            <tag name="cache.pool" clearer="cache.system_clearer" />
             <tag name="monolog.logger" channel="cache" />
             <argument /> <!-- namespace -->
             <argument>0</argument> <!-- default lifetime -->
@@ -101,6 +101,10 @@
         </service>
 
         <service id="cache.default_clearer" class="Symfony\Component\HttpKernel\CacheClearer\Psr6CacheClearer">
+            <argument type="collection" />
+        </service>
+
+        <service id="cache.system_clearer" parent="cache.default_clearer" public="true">
             <tag name="kernel.cache_clearer" />
         </service>
 
diff --git a/Routing/DelegatingLoader.php b/Routing/DelegatingLoader.php
@@ -30,8 +30,6 @@ class DelegatingLoader extends BaseDelegatingLoader
     private $loading = false;
 
     /**
-     * Constructor.
-     *
      * @param ControllerNameParser    $parser   A ControllerNameParser instance
      * @param LoaderResolverInterface $resolver A LoaderResolverInterface instance
      */
@@ -75,7 +73,7 @@ public function load($resource, $type = null)
         }
 
         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
@@ -33,8 +33,6 @@ class Router extends BaseRouter implements WarmableInterface, ServiceSubscriberI
     private $collectedParameters = array();
 
     /**
-     * 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/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
@@ -15,8 +15,6 @@
 use Symfony\Component\Templating\Helper\Helper;
 
 /**
- * CodeHelper.
- *
  * @author Fabien Potencier <fabien@symfony.com>
  */
 class CodeHelper extends Helper
@@ -26,8 +24,6 @@ class CodeHelper extends Helper
     protected $charset;
 
     /**
-     * Constructor.
-     *
      * @param string|FileLinkFormatter $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/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/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/Tests/Functional/CachePoolsTest.php b/Tests/Functional/CachePoolsTest.php
@@ -11,15 +11,15 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
 
-use Symfony\Component\Cache\Adapter\FilesystemAdapter;
+use Symfony\Component\Cache\Adapter\AdapterInterface;
 use Symfony\Component\Cache\Adapter\RedisAdapter;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
 
 class CachePoolsTest extends WebTestCase
 {
     public function testCachePools()
     {
-        $this->doTestCachePools(array(), FilesystemAdapter::class);
+        $this->doTestCachePools(array(), AdapterInterface::class);
     }
 
     /**
@@ -67,7 +67,7 @@ public function testRedisCustomCachePools()
         }
     }
 
-    public function doTestCachePools($options, $adapterClass)
+    private function doTestCachePools($options, $adapterClass)
     {
         static::bootKernel($options);
         $container = static::$kernel->getContainer();
diff --git a/Tests/Functional/app/CachePools/config.yml b/Tests/Functional/app/CachePools/config.yml
@@ -6,6 +6,7 @@ framework:
         pools:
             cache.pool1:
                 public: true
+                adapter: cache.system
             cache.pool2:
                 public: true
                 adapter: cache.pool3
diff --git a/Tests/Functional/app/CachePools/redis_config.yml b/Tests/Functional/app/CachePools/redis_config.yml
@@ -11,6 +11,7 @@ framework:
         pools:
             cache.pool1:
                 public: true
+                clearer: cache.system_clearer
             cache.pool2:
                 public: true
                 clearer: ~
diff --git a/Tests/Functional/app/CachePools/redis_custom_config.yml b/Tests/Functional/app/CachePools/redis_custom_config.yml
@@ -22,6 +22,7 @@ framework:
         pools:
             cache.pool1:
                 public: true
+                clearer: cache.system_clearer
             cache.pool2:
                 public: true
                 clearer: ~
diff --git a/Translation/Translator.php b/Translation/Translator.php
@@ -47,8 +47,6 @@ class Translator extends BaseTranslator implements WarmableInterface
     private $resources = array();
 
     /**
-     * Constructor.
-     *
      * Available options:
      *
      *   * cache_dir: The cache directory (or null to disable caching)

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`