Merge branch '3.4' into 4.3

* 3.4:
  Use PHP 7.4 on deps=low

.travis.yml

@@ -26,9 +26,10 @@ env:
 matrix:
     include:
         - php: 7.1
-        - php: 7.2
+          env: php_extra="7.2"
-          env: deps=high
         - 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"

src/Symfony/Bridge/Doctrine/composer.json

@@ -24,6 +24,7 @@
         "symfony/service-contracts": "^1.1"
     },
     "require-dev": {
+        "doctrine/annotations": "~1.7",
         "symfony/stopwatch": "~3.4|~4.0",
         "symfony/config": "^4.2",
         "symfony/dependency-injection": "~3.4|~4.0",

src/Symfony/Bundle/FrameworkBundle/Tests/CacheWarmer/ValidatorCacheWarmerTest.php

@@ -21,6 +21,8 @@ use Symfony\Component\Validator\ValidatorBuilder;
 class ValidatorCacheWarmerTest extends TestCase
 {
     /**
+     * @group issue-32995
+     *
      * @runInSeparateProcess https://github.com/symfony/symfony/issues/32995
      */
     public function testWarmUp()

src/Symfony/Bundle/FrameworkBundle/composer.json

@@ -18,7 +18,7 @@
     "require": {
         "php": "^7.1.3",
         "ext-xml": "*",
-        "symfony/cache": "~4.3",
+        "symfony/cache": "^4.3.4",
         "symfony/config": "^4.3.4",
         "symfony/debug": "~4.0",
         "symfony/dependency-injection": "^4.3",
@@ -34,7 +34,7 @@
         "fig/link-util": "^1.0",
         "symfony/asset": "~3.4|~4.0",
         "symfony/browser-kit": "^4.3",
-        "symfony/console": "^4.3",
+        "symfony/console": "^4.3.4",
         "symfony/css-selector": "~3.4|~4.0",
         "symfony/dom-crawler": "^4.3",
         "symfony/polyfill-intl-icu": "~1.0",
@@ -59,7 +59,7 @@
         "symfony/property-info": "~3.4|~4.0",
         "symfony/lock": "~3.4|~4.0",
         "symfony/web-link": "~3.4|~4.0",
-        "doctrine/annotations": "~1.0",
+        "doctrine/annotations": "~1.7",
         "phpdocumentor/reflection-docblock": "^3.0|^4.0",
         "twig/twig": "~1.34|~2.4"
     },

src/Symfony/Bundle/SecurityBundle/composer.json

@@ -44,7 +44,7 @@
         "symfony/yaml": "~3.4|~4.0",
         "symfony/expression-language": "~3.4|~4.0",
         "doctrine/doctrine-bundle": "~1.5",
-        "twig/twig": "~1.34|~2.4"
+        "twig/twig": "~1.41|~2.10"
     },
     "conflict": {
         "symfony/browser-kit": "<4.2",

src/Symfony/Bundle/TwigBundle/composer.json

@@ -38,7 +38,7 @@
         "symfony/yaml": "~3.4|~4.0",
         "symfony/framework-bundle": "~4.3",
         "symfony/web-link": "~3.4|~4.0",
-        "doctrine/annotations": "~1.0",
+        "doctrine/annotations": "~1.7",
         "doctrine/cache": "~1.0"
     },
     "conflict": {

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

@@ -254,6 +254,8 @@ abstract class AdapterTestCase extends CachePoolTest
     }
 
     /**
+     * @group issue-32995
+     *
      * @runInSeparateProcess https://github.com/symfony/symfony/issues/32995
      */
     public function testSavingObject()

src/Symfony/Component/Config/Tests/Resource/ClassExistenceResourceTest.php

@@ -76,6 +76,8 @@ EOF
     }
 
     /**
+     * @group issue-32995
+     *
      * @runInSeparateProcess https://github.com/symfony/symfony/issues/32995
      */
     public function testBadParentWithTimestamp()
@@ -85,6 +87,8 @@ EOF
     }
 
     /**
+     * @group issue-32995
+     *
      * @runInSeparateProcess https://github.com/symfony/symfony/issues/32995
      */
     public function testBadParentWithNoTimestamp()

src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php

@@ -350,6 +350,8 @@ class AutowirePassTest extends TestCase
     }
 
     /**
+     * @group issue-32995
+     *
      * @runInSeparateProcess https://github.com/symfony/symfony/issues/32995
      */
     public function testParentClassNotFoundThrowsException()
@@ -626,6 +628,8 @@ class AutowirePassTest extends TestCase
     }
 
     /**
+     * @group issue-32995
+     *
      * @runInSeparateProcess https://github.com/symfony/symfony/issues/32995
      */
     public function testIgnoreServiceWithClassNotExisting()
@@ -831,6 +835,8 @@ class AutowirePassTest extends TestCase
     }
 
     /**
+     * @group issue-32995
+     *
      * @runInSeparateProcess https://github.com/symfony/symfony/issues/32995
      */
     public function testExceptionWhenAliasDoesNotExist()

src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveBindingsPassTest.php

@@ -62,6 +62,8 @@ class ResolveBindingsPassTest extends TestCase
     }
 
     /**
+     * @group issue-32995
+     *
      * @runInSeparateProcess https://github.com/symfony/symfony/issues/32995
      */
     public function testMissingParent()

src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php

@@ -1044,6 +1044,8 @@ class PhpDumperTest extends TestCase
     }
 
     /**
+     * @group issue-32995
+     *
      * @runInSeparateProcess https://github.com/symfony/symfony/issues/32995
      */
     public function testHotPathOptimizations()

src/Symfony/Component/DependencyInjection/Tests/Loader/FileLoaderTest.php

@@ -107,6 +107,8 @@ class FileLoaderTest extends TestCase
     }
 
     /**
+     * @group issue-32995
+     *
      * @runInSeparateProcess https://github.com/symfony/symfony/issues/32995
      */
     public function testRegisterClassesWithExclude()
@@ -139,6 +141,8 @@ class FileLoaderTest extends TestCase
     }
 
     /**
+     * @group issue-32995
+     *
      * @runInSeparateProcess https://github.com/symfony/symfony/issues/32995
      */
     public function testRegisterClassesWithExcludeAsArray()
@@ -161,6 +165,8 @@ class FileLoaderTest extends TestCase
     }
 
     /**
+     * @group issue-32995
+     *
      * @runInSeparateProcess https://github.com/symfony/symfony/issues/32995
      */
     public function testNestedRegisterClasses()
@@ -192,6 +198,8 @@ class FileLoaderTest extends TestCase
     }
 
     /**
+     * @group issue-32995
+     *
      * @runInSeparateProcess https://github.com/symfony/symfony/issues/32995
      */
     public function testMissingParentClass()

src/Symfony/Component/PropertyInfo/composer.json

@@ -31,7 +31,7 @@
         "symfony/cache": "~3.4|~4.0",
         "symfony/dependency-injection": "~3.4|~4.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",

src/Symfony/Component/Validator/composer.json

@@ -35,11 +35,12 @@
         "symfony/property-access": "~3.4|~4.0",
         "symfony/property-info": "~3.4|~4.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",

src/Symfony/Component/Workflow/composer.json

@@ -21,7 +21,7 @@
     ],
     "require": {
         "php": "^7.1.3",
-        "symfony/property-access": "~3.4|~4.0"
+        "symfony/property-access": "~3.4.31|^4.3.4"
     },
     "require-dev": {
         "psr/log": "~1.0",