Merge pull request #431 from bearsunday/drop-php8.0

Drop PHP 8.0 support
bearsunday · Mar 25, 2024 · 9e7de07 · 9e7de07
2 parents 4fb1952 + 0330e82
commit 9e7de07
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 27 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -9,5 +9,5 @@ jobs:
   ci:
     uses: ray-di/.github/.github/workflows/continuous-integration.yml@v1
     with:
-      old_stable: '["8.0", "8.1", "8.2"]
+      old_stable: '["8.1", "8.2"]
       current_stable: 8.3
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -4,5 +4,9 @@ build:
       tests:
         override:
           - php-scrutinizer-run
+      environment:
+        php:
+          version: 8.2
+
 filter:
-    paths: ["src/*"]
+  paths: ["src/*"]
diff --git a/composer.json b/composer.json
@@ -10,7 +10,7 @@
         }
     ],
     "require": {
-        "php": "^8.0",
+        "php": "^8.1",
         "ext-hash": "*",
         "aura/cli": "^2.2",
         "bear/app-meta": "^1.8",

diff --git a/rector.php b/rector.php
@@ -14,12 +14,8 @@
         __DIR__ . '/tests-files',
     ]);
 
-    // register a single rule
-    $rectorConfig->rule(InlineConstructorDefaultToPropertyRector::class);
-    $rectorConfig->rule(AnnotationBindingRector::class);
-
     // define sets of rules
-        $rectorConfig->sets([
-            LevelSetList::UP_TO_PHP_80
-        ]);
+    $rectorConfig->sets([
+        LevelSetList::UP_TO_PHP_81
+    ]);
 };
diff --git a/tests/Provide/Representation/HalRendererTest.php b/tests/Provide/Representation/HalRendererTest.php
@@ -11,7 +11,6 @@
 use BEAR\Resource\ResourceInterface;
 use BEAR\Resource\ResourceObject;
 use BEAR\Resource\Uri;
-use Doctrine\Common\Annotations\AnnotationReader;
 use FakeVendor\HelloWorld\Resource\App\Task;
 use PHPUnit\Framework\TestCase;
 
@@ -158,7 +157,7 @@ public function testOptions(): void
 
     public function testHalRendererNoParam(): void
     {
-        $halRenderer = new HalRenderer(new AnnotationReader(), new HalLinker(new RouterReverseLinker(new FakeRouter())));
+        $halRenderer = new HalRenderer(new HalLinker(new RouterReverseLinker(new FakeRouter())));
         $ro = new Task();
         $ro->onPost();
         $ro->uri = new Uri('app://self/task');
@@ -178,7 +177,7 @@ public function testHalRendererNoParam(): void
 
     public function testHalRendererWithParam(): void
     {
-        $halRenderer = new HalRenderer(new AnnotationReader(), new HalLinker(new RouterReverseLinker(new FakeRouter())));
+        $halRenderer = new HalRenderer(new HalLinker(new RouterReverseLinker(new FakeRouter())));
         $ro = new Task();
         $ro->uri = new Uri('app://self/task?id=1');
         $ro->uri->method = 'post';

diff --git a/vendor-bin/tools/composer.json b/vendor-bin/tools/composer.json
@@ -8,7 +8,7 @@
         "squizlabs/php_codesniffer": "^3.7",
         "vimeo/psalm": "^5.15",
         "ray/rector-ray": "^1.1",
-        "rector/rector": "^0.18.1"
+        "rector/rector": "^1.0"
     },
     "config": {
         "allow-plugins": {

diff --git a/vendor-bin/tools/composer.lock b/vendor-bin/tools/composer.lock