Merge branch '3.2' into 3.3

* 3.2:
  Fix optional cache warmers are always instantiated whereas they should be lazy-loaded
  add some \ on PHP_VERSION_ID for 2.8
  [PropertyInfo][DoctrineBridge] The bigint Doctrine's type must be converted to string

Author: nicolas-grekas

CacheWarmer/ClassCacheCacheWarmer.php

@@ -27,7 +27,7 @@ class ClassCacheCacheWarmer implements CacheWarmerInterface
 
     public function __construct(array $declaredClasses = null)
     {
-        if (PHP_VERSION_ID >= 70000) {
+        if (\PHP_VERSION_ID >= 70000) {
             @trigger_error('The '.__CLASS__.' class is deprecated since version 3.3 and will be removed in 4.0.', E_USER_DEPRECATED);
         }
 

CacheWarmer/TranslationsCacheWarmer.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Bundle\FrameworkBundle\CacheWarmer;
 
+use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpKernel\CacheWarmer\CacheWarmerInterface;
 use Symfony\Component\HttpKernel\CacheWarmer\WarmableInterface;
 use Symfony\Component\Translation\TranslatorInterface;
@@ -22,18 +23,35 @@
  */
 class TranslationsCacheWarmer implements CacheWarmerInterface
 {
+    private $container;
     private $translator;
 
-    public function __construct(TranslatorInterface $translator)
+    /**
+     * TranslationsCacheWarmer constructor.
+     *
+     * @param ContainerInterface|TranslatorInterface $container
+     */
+    public function __construct($container)
     {
-        $this->translator = $translator;
+        // As this cache warmer is optional, dependencies should be lazy-loaded, that's why a container should be injected.
+        if ($container instanceof ContainerInterface) {
+            $this->container = $container;
+        } elseif ($container instanceof TranslatorInterface) {
+            $this->translator = $container;
+        } else {
+            throw new \InvalidArgumentException(sprintf('%s only accepts instance of Symfony\Component\DependencyInjection\ContainerInterface or Symfony\Component\Translation\TranslatorInterface as first argument.', __CLASS__));
+        }
     }
 
     /**
      * {@inheritdoc}
      */
     public function warmUp($cacheDir)
     {
+        if (null === $this->translator) {
+            $this->translator = $this->container->get('translator');
+        }
+
         if ($this->translator instanceof WarmableInterface) {
             $this->translator->warmUp($cacheDir);
         }

DependencyInjection/FrameworkExtension.php

@@ -96,7 +96,7 @@ public function load(array $configs, ContainerBuilder $container)
         $loader->load('web.xml');
         $loader->load('services.xml');
 
-        if (PHP_VERSION_ID < 70000) {
+        if (\PHP_VERSION_ID < 70000) {
             $definition = $container->getDefinition('kernel.class_cache.cache_warmer');
             $definition->addTag('kernel.cache_warmer');
             // Ignore deprecation for PHP versions below 7.0
@@ -289,7 +289,7 @@ public function load(array $configs, ContainerBuilder $container)
         $container->registerForAutoconfiguration(ObjectInitializerInterface::class)
             ->addTag('validator.initializer');
 
-        if (PHP_VERSION_ID < 70000) {
+        if (\PHP_VERSION_ID < 70000) {
             $this->addClassesToCompile(array(
                 'Symfony\\Component\\Config\\ConfigCache',
                 'Symfony\\Component\\Config\\FileLocator',
@@ -674,7 +674,7 @@ private function registerRouterConfiguration(array $config, ContainerBuilder $co
         $container->setParameter('request_listener.http_port', $config['http_port']);
         $container->setParameter('request_listener.https_port', $config['https_port']);
 
-        if (PHP_VERSION_ID < 70000) {
+        if (\PHP_VERSION_ID < 70000) {
             $this->addClassesToCompile(array(
                 'Symfony\\Component\\Routing\\Generator\\UrlGenerator',
                 'Symfony\\Component\\Routing\\RequestContext',
@@ -725,7 +725,7 @@ private function registerSessionConfiguration(array $config, ContainerBuilder $c
 
         $container->setParameter('session.save_path', $config['save_path']);
 
-        if (PHP_VERSION_ID < 70000) {
+        if (\PHP_VERSION_ID < 70000) {
             $this->addClassesToCompile(array(
                 'Symfony\\Component\\HttpKernel\\EventListener\\SessionListener',
                 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\NativeSessionStorage',
@@ -810,7 +810,7 @@ private function registerTemplatingConfiguration(array $config, ContainerBuilder
             $container->setDefinition('templating.loader', $loaderCache);
         }
 
-        if (PHP_VERSION_ID < 70000) {
+        if (\PHP_VERSION_ID < 70000) {
             $this->addClassesToCompile(array(
                 'Symfony\\Bundle\\FrameworkBundle\\Templating\\GlobalVariables',
                 'Symfony\\Bundle\\FrameworkBundle\\Templating\\TemplateReference',
@@ -850,7 +850,7 @@ private function registerTemplatingConfiguration(array $config, ContainerBuilder
                 $container->setAlias('debug.templating.engine.php', 'templating.engine.php');
             }
 
-            if (PHP_VERSION_ID < 70000) {
+            if (\PHP_VERSION_ID < 70000) {
                 $this->addClassesToCompile(array(
                     'Symfony\\Component\\Templating\\Storage\\FileStorage',
                     'Symfony\\Bundle\\FrameworkBundle\\Templating\\PhpEngine',
@@ -1191,7 +1191,7 @@ private function registerAnnotationsConfiguration(array $config, ContainerBuilde
                 $definition = $container->findDefinition('annotations.cache_warmer');
                 $definition->addTag('kernel.cache_warmer');
 
-                if (PHP_VERSION_ID < 70000) {
+                if (\PHP_VERSION_ID < 70000) {
                     $this->addClassesToCompile(array(
                         'Symfony\Component\Cache\Adapter\PhpArrayAdapter',
                         'Symfony\Component\Cache\DoctrineProvider',
@@ -1448,7 +1448,7 @@ private function registerCacheConfiguration(array $config, ContainerBuilder $con
             }
         }
 
-        if (PHP_VERSION_ID < 70000) {
+        if (\PHP_VERSION_ID < 70000) {
             $this->addClassesToCompile(array(
                 'Symfony\Component\Cache\Adapter\ApcuAdapter',
                 'Symfony\Component\Cache\Adapter\FilesystemAdapter',

Resources/config/translation.xml

@@ -123,7 +123,7 @@
         <service id="translation.writer" class="Symfony\Component\Translation\Writer\TranslationWriter" public="true" />
 
         <service id="translation.warmer" class="Symfony\Bundle\FrameworkBundle\CacheWarmer\TranslationsCacheWarmer">
-            <argument type="service" id="translator" />
+            <argument type="service" id="service_container" />
             <tag name="kernel.cache_warmer" />
         </service>