Merge pull request #324 from Roave/feature/php-8-compatibility

PHP 8.0 and PHP 8.1 support, BetterReflection 5.x upgrade
Roave · Dec 6, 2021 · 565f6e6 · 565f6e6
2 parents 11c7b6f + a8ec81e
commit 565f6e6
Show file tree

Hide file tree

Showing 87 changed files with 1,860 additions and 1,286 deletions.
diff --git a/.github/workflows/backwards-compatibility.yml b/.github/workflows/backwards-compatibility.yml
@@ -15,7 +15,8 @@ jobs:
         dependencies:
           - "locked"
         php-version:
-          - "7.4"
+          - "8.0"
+          - "8.1"
         operating-system:
           - "ubuntu-latest"
 

diff --git a/bin/roave-backward-compatibility-check.php b/bin/roave-backward-compatibility-check.php
@@ -114,7 +114,7 @@ static function (string $installationPath) use ($composerIo): Installer {
                                     new PropertyBased\SkipPropertyBasedErrors(new PropertyBased\OnlyPublicPropertyChanged(
                                         new PropertyBased\MultipleChecksOnAProperty(
                                             new PropertyBased\SkipPropertyBasedErrors(new PropertyBased\PropertyBecameInternal()),
-                                            new PropertyBased\SkipPropertyBasedErrors(new PropertyBased\PropertyDocumentedTypeChanged()),
+                                            new PropertyBased\SkipPropertyBasedErrors(new PropertyBased\PropertyTypeChanged(new TypeIsContravariant(), new TypeIsCovariant())),
                                             new PropertyBased\SkipPropertyBasedErrors(new PropertyBased\PropertyDefaultValueChanged()),
                                             new PropertyBased\SkipPropertyBasedErrors(new PropertyBased\PropertyVisibilityReduced()),
                                             new PropertyBased\SkipPropertyBasedErrors(new PropertyBased\PropertyScopeChanged())
@@ -123,7 +123,7 @@ static function (string $installationPath) use ($composerIo): Installer {
                                     new PropertyBased\SkipPropertyBasedErrors(new PropertyBased\OnlyProtectedPropertyChanged(
                                         new PropertyBased\MultipleChecksOnAProperty(
                                             new PropertyBased\SkipPropertyBasedErrors(new PropertyBased\PropertyBecameInternal()),
-                                            new PropertyBased\SkipPropertyBasedErrors(new PropertyBased\PropertyDocumentedTypeChanged()),
+                                            new PropertyBased\SkipPropertyBasedErrors(new PropertyBased\PropertyTypeChanged(new TypeIsContravariant(), new TypeIsCovariant())),
                                             new PropertyBased\SkipPropertyBasedErrors(new PropertyBased\PropertyDefaultValueChanged()),
                                             new PropertyBased\SkipPropertyBasedErrors(new PropertyBased\PropertyVisibilityReduced()),
                                             new PropertyBased\SkipPropertyBasedErrors(new PropertyBased\PropertyScopeChanged())
@@ -193,7 +193,7 @@ static function (string $installationPath) use ($composerIo): Installer {
                                 new PropertyBased\SkipPropertyBasedErrors(new PropertyBased\OnlyPublicPropertyChanged(
                                     new PropertyBased\MultipleChecksOnAProperty(
                                         new PropertyBased\SkipPropertyBasedErrors(new PropertyBased\PropertyBecameInternal()),
-                                        new PropertyBased\SkipPropertyBasedErrors(new PropertyBased\PropertyDocumentedTypeChanged()),
+                                        new PropertyBased\SkipPropertyBasedErrors(new PropertyBased\PropertyTypeChanged(new TypeIsContravariant(), new TypeIsCovariant())),
                                         new PropertyBased\SkipPropertyBasedErrors(new PropertyBased\PropertyDefaultValueChanged()),
                                         new PropertyBased\SkipPropertyBasedErrors(new PropertyBased\PropertyVisibilityReduced()),
                                         new PropertyBased\SkipPropertyBasedErrors(new PropertyBased\PropertyScopeChanged())
@@ -271,7 +271,7 @@ static function (string $installationPath) use ($composerIo): Installer {
                         new ClassBased\SkipClassBasedErrors(new ClassBased\PropertyChanged(
                             new PropertyBased\MultipleChecksOnAProperty(
                                 new PropertyBased\SkipPropertyBasedErrors(new PropertyBased\PropertyBecameInternal()),
-                                new PropertyBased\SkipPropertyBasedErrors(new PropertyBased\PropertyDocumentedTypeChanged()),
+                                new PropertyBased\SkipPropertyBasedErrors(new PropertyBased\PropertyTypeChanged(new TypeIsContravariant(), new TypeIsCovariant())),
                                 new PropertyBased\SkipPropertyBasedErrors(new PropertyBased\PropertyDefaultValueChanged()),
                                 new PropertyBased\SkipPropertyBasedErrors(new PropertyBased\PropertyVisibilityReduced()),
                                 new PropertyBased\SkipPropertyBasedErrors(new PropertyBased\PropertyScopeChanged())

diff --git a/composer.json b/composer.json
@@ -2,13 +2,13 @@
     "name": "roave/backward-compatibility-check",
     "description": "Tool to compare two revisions of a public API to check for BC breaks",
     "require": {
-        "php": "^7.4.7",
+        "php": "~8.0.0 || ~8.1.0",
         "ext-json": "*",
-        "azjezz/psl": "^1.6.1",
+        "azjezz/psl": "^1.9.1",
         "composer/composer": "^2.1.11",
         "nikolaposa/version": "^4.1.0",
-        "ocramius/package-versions": "^2.1.0",
-        "roave/better-reflection": "^4.12.2",
+        "ocramius/package-versions": "^2.4.0",
+        "roave/better-reflection": "5.0.x-dev@DEV",
         "symfony/console": "^5.3.10"
     },
     "license": "MIT",
@@ -26,11 +26,15 @@
         "doctrine/coding-standard": "^9.0.0",
         "php-standard-library/psalm-plugin": "^1.1.1",
         "phpunit/phpunit": "^9.5.10",
+        "psalm/plugin-phpunit": "^0.16.1",
         "roave/infection-static-analysis-plugin": "^1.10",
         "roave/security-advisories": "dev-master",
         "squizlabs/php_codesniffer": "^3.6.1",
         "vimeo/psalm": "^4.12.0"
     },
+    "conflict": {
+        "symfony/process": "<5.3.7"
+    },
     "autoload": {
         "psr-4": {
             "Roave\\BackwardCompatibility\\": "src"
@@ -45,6 +49,9 @@
         "bin/roave-backward-compatibility-check"
     ],
     "config": {
-        "sort-packages": true
+        "sort-packages": true,
+        "platform": {
+            "php": "8.0.99"
+        }
     }
 }