Skip to content

Commit 00c6aee

Browse files
authored
Merge pull request #211 from acelaya-forks/php-8.5
Add support for PHP 8.5, Remove support for PHP 8.1
2 parents 1793e78 + 98c4d6d commit 00c6aee

File tree

9 files changed

+99
-71
lines changed

9 files changed

+99
-71
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.4": true
3+
"8.4": true,
4+
"8.5": true
45
}
56
}

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
"homepage": "https://laminas.dev",
1010
"license": "BSD-3-Clause",
1111
"require": {
12-
"php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0"
12+
"php": "~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0"
1313
},
1414
"require-dev": {
1515
"ext-phar": "*",
1616
"doctrine/annotations": "^2.0.1",
1717
"laminas/laminas-coding-standard": "^3.0.0",
1818
"laminas/laminas-stdlib": "^3.18.0",
19-
"phpunit/phpunit": "^10.5.37",
19+
"phpunit/phpunit": "^10.5.58",
2020
"psalm/plugin-phpunit": "^0.19.0",
2121
"vimeo/psalm": "^5.15.0"
2222
},
@@ -29,7 +29,7 @@
2929
"dealerdirect/phpcodesniffer-composer-installer": true
3030
},
3131
"platform": {
32-
"php": "8.1.99"
32+
"php": "8.2.99"
3333
},
3434
"sort-packages": true
3535
},

composer.lock

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

psalm-baseline.xml

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -584,14 +584,6 @@
584584
<code>self</code>
585585
</PossiblyUnusedReturnValue>
586586
</file>
587-
<file src="src/Generator/TypeGenerator.php">
588-
<InvalidArgument>
589-
<code>$type</code>
590-
</InvalidArgument>
591-
<RedundantConditionGivenDocblockType>
592-
<code>$type instanceof ReflectionNamedType</code>
593-
</RedundantConditionGivenDocblockType>
594-
</file>
595587
<file src="src/Generator/ValueGenerator.php">
596588
<DeprecatedMethod>
597589
<code>getConstants</code>
@@ -1675,9 +1667,6 @@
16751667
<code>validClassName</code>
16761668
<code>variadicHints</code>
16771669
</PossiblyUnusedMethod>
1678-
<UnusedMethodCall>
1679-
<code>setAccessible</code>
1680-
</UnusedMethodCall>
16811670
</file>
16821671
<file src="test/Generator/PropertyGeneratorTest.php">
16831672
<ArgumentTypeCoercion>
@@ -1742,9 +1731,6 @@
17421731
<RedundantConditionGivenDocblockType>
17431732
<code>assertIsArray</code>
17441733
</RedundantConditionGivenDocblockType>
1745-
<UnusedMethodCall>
1746-
<code>setAccessible</code>
1747-
</UnusedMethodCall>
17481734
</file>
17491735
<file src="test/Generator/PropertyValueGeneratorTest.php">
17501736
<MissingReturnType>
@@ -1798,9 +1784,6 @@
17981784
<code>true</code>
17991785
<code>true</code>
18001786
</InvalidArgument>
1801-
<UnusedMethodCall>
1802-
<code>setAccessible</code>
1803-
</UnusedMethodCall>
18041787
</file>
18051788
<file src="test/Generator/TypeGenerator/CompositeTypeTest.php">
18061789
<PossiblyUnusedMethod>

0 commit comments

Comments
 (0)