From ead8ef8f2868ccee6881e471295ebbaf8428c96c Mon Sep 17 00:00:00 2001
From: Jeroen De Dauw <jeroendedauw@gmail.com>
Date: Fri, 15 Jan 2021 15:23:11 +0100
Subject: [PATCH] Allow installation with PHP 8.x (#9)

* Allow installation with PHP 8.x

* Update .travis.yml

* Update composer.json

* Modernize dev dependencies

* Update .travis.yml
---
 .gitignore    |  1 +
 .travis.yml   |  6 ++----
 README.md     |  5 ++++-
 composer.json |  9 ++++-----
 phpcs.xml     | 37 -------------------------------------
 5 files changed, 11 insertions(+), 47 deletions(-)

diff --git a/.gitignore b/.gitignore
index 09ec1c5..8582002 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 
 !.*
 .idea/
+.phpunit.result.cache
 
 composer.phar
 composer.lock
diff --git a/.travis.yml b/.travis.yml
index d69c951..cbf8c9d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,9 @@
 language: php
 
 php:
-  - '7.0'
-  - '7.1'
-  - '7.2'
   - '7.3'
   - '7.4'
+  - '8.0'
 
 install:
   - travis_retry composer install
@@ -15,7 +13,7 @@ script:
   - make ci
 
 after_success:
-  - if [[ "`phpenv version-name`" != "7.3" ]]; then exit 0; fi
+  - if [[ "`phpenv version-name`" != "7.4" ]]; then exit 0; fi
   - vendor/bin/phpunit --coverage-clover coverage.clover
   - wget https://scrutinizer-ci.com/ocular.phar
   - php ocular.phar code-coverage:upload --format=php-clover coverage.clover
diff --git a/README.md b/README.md
index 0108861..d56b2c0 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,6 @@ The message reporter specifies `MessageReporter` and `MessageReporterAware` as a
 use Onoi\MessageReporter\MessageReporterFactory;
 use Onoi\MessageReporter\MessageReporterAware;
 use Onoi\MessageReporter\MessageReporterAwareTrait;
-use Onoi\MessageReporter\MessageReporter;
 
 class Bar implements MessageReporterAware {
 
@@ -113,6 +112,10 @@ You can also invoke PHPUnit directly to pass it arguments, as follows
 
 ## Release notes
 
+* 1.4.2 (2021-01-15)
+  - Added support for PHP 8
+  - Changed minimum PHP version to 7.3
+
 * 1.4.1 (2019-04-10)
   - Added `.gitattributes`
 
diff --git a/composer.json b/composer.json
index a005223..b56b8f6 100644
--- a/composer.json
+++ b/composer.json
@@ -18,15 +18,14 @@
 		}
 	],
 	"require": {
-		"php": "^5.6.99|^7.0"
+		"php": ">=7.3"
 	},
 	"require-dev": {
-		"phpunit/phpunit": "^6.5.14",
+		"phpunit/phpunit": "^9.5",
 		"ockcyp/covers-validator": "~1.1",
 		"squizlabs/php_codesniffer": "~3.3",
-		"slevomat/coding-standard": "^3.0|~4.5",
-		"mediawiki/mediawiki-codesniffer": "~23.0",
-		"phpstan/phpstan": "~0.9.2"
+		"mediawiki/mediawiki-codesniffer": "~34.0",
+		"phpstan/phpstan": "~0.12.67"
 	},
 	"extra": {
 		"branch-alias": {
diff --git a/phpcs.xml b/phpcs.xml
index 8c0edd1..9f7bd4a 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -140,43 +140,6 @@
         <exclude name="PEAR.Functions.FunctionCallSignature.OpeningIndent" />
     </rule>
 
-    <!-- Using 3rd party sniff while Squiz isn't there, yet. https://github.com/squizlabs/PHP_CodeSniffer/issues/911 -->
-    <rule ref="./vendor/slevomat/coding-standard/SlevomatCodingStandard/Sniffs/TypeHints/DeclareStrictTypesSniff.php" />
-    <rule ref="SlevomatCodingStandard.TypeHints.DeclareStrictTypes">
-        <properties>
-            <property name="newlinesCountBetweenOpenTagAndDeclare" value="2" />
-            <property name="spacesCountAroundEqualsSign" value="1" />
-        </properties>
-    </rule>
-
-    <rule ref="./vendor/slevomat/coding-standard/SlevomatCodingStandard/Sniffs/TypeHints/ReturnTypeHintSpacingSniff.php" />
-
-    <rule ref="./vendor/slevomat/coding-standard/SlevomatCodingStandard/Sniffs/TypeHints/TypeHintDeclarationSniff.php">
-        <exclude name="SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingTraversableParameterTypeHintSpecification" />
-        <exclude name="SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingTraversablePropertyTypeHintSpecification" />
-        <exclude name="SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingTraversableReturnTypeHintSpecification" />
-        <exclude name="SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingPropertyTypeHint" />
-        <exclude name="SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingParameterTypeHint" />
-        <exclude name="SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingReturnTypeHint" />
-        <exclude name="SlevomatCodingStandard.TypeHints.DeclareStrictTypes.DeclareStrictTypesMissing" />
-        <exclude name="SlevomatCodingStandard.TypeHints.TypeHintDeclaration.UselessDocComment" />
-    </rule>
-
-    <rule ref="SlevomatCodingStandard.TypeHints.TypeHintDeclaration">
-        <properties>
-            <property name="usefulAnnotations" type="array" value="
-				@see,
-				@throws,
-				@dataProvider,
-				@slowThreshold,
-				@noinspection
-			"/>
-            <property name="enableVoidTypeHint" value="false" />
-        </properties>
-    </rule>
-
-    <rule ref="./vendor/slevomat/coding-standard/SlevomatCodingStandard/Sniffs/Namespaces/UseDoesNotStartWithBackslashSniff.php" />
-
     <rule ref="MediaWiki.WhiteSpace.DisallowEmptyLineFunctions">
         <exclude name="MediaWiki.WhiteSpace.DisallowEmptyLineFunctions.NoEmptyLine" />
         <exclude name="MediaWiki.WhiteSpace.SpaceAfterClosure.NoWhitespaceAfterClosure" />