Merge pull request #46 from sandrokeil/feature/support-php-8

Add support for PHP 8
sandrokeil · Sep 5, 2020 · acb0c24 · acb0c24
2 parents 308d4ab + 055b9b2
commit acb0c24
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -30,10 +30,10 @@ matrix:
     - php: 7.4
       env:
         - TEST_COVERAGE=true
-    - php: nightly
+    - php: 8.0
 
   allow_failures:
-    - php: nightly
+    - php: 8.0
 
 before_install:
   - mkdir -p "$HOME/.php-cs-fixer"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,24 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
+## 2.2.0 (2020-09-05)
+
+### Added
+
+* PHP 8 support
+
+### Deprecated
+
+* Nothing
+
+### Removed
+
+* Nothing
+
+### Fixed
+
+* Nothing
+
 ## 2.1.0 (2017-02-14)
 
 ### Added

diff --git a/composer.json b/composer.json
@@ -42,14 +42,14 @@
     }
   },
   "require": {
-    "php": "^7.1"
+    "php": "^7.1 || ^8.0"
   },
   "require-dev": {
     "bookdown/bookdown": "^1.1.0",
     "malukenho/docheader": "^0.1.7",
     "php-coveralls/php-coveralls": "^2.1",
     "phpbench/phpbench": "^0.15",
-    "phpunit/phpunit": "^7.0.1",
+    "phpunit/phpunit": "^7.0.1 || ^9.3.8",
     "squizlabs/php_codesniffer": "^3.0",
     "webuni/commonmark-attributes-extension": "^0.5.0",
     "webuni/commonmark-table-extension": "^0.6.1"

diff --git a/test/Tool/ConfigDumperCommandTest.php b/test/Tool/ConfigDumperCommandTest.php
@@ -51,7 +51,7 @@ class ConfigDumperCommandTest extends TestCase
     private $consoleHelper;
 
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -65,7 +65,7 @@ public function setUp()
         $this->consoleHelper = new ConsoleHelper($this->inputStream, $this->outputStream, $this->errorStream);
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         stream_wrapper_unregister('test');
         TestAsset\TestStream::$inputStack = [];

diff --git a/test/Tool/ConfigDumperTest.php b/test/Tool/ConfigDumperTest.php
@@ -48,7 +48,7 @@ class ConfigDumperTest extends TestCase
     private $consoleHelper;
 
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -62,7 +62,7 @@ public function setUp()
         $this->consoleHelper = new ConsoleHelper($this->inputStream, $this->outputStream, $this->errorStream);
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         stream_wrapper_unregister('test');
         TestAsset\TestStream::$inputStack = [];

diff --git a/test/Tool/ConfigReaderCommandTest.php b/test/Tool/ConfigReaderCommandTest.php
@@ -51,7 +51,7 @@ class ConfigReaderCommandTest extends TestCase
     private $consoleHelper;
 
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -67,7 +67,7 @@ public function setUp()
         file_put_contents(self::CONFIG_FILE, $this->getTestConfig());
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         stream_wrapper_unregister('test');
         TestAsset\TestStream::$inputStack = [];

diff --git a/test/Tool/ConfigReaderTest.php b/test/Tool/ConfigReaderTest.php
@@ -49,7 +49,7 @@ class ConfigReaderTest extends TestCase
     private $consoleHelper;
 
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -63,7 +63,7 @@ public function setUp()
         $this->consoleHelper = new ConsoleHelper($this->inputStream, $this->outputStream, $this->errorStream);
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         stream_wrapper_unregister('test');
         TestAsset\TestStream::$inputStack = [];