* Add Override attributes instead of disabling psalm feature

Signed-off-by: Thomas Rieschl <[email protected]>

Author: rieschl

psalm.xml

@@ -5,7 +5,6 @@
         xmlns="https://getpsalm.org/schema/config"
         xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
         errorLevel="1"
-        ensureOverrideAttribute="false"
         findUnusedPsalmSuppress="true"
         findUnusedCode="true"
         findUnusedBaselineEntry="true"

src/PHPUnit/Constraint/HasRedirectConstraint.php

@@ -7,6 +7,7 @@
 use Laminas\Http\Header\Location;
 use Laminas\Http\PhpEnvironment\Response;
 use Laminas\Test\PHPUnit\Controller\AbstractHttpControllerTestCase;
+use Override;
 use PHPUnit\Framework\Constraint\Constraint;
 
 final class HasRedirectConstraint extends Constraint
@@ -15,12 +16,14 @@ public function __construct(private readonly AbstractHttpControllerTestCase $act
     {
     }
 
+    #[Override]
     public function toString(): string
     {
         return 'has a redirect';
     }
 
     /** @param mixed $other */
+    #[Override]
     public function matches($other): bool
     {
         $response = $this->activeTestCase->getResponse();

src/PHPUnit/Constraint/IsCurrentModuleNameConstraint.php

@@ -4,6 +4,8 @@
 
 namespace Laminas\Test\PHPUnit\Constraint;
 
+use Override;
+
 use function ltrim;
 use function str_contains;
 use function strrpos;
@@ -12,19 +14,22 @@
 
 final class IsCurrentModuleNameConstraint extends LaminasConstraint
 {
+    #[Override]
     public function toString(): string
     {
         return 'is the actual module name';
     }
 
     /** @param mixed $other */
+    #[Override]
     public function failureDescription($other): string
     {
         $other = (string) $other;
         return "\"$other\" {$this->toString()}, actual module name is \"{$this->getCurrentModuleName()}\"";
     }
 
     /** @param mixed $other */
+    #[Override]
     public function matches($other): bool
     {
         $other = (string) $other;

src/PHPUnit/Constraint/IsRedirectedRouteNameConstraint.php

@@ -12,6 +12,7 @@
 use Laminas\Mvc\Controller\Plugin\Url;
 use Laminas\Router\RouteMatch;
 use Laminas\Test\PHPUnit\Controller\AbstractHttpControllerTestCase;
+use Override;
 use PHPUnit\Framework\Constraint\Constraint;
 use RuntimeException;
 
@@ -25,12 +26,14 @@ public function __construct(private readonly AbstractHttpControllerTestCase $act
     {
     }
 
+    #[Override]
     public function toString(): string
     {
         return 'is the redirected route name';
     }
 
     /** @param mixed $other */
+    #[Override]
     public function matches($other): bool
     {
         if (! is_string($other)) {

src/PHPUnit/Constraint/LaminasConstraint.php

@@ -6,6 +6,7 @@
 
 use Exception;
 use Laminas\Test\PHPUnit\Controller\AbstractControllerTestCase;
+use Override;
 use PHPUnit\Framework\Constraint\Constraint;
 use PHPUnit\Framework\ExpectationFailedException;
 use SebastianBergmann\Comparator\ComparisonFailure;
@@ -33,6 +34,7 @@ final public function getTestCase(): AbstractControllerTestCase
     /**
      * @psalm-return never
      */
+    #[Override]
     final public function fail(mixed $other, string $description, ?ComparisonFailure $comparisonFailure = null): never
     {
         try {

src/PHPUnit/Controller/AbstractControllerTestCase.php

@@ -23,6 +23,7 @@
 use Laminas\Test\PHPUnit\Constraint\IsCurrentModuleNameConstraint;
 use Laminas\Uri\Http as HttpUri;
 use Laminas\View\Model\ModelInterface;
+use Override;
 use PHPUnit\Framework\Assert;
 use PHPUnit\Framework\ExpectationFailedException;
 use PHPUnit\Framework\TestCase;
@@ -66,6 +67,7 @@ abstract class AbstractControllerTestCase extends TestCase
     /**
      * Reset the application for isolation
      */
+    #[Override]
     protected function setUp(): void
     {
         $this->reset();
@@ -74,6 +76,7 @@ protected function setUp(): void
     /**
      * Restore params
      */
+    #[Override]
     protected function tearDown(): void
     {
         // Prevent memory leak

test/PHPUnit/Controller/AbstractControllerTestCaseTest.php

@@ -15,6 +15,7 @@
 use LaminasTest\Test\ExpectedExceptionTrait;
 use org\bovigo\vfs\vfsStream;
 use org\bovigo\vfs\vfsStreamWrapper;
+use Override;
 use PHPUnit\Framework\AssertionFailedError;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\ExpectationFailedException;
@@ -70,6 +71,7 @@ public static function rmdir(string $dir): bool
         return rmdir($dir);
     }
 
+    #[Override]
     protected function setUp(): void
     {
         $this->traceErrorCache = $this->traceError;
@@ -80,6 +82,7 @@ protected function setUp(): void
         parent::setUp();
     }
 
+    #[Override]
     protected function tearDown(): void
     {
         $this->traceError = $this->traceErrorCache;

test/PHPUnit/Controller/AbstractHttpControllerTestCaseTest.php

@@ -11,6 +11,7 @@
 use Laminas\Test\PHPUnit\Controller\AbstractHttpControllerTestCase;
 use Laminas\View\Model\ViewModel;
 use LaminasTest\Test\ExpectedExceptionTrait;
+use Override;
 use PHPUnit\Framework\ExpectationFailedException;
 use RuntimeException;
 
@@ -24,6 +25,7 @@ class AbstractHttpControllerTestCaseTest extends AbstractHttpControllerTestCase
 {
     use ExpectedExceptionTrait;
 
+    #[Override]
     protected function setUp(): void
     {
         $this->setApplicationConfig(

test/PHPUnit/Controller/MemoryLeakTest.php

@@ -5,6 +5,7 @@
 namespace LaminasTest\Test\PHPUnit\Controller;
 
 use Laminas\Test\PHPUnit\Controller\AbstractControllerTestCase;
+use Override;
 use PHPUnit\Framework\Attributes\DataProvider;
 
 use function array_fill;
@@ -15,6 +16,7 @@ class MemoryLeakTest extends AbstractControllerTestCase
     /** @var int|null */
     public static $memStart;
 
+    #[Override]
     public static function setUpBeforeClass(): void
     {
         self::$memStart = memory_get_usage(true);

test/PHPUnit/Util/ModuleLoaderTest.php

@@ -11,6 +11,7 @@
 use Laminas\Test\Util\ModuleLoader;
 use LaminasTest\Test\ExpectedExceptionTrait;
 use ModuleWithNamespace\TestModule\Module;
+use Override;
 use PHPUnit\Framework\TestCase;
 
 use function array_diff;
@@ -48,11 +49,13 @@ public static function rmdir($dir): bool
         return rmdir($dir);
     }
 
+    #[Override]
     protected function setUp(): void
     {
         $this->tearDownCacheDir();
     }
 
+    #[Override]
     protected function tearDown(): void
     {
         $this->tearDownCacheDir();

test/_files/modules-path/with-subdir/Qux/Module.php

@@ -6,6 +6,7 @@
 
 use Laminas\ModuleManager\Feature\InitProviderInterface;
 use Laminas\ModuleManager\ModuleManagerInterface;
+use Override;
 use stdClass;
 
 /** @psalm-suppress UnusedClass */
@@ -22,6 +23,7 @@ public function getConfig(): array
         ];
     }
 
+    #[Override]
     public function init(ModuleManagerInterface $manager): void
     {
         $manager->loadModule('Foo');