Merge pull request #702 from ergebnis/fix/php80

Fix: Drop support for PHP 8.0
ergebnis · Jun 27, 2023 · 8fadfcd · 8fadfcd
2 parents 789b0d5 + 72ea604
commit 8fadfcd
Show file tree

Hide file tree

Showing 11 changed files with 31 additions and 71 deletions.
diff --git a/.github/settings.yml b/.github/settings.yml
@@ -14,16 +14,13 @@ branches:
         required_approving_review_count: 1
       required_status_checks:
         checks:
-          - context: "Code Coverage (8.0, locked)"
-          - context: "Coding Standards (8.0, locked)"
-          - context: "Dependency Analysis (8.0, locked)"
-          - context: "Mutation Tests (8.0, locked)"
-          - context: "Refactoring (8.0, locked)"
-          - context: "Security Analysis (8.0, locked)"
-          - context: "Static Code Analysis (8.0, locked)"
-          - context: "Tests (8.0, highest)"
-          - context: "Tests (8.0, locked)"
-          - context: "Tests (8.0, lowest)"
+          - context: "Code Coverage (8.1, locked)"
+          - context: "Coding Standards (8.1, locked)"
+          - context: "Dependency Analysis (8.1, locked)"
+          - context: "Mutation Tests (8.1, locked)"
+          - context: "Refactoring (8.1, locked)"
+          - context: "Security Analysis (8.1, locked)"
+          - context: "Static Code Analysis (8.1, locked)"
           - context: "Tests (8.1, highest)"
           - context: "Tests (8.1, locked)"
           - context: "Tests (8.1, lowest)"

diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml
@@ -17,7 +17,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.0"
+          - "8.1"
 
         dependencies:
           - "locked"
@@ -76,7 +76,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.0"
+          - "8.1"
 
         dependencies:
           - "locked"
@@ -146,7 +146,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.0"
+          - "8.1"
 
         dependencies:
           - "locked"
@@ -200,7 +200,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.0"
+          - "8.1"
 
         dependencies:
           - "locked"
@@ -250,7 +250,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.0"
+          - "8.1"
 
         dependencies:
           - "locked"
@@ -310,7 +310,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.0"
+          - "8.1"
 
         dependencies:
           - "locked"
@@ -358,7 +358,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.0"
+          - "8.1"
 
         dependencies:
           - "locked"
@@ -409,7 +409,6 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.0"
           - "8.1"
           - "8.2"
 

diff --git a/.github/workflows/renew.yaml b/.github/workflows/renew.yaml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.0"
+          - "8.1"
 
         dependencies:
           - "locked"

diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php
@@ -26,7 +26,7 @@
 
 $license->save();
 
-$config = PhpCsFixer\Config\Factory::fromRuleSet(new PhpCsFixer\Config\RuleSet\Php80($license->header()));
+$config = PhpCsFixer\Config\Factory::fromRuleSet(new PhpCsFixer\Config\RuleSet\Php81($license->header()));
 
 $config->getFinder()
     ->exclude([

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 For a full diff see [`1.4.0...main`][1.4.0...main].
 
+### Changed
+
+- Dropped support for PHP 8.0 ([#702]), by [@localheinz]
+
 ## [`1.4.0`][1.4.0]
 
 For a full diff see [`1.3.0...1.4.0`][1.3.0...1.4.0].
@@ -158,6 +162,7 @@ For a full diff see [`0.4.0...0.5.0`][0.4.0...0.5.0].
 [#481]: https://github.com/ergebnis/classy/pull/481
 [#486]: https://github.com/ergebnis/classy/pull/486
 [#619]: https://github.com/ergebnis/classy/pull/619
+[#702]: https://github.com/ergebnis/classy/pull/702
 
 [@ergebnis]: https://github.com/ergebnis
 [@localheinz]: https://github.com/localheinz
diff --git a/composer.json b/composer.json
@@ -23,7 +23,7 @@
     "source": "https://github.com/ergebnis/classy"
   },
   "require": {
-    "php": "~8.0.0 || ~8.1.0 || ~8.2.0",
+    "php": "~8.1.0 || ~8.2.0",
     "ext-tokenizer": "*"
   },
   "require-dev": {
@@ -57,7 +57,7 @@
       "infection/extension-installer": true
     },
     "platform": {
-      "php": "8.0.25"
+      "php": "8.1.20"
     },
     "preferred-install": "dist",
     "sort-packages": true

diff --git a/composer.lock b/composer.lock
diff --git a/infection.json b/infection.json
@@ -3,8 +3,8 @@
   "logs": {
     "text": ".build/infection/infection-log.txt"
   },
-  "minCoveredMsi": 87,
-  "minMsi": 82,
+  "minCoveredMsi": 89,
+  "minMsi": 87,
   "phpUnit": {
     "configDir": "test\/Unit"
   },

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.11.0@c9b192ab8400fdaf04b2b13d110575adc879aa90">
+<files psalm-version="5.13.0@a0a9c27630bcf8301ee78cb06741d2907d8c9fef">
   <file src="src/Constructs.php">
     <MixedAssignment>
       <code>$fileInfo</code>
@@ -25,38 +25,6 @@
         }]]></code>
     </TooManyArguments>
   </file>
-  <file src="test/Unit/ConstructsTest.php">
-    <MixedArgument>
-      <code>Test\Fixture\Classy\Php81\WithinMultipleNamespaces\Bar\Bar::class</code>
-      <code>Test\Fixture\Classy\Php81\WithinMultipleNamespaces\Bar\Baz::class</code>
-      <code>Test\Fixture\Classy\Php81\WithinMultipleNamespaces\Bar\Foo::class</code>
-      <code>Test\Fixture\Classy\Php81\WithinMultipleNamespaces\Bar\Qux::class</code>
-      <code>Test\Fixture\Classy\Php81\WithinMultipleNamespaces\Foo\Bar::class</code>
-      <code>Test\Fixture\Classy\Php81\WithinMultipleNamespaces\Foo\Baz::class</code>
-      <code>Test\Fixture\Classy\Php81\WithinMultipleNamespaces\Foo\Foo::class</code>
-      <code>Test\Fixture\Classy\Php81\WithinMultipleNamespaces\Foo\Qux::class</code>
-      <code>Test\Fixture\Classy\Php81\WithinNamespaceWithBraces\Bar::class</code>
-      <code>Test\Fixture\Classy\Php81\WithinNamespaceWithBraces\Baz::class</code>
-      <code>Test\Fixture\Classy\Php81\WithinNamespaceWithBraces\Foo::class</code>
-      <code>Test\Fixture\Classy\Php81\WithinNamespaceWithBraces\Qux::class</code>
-      <code>Test\Fixture\Classy\Php81\WithinNamespace\Qux::class</code>
-    </MixedArgument>
-    <UndefinedClass>
-      <code>Test\Fixture\Classy\Php81\WithinMultipleNamespaces\Bar\Bar</code>
-      <code>Test\Fixture\Classy\Php81\WithinMultipleNamespaces\Bar\Baz</code>
-      <code>Test\Fixture\Classy\Php81\WithinMultipleNamespaces\Bar\Foo</code>
-      <code>Test\Fixture\Classy\Php81\WithinMultipleNamespaces\Bar\Qux</code>
-      <code>Test\Fixture\Classy\Php81\WithinMultipleNamespaces\Foo\Bar</code>
-      <code>Test\Fixture\Classy\Php81\WithinMultipleNamespaces\Foo\Baz</code>
-      <code>Test\Fixture\Classy\Php81\WithinMultipleNamespaces\Foo\Foo</code>
-      <code>Test\Fixture\Classy\Php81\WithinMultipleNamespaces\Foo\Qux</code>
-      <code>Test\Fixture\Classy\Php81\WithinNamespaceWithBraces\Bar</code>
-      <code>Test\Fixture\Classy\Php81\WithinNamespaceWithBraces\Baz</code>
-      <code>Test\Fixture\Classy\Php81\WithinNamespaceWithBraces\Foo</code>
-      <code>Test\Fixture\Classy\Php81\WithinNamespaceWithBraces\Qux</code>
-      <code>Test\Fixture\Classy\Php81\WithinNamespace\Qux</code>
-    </UndefinedClass>
-  </file>
   <file src="test/Util/PhpVersion.php">
     <PossiblyUnusedMethod>
       <code>toInt</code>

diff --git a/rector.php b/rector.php
@@ -25,7 +25,7 @@
         __DIR__ . '/test/',
     ]);
 
-    $rectorConfig->phpVersion(Core\ValueObject\PhpVersion::PHP_80);
+    $rectorConfig->phpVersion(Core\ValueObject\PhpVersion::PHP_81);
 
     $rectorConfig->sets([
         PHPUnit\Set\PHPUnitSetList::PHPUNIT_91,

diff --git a/src/Constructs.php b/src/Constructs.php
@@ -45,20 +45,11 @@ public static function fromSource(string $source): array
 
         $classyTokens = [
             \T_CLASS,
+            \T_ENUM,
             \T_INTERFACE,
             \T_TRAIT,
         ];
 
-        // https://wiki.php.net/rfc/enumerations
-        if (\PHP_VERSION_ID >= 80100 && \defined('T_ENUM')) {
-            $classyTokens = [
-                \T_CLASS,
-                \T_ENUM,
-                \T_INTERFACE,
-                \T_TRAIT,
-            ];
-        }
-
         for ($index = 0; $index < $count; ++$index) {
             $token = $sequence[$index];