Merge pull request #11 from dmt-software/1.1

upgrade to php 8

Author: proggeler

composer.json

@@ -11,7 +11,7 @@
         }
     ],
     "require": {
-        "php": ">=7.2",
+        "php": ">=8.0",
         "league/tactician": "^1.0",
         "symfony/validator": "^5.1"
     },
@@ -25,7 +25,7 @@
         "doctrine/cache": "Enables adding constraints using annotations"
     },
     "require-dev": {
-        "phpunit/phpunit": ">=7.2",
+        "phpunit/phpunit": "^12.0",
         "doctrine/annotations": "^1.6"
     },
     "autoload-dev": {

phpunit.xml.dist

@@ -1,23 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
          bootstrap="vendor/autoload.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false">
-
+         cacheDirectory=".phpunit.cache"
+         executionOrder="depends,defects"
+         beStrictAboutCoverageMetadata="true"
+         beStrictAboutOutputDuringTests="true"
+         displayDetailsOnPhpunitDeprecations="true"
+         failOnPhpunitDeprecation="true"
+         failOnRisky="true"
+         failOnWarning="true">
     <testsuites>
-        <testsuite name="Test Suite">
-            <directory>./tests/</directory>
+        <testsuite name="default">
+            <directory>tests</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist>
-            <directory>./src/</directory>
-        </whitelist>
-    </filter>
+
+    <source ignoreIndirectDeprecations="true" restrictNotices="true" restrictWarnings="true">
+        <include>
+            <directory>src</directory>
+        </include>
+    </source>
 </phpunit>

src/Validator/ValidationMiddleware.php

@@ -2,10 +2,7 @@
 
 namespace DMT\CommandBus\Validator;
 
-use Doctrine\Common\Annotations\AnnotationException;
 use Doctrine\Common\Annotations\AnnotationReader;
-use Doctrine\Common\Annotations\CachedReader;
-use Doctrine\Common\Cache\ArrayCache;
 use League\Tactician\Middleware;
 use Symfony\Component\Validator\Mapping\Factory\LazyLoadingMetadataFactory;
 use Symfony\Component\Validator\Mapping\Loader\AnnotationLoader;
@@ -22,16 +19,12 @@
  */
 class ValidationMiddleware implements Middleware
 {
-    /**
-     * @var ValidatorInterface
-     */
-    protected $validator;
+    protected ValidatorInterface|RecursiveValidator $validator;
 
     /**
      * ValidationMiddleware constructor.
      *
      * @param ValidatorInterface|null $validator
-     * @throws AnnotationException
      */
     public function __construct(ValidatorInterface $validator = null)
     {
@@ -44,7 +37,7 @@ public function __construct(ValidatorInterface $validator = null)
      *
      * @return mixed
      */
-    public function execute($command, callable $next)
+    public function execute($command, callable $next): mixed
     {
         $violations = $this->validator->validate($command);
 
@@ -60,25 +53,12 @@ public function execute($command, callable $next)
         return $next($command);
     }
 
-    /**
-     * Get a default validator.
-     *
-     * By default the usage of annotations to validate object is off. To enable annotation configuration install
-     * `doctrine/annotations`.
-     *
-     * @return RecursiveValidator|ValidatorInterface
-     * @throws AnnotationException
-     */
     protected function getDefaultValidator(): ValidatorInterface
     {
         $loaders = [new StaticMethodLoader()];
 
         if (class_exists(AnnotationReader::class)) {
-            if (class_exists(ArrayCache::class)) {
-                $loaders[] = new AnnotationLoader(new CachedReader(new AnnotationReader(), new ArrayCache()));
-            } else {
-                $loaders[] = new AnnotationLoader(new AnnotationReader());
-            }
+            $loaders[] = new AnnotationLoader(new AnnotationReader());
         }
 
         return (new ValidatorBuilder())

tests/Validator/ValidationMiddlewareTest.php

@@ -6,8 +6,9 @@
 use DMT\CommandBus\Validator\ValidationMiddleware;
 use DMT\Test\CommandBus\Fixtures\AnnotationReaderCommand;
 use DMT\Test\CommandBus\Fixtures\ClassMetadataCommand;
-use Doctrine\Common\Annotations\AnnotationException;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
+use stdClass;
 use Symfony\Component\Validator\ConstraintViolation;
 use Symfony\Component\Validator\ConstraintViolationList;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
@@ -19,13 +20,10 @@
  */
 class ValidationMiddlewareTest extends TestCase
 {
-    /**
-     * @throws \ReflectionException
-     * @throws AnnotationException
-     */
-    public function testValidCommand()
+    public function testValidCommand(): void
     {
-        $validator = static::getMockForAbstractClass(ValidatorInterface::class);
+        /** @var ValidatorInterface $validator */
+        $validator = static::getMockBuilder(ValidatorInterface::class)->getMock();
         $validator->expects(static::once())
             ->method('validate')
             ->willReturn(new ConstraintViolationList());
@@ -43,10 +41,7 @@ function ($command) {
         static::assertSame($expected, $result);
     }
 
-    /**
-     * @throws AnnotationException
-     */
-    public function testLoadClassMetadataValidator()
+    public function testLoadClassMetadataValidator(): void
     {
         $this->expectException(ValidationException::class);
         $this->expectExceptionMessageMatches("~Invalid command .* given~");
@@ -55,10 +50,7 @@ public function testLoadClassMetadataValidator()
         $middleware->execute(new ClassMetadataCommand(), 'gettype');
     }
 
-    /**
-     * @throws AnnotationException
-     */
-    public function testAnnotationReaderValidator()
+    public function testAnnotationReaderValidator(): void
     {
         $this->expectException(ValidationException::class);
         $this->expectExceptionMessageMatches("~Invalid command .* given~");
@@ -67,25 +59,19 @@ public function testAnnotationReaderValidator()
         $middleware->execute(new AnnotationReaderCommand(), 'gettype');
     }
 
-    /**
-     * @dataProvider provideConstraintViolations
-     *
-     * @param ConstraintViolationList $violations
-     *
-     * @throws \ReflectionException
-     * @throws AnnotationException
-     */
-    public function testInvalidCommand(ConstraintViolationList $violations)
+    #[DataProvider(methodName: "provideConstraintViolations")]
+    public function testInvalidCommand(ConstraintViolationList $violations): void
     {
-        $validator = static::getMockForAbstractClass(ValidatorInterface::class);
+        /** @var ValidatorInterface $validator */
+        $validator = static::getMockBuilder(ValidatorInterface::class)->getMock();
         $validator->expects(static::once())
             ->method('validate')
             ->willReturn($violations);
 
         try {
             $middleware = new ValidationMiddleware($validator);
             $middleware->execute(
-                new \stdClass(),
+                new stdClass(),
                 function ($command) {
                     return $command;
                 }
@@ -95,20 +81,20 @@ function ($command) {
         }
     }
 
-    public function provideConstraintViolations(): array
+    public static function provideConstraintViolations(): array
     {
         return [
             [
                 new ConstraintViolationList(
-                    [new ConstraintViolation('missing property $foo', null, ['foo'], new \StdClass(), 'foo', null)]
+                    [new ConstraintViolation('missing property $foo', null, ['foo'], new stdClass(), 'foo', null)]
                 )
             ],
             [
                 new ConstraintViolationList(
                     [
-                        new ConstraintViolation('missing property $foo', null, ['foo'], new \StdClass(), 'foo', null),
-                        new ConstraintViolation('missing property $bar', null, ['bar'], new \StdClass(), 'bar', null),
-                        new ConstraintViolation('missing property $baz', null, ['baz'], new \StdClass(), 'baz', null),
+                        new ConstraintViolation('missing property $foo', null, ['foo'], new stdClass(), 'foo', null),
+                        new ConstraintViolation('missing property $bar', null, ['bar'], new stdClass(), 'bar', null),
+                        new ConstraintViolation('missing property $baz', null, ['baz'], new stdClass(), 'baz', null),
                     ]
                 )
             ],