Merge pull request #140 from netglue/dependency-refresh

Update Psalm to ^5.4 and Doctrine Coding Standard to ^11

Author: gsteel

composer.json

@@ -38,15 +38,15 @@
         }
     },
     "require-dev": {
-        "doctrine/coding-standard": "^10.0",
-        "laminas/laminas-config-aggregator": "^1.11",
-        "laminas/laminas-servicemanager": "^3.19",
-        "lctrs/psalm-psr-container-plugin": "^1.8",
-        "phpunit/phpunit": "^9.5.26",
-        "psalm/plugin-phpunit": "^0.17.0",
+        "doctrine/coding-standard": "^11.0",
+        "laminas/laminas-config-aggregator": "^1.13",
+        "laminas/laminas-servicemanager": "^3.20",
+        "lctrs/psalm-psr-container-plugin": "^1.9",
+        "phpunit/phpunit": "^9.5.27",
+        "psalm/plugin-phpunit": "^0.18.4",
         "roave/security-advisories": "dev-latest",
         "symfony/cache": "^5.4.15",
-        "vimeo/psalm": "^4.29"
+        "vimeo/psalm": "^5.4"
     },
     "conflict": {
         "guzzlehttp/guzzle": "^6.0"

composer.lock

@@ -20,6 +20,7 @@ final class MessageValidator extends ValidatorChain
     public function __construct(ValidatorPluginManager|null $pluginManager = null)
     {
         parent::__construct();
+
         if ($pluginManager) {
             $this->setPluginManager($pluginManager);
         }

src/Validator/MessageValidator.php

@@ -20,6 +20,7 @@ class PermittedSendersFactoryTest extends TestCase
     protected function setUp(): void
     {
         parent::setUp();
+
         $this->container = $this->createMock(ContainerInterface::class);
     }
 

tests/Container/PermittedSendersFactoryTest.php

@@ -19,6 +19,7 @@ class SuppressionListFactoryTest extends TestCase
     protected function setUp(): void
     {
         parent::setUp();
+
         $this->container = $this->createMock(ContainerInterface::class);
     }
 

tests/Container/SuppressionListFactoryTest.php

@@ -22,6 +22,7 @@ class PermittedSendersTest extends TestCase
     protected function setUp(): void
     {
         parent::setUp();
+
         $this->client = $this->createMock(PostmarkAdminClient::class);
         $this->cache = new ArrayAdapter();
     }

tests/PermittedSendersTest.php

@@ -19,9 +19,7 @@
 use Psr\Cache\CacheItemPoolInterface;
 use Symfony\Component\Cache\Adapter\ArrayAdapter;
 
-use function assert;
-use function is_array;
-
+/** @psalm-import-type ServiceManagerConfiguration from ServiceManager */
 class ServiceManagerIntegrationTest extends TestCase
 {
     private ServiceManager $serviceManager;
@@ -44,11 +42,11 @@ protected function setUp(): void
             new ArrayProvider($config),
         ]);
         $config = $aggregator->getMergedConfig();
-        assert(is_array($config['dependencies']));
-        /** @psalm-suppress MixedArrayAssignment */
-        $config['dependencies']['services']['config'] = $config;
-        /** @psalm-suppress MixedArgumentTypeCoercion */
-        $this->serviceManager = new ServiceManager($config['dependencies']);
+        /** @psalm-var ServiceManagerConfiguration $dependencies */
+        $dependencies = $config['dependencies'] ?? [];
+        unset($dependencies['services']['config']);
+        $dependencies['services']['config'] = $config;
+        $this->serviceManager = new ServiceManager($dependencies);
         $this->serviceManager->setService('cache', $this->setUpCache());
     }
 

tests/ServiceManagerIntegrationTest.php

@@ -23,6 +23,7 @@ class SuppressionListTest extends TestCase
     protected function setUp(): void
     {
         parent::setUp();
+
         $this->client = $this->createMock(PostmarkClient::class);
         $this->cache = new ArrayAdapter();
         $this->list = new SuppressionList($this->client, $this->cache);

tests/SuppressionListTest.php

@@ -36,6 +36,7 @@ class PostmarkTransportTest extends TestCase
     protected function setUp(): void
     {
         parent::setUp();
+
         $this->client = $this->createMock(PostmarkClient::class);
         $this->validator = new MessageValidator();
     }

tests/Transport/PostmarkTransportTest.php

@@ -18,6 +18,7 @@ class FromAddressValidatorTest extends TestCase
     protected function setUp(): void
     {
         parent::setUp();
+
         $this->permittedSenders = $this->createMock(PermittedSenders::class);
     }