Merge branch '3.2'

* 3.2: (27 commits)
  Improve tracking of environment variables in the case of private services
  [DI] Align AutowirePass with 2.8
  property constraints can be added in child classes
  added test for staticClassLoader in LazyLoadingMetadatafactory
  fixed PHPUnit setUp and tearDown method visibility
  spelling fixes
  Readd Symfony version status in the toolbar
  [Security] LdapUserProvider should not throw an exception if the UID key does not exist in an LDAP entry
  make sure that null can be the invalid value
  [VarDumper] Improve dump of AMQP* Object
  Fix annotations cache folder path
  [FrameworkBundle] Wire ArrayCache for annotation reader at bootstrap
  Ignore missing 'debug.file_link_formatter' service in Debug bundle
  [VarDumper] Fixed dumping of terminated generator
  bumped Symfony version to 3.2.4
  updated VERSION for 3.2.3
  updated CHANGELOG for 3.2.3
  bumped Symfony version to 2.8.18
  updated VERSION for 2.8.17
  updated CHANGELOG for 2.8.17
  ...

Author: nicolas-grekas

DependencyInjection/Compiler/AddAnnotationsCachedReaderPass.php

@@ -13,6 +13,7 @@
 
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
 
 /**
  * @internal
@@ -27,7 +28,16 @@ public function process(ContainerBuilder $container)
         // "annotations.cached_reader" is wired late so that any passes using
         // "annotation_reader" at build time don't get any cache
         if ($container->hasDefinition('annotations.cached_reader')) {
-            $container->setAlias('annotation_reader', 'annotations.cached_reader');
+            $reader = $container->getDefinition('annotations.cached_reader');
+            $tags = $reader->getTags();
+
+            if (isset($tags['annotations.cached_reader'][0]['provider'])) {
+                if ($container->hasAlias($provider = $tags['annotations.cached_reader'][0]['provider'])) {
+                    $provider = (string) $container->getAlias($provider);
+                }
+                $container->set('annotations.cached_reader', null);
+                $container->setDefinition('annotations.cached_reader', $reader->replaceArgument(1, new Reference($provider)));
+            }
         }
     }
 }

DependencyInjection/FrameworkExtension.php

@@ -796,23 +796,14 @@ private function createPackageDefinition($basePath, array $baseUrls, Reference $
             throw new \LogicException('An asset package cannot have base URLs and base paths.');
         }
 
-        if (!$baseUrls) {
-            $package = new ChildDefinition('assets.path_package');
-
-            return $package
-                ->setPublic(false)
-                ->replaceArgument(0, $basePath)
-                ->replaceArgument(1, $version)
-            ;
-        }
-
-        $package = new ChildDefinition('assets.url_package');
-
-        return $package
+        $package = new ChildDefinition($baseUrls ? 'assets.url_package' : 'assets.path_package');
+        $package
             ->setPublic(false)
-            ->replaceArgument(0, $baseUrls)
+            ->replaceArgument(0, $baseUrls ?: $basePath)
             ->replaceArgument(1, $version)
         ;
+
+        return $package;
     }
 
     private function createVersion(ContainerBuilder $container, $version, $format, $name)
@@ -1084,9 +1075,10 @@ private function registerAnnotationsConfiguration(array $config, ContainerBuilde
 
             $container
                 ->getDefinition('annotations.cached_reader')
-                ->replaceArgument(1, new Reference($cacheService))
                 ->replaceArgument(2, $config['debug'])
+                ->addTag('annotations.cached_reader', array('provider' => $cacheService))
             ;
+            $container->setAlias('annotation_reader', 'annotations.cached_reader');
             $container->setAlias(Reader::class, new Alias('annotations.cached_reader', false));
         } else {
             $container->removeDefinition('annotations.cached_reader');
@@ -1276,7 +1268,6 @@ private function registerPropertyInfoConfiguration(array $config, ContainerBuild
     private function registerCacheConfiguration(array $config, ContainerBuilder $container)
     {
         $version = substr(str_replace('/', '-', base64_encode(hash('sha256', uniqid(mt_rand(), true), true))), 0, 22);
-        $container->getDefinition('cache.annotations')->replaceArgument(2, $version);
         $container->getDefinition('cache.adapter.apcu')->replaceArgument(2, $version);
         $container->getDefinition('cache.adapter.system')->replaceArgument(2, $version);
         $container->getDefinition('cache.adapter.filesystem')->replaceArgument(2, $config['directory']);

Resources/config/annotations.xml

@@ -10,7 +10,9 @@
 
         <service id="annotations.cached_reader" class="Doctrine\Common\Annotations\CachedReader" public="false">
             <argument type="service" id="annotations.reader" />
-            <argument /><!-- Cache Implementation -->
+            <argument type="service">
+                <service class="Doctrine\Common\Cache\ArrayCache" />
+            </argument>
             <argument /><!-- Debug-Flag -->
         </service>
 

Tests/CacheWarmer/TemplatePathsCacheWarmerTest.php

@@ -35,7 +35,7 @@ class TemplatePathsCacheWarmerTest extends TestCase
 
     private $tmpDir;
 
-    public function setUp()
+    protected function setUp()
     {
         $this->templateFinder = $this
             ->getMockBuilder(TemplateFinderInterface::class)
@@ -56,7 +56,7 @@ public function setUp()
         $this->filesystem->mkdir($this->tmpDir);
     }
 
-    public function tearDown()
+    protected function tearDown()
     {
         $this->filesystem->remove($this->tmpDir);
     }

Tests/DependencyInjection/FrameworkExtensionTest.php

@@ -14,6 +14,7 @@
 use Doctrine\Common\Annotations\Annotation;
 use Symfony\Bundle\FullStack;
 use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
+use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddAnnotationsCachedReaderPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\FrameworkExtension;
 use Symfony\Component\Cache\Adapter\ApcuAdapter;
 use Symfony\Component\Cache\Adapter\ChainAdapter;
@@ -871,6 +872,7 @@ protected function createContainerFromFile($file, $data = array(), $resetCompile
             $container->getCompilerPassConfig()->setOptimizationPasses(array());
             $container->getCompilerPassConfig()->setRemovingPasses(array());
         }
+        $container->getCompilerPassConfig()->setBeforeRemovingPasses(array(new AddAnnotationsCachedReaderPass()));
         $container->compile();
 
         return self::$containerCache[$cacheKey] = $container;