Make tests support phpunit 8

Author: nicolas-grekas

ForwardCompatTestTrait.php

@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\PhpUnit;
+
+use PHPUnit\Framework\TestCase;
+
+// A trait to provide forward compatibility with newest PHPUnit versions
+
+if (method_exists(\ReflectionMethod::class, 'hasReturnType') && (new \ReflectionMethod(TestCase::class, 'tearDown'))->hasReturnType()) {
+    trait ForwardCompatTestTrait
+    {
+        use Legacy\ForwardCompatTestTraitForV8;
+    }
+} else {
+    trait ForwardCompatTestTrait
+    {
+        use Legacy\ForwardCompatTestTraitForV5;
+    }
+}

Legacy/ForwardCompatTestTraitForV5.php

@@ -0,0 +1,82 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\PhpUnit\Legacy;
+
+/**
+ * @internal
+ */
+trait ForwardCompatTestTraitForV5
+{
+    /**
+     * @return void
+     */
+    public static function setUpBeforeClass()
+    {
+        self::doSetUpBeforeClass();
+    }
+
+    /**
+     * @return void
+     */
+    public static function tearDownAfterClass()
+    {
+        self::doTearDownAfterClass();
+    }
+
+    /**
+     * @return void
+     */
+    protected function setUp()
+    {
+        self::doSetUp();
+    }
+
+    /**
+     * @return void
+     */
+    protected function tearDown()
+    {
+        self::doTearDown();
+    }
+
+    /**
+     * @return void
+     */
+    private static function doSetUpBeforeClass()
+    {
+        parent::setUpBeforeClass();
+    }
+
+    /**
+     * @return void
+     */
+    private static function doTearDownAfterClass()
+    {
+        parent::tearDownAfterClass();
+    }
+
+    /**
+     * @return void
+     */
+    private function doSetUp()
+    {
+        parent::setUp();
+    }
+
+    /**
+     * @return void
+     */
+    private function doTearDown()
+    {
+        parent::tearDown();
+    }
+}

Legacy/ForwardCompatTestTraitForV8.php

@@ -0,0 +1,58 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\PhpUnit\Legacy;
+
+/**
+ * @internal
+ */
+trait ForwardCompatTestTraitForV8
+{
+    public static function setUpBeforeClass(): void
+    {
+        self::doSetUpBeforeClass();
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::doTearDownAfterClass();
+    }
+
+    protected function setUp(): void
+    {
+        self::doSetUp();
+    }
+
+    protected function tearDown(): void
+    {
+        self::doTearDown();
+    }
+
+    private static function doSetUpBeforeClass(): void
+    {
+        parent::setUpBeforeClass();
+    }
+
+    private static function doTearDownAfterClass(): void
+    {
+        parent::tearDownAfterClass();
+    }
+
+    private function doSetUp(): void
+    {
+        parent::setUp();
+    }
+
+    private function doTearDown(): void
+    {
+        parent::tearDown();
+    }
+}

Tests/ClockMockTest.php

@@ -13,6 +13,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Bridge\PhpUnit\ClockMock;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 
 /**
  * @author Dominic Tubach <[email protected]>
@@ -21,12 +22,14 @@
  */
 class ClockMockTest extends TestCase
 {
-    public static function setUpBeforeClass()
+    use ForwardCompatTestTrait;
+
+    private static function doSetUpBeforeClass()
     {
         ClockMock::register(__CLASS__);
     }
 
-    protected function setUp()
+    private function doSetUp()
     {
         ClockMock::withClockMock(1234567890.125);
     }

Tests/DnsMockTest.php

@@ -13,10 +13,13 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Bridge\PhpUnit\DnsMock;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 
 class DnsMockTest extends TestCase
 {
-    protected function tearDown()
+    use ForwardCompatTestTrait;
+
+    private function doTearDown()
     {
         DnsMock::withMockedHosts(array());
     }