From fa0e7f0e0b5d199def87f18f6625e6e2007a3d56 Mon Sep 17 00:00:00 2001
From: George Steel <george@net-glue.co.uk>
Date: Fri, 5 Jan 2024 00:24:04 +0000
Subject: [PATCH] Upgrade to PHP 8.3

Also removes the PSR container psalm plugin in favour of a stub
---
 .gitattributes          |   1 +
 .psr-container.php.stub |  24 +++++++++
 composer.json           |   5 +-
 composer.lock           | 107 ++++++----------------------------------
 psalm.xml               |  17 ++-----
 5 files changed, 44 insertions(+), 110 deletions(-)
 create mode 100644 .psr-container.php.stub

diff --git a/.gitattributes b/.gitattributes
index f69af5e..4805b2f 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -9,3 +9,4 @@
 /tests/ export-ignore
 /.laminas-ci/ export-ignore
 /.laminas-ci.json export-ignore
+/.psr-container.php.stub export-ignore
diff --git a/.psr-container.php.stub b/.psr-container.php.stub
new file mode 100644
index 0000000..2ca173a
--- /dev/null
+++ b/.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);
+    }
+}
diff --git a/composer.json b/composer.json
index b47be4d..d8310a5 100644
--- a/composer.json
+++ b/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": {
diff --git a/composer.lock b/composer.lock
index 4251321..4559409 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "f1575ea22f26503705ef771685943883",
+    "content-hash": "b880c50ca6ba5048c5a37614dc93b669",
     "packages": [
         {
             "name": "guzzlehttp/guzzle",
@@ -877,31 +877,30 @@
         },
         {
             "name": "netglue/psr-container-postmark",
-            "version": "1.10.0",
+            "version": "1.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/netglue/psr-container-postmark.git",
-                "reference": "13c46463fb48dc4af76fc673b8e8397324eca4f8"
+                "reference": "cf319ac0204f734710bdfda3a76abfcea8551e80"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/netglue/psr-container-postmark/zipball/13c46463fb48dc4af76fc673b8e8397324eca4f8",
-                "reference": "13c46463fb48dc4af76fc673b8e8397324eca4f8",
+                "url": "https://api.github.com/repos/netglue/psr-container-postmark/zipball/cf319ac0204f734710bdfda3a76abfcea8551e80",
+                "reference": "cf319ac0204f734710bdfda3a76abfcea8551e80",
                 "shasum": ""
             },
             "require": {
-                "php": "~8.1 || ~8.2",
+                "php": "~8.1 || ~8.2 || ~8.3",
                 "psr/container": "^1.0.0 || ^2.0.0",
-                "wildbit/postmark-php": "^2.9||^3.0||^4.0"
+                "wildbit/postmark-php": "^2.9||^3.0||^4.0 || ^6.0"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^11.1",
-                "laminas/laminas-servicemanager": "^3.20",
-                "lctrs/psalm-psr-container-plugin": "^1.9.0",
-                "phpunit/phpunit": "^10.0.16",
+                "doctrine/coding-standard": "^12.0",
+                "laminas/laminas-servicemanager": "^3.22.1",
+                "phpunit/phpunit": "^10.5.5",
                 "psalm/plugin-phpunit": "^0.18.4",
                 "roave/security-advisories": "dev-latest",
-                "vimeo/psalm": "^5.8"
+                "vimeo/psalm": "^5.18.0"
             },
             "type": "library",
             "extra": {
@@ -927,9 +926,9 @@
             "description": "Postmark client factories for PSR Containers",
             "support": {
                 "issues": "https://github.com/netglue/psr-container-postmark/issues",
-                "source": "https://github.com/netglue/psr-container-postmark/tree/1.10.0"
+                "source": "https://github.com/netglue/psr-container-postmark/tree/1.11.0"
             },
-            "time": "2023-03-16T10:04:50+00:00"
+            "time": "2024-01-05T00:17:32+00:00"
         },
         {
             "name": "psr/cache",
@@ -2683,84 +2682,6 @@
             ],
             "time": "2023-09-19T12:35:37+00:00"
         },
-        {
-            "name": "lctrs/psalm-psr-container-plugin",
-            "version": "1.9.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Lctrs/psalm-psr-container-plugin.git",
-                "reference": "2a3608a19a555a1589c12a97ff6f814a780def48"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Lctrs/psalm-psr-container-plugin/zipball/2a3608a19a555a1589c12a97ff6f814a780def48",
-                "reference": "2a3608a19a555a1589c12a97ff6f814a780def48",
-                "shasum": ""
-            },
-            "require": {
-                "ext-simplexml": "*",
-                "nikic/php-parser": "^4.15.2",
-                "php": ">=8.0.2 <8.3.0",
-                "psr/container": "^1.1.2 || ^2.0.2",
-                "vimeo/psalm": "^5.0.0"
-            },
-            "require-dev": {
-                "codeception/codeception": "4.2.2",
-                "codeception/module-asserts": "2.0.1",
-                "codeception/module-cli": "1.1.1",
-                "codeception/module-filesystem": "1.0.3",
-                "doctrine/coding-standard": "9.0.0",
-                "ergebnis/composer-normalize": "2.28.3",
-                "ergebnis/license": "2.1.0",
-                "phpstan/extension-installer": "1.2.0",
-                "phpstan/phpstan": "1.9.2",
-                "phpstan/phpstan-deprecation-rules": "1.0.0",
-                "phpstan/phpstan-phpunit": "1.2.2",
-                "phpstan/phpstan-strict-rules": "1.4.4",
-                "phpunit/phpunit": "9.5.26",
-                "psalm/plugin-phpunit": "0.18.3",
-                "symfony/yaml": "5.4.16",
-                "weirdan/codeception-psalm-module": "0.13.1"
-            },
-            "type": "psalm-plugin",
-            "extra": {
-                "psalm": {
-                    "pluginClass": "Lctrs\\PsalmPsrContainerPlugin\\Plugin"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Lctrs\\PsalmPsrContainerPlugin\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jérôme Parmentier",
-                    "email": "jerome@prmntr.me"
-                }
-            ],
-            "description": "Let Psalm understand better psr11 containers",
-            "homepage": "https://github.com/Lctrs/psalm-psr-container-plugin",
-            "keywords": [
-                "code",
-                "container",
-                "inspection",
-                "php",
-                "psalm",
-                "psalm-plugin",
-                "psr",
-                "psr11"
-            ],
-            "support": {
-                "issues": "https://github.com/Lctrs/psalm-psr-container-plugin/issues",
-                "source": "https://github.com/Lctrs/psalm-psr-container-plugin"
-            },
-            "time": "2022-12-01T07:02:46+00:00"
-        },
         {
             "name": "myclabs/deep-copy",
             "version": "1.11.1",
@@ -6595,7 +6516,7 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": "~8.1 || ~8.2"
+        "php": "~8.1 || ~8.2 || ~8.3"
     },
     "platform-dev": [],
     "platform-overrides": {
diff --git a/psalm.xml b/psalm.xml
index 5f3fa30..ceaf923 100644
--- a/psalm.xml
+++ b/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>