Merge pull request #214 from gsteel/PHP-8.2

Add support for PHP 8.2

.laminas-ci.json

@@ -1,5 +1,6 @@
 {
     "ignore_php_platform_requirements": {
-        "8.1": true
+        "8.1": false,
+        "8.2": true
     }
 }

composer.json

@@ -8,7 +8,7 @@
     "homepage": "https://laminas.dev",
     "license": "BSD-3-Clause",
     "require": {
-        "php": "~8.0.0 || ~8.1.0",
+        "php": "~8.0.0 || ~8.1.0 || ~8.2.0",
         "ext-iconv": "*",
         "laminas/laminas-loader": "^2.8.0",
         "laminas/laminas-mime": "^2.10.0",
@@ -22,11 +22,11 @@
         "laminas/laminas-coding-standard": "~2.4.0",
         "laminas/laminas-crypt": "^3.8.0",
         "laminas/laminas-db": "^2.15.0",
-        "laminas/laminas-servicemanager": "^3.16.0",
-        "phpunit/phpunit": "^9.5.21",
+        "laminas/laminas-servicemanager": "^3.19",
+        "phpunit/phpunit": "^9.5.25",
         "psalm/plugin-phpunit": "^0.17.0",
         "symfony/process": "^6.0.11",
-        "vimeo/psalm": "^4.26.0"
+        "vimeo/psalm": "^4.29"
     },
     "suggest": {
         "laminas/laminas-crypt": "^3.8 Crammd5 support in SMTP Auth",

psalm-baseline.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="4.28.0@52e96bea381e6cb07a672aefec791a5817694a26">
+<files psalm-version="4.29.0@7ec5ffbd5f68ae03782d7fd33fff0c45a69f95b3">
   <file src="src/Address.php">
     <DocblockTypeContradiction occurrences="2">
       <code>! is_string($email)</code>
@@ -54,12 +54,6 @@
       <code>is_object($emailOrAddress)</code>
     </RedundantConditionGivenDocblockType>
   </file>
-  <file src="src/ConfigProvider.php">
-    <MixedArrayOffset occurrences="1"/>
-    <UndefinedClass occurrences="1">
-      <code>SmtpPluginManager</code>
-    </UndefinedClass>
-  </file>
   <file src="src/Header/AbstractAddressList.php">
     <DocblockTypeContradiction occurrences="1">
       <code>null === $this-&gt;addressList</code>
@@ -80,15 +74,6 @@
     <MixedArgument occurrences="1">
       <code>$value</code>
     </MixedArgument>
-    <MixedArrayAccess occurrences="1">
-      <code>$conversionInfo['errors']</code>
-    </MixedArrayAccess>
-    <MixedInferredReturnType occurrences="1">
-      <code>string</code>
-    </MixedInferredReturnType>
-    <MixedReturnStatement occurrences="1">
-      <code>$ascii</code>
-    </MixedReturnStatement>
     <RedundantConditionGivenDocblockType occurrences="1">
       <code>$format !== HeaderInterface::FORMAT_RAW</code>
     </RedundantConditionGivenDocblockType>
@@ -854,17 +839,10 @@
     <MissingReturnType occurrences="1">
       <code>validatePlugin</code>
     </MissingReturnType>
-    <MixedArrayOffset occurrences="1"/>
     <NonInvariantDocblockPropertyType occurrences="2">
       <code>$aliases</code>
       <code>$instanceOf</code>
     </NonInvariantDocblockPropertyType>
-    <UndefinedClass occurrences="4">
-      <code>Crammd5</code>
-      <code>Login</code>
-      <code>Plain</code>
-      <code>\Zend\Mail\Protocol\Smtp</code>
-    </UndefinedClass>
   </file>
   <file src="src/Protocol/SmtpPluginManagerFactory.php">
     <DeprecatedInterface occurrences="1">

src/ConfigProvider.php

@@ -2,8 +2,6 @@
 
 namespace Laminas\Mail;
 
-use Zend\Mail\Protocol\SmtpPluginManager;
-
 class ConfigProvider
 {
     /**
@@ -28,7 +26,7 @@ public function getDependencyConfig()
         return [
             // Legacy Zend Framework aliases
             'aliases'   => [
-                SmtpPluginManager::class => Protocol\SmtpPluginManager::class,
+                'Zend\Mail\Protocol\SmtpPluginManager' => Protocol\SmtpPluginManager::class,
             ],
             'factories' => [
                 Protocol\SmtpPluginManager::class => Protocol\SmtpPluginManagerFactory::class,