Merge branch '2.8' into 3.2

* 2.8:
  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

src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php

@@ -174,13 +174,13 @@ private function getPhpType($doctrineType)
     {
         switch ($doctrineType) {
             case DBALType::SMALLINT:
-            case DBALType::BIGINT:
             case DBALType::INTEGER:
                 return Type::BUILTIN_TYPE_INT;
 
             case DBALType::FLOAT:
                 return Type::BUILTIN_TYPE_FLOAT;
 
+            case DBALType::BIGINT:
             case DBALType::STRING:
             case DBALType::TEXT:
             case DBALType::GUID:
@@ -196,9 +196,6 @@ private function getPhpType($doctrineType)
 
             case DBALType::OBJECT:
                 return Type::BUILTIN_TYPE_OBJECT;
-
-            default:
-                return;
         }
     }
 }

src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php

@@ -55,6 +55,7 @@ public function testGetProperties()
                 'bool',
                 'binary',
                 'customFoo',
+                'bigint',
                 'foo',
                 'bar',
                 'indexedBar',
@@ -76,6 +77,7 @@ public function typesProvider()
         return array(
             array('id', array(new Type(Type::BUILTIN_TYPE_INT))),
             array('guid', array(new Type(Type::BUILTIN_TYPE_STRING))),
+            array('bigint', array(new Type(Type::BUILTIN_TYPE_STRING))),
             array('float', array(new Type(Type::BUILTIN_TYPE_FLOAT))),
             array('decimal', array(new Type(Type::BUILTIN_TYPE_STRING))),
             array('bool', array(new Type(Type::BUILTIN_TYPE_BOOL))),

src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineDummy.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Bridge\Doctrine\Tests\PropertyInfo\Fixtures;
 
+use Doctrine\ORM\Mapping as ORM;
 use Doctrine\ORM\Mapping\Column;
 use Doctrine\ORM\Mapping\Entity;
 use Doctrine\ORM\Mapping\Id;
@@ -90,5 +91,10 @@ class DoctrineDummy
      */
     private $customFoo;
 
+    /**
+     * @Column(type="bigint")
+     */
+    private $bigint;
+
     public $notMapped;
 }

src/Symfony/Bridge/PhpUnit/bin/simple-phpunit

@@ -16,7 +16,7 @@
 error_reporting(-1);
 
 // PHPUnit 4.8 does not support PHP 7, while 5.1 requires PHP 5.6+
-$PHPUNIT_VERSION = PHP_VERSION_ID >= 50600 ? getenv('SYMFONY_PHPUNIT_VERSION') ?: '5.4' : '4.8';
+$PHPUNIT_VERSION = \PHP_VERSION_ID >= 50600 ? getenv('SYMFONY_PHPUNIT_VERSION') ?: '5.4' : '4.8';
 $oldPwd = getcwd();
 $PHPUNIT_DIR = getenv('SYMFONY_PHPUNIT_DIR') ?: (__DIR__.'/.phpunit');
 $PHP = defined('PHP_BINARY') ? PHP_BINARY : 'php';

src/Symfony/Bridge/Twig/Tests/Node/DumpNodeTest.php

@@ -86,7 +86,7 @@ public function testOneVar()
 
 EOTXT;
 
-        if (PHP_VERSION_ID >= 70000) {
+        if (\PHP_VERSION_ID >= 70000) {
             $expected = preg_replace('/%(.*?)%/', '($context["$1"] ?? null)', $expected);
         } else {
             $expected = preg_replace('/%(.*?)%/', '(isset($context["$1"]) ? $context["$1"] : null)', $expected);

src/Symfony/Bundle/FrameworkBundle/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);
         }

src/Symfony/Bundle/FrameworkBundle/Resources/config/translation.xml

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

src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheWarmer.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Bundle\TwigBundle\CacheWarmer;
 
+use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpKernel\CacheWarmer\CacheWarmerInterface;
 use Twig\Environment;
 use Twig\Error\Error;
@@ -22,12 +23,27 @@
  */
 class TemplateCacheWarmer implements CacheWarmerInterface
 {
+    private $container;
     private $twig;
     private $iterator;
 
-    public function __construct(Environment $twig, \Traversable $iterator)
+    /**
+     * TemplateCacheWarmer constructor.
+     *
+     * @param ContainerInterface|Environment $container
+     * @param \Traversable                   $iterator
+     */
+    public function __construct($container, \Traversable $iterator)
     {
-        $this->twig = $twig;
+        // 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 Environment) {
+            $this->twig = $container;
+        } else {
+            throw new \InvalidArgumentException(sprintf('%s only accepts instance of Symfony\Component\DependencyInjection\ContainerInterface or Environment as first argument.', __CLASS__));
+        }
+
         $this->iterator = $iterator;
     }
 
@@ -36,6 +52,10 @@ public function __construct(Environment $twig, \Traversable $iterator)
      */
     public function warmUp($cacheDir)
     {
+        if (null === $this->twig) {
+            $this->twig = $this->container->get('twig');
+        }
+
         foreach ($this->iterator as $template) {
             try {
                 $this->twig->loadTemplate($template);

src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml

@@ -40,7 +40,7 @@
 
         <service id="twig.template_cache_warmer" class="Symfony\Bundle\TwigBundle\CacheWarmer\TemplateCacheWarmer" public="false">
             <tag name="kernel.cache_warmer" />
-            <argument type="service" id="twig" />
+            <argument type="service" id="service_container" />
             <argument type="service" id="twig.template_iterator" />
         </service>
 

src/Symfony/Component/Cache/Adapter/PhpArrayAdapter.php

@@ -65,7 +65,7 @@ function ($key, $value, $isHit) {
     public static function create($file, CacheItemPoolInterface $fallbackPool)
     {
         // Shared memory is available in PHP 7.0+ with OPCache enabled and in HHVM
-        if ((PHP_VERSION_ID >= 70000 && ini_get('opcache.enable')) || defined('HHVM_VERSION')) {
+        if ((\PHP_VERSION_ID >= 70000 && ini_get('opcache.enable')) || defined('HHVM_VERSION')) {
             if (!$fallbackPool instanceof AdapterInterface) {
                 $fallbackPool = new ProxyAdapter($fallbackPool);
             }