Merge branch '3.3' into 3.4

* 3.3: (27 commits)
  Always require symfony/polyfill-apcu to provide APCuIterator everywhere
  bumped Symfony version to 3.3.9
  updated VERSION for 3.3.8
  updated CHANGELOG for 3.3.8
  [DI] Fix tracking env var placeholders nested in object graphs
  bumped Symfony version to 3.3.8
  updated VERSION for 3.3.7
  updated CHANGELOG for 3.3.7
  [DI] Fix tracking env vars when merging configs (bis)
  removed obsolete comment
  install PHPUnit 6 on PHP 7.2
  [Cache] Use zend.detect_unicode instead of zend.multibyte
  Fix case sensitive typo in use class name
  [VarDumper] Enhance docblock to tell about AbstractDumper::dumpLine(-1)
  [Debug] Remove false-positive check in DebugClassLoader
  [Validator] Fix use of GroupSequenceProvider in child classes
  Change number PHPDoc type to int|float
  [Cache] Workaround zend.detect_unicode + zend.multibyte
  [VarDumper] Strengthen dumped JS
  [VarDumper] Strengthen dumped JS
  ...

Author: fabpot

.travis.yml

@@ -56,15 +56,38 @@ before_install:
       export PHPUNIT_X="$PHPUNIT --exclude-group tty,benchmark,intl-data"
       export COMPOSER_UP='composer update --no-progress --no-suggest --ansi'
 
+      nanoseconds() {
+          local cmd="date"
+          local format="+%s%N"
+          local os=$(uname)
+          if hash gdate > /dev/null 2>&1; then
+            cmd="gdate"
+          elif [[ "$os" = Darwin ]]; then
+            format="+%s000000000"
+          fi
+          $cmd -u $format
+      }
+      export -f nanoseconds
+
       # tfold is a helper to create folded reports
       tfold () {
-          title=$1
-          fold=$(echo $title | sed -r 's/[^-_A-Za-z\d]+/./g')
+          local title=$1
+          local fold=$(echo $title | sed -r 's/[^-_A-Za-z0-9]+/./g')
           shift
-          echo -e "travis_fold:start:$fold\\n\\e[1;34m$title\\e[0m"
-          bash -xc "$*" 2>&1 &&
+          local id=$(printf %08x $(( RANDOM * RANDOM )))
+          local start=$(nanoseconds)
+          echo -e "travis_fold:start:$fold"
+          echo -e "travis_time:start:$id"
+          echo -e "\\e[1;34m$title\\e[0m"
+
+          bash -xc "$*" 2>&1
+          local ok=$?
+          local end=$(nanoseconds)
+          echo -e "\\ntravis_time:end:$id:start=$start,finish=$end,duration=$(($end-$start))"
+          (exit $ok) &&
               echo -e "\\e[32mOK\\e[0m $title\\n\\ntravis_fold:end:$fold" ||
-              ( echo -e "\\e[41mKO\\e[0m $title\\n" && exit 1 )
+              echo -e "\\e[41mKO\\e[0m $title\\n"
+          (exit $ok)
       }
       export -f tfold
 

CHANGELOG-3.3.md

@@ -7,6 +7,50 @@ in 3.3 minor versions.
 To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
 To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v3.3.0...v3.3.1
 
+* 3.3.8 (2017-08-28)
+
+ * bug #24016 [DI] Fix tracking env var placeholders nested in object graphs (nicolas-grekas)
+
+* 3.3.7 (2017-08-28)
+
+ * bug #24009 [DI] Fix tracking env vars when merging configs (bis) (nicolas-grekas)
+ * bug #23952 [PhpUnitBridge] install PHPUnit 6 on PHP 7.2 (xabbuh)
+ * bug #23985 [Cache] Workaround zend.detect_unicode + zend.multibyte (nicolas-grekas)
+ * bug #23989 [Debug] Remove false-positive check in DebugClassLoader (nicolas-grekas)
+ * bug #23983 [VarDumper] Strengthen dumped JS (nicolas-grekas)
+ * bug #23982 [VarDumper] Strengthen dumped JS (nicolas-grekas)
+ * bug #23925 [Validator] Fix use of GroupSequenceProvider in child classes (linniksa)
+ * bug #23971 [Cache] Fix lazy Memcached connections (nicolas-grekas)
+ * bug #23970 [Cache] Fix >30 days expirations with Memcached (nicolas-grekas)
+ * bug #23949 [Dotenv] Get env using $_SERVER to work with fastcgi_param and workaround thread safety issues (nicolas-grekas)
+ * bug #23799 [Dotenv][WebServerBundle] Override previously loaded variables (voronkovich)
+ * bug #23676 [WebProfilerBundle] Re add missing link to the controller (lyrixx)
+ * bug #23870 [DI] Use GlobResource for non-tracked directories (vudaltsov)
+ * bug #23945 [Validator] Fix Greek translation (azhurb)
+ * bug #23940 [DI] Fix resolving env vars when compiling a ContainerBuilder (nicolas-grekas)
+ * bug #23903 [DI] Fix merging of env vars in configs (nicolas-grekas)
+ * bug #23825 Revert "feature #21038 [FrameworkBundle] deprecated cache:clear with warmup (fabpot)" (nicolas-grekas)
+ * bug #23899 [DI] Fix reading env vars from fastcgi params (nicolas-grekas)
+ * bug #23909 [Console] Initialize lazily to render exceptions properly (nicolas-grekas)
+ * bug #23878 [VarDumper] play nice with open_basedir when looking for composer.json (nicolas-grekas)
+ * bug #23897 Allow phpdocumentor/reflection-docblock 4 (derrabus)
+ * bug #23865 [Workflow] fixed InvalidDefinitionException message for StateMachineValidator (fmata)
+ * bug #23856 [DI] Fix dumping abstract with YamlDumper (nicolas-grekas)
+ * bug #23848 restrict reflection doc block (ElectricMaxxx)
+ * bug #23854 [DI] Fix YamlDumper not dumping abstract and autoconfigure (nicolas-grekas)
+ * bug #23752 Ignore memcached missing key error on session destroy (jderusse)
+ * bug #23829 Fixed the exception page design in responsive mode (javiereguiluz)
+ * bug #23828 [Console] Log exit codes as debug messages instead of errors (haroldiedema)
+ * bug #23763 [Cache] Hash cache key on save (lstrojny)
+ * bug #23806 [Profiler] Fix request_collector check in main layout (ogizanagi)
+ * bug #23658 [HttpFoundation] Generate safe fallback filename for wrongly encoded filename (xelaris)
+ * bug #23776 [FrameworkBundle] Warmup annotations for bundle-less controllers and entities (nicolas-grekas)
+ * bug #23783 Avoid infinite loops when profiler data is malformed (javiereguiluz)
+ * bug #23638 [FrameworkBundle][Workflow] better errors when security deps are missing (xabbuh)
+ * bug #23729 [Bridge\ProxyManager] Dont call __destruct() on non-instantiated services (nicolas-grekas)
+ * bug #23703 Bump minimal PHP version to ^5.5.9|>=7.0.8 (nicolas-grekas)
+ * bug #23755 [Config] Fix checking class existence freshness (nicolas-grekas)
+
 * 3.3.6 (2017-08-01)
 
  * bug #22244 [Console] Fix passing options with defaultCommand (Jakub Sacha)

composer.json

@@ -26,6 +26,7 @@
         "psr/link": "^1.0",
         "psr/log": "~1.0",
         "psr/simple-cache": "^1.0",
+        "symfony/polyfill-apcu": "~1.1",
         "symfony/polyfill-intl-icu": "~1.0",
         "symfony/polyfill-mbstring": "~1.0",
         "symfony/polyfill-php56": "~1.0",
@@ -97,7 +98,6 @@
         "predis/predis": "~1.0",
         "egulias/email-validator": "~1.2,>=1.2.8|~2.0",
         "symfony/phpunit-bridge": "~3.2",
-        "symfony/polyfill-apcu": "~1.1",
         "symfony/security-acl": "~2.8|~3.0",
         "phpdocumentor/reflection-docblock": "^3.0|^4.0"
     },

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

@@ -15,8 +15,17 @@
 
 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.7' : '4.8';
+if (PHP_VERSION_ID >= 70200) {
+    // PHPUnit 6 is required for PHP 7.2+
+    $PHPUNIT_VERSION = getenv('SYMFONY_PHPUNIT_VERSION') ?: '6.3';
+} elseif (PHP_VERSION_ID >= 50600) {
+    // PHPUnit 4 does not support PHP 7
+    $PHPUNIT_VERSION = getenv('SYMFONY_PHPUNIT_VERSION') ?: '5.7';
+} else {
+    // PHPUnit 5.1 requires PHP 5.6+
+    $PHPUNIT_VERSION = '4.8';
+}
+
 $oldPwd = getcwd();
 $PHPUNIT_DIR = getenv('SYMFONY_PHPUNIT_DIR') ?: (__DIR__.'/.phpunit');
 $PHP = defined('PHP_BINARY') ? PHP_BINARY : 'php';

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

@@ -38,6 +38,7 @@ public function __construct($file, AdapterInterface $fallbackPool)
     {
         $this->file = $file;
         $this->fallbackPool = $fallbackPool;
+        $this->zendDetectUnicode = ini_get('zend.detect_unicode');
         $this->createCacheItem = \Closure::bind(
             function ($key, $value, $isHit) {
                 $item = new CacheItem();

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

@@ -36,5 +36,6 @@ public function __construct($namespace = '', $defaultLifetime = 0, $directory =
 
         $e = new \Exception();
         $this->includeHandler = function () use ($e) { throw $e; };
+        $this->zendDetectUnicode = ini_get('zend.detect_unicode');
     }
 }

src/Symfony/Component/Cache/Simple/PhpArrayCache.php

@@ -34,6 +34,7 @@ public function __construct($file, CacheInterface $fallbackPool)
     {
         $this->file = $file;
         $this->fallbackPool = $fallbackPool;
+        $this->zendDetectUnicode = ini_get('zend.detect_unicode');
     }
 
     /**

src/Symfony/Component/Cache/Simple/PhpFilesCache.php

@@ -36,5 +36,6 @@ public function __construct($namespace = '', $defaultLifetime = 0, $directory =
 
         $e = new \Exception();
         $this->includeHandler = function () use ($e) { throw $e; };
+        $this->zendDetectUnicode = ini_get('zend.detect_unicode');
     }
 }

src/Symfony/Component/Cache/Tests/Adapter/AdapterTestCase.php

@@ -50,6 +50,26 @@ public function testDefaultLifeTime()
         $this->assertFalse($item->isHit());
     }
 
+    public function testExpiration()
+    {
+        if (isset($this->skippedTests[__FUNCTION__])) {
+            $this->markTestSkipped($this->skippedTests[__FUNCTION__]);
+        }
+
+        $cache = $this->createCachePool();
+        $cache->save($cache->getItem('k1')->set('v1')->expiresAfter(2));
+        $cache->save($cache->getItem('k2')->set('v2')->expiresAfter(366 * 86400));
+
+        sleep(3);
+        $item = $cache->getItem('k1');
+        $this->assertFalse($item->isHit());
+        $this->assertNull($item->get(), "Item's value must be null when isHit() is false.");
+
+        $item = $cache->getItem('k2');
+        $this->assertTrue($item->isHit());
+        $this->assertSame('v2', $item->get());
+    }
+
     public function testNotUnserializable()
     {
         if (isset($this->skippedTests[__FUNCTION__])) {

src/Symfony/Component/Cache/Tests/Adapter/ApcuAdapterTest.php

@@ -77,6 +77,31 @@ public function testVersion()
         $this->assertNull($item->get());
     }
 
+    public function testNamespace()
+    {
+        $namespace = str_replace('\\', '.', get_class($this));
+
+        $pool1 = new ApcuAdapter($namespace.'_1', 0, 'p1');
+
+        $item = $pool1->getItem('foo');
+        $this->assertFalse($item->isHit());
+        $this->assertTrue($pool1->save($item->set('bar')));
+
+        $item = $pool1->getItem('foo');
+        $this->assertTrue($item->isHit());
+        $this->assertSame('bar', $item->get());
+
+        $pool2 = new ApcuAdapter($namespace.'_2', 0, 'p1');
+
+        $item = $pool2->getItem('foo');
+        $this->assertFalse($item->isHit());
+        $this->assertNull($item->get());
+
+        $item = $pool1->getItem('foo');
+        $this->assertTrue($item->isHit());
+        $this->assertSame('bar', $item->get());
+    }
+
     public function testWithCliSapi()
     {
         try {