symfony · phansys · Jul 22, 2019 · Jul 23, 2019 · Jul 23, 2019 · Jul 23, 2019
diff --git a/.travis.yml b/.travis.yml
@@ -26,6 +26,7 @@ matrix:
           env: deps=high
         - php: 7.3
           env: deps=low
+        - php: 7.4snapshot
    fast_finish: true
 
 cache:
@@ -178,7 +179,7 @@ before_install:
               [[ -e $ext_cache ]] || (tfold ext.symfony_debug "cd src/Symfony/Component/Debug/Resources/ext && phpize && ./configure && make && mv modules/symfony_debug.so $ext_cache && phpize --clean")
               echo extension = $ext_cache >> $INI
           elif [[ $PHP = 7.* ]]; then
-              tfold ext.apcu tpecl apcu-5.1.16 apcu.so $INI
+              tfold ext.apcu tpecl apcu-5.1.17 apcu.so $INI
               tfold ext.mongodb tpecl mongodb-1.6.0alpha1 mongodb.so $INI
           fi
       done

diff --git a/phpunit b/phpunit
@@ -7,8 +7,12 @@ if (!file_exists(__DIR__.'/vendor/symfony/phpunit-bridge/bin/simple-phpunit')) {
     echo "Unable to find the `simple-phpunit` script in `vendor/symfony/phpunit-bridge/bin/`.\nPlease run `composer update` before running this command.\n";
     exit(1);
 }
-if (\PHP_VERSION_ID >= 70000 && !getenv('SYMFONY_PHPUNIT_VERSION')) {
-    putenv('SYMFONY_PHPUNIT_VERSION=6.5');
+if (!getenv('SYMFONY_PHPUNIT_VERSION')) {
+    if (\PHP_VERSION_ID >= 70400) {
+        putenv('SYMFONY_PHPUNIT_VERSION=8.2');
+    } elseif (\PHP_VERSION_ID >= 70000) {
+        putenv('SYMFONY_PHPUNIT_VERSION=6.5');
+    }
 }
 putenv('SYMFONY_PHPUNIT_DIR='.__DIR__.'/.phpunit');
 require __DIR__.'/vendor/symfony/phpunit-bridge/bin/simple-phpunit';
diff --git a/src/Symfony/Bridge/Doctrine/Tests/ContainerAwareEventManagerTest.php b/src/Symfony/Bridge/Doctrine/Tests/ContainerAwareEventManagerTest.php
@@ -20,7 +20,10 @@ class ContainerAwareEventManagerTest extends TestCase
     private $container;
     private $evm;
 
-    protected function setUp()
+    /**
+     * @before
+     */
+    protected function before()
     {
         $this->container = new Container();
         $this->evm = new ContainerAwareEventManager($this->container);

diff --git a/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/DoctrineExtensionTest.php b/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/DoctrineExtensionTest.php
@@ -26,9 +26,11 @@ class DoctrineExtensionTest extends TestCase
      */
     private $extension;
 
-    protected function setUp()
+    /**
+     * @before
+     */
+    protected function before()
     {
-        parent::setUp();
 
         $this->extension = $this
             ->getMockBuilder('Symfony\Bridge\Doctrine\DependencyInjection\AbstractDoctrineExtension')

diff --git a/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/DoctrineChoiceLoaderTest.php b/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/DoctrineChoiceLoaderTest.php
@@ -71,7 +71,10 @@ class DoctrineChoiceLoaderTest extends TestCase
      */
     private $obj3;
 
-    protected function setUp()
+    /**
+     * @before
+     */
+    protected function before()
     {
         $this->factory = $this->getMockBuilder('Symfony\Component\Form\ChoiceList\Factory\ChoiceListFactoryInterface')->getMock();
         $this->om = $this->getMockBuilder('Doctrine\Common\Persistence\ObjectManager')->getMock();

diff --git a/src/Symfony/Bridge/Doctrine/Tests/Form/DataTransformer/CollectionToArrayTransformerTest.php b/src/Symfony/Bridge/Doctrine/Tests/Form/DataTransformer/CollectionToArrayTransformerTest.php
@@ -25,7 +25,10 @@ class CollectionToArrayTransformerTest extends TestCase
      */
     private $transformer;
 
-    protected function setUp()
+    /**
+     * @before
+     */
+    protected function before()
     {
         $this->transformer = new CollectionToArrayTransformer();
     }

diff --git a/src/Symfony/Bridge/Doctrine/Tests/Form/EventListener/MergeDoctrineCollectionListenerTest.php b/src/Symfony/Bridge/Doctrine/Tests/Form/EventListener/MergeDoctrineCollectionListenerTest.php
@@ -28,7 +28,10 @@ class MergeDoctrineCollectionListenerTest extends TestCase
     private $factory;
     private $form;
 
-    protected function setUp()
+    /**
+     * @before
+     */
+    protected function before()
     {
         $this->collection = new ArrayCollection(['test']);
         $this->dispatcher = new EventDispatcher();
@@ -37,7 +40,10 @@ protected function setUp()
             ->getForm();
     }
 
-    protected function tearDown()
+    /**
+     * @after
+     */
+    protected function after()
     {
         $this->collection = null;
         $this->dispatcher = null;

diff --git a/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypePerformanceTest.php b/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypePerformanceTest.php
@@ -50,12 +50,13 @@ protected function getExtensions()
         ];
     }
 
-    protected function setUp()
+    /**
+     * @before
+     */
+    protected function before()
     {
         $this->em = DoctrineTestHelper::createTestEntityManager();
 
-        parent::setUp();
-
         $schemaTool = new SchemaTool($this->em);
         $classes = [
             $this->em->getClassMetadata(self::ENTITY_CLASS),

diff --git a/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php b/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php
@@ -59,13 +59,14 @@ class EntityTypeTest extends BaseTypeTest
 
     protected static $supportedFeatureSetVersion = 304;
 
-    protected function setUp()
+    /**
+     * @before
+     */
+    protected function before()
     {
         $this->em = DoctrineTestHelper::createTestEntityManager();
         $this->emRegistry = $this->createRegistryMock('default', $this->em);
 
-        parent::setUp();
-
         $schemaTool = new SchemaTool($this->em);
         $classes = [
             $this->em->getClassMetadata(self::ITEM_GROUP_CLASS),
@@ -89,9 +90,11 @@ protected function setUp()
         }
     }
 
-    protected function tearDown()
+    /**
+     * @after
+     */
+    protected function after()
     {
-        parent::tearDown();
 
         $this->em = null;
         $this->emRegistry = null;

diff --git a/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php b/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php
@@ -28,7 +28,10 @@ class DoctrineExtractorTest extends TestCase
      */
     private $extractor;
 
-    protected function setUp()
+    /**
+     * @before
+     */
+    protected function before()
     {
         $config = Setup::createAnnotationMetadataConfiguration([__DIR__.\DIRECTORY_SEPARATOR.'Fixtures'], true);
         $entityManager = EntityManager::create(['driver' => 'pdo_sqlite'], $config);

diff --git a/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php b/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php
@@ -58,7 +58,10 @@ class UniqueEntityValidatorTest extends ConstraintValidatorTestCase
 
     protected $repositoryFactory;
 
-    protected function setUp()
+    /**
+     * @before
+     */
+    protected function before()
     {
         $this->repositoryFactory = new TestRepositoryFactory();
 
@@ -73,7 +76,6 @@ protected function setUp()
         $this->registry = $this->createRegistryMock($this->em);
         $this->createSchema($this->em);
 
-        parent::setUp();
     }
 
     protected function createRegistryMock(ObjectManager $em = null)

diff --git a/src/Symfony/Bridge/PhpUnit/Tests/ClockMockTest.php b/src/Symfony/Bridge/PhpUnit/Tests/ClockMockTest.php
@@ -26,7 +26,10 @@ public static function setUpBeforeClass()
         ClockMock::register(__CLASS__);
     }
 
-    protected function setUp()
+    /**
+     * @before
+     */
+    protected function before()
     {
         ClockMock::withClockMock(1234567890.125);
     }

diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DnsMockTest.php b/src/Symfony/Bridge/PhpUnit/Tests/DnsMockTest.php
@@ -16,7 +16,10 @@
 
 class DnsMockTest extends TestCase
 {
-    protected function tearDown()
+    /**
+     * @after
+     */
+    protected function after()
     {
         DnsMock::withMockedHosts(array());
     }

diff --git a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Instantiator/RuntimeInstantiatorTest.php b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Instantiator/RuntimeInstantiatorTest.php
@@ -29,8 +29,10 @@ class RuntimeInstantiatorTest extends TestCase
 
     /**
      * {@inheritdoc}
+     *
+     * @before
      */
-    protected function setUp()
+    protected function before()
     {
         $this->instantiator = new RuntimeInstantiator();
     }

diff --git a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php
@@ -31,8 +31,10 @@ class ProxyDumperTest extends TestCase
 
     /**
      * {@inheritdoc}
+     *
+     * @before
      */
-    protected function setUp()
+    protected function before()
     {
         $this->dumper = new ProxyDumper();
     }

diff --git a/src/Symfony/Bridge/Twig/Tests/AppVariableTest.php b/src/Symfony/Bridge/Twig/Tests/AppVariableTest.php
@@ -15,7 +15,10 @@ class AppVariableTest extends TestCase
      */
     protected $appVariable;
 
-    protected function setUp()
+    /**
+     * @before
+     */
+    protected function before()
     {
         $this->appVariable = new AppVariable();
     }

diff --git a/src/Symfony/Bridge/Twig/Tests/Command/LintCommandTest.php b/src/Symfony/Bridge/Twig/Tests/Command/LintCommandTest.php
@@ -113,12 +113,18 @@ private function createFile($content)
         return $filename;
     }
 
-    protected function setUp()
+    /**
+     * @before
+     */
+    protected function before()
     {
         $this->files = [];
     }
 
-    protected function tearDown()
+    /**
+     * @after
+     */
+    protected function after()
     {
         foreach ($this->files as $file) {
             if (file_exists($file)) {

@@ -33,9 +33,12 @@ class FormExtensionBootstrap3HorizontalLayoutTest extends AbstractBootstrap3Hori
      */
     private $renderer;
 
-    protected function setUp()
+    /**
+     * @before
+     */
+    protected function before()
     {
-        parent::setUp();
+        parent::before();
 
         $loader = new StubFilesystemLoader([
             __DIR__.'/../../Resources/views/Form',

@@ -29,9 +29,12 @@ class FormExtensionBootstrap3LayoutTest extends AbstractBootstrap3LayoutTest
      */
     private $renderer;
 
-    protected function setUp()
+    /**
+     * @before
+     */
+    protected function before()
     {
-        parent::setUp();
+        parent::before();
 
         $loader = new StubFilesystemLoader([
             __DIR__.'/../../Resources/views/Form',

@@ -35,9 +35,12 @@ class FormExtensionBootstrap4HorizontalLayoutTest extends AbstractBootstrap4Hori
 
     private $renderer;
 
-    protected function setUp()
+    /**
+     * @before
+     */
+    protected function before()
     {
-        parent::setUp();
+        parent::before();
 
         $loader = new StubFilesystemLoader([
             __DIR__.'/../../Resources/views/Form',

@@ -33,9 +33,12 @@ class FormExtensionBootstrap4LayoutTest extends AbstractBootstrap4LayoutTest
      */
     private $renderer;
 
-    protected function setUp()
+    /**
+     * @before
+     */
+    protected function before()
     {
-        parent::setUp();
+        parent::before();
 
         $loader = new StubFilesystemLoader([
             __DIR__.'/../../Resources/views/Form',

@@ -33,9 +33,12 @@ class FormExtensionDivLayoutTest extends AbstractDivLayoutTest
 
     protected static $supportedFeatureSetVersion = 304;
 
-    protected function setUp()
+    /**
+     * @before
+     */
+    protected function before()
     {
-        parent::setUp();
+        parent::before();
 
         $loader = new StubFilesystemLoader([
             __DIR__.'/../../Resources/views/Form',

@@ -32,9 +32,12 @@ class FormExtensionTableLayoutTest extends AbstractTableLayoutTest
 
     protected static $supportedFeatureSetVersion = 304;
 
-    protected function setUp()
+    /**
+     * @before
+     */
+    protected function before()
     {
-        parent::setUp();
+        parent::before();
 
         $loader = new StubFilesystemLoader([
             __DIR__.'/../../Resources/views/Form',

diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/WebLinkExtensionTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/WebLinkExtensionTest.php
@@ -32,7 +32,10 @@ class WebLinkExtensionTest extends TestCase
      */
     private $extension;
 
-    protected function setUp()
+    /**
+     * @before
+     */
+    protected function before()
     {
         $this->request = new Request();
 

@@ -23,7 +23,10 @@ class WorkflowExtensionTest extends TestCase
 {
     private $extension;
 
-    protected function setUp()
+    /**
+     * @before
+     */
+    protected function before()
     {
         $places = ['ordered', 'waiting_for_payment', 'processed'];
         $transitions = [