Add support for php 8 attributes

.github/workflows/checks.yml

@@ -33,6 +33,10 @@ jobs:
           -
             version: 8.0
             xdebug: 3.1.1
+
+          -
+            version: 8.1.0RC3
+            xdebug: 3.1.1
     runs-on: ubuntu-20.04
     steps:
       -
@@ -81,12 +85,18 @@ jobs:
           -
             version: 8.0
             composer: --prefer-lowest
+          -
+            version: 8.1.0RC3
+            composer: --prefer-lowest
           -
             version: 7.4
             composer: --prefer-stable
           -
             version: 8.0
             composer: --prefer-stable
+          -
+            version: 8.1.0RC3
+            composer: --prefer-stable
     steps:
       -
         name: Download sources
@@ -190,6 +200,7 @@ jobs:
         run: |
           chmod a+x bin/wait-for-all.sh bin/wait-for-it.sh
           make platform
+          make platform-logs
           docker run -i --rm --net=host --sig-proxy=true --pid=host \
             -v "${GITHUB_WORKSPACE}":"${GITHUB_WORKSPACE}" -w "${GITHUB_WORKSPACE}" php-avro-serde:7.4 \
             vendor/bin/phpunit --group integration

.php-cs-fixer.dist.php

@@ -6,6 +6,13 @@
     ->in(['src', 'test'])
 ;
 
+if (version_compare(PHP_VERSION, '8.1') < 0) {
+    $finder = $finder
+        ->notPath('Objects/Schema/Generation/Attributes')
+        ->notPath('Objects/Schema/Generation/AttributeReader.php')
+        ->notPath('Objects/Schema/Generation/Fixture/Attributes');
+}
+
 return (new PhpCsFixer\Config())
     ->setRules([
         '@Symfony' => true,

Dockerfile

@@ -1,6 +1,6 @@
 ARG PHP_VERSION=7.4
 
-FROM php:${PHP_VERSION}-cli-alpine
+FROM php:${PHP_VERSION}-cli-alpine3.13
 
 ARG XDEBUG_VERSION=3.1.1
 

Makefile

@@ -11,7 +11,7 @@ ZOOKEEPER_IPV4 ?= 192.168.104.101
 COMPOSER ?= bin/composer.phar
 COMPOSER_VERSION ?= 2.1.9
 PHP_STAN ?= bin/phpstan.phar
-PHP_STAN_VERSION ?= 0.12.99
+PHP_STAN_VERSION ?= 1.0.1
 PHP_CS_FIXER ?= bin/php-cs-fixer.phar
 PHP_CS_FIXER_VERSION ?= 3.2.1
 PHPUNIT ?= vendor/bin/phpunit
@@ -75,6 +75,10 @@ platform:
 	docker-compose up -d
 	bin/wait-for-all.sh
 
+platform-logs:
+	docker-compose ps
+	docker-compose logs schema_registry
+
 clean:
 	rm -rf build
 	docker-compose down

composer.json

@@ -31,7 +31,7 @@
     "widmogrod/php-functional": "^6.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "^8.2.3|^9.4.2",
+    "phpunit/phpunit": "^9.5.10",
     "phpbench/phpbench": "1.0.0-alpha2",
     "vlucas/phpdotenv": "~2.4",
     "symfony/serializer": "^3.4|^4.3",

phpstan-conditional.config.php

@@ -0,0 +1,15 @@
+<?php
+declare(strict_types = 1);
+
+$config = [];
+
+if (version_compare(PHP_VERSION, '8.1') < 0) {
+    $config['parameters']['excludePaths'] = [
+        'analyseAndScan' => [
+            'src/Objects/Schema/Generation/Attributes/',
+            'src/Objects/Schema/Generation/AttributeReader.php'
+        ],
+    ];
+}
+
+return $config;

phpstan.neon

@@ -1,3 +1,5 @@
+includes:
+    - phpstan-conditional.config.php
 parameters:
     level: 8
     paths: [ src ]

src/Objects/Exceptions/Exceptions.php

@@ -8,6 +8,7 @@ final class Exceptions
 {
     public const ERROR_ENCODING = 501;
     public const ERROR_DECODING = 502;
+    public const ERROR_PHP_VERSION = 503;
 
     /**
      * @param mixed $record
@@ -41,4 +42,19 @@ public static function forDecode(string $binaryMessage, \Exception $previous = n
 
         return new AvroDecodingException($message, self::ERROR_DECODING, $previous);
     }
+
+    public static function forPhpVersion(string $currentVersion, string $minimumVersion): UnsupportedPhpVersionException
+    {
+        $message = sprintf(
+            'The current php version \'%s\' is not supported for this feature. ' .
+            'Minimum supported version is \'%s\'',
+            $currentVersion,
+            $minimumVersion,
+        );
+
+        return new UnsupportedPhpVersionException(
+            $message,
+            self::ERROR_PHP_VERSION
+        );
+    }
 }

src/Objects/Exceptions/UnsupportedPhpVersionException.php

@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+namespace FlixTech\AvroSerializer\Objects\Exceptions;
+
+use RuntimeException;
+
+class UnsupportedPhpVersionException extends RuntimeException
+{
+}

src/Objects/Schema/Generation/Annotations/AvroItems.php

@@ -5,14 +5,36 @@
 namespace FlixTech\AvroSerializer\Objects\Schema\Generation\Annotations;
 
 use FlixTech\AvroSerializer\Objects\Schema\AttributeName;
+use FlixTech\AvroSerializer\Objects\Schema\Generation\SchemaAttributes;
 use FlixTech\AvroSerializer\Objects\Schema\Generation\TypeOnlyAttribute;
 
 /**
  * @Annotation
  */
 final class AvroItems implements TypeOnlyAttribute
 {
-    use ContainsOnlyTypes;
+    /**
+     * @var mixed
+     */
+    public $value;
+
+    public function value(): array
+    {
+        $value = \is_array($this->value) ? $this->value : [$this->value];
+
+        return array_map(function ($value) {
+            if ($value instanceof AvroType) {
+                return $value;
+            }
+
+            return AvroType::create($value);
+        }, $value);
+    }
+
+    public function attributes(): SchemaAttributes
+    {
+        return new SchemaAttributes(...$this->value());
+    }
 
     /**
      * {@inheritdoc}

src/Objects/Schema/Generation/Annotations/AvroValues.php

@@ -5,14 +5,36 @@
 namespace FlixTech\AvroSerializer\Objects\Schema\Generation\Annotations;
 
 use FlixTech\AvroSerializer\Objects\Schema\AttributeName;
+use FlixTech\AvroSerializer\Objects\Schema\Generation\SchemaAttributes;
 use FlixTech\AvroSerializer\Objects\Schema\Generation\TypeOnlyAttribute;
 
 /**
  * @Annotation
  */
 final class AvroValues implements TypeOnlyAttribute
 {
-    use ContainsOnlyTypes;
+    /**
+     * @var mixed
+     */
+    public $value;
+
+    public function value(): array
+    {
+        $value = \is_array($this->value) ? $this->value : [$this->value];
+
+        return array_map(function ($value) {
+            if ($value instanceof AvroType) {
+                return $value;
+            }
+
+            return AvroType::create($value);
+        }, $value);
+    }
+
+    public function attributes(): SchemaAttributes
+    {
+        return new SchemaAttributes(...$this->value());
+    }
 
     /**
      * {@inheritdoc}

src/Objects/Schema/Generation/AttributeReader.php

@@ -0,0 +1,44 @@
+<?php
+
+declare(strict_types=1);
+
+namespace FlixTech\AvroSerializer\Objects\Schema\Generation;
+
+use FlixTech\AvroSerializer\Objects\Exceptions\Exceptions;
+use ReflectionAttribute;
+use ReflectionClass;
+use ReflectionProperty;
+
+class AttributeReader implements SchemaAttributeReader
+{
+    private const MINIMUM_REQUIRED_VERSION = '8.1';
+
+    public function __construct()
+    {
+        if (version_compare(PHP_VERSION, self::MINIMUM_REQUIRED_VERSION) < 0) {
+            throw Exceptions::forPhpVersion(
+                PHP_VERSION,
+                self::MINIMUM_REQUIRED_VERSION,
+            );
+        }
+    }
+
+    public function readClassAttributes(ReflectionClass $class): SchemaAttributes
+    {
+        $attributes = $class->getAttributes();
+        return $this->getSchemaAttributes(...$attributes);
+    }
+
+    public function readPropertyAttributes(ReflectionProperty $property): SchemaAttributes
+    {
+        $attributes = $property->getAttributes();
+        return $this->getSchemaAttributes(...$attributes);
+    }
+
+    private function getSchemaAttributes(ReflectionAttribute ...$attributes): SchemaAttributes
+    {
+        $attributes = array_map(fn($attr) => $attr->newInstance(), $attributes);
+        $attributes = array_filter($attributes, fn($attr) => $attr instanceof SchemaAttribute);
+        return new SchemaAttributes(...$attributes);
+    }
+}

src/Objects/Schema/Generation/Attributes/AvroAliases.php

@@ -0,0 +1,50 @@
+<?php
+
+declare(strict_types=1);
+
+namespace FlixTech\AvroSerializer\Objects\Schema\Generation\Attributes;
+
+use FlixTech\AvroSerializer\Objects\Schema\AttributeName;
+use FlixTech\AvroSerializer\Objects\Schema\Generation\SchemaAttributes;
+use FlixTech\AvroSerializer\Objects\Schema\Generation\VariadicAttribute;
+
+#[\Attribute]
+final class AvroAliases implements VariadicAttribute
+{
+    /**
+     * @var array<string>
+     */
+    public array $aliases;
+
+    public function __construct(
+        string ...$aliases,
+    ) {
+        $this->aliases = $aliases;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function name(): string
+    {
+        return AttributeName::ALIASES;
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @return array<string>
+     */
+    public function value(): array
+    {
+        return $this->aliases;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function attributes(): SchemaAttributes
+    {
+        return new SchemaAttributes();
+    }
+}