Add PHP 8.0 to build matrix

.github/workflows/continuous-integration.yml

@@ -8,8 +8,8 @@ jobs:
     strategy:
       matrix:
         operating-system: [ubuntu-latest]
-        # TODO Add 8.0 and 8.1 versions as well
-        php-versions: ['5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4']
+        # TODO Add 8.1 version as well
+        php-versions: ['5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0']
     name: PHP ${{ matrix.php-versions }} Test on ${{ matrix.operating-system }}
     steps:
       - uses: actions/checkout@v2

composer.json

@@ -16,10 +16,11 @@
         "php": ">=5.5.9"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.8.36 || ~5.7 || ~6.5 || ~7.5",
+        "phpunit/phpunit": "~4.8.36 || ~5.7 || ~6.5 || ~7.5 || ~8.5",
         "scrutinizer/ocular": "~1.1",
         "squizlabs/php_codesniffer": "~2.2",
-        "symfony/yaml": "~3.4"
+        "symfony/yaml": "~3.4",
+        "yoast/phpunit-polyfills": "^1.0"
     },
     "suggest": {
         "symfony/yaml": "~3.4"

tests/AbstractConfigTest.php

@@ -1,7 +1,7 @@
 <?php
 namespace Noodlehaus;
 
-use PHPUnit\Framework\TestCase;
+use Yoast\PHPUnitPolyfills\TestCases\TestCase;
 use Noodlehaus\Test\Fixture\SimpleConfig;
 
 /**
@@ -18,8 +18,7 @@ class AbstractConfigTest extends TestCase
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
      */
-    protected function setUp()
-    {
+    protected function set_up() {
         $this->config = new SimpleConfig(
             [
                 'host' => 'localhost',
@@ -39,14 +38,6 @@ protected function setUp()
         );
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers Noodlehaus\AbstractConfig::__construct()
      * @covers Noodlehaus\AbstractConfig::getDefaults()

tests/ConfigTest.php

@@ -15,22 +15,6 @@ class ConfigTest extends TestCase
      */
     protected $config;
 
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     */
-    protected function setUp()
-    {
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers                   Noodlehaus\Config::load()
      * @covers                   Noodlehaus\Config::loadFromFile()

tests/Parser/IniTest.php

@@ -1,7 +1,7 @@
 <?php
 namespace Noodlehaus\Parser\Test;
 
-use PHPUnit\Framework\TestCase;
+use Yoast\PHPUnitPolyfills\TestCases\TestCase;
 use Noodlehaus\Parser\Ini;
 
 /**
@@ -18,19 +18,11 @@ class IniTest extends TestCase
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
      */
-    protected function setUp()
+    protected function set_up()
     {
         $this->ini = new Ini();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers Noodlehaus\Parser\Ini::getSupportedExtensions()
      */

tests/Parser/JsonTest.php

@@ -1,7 +1,7 @@
 <?php
 namespace Noodlehaus\Parser\Test;
 
-use PHPUnit\Framework\TestCase;
+use Yoast\PHPUnitPolyfills\TestCases\TestCase;
 use Noodlehaus\Parser\Json;
 
 /**
@@ -18,19 +18,11 @@ class JsonTest extends TestCase
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
      */
-    protected function setUp()
+    protected function set_up()
     {
         $this->json = new Json();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers Noodlehaus\Parser\Json::getSupportedExtensions()
      */

tests/Parser/PhpTest.php

@@ -1,7 +1,7 @@
 <?php
 namespace Noodlehaus\Parser\Test;
 
-use PHPUnit\Framework\TestCase;
+use Yoast\PHPUnitPolyfills\TestCases\TestCase;
 use Noodlehaus\Parser\Php;
 
 /**
@@ -18,19 +18,11 @@ class PhpTest extends TestCase
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
      */
-    protected function setUp()
+    protected function set_up()
     {
         $this->php = new Php();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers Noodlehaus\Parser\Php::getSupportedExtensions()
      */

tests/Parser/PropertiesTest.php

@@ -3,7 +3,7 @@
 namespace Noodlehaus\Parser\Test;
 
 use Noodlehaus\Parser\Properties;
-use PHPUnit\Framework\TestCase;
+use Yoast\PHPUnitPolyfills\TestCases\TestCase;
 
 class PropertiesTest extends TestCase
 {
@@ -16,19 +16,11 @@ class PropertiesTest extends TestCase
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
      */
-    protected function setUp()
+    protected function set_up()
     {
         $this->properties = new Properties();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers Noodlehaus\Parser\Properties::getSupportedExtensions()
      */

tests/Parser/SerializeTest.php

@@ -1,7 +1,7 @@
 <?php
 namespace Noodlehaus\Parser\Test;
 
-use PHPUnit\Framework\TestCase;
+use Yoast\PHPUnitPolyfills\TestCases\TestCase;
 use Noodlehaus\Parser\Serialize;
 
 /**
@@ -18,19 +18,11 @@ class SerializeTest extends TestCase
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
      */
-    protected function setUp()
+    protected function set_up()
     {
         $this->serialize = new Serialize();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers Noodlehaus\Parser\Serialize::getSupportedExtensions()
      */

tests/Parser/XmlTest.php

@@ -1,7 +1,7 @@
 <?php
 namespace Noodlehaus\Parser\Test;
 
-use PHPUnit\Framework\TestCase;
+use Yoast\PHPUnitPolyfills\TestCases\TestCase;
 use Noodlehaus\Parser\Xml;
 
 /**
@@ -18,19 +18,11 @@ class XmlTest extends TestCase
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
      */
-    protected function setUp()
+    protected function set_up()
     {
         $this->xml = new Xml();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers Noodlehaus\Parser\Xml::getSupportedExtensions()
      */

tests/Parser/YamlTest.php

@@ -1,7 +1,7 @@
 <?php
 namespace Noodlehaus\Parser\Test;
 
-use PHPUnit\Framework\TestCase;
+use Yoast\PHPUnitPolyfills\TestCases\TestCase;
 use Noodlehaus\Parser\Yaml;
 
 /**
@@ -18,19 +18,11 @@ class YamlTest extends TestCase
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
      */
-    protected function setUp()
+    protected function set_up()
     {
         $this->yaml = new Yaml();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers Noodlehaus\Parser\Yaml::getSupportedExtensions()
      */

tests/Writer/IniTest.php

@@ -3,7 +3,7 @@
 namespace Noodlehaus\Writer\Test;
 
 use Noodlehaus\Writer\Ini;
-use PHPUnit\Framework\TestCase;
+use Yoast\PHPUnitPolyfills\TestCases\TestCase;
 
 class IniTest extends TestCase
 {
@@ -26,7 +26,7 @@ class IniTest extends TestCase
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
      */
-    protected function setUp()
+    protected function set_up()
     {
         $this->writer = new Ini();
         $this->temp_file = tempnam(sys_get_temp_dir(), 'config.ini');
@@ -46,7 +46,7 @@ protected function setUp()
      * Tears down the fixture, for example, closes a network connection.
      * This method is called after a test is executed.
      */
-    protected function tearDown()
+    protected function tear_down()
     {
         unlink($this->temp_file);
     }

tests/Writer/JsonTest.php

@@ -3,7 +3,7 @@
 namespace Noodlehaus\Writer\Test;
 
 use Noodlehaus\Writer\Json;
-use PHPUnit\Framework\TestCase;
+use Yoast\PHPUnitPolyfills\TestCases\TestCase;
 
 class JsonTest extends TestCase
 {
@@ -26,7 +26,7 @@ class JsonTest extends TestCase
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
      */
-    protected function setUp()
+    protected function set_up()
     {
         $this->writer = new Json();
         $this->temp_file = tempnam(sys_get_temp_dir(), 'config.json');
@@ -49,7 +49,7 @@ protected function setUp()
      * Tears down the fixture, for example, closes a network connection.
      * This method is called after a test is executed.
      */
-    protected function tearDown()
+    protected function tear_down()
     {
         unlink($this->temp_file);
     }

tests/Writer/PropertiesTest.php

@@ -3,7 +3,7 @@
 namespace Noodlehaus\Writer\Test;
 
 use Noodlehaus\Writer\Properties;
-use PHPUnit\Framework\TestCase;
+use Yoast\PHPUnitPolyfills\TestCases\TestCase;
 
 class PropertiesTest extends TestCase
 {
@@ -26,7 +26,7 @@ class PropertiesTest extends TestCase
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
      */
-    protected function setUp()
+    protected function set_up()
     {
         $this->writer = new Properties();
         $this->temp_file = tempnam(sys_get_temp_dir(), 'config.properties');
@@ -45,7 +45,7 @@ protected function setUp()
      * Tears down the fixture, for example, closes a network connection.
      * This method is called after a test is executed.
      */
-    protected function tearDown()
+    protected function tear_down()
     {
         unlink($this->temp_file);
     }

tests/Writer/SerializeTest.php

@@ -3,7 +3,7 @@
 namespace Noodlehaus\Writer\Test;
 
 use Noodlehaus\Writer\Serialize;
-use PHPUnit\Framework\TestCase;
+use Yoast\PHPUnitPolyfills\TestCases\TestCase;
 
 class SerializeTest extends TestCase
 {
@@ -26,7 +26,7 @@ class SerializeTest extends TestCase
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
      */
-    protected function setUp()
+    protected function set_up()
     {
         $this->writer = new Serialize();
         $this->temp_file = tempnam(sys_get_temp_dir(), 'config.txt');
@@ -49,7 +49,7 @@ protected function setUp()
      * Tears down the fixture, for example, closes a network connection.
      * This method is called after a test is executed.
      */
-    protected function tearDown()
+    protected function tear_down()
     {
         unlink($this->temp_file);
     }