Skip to content

Commit edf3832

Browse files
authored
Merge pull request #214 from gsteel/PHP-8.2
Add support for PHP 8.2
2 parents 332b38c + 8cae063 commit edf3832

File tree

7 files changed

+90
-115
lines changed

7 files changed

+90
-115
lines changed

.laminas-ci.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"ignore_php_platform_requirements": {
3-
"8.1": true
3+
"8.1": false,
4+
"8.2": true
45
}
56
}

composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"homepage": "https://laminas.dev",
99
"license": "BSD-3-Clause",
1010
"require": {
11-
"php": "~8.0.0 || ~8.1.0",
11+
"php": "~8.0.0 || ~8.1.0 || ~8.2.0",
1212
"ext-iconv": "*",
1313
"laminas/laminas-loader": "^2.8.0",
1414
"laminas/laminas-mime": "^2.10.0",
@@ -22,11 +22,11 @@
2222
"laminas/laminas-coding-standard": "~2.4.0",
2323
"laminas/laminas-crypt": "^3.8.0",
2424
"laminas/laminas-db": "^2.15.0",
25-
"laminas/laminas-servicemanager": "^3.16.0",
26-
"phpunit/phpunit": "^9.5.21",
25+
"laminas/laminas-servicemanager": "^3.19",
26+
"phpunit/phpunit": "^9.5.25",
2727
"psalm/plugin-phpunit": "^0.17.0",
2828
"symfony/process": "^6.0.11",
29-
"vimeo/psalm": "^4.26.0"
29+
"vimeo/psalm": "^4.29"
3030
},
3131
"suggest": {
3232
"laminas/laminas-crypt": "^3.8 Crammd5 support in SMTP Auth",

composer.lock

Lines changed: 55 additions & 58 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

psalm-baseline.xml

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<files psalm-version="4.28.0@52e96bea381e6cb07a672aefec791a5817694a26">
2+
<files psalm-version="4.29.0@7ec5ffbd5f68ae03782d7fd33fff0c45a69f95b3">
33
<file src="src/Address.php">
44
<DocblockTypeContradiction occurrences="2">
55
<code>! is_string($email)</code>
@@ -54,12 +54,6 @@
5454
<code>is_object($emailOrAddress)</code>
5555
</RedundantConditionGivenDocblockType>
5656
</file>
57-
<file src="src/ConfigProvider.php">
58-
<MixedArrayOffset occurrences="1"/>
59-
<UndefinedClass occurrences="1">
60-
<code>SmtpPluginManager</code>
61-
</UndefinedClass>
62-
</file>
6357
<file src="src/Header/AbstractAddressList.php">
6458
<DocblockTypeContradiction occurrences="1">
6559
<code>null === $this-&gt;addressList</code>
@@ -80,15 +74,6 @@
8074
<MixedArgument occurrences="1">
8175
<code>$value</code>
8276
</MixedArgument>
83-
<MixedArrayAccess occurrences="1">
84-
<code>$conversionInfo['errors']</code>
85-
</MixedArrayAccess>
86-
<MixedInferredReturnType occurrences="1">
87-
<code>string</code>
88-
</MixedInferredReturnType>
89-
<MixedReturnStatement occurrences="1">
90-
<code>$ascii</code>
91-
</MixedReturnStatement>
9277
<RedundantConditionGivenDocblockType occurrences="1">
9378
<code>$format !== HeaderInterface::FORMAT_RAW</code>
9479
</RedundantConditionGivenDocblockType>
@@ -854,17 +839,10 @@
854839
<MissingReturnType occurrences="1">
855840
<code>validatePlugin</code>
856841
</MissingReturnType>
857-
<MixedArrayOffset occurrences="1"/>
858842
<NonInvariantDocblockPropertyType occurrences="2">
859843
<code>$aliases</code>
860844
<code>$instanceOf</code>
861845
</NonInvariantDocblockPropertyType>
862-
<UndefinedClass occurrences="4">
863-
<code>Crammd5</code>
864-
<code>Login</code>
865-
<code>Plain</code>
866-
<code>\Zend\Mail\Protocol\Smtp</code>
867-
</UndefinedClass>
868846
</file>
869847
<file src="src/Protocol/SmtpPluginManagerFactory.php">
870848
<DeprecatedInterface occurrences="1">

src/ConfigProvider.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
namespace Laminas\Mail;
44

5-
use Zend\Mail\Protocol\SmtpPluginManager;
6-
75
class ConfigProvider
86
{
97
/**
@@ -28,7 +26,7 @@ public function getDependencyConfig()
2826
return [
2927
// Legacy Zend Framework aliases
3028
'aliases' => [
31-
SmtpPluginManager::class => Protocol\SmtpPluginManager::class,
29+
'Zend\Mail\Protocol\SmtpPluginManager' => Protocol\SmtpPluginManager::class,
3230
],
3331
'factories' => [
3432
Protocol\SmtpPluginManager::class => Protocol\SmtpPluginManagerFactory::class,

0 commit comments

Comments
 (0)