Merge pull request #350 from netglue/deps

Drop support for PHP 8.1

.gitattributes

@@ -5,3 +5,4 @@
 /phpunit.xml.dist export-ignore
 /psalm.xml export-ignore
 /test/ export-ignore
+.psr-container.php.stub export-ignore

.github/workflows/continuous-integration.yml

@@ -17,7 +17,7 @@ jobs:
       - uses: actions/checkout@v4.1.1
       - uses: shivammathur/setup-php@2.29.0
         with:
-          php-version: 8.1
+          php-version: 8.2
           extensions: pcov
           coverage: pcov
           ini-values: pcov.enabled=1
@@ -37,7 +37,7 @@ jobs:
       - uses: actions/checkout@v4.1.1
       - uses: shivammathur/setup-php@2.29.0
         with:
-          php-version: 8.1
+          php-version: 8.2
       - uses: "ramsey/composer-install@2.2.0"
         with:
           dependency-versions: "highest"

.psr-container.php.stub

@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Psr\Container {
+    /**
+     * Provides automatic type inference for Psalm when retrieving a service from a container using a FQCN
+     */
+    interface ContainerInterface
+    {
+        /**
+         * @param string|class-string $id
+         * @return bool
+         */
+        public function has(string $id);
+
+        /**
+         * @template T
+         * @psalm-param string|class-string<T> $id
+         * @psalm-return ($id is class-string ? T : mixed)
+         */
+        public function get(string $id);
+    }
+}

composer.json

@@ -18,7 +18,7 @@
             "php-http/discovery": false
         },
         "platform": {
-            "php": "8.1.99"
+            "php": "8.2.99"
         }
     },
     "autoload": {
@@ -33,7 +33,7 @@
         }
     },
     "require": {
-        "php": "~8.1 || ~8.2 || ~8.3",
+        "php": "~8.2 || ~8.3",
         "ext-json": "*",
         "netglue/prismic-client": "^1.0.0",
         "netglue/prismic-doctype-client": "^1.0.0",
@@ -43,8 +43,8 @@
         "psr/http-client-implementation": "*",
         "psr/http-factory": "^1.0",
         "psr/http-message": "^1.0 || ^2.0",
-        "sebastian/diff": "^4.0 || ^5.0",
-        "symfony/console": "^5.3.7 || ^6.0.0 || ^7.0.0",
+        "sebastian/diff": "^5.0 || ^6.0",
+        "symfony/console": "^6.0.0 || ^7.0.0",
         "webmozart/assert": "^1.10"
     },
     "require-dev": {
@@ -53,13 +53,12 @@
         "laminas/laminas-config-aggregator": "^1.14",
         "laminas/laminas-diactoros": "^3.3.0",
         "laminas/laminas-servicemanager": "^3.22.1",
-        "lctrs/psalm-psr-container-plugin": "^1.10",
         "php-http/curl-client": "^2.3.1",
-        "phpunit/phpunit": "^10.5.9",
+        "phpunit/phpunit": "^10.5.10",
         "psalm/plugin-phpunit": "^0.18.4",
         "roave/security-advisories": "dev-master",
         "squizlabs/php_codesniffer": "^3.8.1",
-        "vimeo/psalm": "^5.20.0"
+        "vimeo/psalm": "^5.22.0"
     },
     "extra": {
         "laminas": {