Merge pull request #155 from netglue/php-8.3

Upgrade to PHP 8.3

.gitattributes

@@ -9,3 +9,4 @@
 /tests/ export-ignore
 /.laminas-ci/ export-ignore
 /.laminas-ci.json export-ignore
+/.psr-container.php.stub export-ignore

.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

@@ -20,7 +20,7 @@
         }
     },
     "require": {
-        "php": "~8.1 || ~8.2",
+        "php": "~8.1 || ~8.2 || ~8.3",
         "laminas/laminas-mail": "^2.11.0",
         "laminas/laminas-mime": "^2.9.1",
         "laminas/laminas-validator": "^2.23.0",
@@ -44,11 +44,10 @@
         "doctrine/coding-standard": "^12.0",
         "laminas/laminas-config-aggregator": "^1.14",
         "laminas/laminas-servicemanager": "^3.22.1",
-        "lctrs/psalm-psr-container-plugin": "^1.9",
         "phpunit/phpunit": "^10.5.5",
         "psalm/plugin-phpunit": "^0.18.4",
         "roave/security-advisories": "dev-latest",
-        "symfony/cache": "^5.4.15 || ^6.4.2",
+        "symfony/cache": "^5.4.15 || ^6.4.2 || ^7.0",
         "vimeo/psalm": "^5.18"
     },
     "conflict": {

psalm.xml

@@ -17,21 +17,10 @@
             <directory name="vendor" />
         </ignoreFiles>
     </projectFiles>
-    <issueHandlers>
-        <InternalMethod>
-            <errorLevel type="suppress">
-                <referencedMethod name="PHPUnit\Framework\MockObject\Builder\InvocationMocker::method"/>
-            </errorLevel>
-            <errorLevel type="suppress">
-                <referencedMethod name="PHPUnit\Framework\MockObject\Builder\InvocationMocker::willReturn"/>
-            </errorLevel>
-            <errorLevel type="suppress">
-                <referencedMethod name="PHPUnit\Framework\MockObject\Builder\InvocationMocker::with"/>
-            </errorLevel>
-        </InternalMethod>
-    </issueHandlers>
     <plugins>
         <pluginClass class="Psalm\PhpUnitPlugin\Plugin"/>
-        <pluginClass class="Lctrs\PsalmPsrContainerPlugin\Plugin"/>
     </plugins>
+    <stubs>
+        <file name=".psr-container.php.stub"/>
+    </stubs>
 </psalm>