Merge pull request #136 from maddy2101/task/update-phpunit-8

[TASK] Update phpunit to version 8
TYPO3 · May 19, 2019 · a0a5ff2 · a0a5ff2
2 parents ff84f2b + b130f30
commit a0a5ff2
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/Classes/Core/Functional/FunctionalTestCase.php b/Classes/Core/Functional/FunctionalTestCase.php
@@ -240,7 +240,7 @@ abstract class FunctionalTestCase extends BaseTestCase
      * @return void
      * @throws \Doctrine\DBAL\DBALException
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         if (!defined('ORIGINAL_ROOT')) {
             $this->markTestSkipped('Functional tests must be called through phpunit on CLI');

diff --git a/Classes/Core/Unit/UnitTestCase.php b/Classes/Core/Unit/UnitTestCase.php
@@ -92,7 +92,7 @@ abstract class UnitTestCase extends BaseTestCase
     /**
      * Set error reporting to always fail on E_NOTICE
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $errorReporting = self::$backupErrorReporting = error_reporting();
         // Always fail on notice level errors
@@ -102,15 +102,15 @@ public static function setUpBeforeClass()
     /**
      * Reset error reporting to original state
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
         error_reporting(self::$backupErrorReporting);
     }
 
     /**
      * Generic setUp()
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         if ($this->backupEnvironment === true) {
             $this->backupEnvironment();
@@ -130,7 +130,7 @@ protected function setUp()
      * @throws \RuntimeException
      * @return void
      */
-    protected function tearDown()
+    protected function tearDown(): void
     {
         // Restore Environment::class is asked for
         if ($this->backupEnvironment === true) {

diff --git a/Classes/Fluid/Unit/ViewHelpers/ViewHelperBaseTestcase.php b/Classes/Fluid/Unit/ViewHelpers/ViewHelperBaseTestcase.php
@@ -76,8 +76,9 @@ abstract class ViewHelperBaseTestcase extends \TYPO3\TestingFramework\Core\Unit\
     /**
      * @return void
      */
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $this->viewHelperVariableContainer = $this->prophesize(ViewHelperVariableContainer::class);
         $this->templateVariableContainer = $this->createMock(StandardVariableProvider::class);
         $this->uriBuilder = $this->createMock(\TYPO3\CMS\Extbase\Mvc\Web\Routing\UriBuilder::class);

diff --git a/composer.json b/composer.json
@@ -25,7 +25,7 @@
     "issues": "https://github.com/TYPO3/testing-framework/issues"
   },
   "require": {
-    "phpunit/phpunit": "^7.5.6",
+    "phpunit/phpunit": "^7.5.6 || ^8",
     "mikey179/vfsstream": "~1.6.0",
     "typo3fluid/fluid": "^2.5",
     "typo3/cms-core": "^9.3",
@@ -36,7 +36,7 @@
     "typo3/cms-recordlist": "^9.3"
   },
   "suggest": {
-    "codeception/codeception": "^2.4",
+    "codeception/codeception": "^2.5.4 || ^3",
     "typo3/cms-styleguide": "^9.0"
   },
   "config": {