php 8.0 compatibility

sascha-egerer · May 15, 2021 · acad4ae · acad4ae
1 parent 9054aea
commit acad4ae
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,6 +3,7 @@ php:
   - 7.2
   - 7.3
   - 7.4
+  - 8.0
 env:
   - dependencies=lowest
   - dependencies=highest

diff --git a/composer.json b/composer.json
@@ -6,16 +6,17 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
-        "php": "~7.1",
+        "php": "^7.2 || ^8.0",
         "phpstan/phpstan": "^0.12",
         "typo3/cms-core": "^8.7 || ^9.5 || ^10.4 || 11.*.*@dev",
         "typo3/cms-extbase": "^8.7 || ^9.5 || ^10.4 || 11.*.*@dev"
     },
     "require-dev": {
-        "consistence/coding-standard": "^3.8",
+        "consistence-community/coding-standard": "^3.8",
         "dealerdirect/phpcodesniffer-composer-installer": "^0.7.1",
         "php-parallel-lint/php-parallel-lint": "^1.2",
-        "phing/phing": "^2.16.0",
+        "phing/phing": "^2.16.4",
+        "phpstan/phpstan": "^0.12.37",
         "phpstan/phpstan-strict-rules": "^0.12"
     },
     "autoload": {

diff --git a/phpcs.xml b/phpcs.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0"?>
 <ruleset name="PHPStan TYPO3">
 	<config name="php_version" value="70200" />
-	<rule ref="vendor/consistence/coding-standard/Consistence/ruleset.xml">
+	<rule ref="vendor/consistence-community/coding-standard/Consistence/ruleset.xml">
+		<exclude name="SlevomatCodingStandard.Namespaces.FullyQualifiedClassNameAfterKeyword.NonFullyQualifiedImplements"/>
+		<exclude name="SlevomatCodingStandard.TypeHints.DeclareStrictTypes.IncorrectWhitespaceBeforeDeclare"/>
 		<exclude name="SlevomatCodingStandard.Commenting.InlineDocCommentDeclaration.InvalidFormat"/>
-		<exclude name="SlevomatCodingStandard.Namespaces.FullyQualifiedClassNameAfterKeyword"/>
 		<exclude name="SlevomatCodingStandard.Namespaces.FullyQualifiedClassNameInAnnotation"/>
 		<exclude name="SlevomatCodingStandard.Namespaces.ReferenceUsedNamesOnly"/>
 		<exclude name="Consistence.Exceptions.ExceptionDeclaration"/>
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,7 @@ php: @@
       - 7.2
       - 7.3
       - 7.4
+      - 8.0
     env:
       - dependencies=lowest
       - dependencies=highest
@@ Expand Down @@