Skip to content

Commit f7bc97f

Browse files
sandesh-assandesh-as
committed
Allow PHP 8.5 Support
Signed-off-by: sandesh.as <cod48668@adobe.com>
1 parent 70a4e5e commit f7bc97f

9 files changed

Lines changed: 21 additions & 143 deletions

‎psalm-baseline.xml‎

Lines changed: 0 additions & 136 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<files psalm-version="6.13.1@1e3b7f0a8ab32b23197b91107adc0a7ed8a05b51">
33
<file src="src/Acl.php">
4-
<MissingOverrideAttribute>
5-
<code><![CDATA[public function hasResource($resource)]]></code>
6-
<code><![CDATA[public function isAllowed($role = null, $resource = null, $privilege = null)]]></code>
7-
</MissingOverrideAttribute>
84
<MixedArgument>
95
<code><![CDATA[$child]]></code>
106
<code><![CDATA[$childId]]></code>
@@ -201,9 +197,6 @@
201197
</UnusedVariable>
202198
</file>
203199
<file src="src/Assertion/AssertionAggregate.php">
204-
<MissingOverrideAttribute>
205-
<code><![CDATA[public function assert(]]></code>
206-
</MissingOverrideAttribute>
207200
<MixedAssignment>
208201
<code><![CDATA[$assertion]]></code>
209202
</MixedAssignment>
@@ -216,12 +209,6 @@
216209
</MixedOperand>
217210
</file>
218211
<file src="src/Assertion/AssertionManager.php">
219-
<ClassMustBeFinal>
220-
<code><![CDATA[AssertionManager]]></code>
221-
</ClassMustBeFinal>
222-
<MissingOverrideAttribute>
223-
<code><![CDATA[public function validate($instance)]]></code>
224-
</MissingOverrideAttribute>
225212
<MissingReturnType>
226213
<code><![CDATA[validatePlugin]]></code>
227214
</MissingReturnType>
@@ -232,23 +219,10 @@
232219
<code><![CDATA[validatePlugin]]></code>
233220
</PossiblyUnusedMethod>
234221
</file>
235-
<file src="src/Assertion/CallbackAssertion.php">
236-
<MissingOverrideAttribute>
237-
<code><![CDATA[public function assert(]]></code>
238-
</MissingOverrideAttribute>
239-
</file>
240-
<file src="src/Assertion/Exception/InvalidAssertionException.php">
241-
<ClassMustBeFinal>
242-
<code><![CDATA[InvalidAssertionException]]></code>
243-
</ClassMustBeFinal>
244-
</file>
245222
<file src="src/Assertion/ExpressionAssertion.php">
246223
<InvalidNullableReturnType>
247224
<code><![CDATA[bool]]></code>
248225
</InvalidNullableReturnType>
249-
<MissingOverrideAttribute>
250-
<code><![CDATA[public function assert(]]></code>
251-
</MissingOverrideAttribute>
252226
<MissingReturnType>
253227
<code><![CDATA[validateOperand]]></code>
254228
<code><![CDATA[validateOperator]]></code>
@@ -270,52 +244,17 @@
270244
<code><![CDATA[static::evaluateExpression($left, $this->operator, $right)]]></code>
271245
</NullableReturnStatement>
272246
</file>
273-
<file src="src/Assertion/OwnershipAssertion.php">
274-
<ClassMustBeFinal>
275-
<code><![CDATA[OwnershipAssertion]]></code>
276-
</ClassMustBeFinal>
277-
<MissingOverrideAttribute>
278-
<code><![CDATA[public function assert(]]></code>
279-
</MissingOverrideAttribute>
280-
</file>
281-
<file src="src/Exception/InvalidArgumentException.php">
282-
<ClassMustBeFinal>
283-
<code><![CDATA[InvalidArgumentException]]></code>
284-
</ClassMustBeFinal>
285-
</file>
286-
<file src="src/Exception/RuntimeException.php">
287-
<ClassMustBeFinal>
288-
<code><![CDATA[RuntimeException]]></code>
289-
</ClassMustBeFinal>
290-
</file>
291247
<file src="src/Resource/GenericResource.php">
292-
<ClassMustBeFinal>
293-
<code><![CDATA[GenericResource]]></code>
294-
</ClassMustBeFinal>
295-
<MissingOverrideAttribute>
296-
<code><![CDATA[public function __toString(): string]]></code>
297-
<code><![CDATA[public function getResourceId()]]></code>
298-
</MissingOverrideAttribute>
299248
<RedundantCastGivenDocblockType>
300249
<code><![CDATA[(string) $resourceId]]></code>
301250
</RedundantCastGivenDocblockType>
302251
</file>
303252
<file src="src/Role/GenericRole.php">
304-
<ClassMustBeFinal>
305-
<code><![CDATA[GenericRole]]></code>
306-
</ClassMustBeFinal>
307-
<MissingOverrideAttribute>
308-
<code><![CDATA[public function __toString(): string]]></code>
309-
<code><![CDATA[public function getRoleId()]]></code>
310-
</MissingOverrideAttribute>
311253
<RedundantCastGivenDocblockType>
312254
<code><![CDATA[(string) $roleId]]></code>
313255
</RedundantCastGivenDocblockType>
314256
</file>
315257
<file src="src/Role/Registry.php">
316-
<ClassMustBeFinal>
317-
<code><![CDATA[Registry]]></code>
318-
</ClassMustBeFinal>
319258
<InvalidPropertyAssignmentValue>
320259
<code><![CDATA[$this->roles]]></code>
321260
</InvalidPropertyAssignmentValue>
@@ -384,16 +323,10 @@
384323
</UnusedForeachValue>
385324
</file>
386325
<file src="test/AclTest.php">
387-
<ClassMustBeFinal>
388-
<code><![CDATA[AclTest]]></code>
389-
</ClassMustBeFinal>
390326
<InvalidArgument>
391327
<code><![CDATA[new stdClass()]]></code>
392328
<code><![CDATA[new stdClass()]]></code>
393329
</InvalidArgument>
394-
<MissingOverrideAttribute>
395-
<code><![CDATA[protected function setUp(): void]]></code>
396-
</MissingOverrideAttribute>
397330
<MissingReturnType>
398331
<code><![CDATA[testAclResourcePermissionsAreInheritedWithMultilevelResourcesAndDenyPolicy]]></code>
399332
<code><![CDATA[testAllowNullPermissionAfterResourcesExistShouldAllowAllPermissionsForRole]]></code>
@@ -427,38 +360,11 @@
427360
</UnusedForeachValue>
428361
</file>
429362
<file src="test/Assertion/AssertionAggregateTest.php">
430-
<ClassMustBeFinal>
431-
<code><![CDATA[AssertionAggregateTest]]></code>
432-
</ClassMustBeFinal>
433-
<MissingOverrideAttribute>
434-
<code><![CDATA[protected function setUp(): void]]></code>
435-
</MissingOverrideAttribute>
436363
<MissingReturnType>
437364
<code><![CDATA[testClearAssertions]]></code>
438365
</MissingReturnType>
439366
</file>
440-
<file src="test/Assertion/AssertionManagerCompatibilityTest.php">
441-
<ClassMustBeFinal>
442-
<code><![CDATA[AssertionManagerCompatibilityTest]]></code>
443-
</ClassMustBeFinal>
444-
<MissingOverrideAttribute>
445-
<code><![CDATA[protected function getInstanceOf(): string]]></code>
446-
<code><![CDATA[protected function getV2InvalidPluginException(): string]]></code>
447-
<code><![CDATA[protected static function getPluginManager(): AssertionManager]]></code>
448-
</MissingOverrideAttribute>
449-
</file>
450-
<file src="test/Assertion/AssertionManagerTest.php">
451-
<ClassMustBeFinal>
452-
<code><![CDATA[AssertionManagerTest]]></code>
453-
</ClassMustBeFinal>
454-
<MissingOverrideAttribute>
455-
<code><![CDATA[protected function setUp(): void]]></code>
456-
</MissingOverrideAttribute>
457-
</file>
458367
<file src="test/Assertion/CallbackAssertionTest.php">
459-
<ClassMustBeFinal>
460-
<code><![CDATA[CallbackAssertionTest]]></code>
461-
</ClassMustBeFinal>
462368
<MissingClosureParamType>
463369
<code><![CDATA[$aclArg]]></code>
464370
<code><![CDATA[$aclArg]]></code>
@@ -482,33 +388,19 @@
482388
</UnusedClosureParam>
483389
</file>
484390
<file src="test/Assertion/ExpressionAssertionTest.php">
485-
<ClassMustBeFinal>
486-
<code><![CDATA[ExpressionAssertionTest]]></code>
487-
</ClassMustBeFinal>
488391
<MissingReturnType>
489392
<code><![CDATA[testExpressionsEvaluation]]></code>
490393
</MissingReturnType>
491394
</file>
492-
<file src="test/Assertion/OwnershipAssertionTest.php">
493-
<ClassMustBeFinal>
494-
<code><![CDATA[OwnershipAssertionTest]]></code>
495-
</ClassMustBeFinal>
496-
</file>
497395
<file src="test/TestAsset/AssertionLaminas7973.php">
498396
<ClassMustBeFinal>
499397
<code><![CDATA[AssertionLaminas7973]]></code>
500398
</ClassMustBeFinal>
501-
<MissingOverrideAttribute>
502-
<code><![CDATA[public function assert(]]></code>
503-
</MissingOverrideAttribute>
504399
</file>
505400
<file src="test/TestAsset/ExpressionUseCase/BlogPost.php">
506401
<ClassMustBeFinal>
507402
<code><![CDATA[BlogPost]]></code>
508403
</ClassMustBeFinal>
509-
<MissingOverrideAttribute>
510-
<code><![CDATA[public function getResourceId(): string]]></code>
511-
</MissingOverrideAttribute>
512404
<PossiblyUnusedMethod>
513405
<code><![CDATA[getAuthorName]]></code>
514406
<code><![CDATA[getShortDescription]]></code>
@@ -522,9 +414,6 @@
522414
<ClassMustBeFinal>
523415
<code><![CDATA[User]]></code>
524416
</ClassMustBeFinal>
525-
<MissingOverrideAttribute>
526-
<code><![CDATA[public function getRoleId(): string]]></code>
527-
</MissingOverrideAttribute>
528417
<PossiblyUnusedMethod>
529418
<code><![CDATA[isAdult]]></code>
530419
</PossiblyUnusedMethod>
@@ -543,9 +432,6 @@
543432
<ClassMustBeFinal>
544433
<code><![CDATA[MockAssertion]]></code>
545434
</ClassMustBeFinal>
546-
<MissingOverrideAttribute>
547-
<code><![CDATA[public function assert(]]></code>
548-
</MissingOverrideAttribute>
549435
</file>
550436
<file src="test/TestAsset/OwnershipUseCase/Acl.php">
551437
<ClassMustBeFinal>
@@ -566,24 +452,11 @@
566452
<ClassMustBeFinal>
567453
<code><![CDATA[BlogPost]]></code>
568454
</ClassMustBeFinal>
569-
<MissingOverrideAttribute>
570-
<code><![CDATA[public function getOwnerId(): ?int]]></code>
571-
<code><![CDATA[public function getResourceId(): string]]></code>
572-
</MissingOverrideAttribute>
573455
</file>
574456
<file src="test/TestAsset/OwnershipUseCase/Comment.php">
575457
<ClassMustBeFinal>
576458
<code><![CDATA[Comment]]></code>
577459
</ClassMustBeFinal>
578-
<MissingOverrideAttribute>
579-
<code><![CDATA[public function getResourceId(): string]]></code>
580-
</MissingOverrideAttribute>
581-
</file>
582-
<file src="test/TestAsset/OwnershipUseCase/User.php">
583-
<MissingOverrideAttribute>
584-
<code><![CDATA[public function getOwnerId(): ?int]]></code>
585-
<code><![CDATA[public function getRoleId(): string]]></code>
586-
</MissingOverrideAttribute>
587460
</file>
588461
<file src="test/TestAsset/StandardUseCase/Acl.php">
589462
<ClassMustBeFinal>
@@ -594,25 +467,16 @@
594467
<ClassMustBeFinal>
595468
<code><![CDATA[BlogPost]]></code>
596469
</ClassMustBeFinal>
597-
<MissingOverrideAttribute>
598-
<code><![CDATA[public function getResourceId(): string]]></code>
599-
</MissingOverrideAttribute>
600470
</file>
601471
<file src="test/TestAsset/StandardUseCase/User.php">
602472
<ClassMustBeFinal>
603473
<code><![CDATA[User]]></code>
604474
</ClassMustBeFinal>
605-
<MissingOverrideAttribute>
606-
<code><![CDATA[public function getRoleId(): string]]></code>
607-
</MissingOverrideAttribute>
608475
</file>
609476
<file src="test/TestAsset/StandardUseCase/UserIsBlogPostOwnerAssertion.php">
610477
<ClassMustBeFinal>
611478
<code><![CDATA[UserIsBlogPostOwnerAssertion]]></code>
612479
</ClassMustBeFinal>
613-
<MissingOverrideAttribute>
614-
<code><![CDATA[public function assert(]]></code>
615-
</MissingOverrideAttribute>
616480
<ParamNameMismatch>
617481
<code><![CDATA[$blogPost]]></code>
618482
<code><![CDATA[$user]]></code>

‎psalm.xml.dist‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,20 @@
1919
</ignoreFiles>
2020
</projectFiles>
2121

22+
<issueHandlers>
23+
<MissingOverrideAttribute>
24+
<errorLevel type="suppress">
25+
<directory name="src"/>
26+
<directory name="test"/>
27+
</errorLevel>
28+
</MissingOverrideAttribute>
29+
<ClassMustBeFinal>
30+
<errorLevel type="suppress">
31+
<directory name="src"/>
32+
</errorLevel>
33+
</ClassMustBeFinal>
34+
</issueHandlers>
35+
2236
<plugins>
2337
<pluginClass class="Psalm\PhpUnitPlugin\Plugin"/>
2438
</plugins>

‎test/AclTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
use PHPUnit\Framework\TestCase;
1818
use stdClass;
1919

20-
class AclTest extends TestCase
20+
final class AclTest extends TestCase
2121
{
2222
/**
2323
* ACL object for each test method

‎test/Assertion/AssertionAggregateTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
use LaminasTest\Permissions\Acl\Assertion\TestSubclasses\AssertionAggregate;
1717
use PHPUnit\Framework\TestCase;
1818

19-
class AssertionAggregateTest extends TestCase
19+
final class AssertionAggregateTest extends TestCase
2020
{
2121
private AssertionAggregate $assertionAggregate;
2222

‎test/Assertion/AssertionManagerCompatibilityTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
use PHPUnit\Framework\TestCase;
1313
use Throwable;
1414

15-
class AssertionManagerCompatibilityTest extends TestCase
15+
final class AssertionManagerCompatibilityTest extends TestCase
1616
{
1717
use CommonPluginManagerTrait;
1818

‎test/Assertion/AssertionManagerTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
use Laminas\ServiceManager\ServiceManager;
1111
use PHPUnit\Framework\TestCase;
1212

13-
class AssertionManagerTest extends TestCase
13+
final class AssertionManagerTest extends TestCase
1414
{
1515
protected AssertionManager $manager;
1616

‎test/Assertion/CallbackAssertionTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
use LaminasTest\Permissions\Acl\Assertion\TestSubclasses\CallbackAssertion;
1212
use PHPUnit\Framework\TestCase;
1313

14-
class CallbackAssertionTest extends TestCase
14+
final class CallbackAssertionTest extends TestCase
1515
{
1616
/**
1717
* Ensures constructor throws InvalidArgumentException if not callable is provided

‎test/Assertion/ExpressionAssertionTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
use function serialize;
1919

20-
class ExpressionAssertionTest extends TestCase
20+
final class ExpressionAssertionTest extends TestCase
2121
{
2222
public function testFromPropertiesCreation(): void
2323
{

‎test/Assertion/OwnershipAssertionTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
use LaminasTest\Permissions\Acl\TestAsset\OwnershipUseCase;
88
use PHPUnit\Framework\TestCase;
99

10-
class OwnershipAssertionTest extends TestCase
10+
final class OwnershipAssertionTest extends TestCase
1111
{
1212
public function testAssertPassesIfRoleIsNotProprietary(): void
1313
{

0 commit comments

Comments
 (0)