require php >= 8.1

antidot-framework · Jul 2, 2023 · f999b3a · f999b3a
1 parent 67ddc27
commit f999b3a
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 91 deletions.
diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml
@@ -6,7 +6,7 @@ on:
   pull_request:
   push:
     branches:
-      - "1.x.x"
+      - "3.x.x"
 
 jobs:
   coding-standards:
@@ -19,9 +19,8 @@ jobs:
         dependencies:
           - "locked"
         php-version:
-          - "7.4"
-          - "8.0"
           - "8.1"
+          - "8.2"
         operating-system:
           - "ubuntu-latest"
 

diff --git a/.github/workflows/mutation-tests.yml b/.github/workflows/mutation-tests.yml
@@ -6,7 +6,7 @@ on:
   pull_request:
   push:
     branches:
-      - "1.x.x"
+      - "3.x.x"
 
 jobs:
   mutation-tests:
@@ -19,9 +19,8 @@ jobs:
         dependencies:
           - "locked"
         php-version:
-          - "7.4"
-          - "8.0"
           - "8.1"
+          - "8.2"
         operating-system:
           - "ubuntu-latest"
 
@@ -62,4 +61,4 @@ jobs:
         env:
           INFECTION_BADGE_API_KEY: ${{ secrets.INFECTION_BADGE_API_KEY }}
           STRYKER_DASHBOARD_API_KEY: ${{ secrets.STRYKER_DASHBOARD_API_KEY }}
-  
+
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -6,7 +6,7 @@ on:
   pull_request:
   push:
     branches:
-      - "1.x.x"
+      - "3.x.x"
 
 jobs:
   phpunit:
@@ -19,9 +19,8 @@ jobs:
         dependencies:
           - "locked"
         php-version:
-          - "7.4"
-          - "8.0"
           - "8.1"
+          - "8.2"
         operating-system:
           - "ubuntu-latest"
 

diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml
@@ -6,7 +6,7 @@ on:
   pull_request:
   push:
     branches:
-      - "1.x.x"
+      - "3.x.x"
 
 jobs:
   static-analysis-psalm:
@@ -19,9 +19,8 @@ jobs:
         dependencies:
           - "locked"
         php-version:
-          - "7.4"
-          - "8.0"
           - "8.1"
+          - "8.2"
         operating-system:
           - "ubuntu-latest"
 

diff --git a/.github/workflows/release-on-milestone-closed.yml b/.github/workflows/release-on-milestone-closed.yml
diff --git a/composer.json b/composer.json
@@ -16,15 +16,14 @@
         }
     ],
     "require": {
-        "php": ">=7.4.0|^8.0",
-        "psr/container": "^1.0"
+        "php": "~8.1.0 || ~8.2.0",
+        "psr/container": "^2.0"
     },
     "require-dev": {
-        "infection/infection": "^0.25",
         "phpro/grumphp": "^1.0",
         "phpstan/phpstan": "^1.2",
         "phpunit/phpunit": "^9.0",
-        "roave/infection-static-analysis-plugin": "^1.11",
+        "roave/infection-static-analysis-plugin": "^1.32",
         "squizlabs/php_codesniffer": "^3.4",
         "symfony/var-dumper": "^5.0",
         "vimeo/psalm": "^4.0.0"
@@ -60,6 +59,10 @@
         }
     },
     "config": {
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "infection/extension-installer": true,
+            "phpro/grumphp": true
+        }
     }
 }
diff --git a/psalm.xml b/psalm.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <psalm
-    totallyTyped="false"
     errorLevel="1"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"

diff --git a/src/Container.php b/src/Container.php
@@ -24,7 +24,7 @@ public function __construct(ContainerConfig $configuredDependencies, bool $autow
         $this->resolver = new InstanceResolver($this->configuredDependencies, $this->loadedDependencies, $this);
     }
 
-    public function get($id)
+    public function get(string $id)
     {
         if ($this->loadedDependencies->has($id)) {
             return $this->loadedDependencies->get($id);
@@ -40,7 +40,7 @@ public function get($id)
         return $this->loadedDependencies->get($id);
     }
 
-    public function has($id): bool
+    public function has(string $id): bool
     {
         return $this->loadedDependencies->has($id)
             || $this->configuredDependencies->has($id);

diff --git a/tests/BuilderTest.php b/tests/BuilderTest.php
@@ -128,9 +128,9 @@ public function testItShouldCreateAConfiguredContainerFromFrameworkConfigWithCon
                 InvalidArgumentException::class => [
                     'class' => InvalidArgumentException::class,
                     'arguments' => [
-                        'message' => 'Oh Oh!!',
-                        'code' => 0,
-                        'previous' => null,
+                        '$message' => 'Oh Oh!!',
+                        '$code' => 0,
+                        '$previous' => null,
                     ]
                 ],
             ],