Merge branch '4.3' into 4.4

nicolas-grekas · nicolas-grekas · commit 1981f06c88a6 · 2019-08-22T10:37:03.000+02:00
* 4.3:
  fix deps=low
  [VarExporter] fix support for PHP 7.4
  Use PHP 7.4 on deps=low
diff --git a/.travis.yml b/.travis.yml
@@ -26,9 +26,10 @@ env:
 matrix:
     include:
         - php: 7.1
-        - php: 7.2
-          env: deps=high
+          env: php_extra="7.2"
         - php: 7.3
+          env: deps=high
+        - php: 7.4snapshot
           env: deps=low
     fast_finish: true
 
@@ -78,6 +79,12 @@ before_install:
       export COMPONENTS=$(find src/Symfony -mindepth 2 -type f -name phpunit.xml.dist -printf '%h\n')
       find ~/.phpenv -name xdebug.ini -delete
 
+      if [[ $TRAVIS_PHP_VERSION = 7.4* && $deps ]]; then
+          export PHPUNIT_X="$PHPUNIT_X,issue-32995"
+      elif [[ $TRAVIS_PHP_VERSION = 7.4* ]]; then
+          export PHPUNIT_X="$PHPUNIT --group issue-32995"
+      fi
+
       nanoseconds () {
           local cmd="date"
           local format="+%s%N"
diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json
@@ -37,12 +37,12 @@
         "symfony/expression-language": "^3.4|^4.0|^5.0",
         "symfony/validator": "^3.4.31|^4.3.4|^5.0",
         "symfony/translation": "^3.4|^4.0|^5.0",
-        "doctrine/annotations": "~1.0",
+        "doctrine/annotations": "~1.7",
         "doctrine/cache": "~1.6",
         "doctrine/collections": "~1.0",
         "doctrine/data-fixtures": "1.0.*",
         "doctrine/dbal": "~2.4",
-        "doctrine/orm": "^2.4.5",
+        "doctrine/orm": "^2.6.3",
         "doctrine/reflection": "~1.0"
     },
     "conflict": {
diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json
@@ -21,7 +21,7 @@
         "twig/twig": "^1.41|^2.10"
     },
     "require-dev": {
-        "egulias/email-validator": "^2.0",
+        "egulias/email-validator": "^2.1.10",
         "symfony/asset": "^3.4|^4.0|^5.0",
         "symfony/dependency-injection": "^3.4|^4.0|^5.0",
         "symfony/finder": "^3.4|^4.0|^5.0",
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/CacheWarmer/ValidatorCacheWarmerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/CacheWarmer/ValidatorCacheWarmerTest.php
@@ -21,6 +21,8 @@
 class ValidatorCacheWarmerTest extends TestCase
 {
     /**
+     * @group issue-32995
+     *
      * @runInSeparateProcess https://github.com/symfony/symfony/issues/32995
      */
     public function testWarmUp()
diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -30,10 +30,11 @@
         "symfony/routing": "^4.4|^5.0"
     },
     "require-dev": {
+        "doctrine/annotations": "~1.7",
         "doctrine/cache": "~1.0",
         "symfony/asset": "^3.4|^4.0|^5.0",
         "symfony/browser-kit": "^4.3|^5.0",
-        "symfony/console": "^4.3|^5.0",
+        "symfony/console": "^4.3.4|^5.0",
         "symfony/css-selector": "^3.4|^4.0|^5.0",
         "symfony/dom-crawler": "^4.3|^5.0",
         "symfony/polyfill-intl-icu": "~1.0",
@@ -58,9 +59,8 @@
         "symfony/yaml": "^3.4|^4.0|^5.0",
         "symfony/property-info": "^3.4|^4.0|^5.0",
         "symfony/web-link": "^4.4|^5.0",
-        "doctrine/annotations": "~1.0",
         "phpdocumentor/reflection-docblock": "^3.0|^4.0",
-        "twig/twig": "~1.34|~2.4"
+        "twig/twig": "~1.41|~2.10"
     },
     "conflict": {
         "phpdocumentor/reflection-docblock": "<3.0",
diff --git a/src/Symfony/Bundle/SecurityBundle/composer.json b/src/Symfony/Bundle/SecurityBundle/composer.json
@@ -44,7 +44,7 @@
         "symfony/yaml": "^3.4|^4.0|^5.0",
         "symfony/expression-language": "^3.4|^4.0|^5.0",
         "doctrine/doctrine-bundle": "~1.5",
-        "twig/twig": "~1.34|~2.4"
+        "twig/twig": "~1.41|~2.10"
     },
     "conflict": {
         "symfony/browser-kit": "<4.2",
diff --git a/src/Symfony/Bundle/TwigBundle/composer.json b/src/Symfony/Bundle/TwigBundle/composer.json
@@ -37,7 +37,7 @@
         "symfony/yaml": "^3.4|^4.0|^5.0",
         "symfony/framework-bundle": "^4.4|^5.0",
         "symfony/web-link": "^3.4|^4.0|^5.0",
-        "doctrine/annotations": "~1.0",
+        "doctrine/annotations": "~1.7",
         "doctrine/cache": "~1.0"
     },
     "conflict": {
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/AdapterTestCase.php b/src/Symfony/Component/Cache/Tests/Adapter/AdapterTestCase.php
@@ -254,6 +254,8 @@ public function testPrune()
     }
 
     /**
+     * @group issue-32995
+     *
      * @runInSeparateProcess https://github.com/symfony/symfony/issues/32995
      */
     public function testSavingObject()
diff --git a/src/Symfony/Component/Config/Tests/Resource/ClassExistenceResourceTest.php b/src/Symfony/Component/Config/Tests/Resource/ClassExistenceResourceTest.php
@@ -76,6 +76,8 @@ public function testExistsKo()
     }
 
     /**
+     * @group issue-32995
+     *
      * @runInSeparateProcess https://github.com/symfony/symfony/issues/32995
      */
     public function testBadParentWithTimestamp()
@@ -85,6 +87,8 @@ public function testBadParentWithTimestamp()
     }
 
     /**
+     * @group issue-32995
+     *
      * @runInSeparateProcess https://github.com/symfony/symfony/issues/32995
      */
     public function testBadParentWithNoTimestamp()
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
@@ -350,6 +350,8 @@ public function testClassNotFoundThrowsException()
     }
 
     /**
+     * @group issue-32995
+     *
      * @runInSeparateProcess https://github.com/symfony/symfony/issues/32995
      */
     public function testParentClassNotFoundThrowsException()
@@ -626,6 +628,8 @@ public function getCreateResourceTests()
     }
 
     /**
+     * @group issue-32995
+     *
      * @runInSeparateProcess https://github.com/symfony/symfony/issues/32995
      */
     public function testIgnoreServiceWithClassNotExisting()
@@ -831,6 +835,8 @@ public function testExceptionWhenAliasExists()
     }
 
     /**
+     * @group issue-32995
+     *
      * @runInSeparateProcess https://github.com/symfony/symfony/issues/32995
      */
     public function testExceptionWhenAliasDoesNotExist()
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveBindingsPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveBindingsPassTest.php
@@ -62,6 +62,8 @@ public function testUnusedBinding()
     }
 
     /**
+     * @group issue-32995
+     *
      * @runInSeparateProcess https://github.com/symfony/symfony/issues/32995
      */
     public function testMissingParent()
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
@@ -1099,6 +1099,8 @@ public function testInlineSelfRef()
     }
 
     /**
+     * @group issue-32995
+     *
      * @runInSeparateProcess https://github.com/symfony/symfony/issues/32995
      */
     public function testHotPathOptimizations()
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/FileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/FileLoaderTest.php
@@ -107,6 +107,8 @@ public function testRegisterClasses()
     }
 
     /**
+     * @group issue-32995
+     *
      * @runInSeparateProcess https://github.com/symfony/symfony/issues/32995
      */
     public function testRegisterClassesWithExclude()
@@ -139,6 +141,8 @@ public function testRegisterClassesWithExclude()
     }
 
     /**
+     * @group issue-32995
+     *
      * @runInSeparateProcess https://github.com/symfony/symfony/issues/32995
      */
     public function testRegisterClassesWithExcludeAsArray()
@@ -161,6 +165,8 @@ public function testRegisterClassesWithExcludeAsArray()
     }
 
     /**
+     * @group issue-32995
+     *
      * @runInSeparateProcess https://github.com/symfony/symfony/issues/32995
      */
     public function testNestedRegisterClasses()
@@ -192,6 +198,8 @@ public function testNestedRegisterClasses()
     }
 
     /**
+     * @group issue-32995
+     *
      * @runInSeparateProcess https://github.com/symfony/symfony/issues/32995
      */
     public function testMissingParentClass()
diff --git a/src/Symfony/Component/Mailer/composer.json b/src/Symfony/Component/Mailer/composer.json
@@ -17,7 +17,7 @@
     ],
     "require": {
         "php": "^7.1.3",
-        "egulias/email-validator": "^2.0",
+        "egulias/email-validator": "^2.1.10",
         "psr/log": "~1.0",
         "symfony/event-dispatcher": "^4.3",
         "symfony/mime": "^4.3.3|^5.0",
diff --git a/src/Symfony/Component/Mime/composer.json b/src/Symfony/Component/Mime/composer.json
@@ -21,7 +21,7 @@
         "symfony/polyfill-mbstring": "^1.0"
     },
     "require-dev": {
-        "egulias/email-validator": "^2.0",
+        "egulias/email-validator": "^2.1.10",
         "symfony/dependency-injection": "^3.4|^4.1|^5.0"
     },
     "conflict": {
diff --git a/src/Symfony/Component/PropertyInfo/composer.json b/src/Symfony/Component/PropertyInfo/composer.json
@@ -31,7 +31,7 @@
         "symfony/cache": "^3.4|^4.0|^5.0",
         "symfony/dependency-injection": "^3.4|^4.0|^5.0",
         "phpdocumentor/reflection-docblock": "^3.0|^4.0",
-        "doctrine/annotations": "~1.0"
+        "doctrine/annotations": "~1.7"
     },
     "conflict": {
         "phpdocumentor/reflection-docblock": "<3.0||>=3.2.0,<3.2.2",
diff --git a/src/Symfony/Component/Validator/composer.json b/src/Symfony/Component/Validator/composer.json
@@ -35,11 +35,12 @@
         "symfony/property-access": "^3.4|^4.0|^5.0",
         "symfony/property-info": "^3.4|^4.0|^5.0",
         "symfony/translation": "^4.2",
-        "doctrine/annotations": "~1.0",
+        "doctrine/annotations": "~1.7",
         "doctrine/cache": "~1.0",
-        "egulias/email-validator": "^1.2.8|~2.0"
+        "egulias/email-validator": "^2.1.10"
     },
     "conflict": {
+        "doctrine/lexer": "<1.0.2",
         "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0",
         "symfony/dependency-injection": "<3.4",
         "symfony/http-kernel": "<3.4",
diff --git a/src/Symfony/Component/VarExporter/Internal/Exporter.php b/src/Symfony/Component/VarExporter/Internal/Exporter.php
@@ -155,7 +155,7 @@ public static function prepare($values, $objectsPool, &$refsPool, &$objectsCount
                     }
                     $sleep[$n] = false;
                 }
-                if (!\array_key_exists($name, $proto) || $proto[$name] !== $v) {
+                if (!\array_key_exists($name, $proto) || $proto[$name] !== $v || "\x00Error\x00trace" === $name || "\x00Exception\x00trace" === $name) {
                     $properties[$c][$n] = $v;
                 }
             }
@@ -291,7 +291,7 @@ private static function exportRegistry(Registry $value, string $indent, string $
                 continue;
             }
             if (!Registry::$instantiableWithoutConstructor[$class]) {
-                if (is_subclass_of($class, 'Serializable')) {
+                if (is_subclass_of($class, 'Serializable') && !method_exists($class, '__unserialize')) {
                     $serializables[$k] = 'C:'.\strlen($class).':"'.$class.'":0:{}';
                 } else {
                     $serializables[$k] = 'O:'.\strlen($class).':"'.$class.'":0:{}';
diff --git a/src/Symfony/Component/VarExporter/Internal/Registry.php b/src/Symfony/Component/VarExporter/Internal/Registry.php
@@ -75,7 +75,7 @@ public static function getClassReflector($class, $instantiableWithoutConstructor
         } elseif (!$isClass || $reflector->isAbstract()) {
             throw new NotInstantiableTypeException($class);
         } elseif ($reflector->name !== $class) {
-            $reflector = self::$reflectors[$name = $reflector->name] ?? self::getClassReflector($name, $instantiableWithoutConstructor, $cloneable);
+            $reflector = self::$reflectors[$name = $reflector->name] ?? self::getClassReflector($name, false, $cloneable);
             self::$cloneable[$class] = self::$cloneable[$name];
             self::$instantiableWithoutConstructor[$class] = self::$instantiableWithoutConstructor[$name];
             self::$prototypes[$class] = self::$prototypes[$name];
@@ -86,7 +86,7 @@ public static function getClassReflector($class, $instantiableWithoutConstructor
                 $proto = $reflector->newInstanceWithoutConstructor();
                 $instantiableWithoutConstructor = true;
             } catch (\ReflectionException $e) {
-                $proto = $reflector->implementsInterface('Serializable') && (\PHP_VERSION_ID < 70400 || !method_exists($class, '__unserialize')) ? 'C:' : 'O:';
+                $proto = $reflector->implementsInterface('Serializable') && !method_exists($class, '__unserialize') ? 'C:' : 'O:';
                 if ('C:' === $proto && !$reflector->getMethod('unserialize')->isInternal()) {
                     $proto = null;
                 } elseif (false === $proto = @unserialize($proto.\strlen($class).':"'.$class.'":0:{}')) {
diff --git a/src/Symfony/Component/VarExporter/Tests/Fixtures/array-iterator-legacy.php b/src/Symfony/Component/VarExporter/Tests/Fixtures/array-iterator-legacy.php
@@ -0,0 +1,22 @@
+<?php
+
+return \Symfony\Component\VarExporter\Internal\Hydrator::hydrate(
+    $o = [
+        clone (\Symfony\Component\VarExporter\Internal\Registry::$prototypes['ArrayIterator'] ?? \Symfony\Component\VarExporter\Internal\Registry::p('ArrayIterator')),
+    ],
+    null,
+    [
+        'ArrayIterator' => [
+            "\0" => [
+                [
+                    [
+                        123,
+                    ],
+                    1,
+                ],
+            ],
+        ],
+    ],
+    $o[0],
+    []
+);
diff --git a/src/Symfony/Component/VarExporter/Tests/Fixtures/array-iterator.php b/src/Symfony/Component/VarExporter/Tests/Fixtures/array-iterator.php
@@ -5,18 +5,15 @@
         clone (\Symfony\Component\VarExporter\Internal\Registry::$prototypes['ArrayIterator'] ?? \Symfony\Component\VarExporter\Internal\Registry::p('ArrayIterator')),
     ],
     null,
+    [],
+    $o[0],
     [
-        'ArrayIterator' => [
-            "\0" => [
-                [
-                    [
-                        123,
-                    ],
-                    1,
-                ],
+        [
+            1,
+            [
+                123,
             ],
+            [],
         ],
-    ],
-    $o[0],
-    []
+    ]
 );
diff --git a/src/Symfony/Component/VarExporter/Tests/Fixtures/array-object-custom-legacy.php b/src/Symfony/Component/VarExporter/Tests/Fixtures/array-object-custom-legacy.php
@@ -0,0 +1,22 @@
+<?php
+
+return \Symfony\Component\VarExporter\Internal\Hydrator::hydrate(
+    $o = [
+        clone (\Symfony\Component\VarExporter\Internal\Registry::$prototypes['Symfony\\Component\\VarExporter\\Tests\\MyArrayObject'] ?? \Symfony\Component\VarExporter\Internal\Registry::p('Symfony\\Component\\VarExporter\\Tests\\MyArrayObject')),
+    ],
+    null,
+    [
+        'ArrayObject' => [
+            "\0" => [
+                [
+                    [
+                        234,
+                    ],
+                    1,
+                ],
+            ],
+        ],
+    ],
+    $o[0],
+    []
+);
diff --git a/src/Symfony/Component/VarExporter/Tests/Fixtures/array-object-custom.php b/src/Symfony/Component/VarExporter/Tests/Fixtures/array-object-custom.php
@@ -5,18 +5,17 @@
         clone (\Symfony\Component\VarExporter\Internal\Registry::$prototypes['Symfony\\Component\\VarExporter\\Tests\\MyArrayObject'] ?? \Symfony\Component\VarExporter\Internal\Registry::p('Symfony\\Component\\VarExporter\\Tests\\MyArrayObject')),
     ],
     null,
+    [],
+    $o[0],
     [
-        'ArrayObject' => [
-            "\0" => [
-                [
-                    [
-                        234,
-                    ],
-                    1,
-                ],
+        [
+            1,
+            [
+                234,
+            ],
+            [
+                "\0".'Symfony\\Component\\VarExporter\\Tests\\MyArrayObject'."\0".'unused' => 123,
             ],
         ],
-    ],
-    $o[0],
-    []
+    ]
 );
diff --git a/src/Symfony/Component/VarExporter/Tests/Fixtures/array-object-legacy.php b/src/Symfony/Component/VarExporter/Tests/Fixtures/array-object-legacy.php
diff --git a/src/Symfony/Component/VarExporter/Tests/Fixtures/array-object.php b/src/Symfony/Component/VarExporter/Tests/Fixtures/array-object.php
diff --git a/src/Symfony/Component/VarExporter/Tests/Fixtures/final-array-iterator-legacy.php b/src/Symfony/Component/VarExporter/Tests/Fixtures/final-array-iterator-legacy.php
diff --git a/src/Symfony/Component/VarExporter/Tests/Fixtures/final-array-iterator.php b/src/Symfony/Component/VarExporter/Tests/Fixtures/final-array-iterator.php
diff --git a/src/Symfony/Component/VarExporter/Tests/Fixtures/final-error-legacy.php b/src/Symfony/Component/VarExporter/Tests/Fixtures/final-error-legacy.php
diff --git a/src/Symfony/Component/VarExporter/Tests/Fixtures/final-error.php b/src/Symfony/Component/VarExporter/Tests/Fixtures/final-error.php
diff --git a/src/Symfony/Component/VarExporter/Tests/Fixtures/spl-object-storage-legacy.php b/src/Symfony/Component/VarExporter/Tests/Fixtures/spl-object-storage-legacy.php
diff --git a/src/Symfony/Component/VarExporter/Tests/Fixtures/spl-object-storage.php b/src/Symfony/Component/VarExporter/Tests/Fixtures/spl-object-storage.php
diff --git a/src/Symfony/Component/VarExporter/Tests/VarExporterTest.php b/src/Symfony/Component/VarExporter/Tests/VarExporterTest.php
diff --git a/src/Symfony/Component/Workflow/composer.json b/src/Symfony/Component/Workflow/composer.json

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,8 @@`
`21`	`21`	`class ValidatorCacheWarmerTest extends TestCase`
`22`	`22`	`{`
`23`	`23`	`/**`
	`24`	`+ * @group issue-32995`
	`25`	`+ *`
`24`	`26`	`* @runInSeparateProcess https://github.com/symfony/symfony/issues/32995`
`25`	`27`	`*/`
`26`	`28`	`public function testWarmUp()`
Original file line number	Diff line number	Diff line change
`@@ -254,6 +254,8 @@ public function testPrune()`
`254`	`254`	`}`
`255`	`255`
`256`	`256`	`/**`
	`257`	`+ * @group issue-32995`
	`258`	`+ *`
`257`	`259`	`* @runInSeparateProcess https://github.com/symfony/symfony/issues/32995`
`258`	`260`	`*/`
`259`	`261`	`public function testSavingObject()`