From 728d9d5fdfa89de9739bc7ce19ecc19a3c564344 Mon Sep 17 00:00:00 2001 From: mattiabasone Date: Wed, 29 Jan 2025 15:36:46 +0100 Subject: [PATCH] fixes --- .github/workflows/checks.yml | 3 --- composer.json | 2 +- .../Schema/Generation/AttributeReader.php | 3 +++ .../Schema/Generation/Attributes/AvroDoc.php | 2 +- .../Schema/Generation/Attributes/AvroType.php | 2 +- .../Symfony/Serializer/AvroNameConverterTest.php | 1 - .../Symfony/Serializer/AvroSerDeEncoderTest.php | 2 -- .../DefaultRecordSerializerFactoryTest.php | 1 - test/Objects/Schema/ArrayTypeTest.php | 1 - test/Objects/Schema/EnumTypeTest.php | 1 - test/Objects/Schema/FixedTypeTest.php | 1 - .../Generation/Fixture/RecordWithRecordType.php | 16 ++++++++-------- .../Schema/Generation/Fixture/SimpleRecord.php | 12 ++++++------ test/Objects/Schema/MapTypeTest.php | 1 - test/Objects/Schema/RecordTypeTest.php | 1 - .../SchemaResolvers/ChainResolverTest.php | 1 - .../DefinitionInterfaceResolverTest.php | 1 - .../Objects/SchemaResolvers/FileResolverTest.php | 2 -- test/ProtocolTest.php | 1 - 19 files changed, 20 insertions(+), 34 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index f8978ba..c0a52d3 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -100,9 +100,6 @@ jobs: - version: '8.2' composer: --prefer-stable - - - version: '8.2' - composer: --prefer-stable - version: '8.3' composer: --prefer-stable diff --git a/composer.json b/composer.json index 9a51d85..c019b49 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "mattiabasone/avro-serde-php", + "name": "flix-tech/avro-serde-php", "description": "A library to serialize and deserialize Avro records making use of the confluent schema registry", "keywords": [ "confluent-platform", diff --git a/src/Objects/Schema/Generation/AttributeReader.php b/src/Objects/Schema/Generation/AttributeReader.php index b549a28..145ba33 100644 --- a/src/Objects/Schema/Generation/AttributeReader.php +++ b/src/Objects/Schema/Generation/AttributeReader.php @@ -20,6 +20,9 @@ public function readPropertyAttributes(\ReflectionProperty $property): SchemaAtt return $this->getSchemaAttributes(...$attributes); } + /** + * @param \ReflectionAttribute ...$attributes + */ private function getSchemaAttributes(\ReflectionAttribute ...$attributes): SchemaAttributes { $attributes = array_map(fn ($attr) => $attr->newInstance(), $attributes); diff --git a/src/Objects/Schema/Generation/Attributes/AvroDoc.php b/src/Objects/Schema/Generation/Attributes/AvroDoc.php index 477432c..601be62 100644 --- a/src/Objects/Schema/Generation/Attributes/AvroDoc.php +++ b/src/Objects/Schema/Generation/Attributes/AvroDoc.php @@ -12,7 +12,7 @@ final class AvroDoc implements SchemaAttribute { public function __construct( - public string $value + public string $value, ) { } diff --git a/src/Objects/Schema/Generation/Attributes/AvroType.php b/src/Objects/Schema/Generation/Attributes/AvroType.php index 354923c..f7d084b 100644 --- a/src/Objects/Schema/Generation/Attributes/AvroType.php +++ b/src/Objects/Schema/Generation/Attributes/AvroType.php @@ -20,7 +20,7 @@ class AvroType implements SchemaAttribute public function __construct( Type|string $value, - SchemaAttribute ...$attributes + SchemaAttribute ...$attributes, ) { $this->value = \is_string($value) ? $value : $value->value; diff --git a/test/Integrations/Symfony/Serializer/AvroNameConverterTest.php b/test/Integrations/Symfony/Serializer/AvroNameConverterTest.php index 2954bba..2321a2d 100644 --- a/test/Integrations/Symfony/Serializer/AvroNameConverterTest.php +++ b/test/Integrations/Symfony/Serializer/AvroNameConverterTest.php @@ -4,7 +4,6 @@ namespace FlixTech\AvroSerializer\Test\Integrations\Symfony\Serializer; -use PHPUnit\Framework\Attributes\Test; use Doctrine\Common\Annotations\AnnotationReader as DoctrineAnnotationReader; use FlixTech\AvroSerializer\Integrations\Symfony\Serializer\AvroSerDeEncoder; use FlixTech\AvroSerializer\Integrations\Symfony\Serializer\NameConverter\AvroNameConverter; diff --git a/test/Integrations/Symfony/Serializer/AvroSerDeEncoderTest.php b/test/Integrations/Symfony/Serializer/AvroSerDeEncoderTest.php index 7cea892..1f1c063 100644 --- a/test/Integrations/Symfony/Serializer/AvroSerDeEncoderTest.php +++ b/test/Integrations/Symfony/Serializer/AvroSerDeEncoderTest.php @@ -4,8 +4,6 @@ namespace FlixTech\AvroSerializer\Test\Integrations\Symfony\Serializer; -use PHPUnit\Framework\Attributes\Test; -use PHPUnit\Framework\Attributes\DataProvider; use FlixTech\AvroSerializer\Integrations\Symfony\Serializer\AvroSerDeEncoder; use FlixTech\AvroSerializer\Objects\RecordSerializer; use FlixTech\AvroSerializer\Test\AbstractFunctionalTestCase; diff --git a/test/Objects/DefaultRecordSerializerFactoryTest.php b/test/Objects/DefaultRecordSerializerFactoryTest.php index 166527c..57de466 100644 --- a/test/Objects/DefaultRecordSerializerFactoryTest.php +++ b/test/Objects/DefaultRecordSerializerFactoryTest.php @@ -4,7 +4,6 @@ namespace FlixTech\AvroSerializer\Test\Objects; -use PHPUnit\Framework\Attributes\Test; use FlixTech\AvroSerializer\Objects\DefaultRecordSerializerFactory; use PHPUnit\Framework\Attributes\Test; use PHPUnit\Framework\TestCase; diff --git a/test/Objects/Schema/ArrayTypeTest.php b/test/Objects/Schema/ArrayTypeTest.php index 6628a4c..7460551 100644 --- a/test/Objects/Schema/ArrayTypeTest.php +++ b/test/Objects/Schema/ArrayTypeTest.php @@ -4,7 +4,6 @@ namespace FlixTech\AvroSerializer\Test\Objects\Schema; -use PHPUnit\Framework\Attributes\Test; use FlixTech\AvroSerializer\Objects\Schema; use PHPUnit\Framework\Attributes\Test; use PHPUnit\Framework\TestCase; diff --git a/test/Objects/Schema/EnumTypeTest.php b/test/Objects/Schema/EnumTypeTest.php index e3f612f..2e8da28 100644 --- a/test/Objects/Schema/EnumTypeTest.php +++ b/test/Objects/Schema/EnumTypeTest.php @@ -4,7 +4,6 @@ namespace FlixTech\AvroSerializer\Test\Objects\Schema; -use PHPUnit\Framework\Attributes\Test; use FlixTech\AvroSerializer\Objects\Schema; use PHPUnit\Framework\Attributes\Test; use PHPUnit\Framework\TestCase; diff --git a/test/Objects/Schema/FixedTypeTest.php b/test/Objects/Schema/FixedTypeTest.php index f64076c..db9c956 100644 --- a/test/Objects/Schema/FixedTypeTest.php +++ b/test/Objects/Schema/FixedTypeTest.php @@ -4,7 +4,6 @@ namespace FlixTech\AvroSerializer\Test\Objects\Schema; -use PHPUnit\Framework\Attributes\Test; use FlixTech\AvroSerializer\Objects\Schema; use PHPUnit\Framework\Attributes\Test; use PHPUnit\Framework\TestCase; diff --git a/test/Objects/Schema/Generation/Fixture/RecordWithRecordType.php b/test/Objects/Schema/Generation/Fixture/RecordWithRecordType.php index 49288f3..2a90288 100644 --- a/test/Objects/Schema/Generation/Fixture/RecordWithRecordType.php +++ b/test/Objects/Schema/Generation/Fixture/RecordWithRecordType.php @@ -15,8 +15,8 @@ * * @SerDe\AvroName("RecordWithRecordType") */ -#[AvroType("record")] -#[AvroName("RecordWithRecordType")] +#[AvroType('record')] +#[AvroName('RecordWithRecordType')] class RecordWithRecordType { /** @@ -29,10 +29,10 @@ class RecordWithRecordType * @SerDe\AvroDoc("This a simple record for testing purposes") * }) */ - #[AvroName("simpleField")] - #[AvroType("record", + #[AvroName('simpleField')] + #[AvroType('record', new AvroTargetClass(SimpleRecord::class), - new AvroDoc("This a simple record for testing purposes") + new AvroDoc('This a simple record for testing purposes') )] private SimpleRecord $simpleRecord; @@ -42,8 +42,8 @@ class RecordWithRecordType * @SerDe\AvroType("null") * @SerDe\AvroType("org.acme.SimpleRecord") */ - #[AvroName("unionField")] - #[AvroType("null")] - #[AvroType("org.acme.SimpleRecord")] + #[AvroName('unionField')] + #[AvroType('null')] + #[AvroType('org.acme.SimpleRecord')] private ?SimpleRecord $unionRecord; } diff --git a/test/Objects/Schema/Generation/Fixture/SimpleRecord.php b/test/Objects/Schema/Generation/Fixture/SimpleRecord.php index 74dc9d5..148d402 100644 --- a/test/Objects/Schema/Generation/Fixture/SimpleRecord.php +++ b/test/Objects/Schema/Generation/Fixture/SimpleRecord.php @@ -17,9 +17,9 @@ * * @SerDe\AvroType("record") */ -#[AvroName("SimpleRecord")] -#[AvroNamespace("org.acme")] -#[AvroType("record")] +#[AvroName('SimpleRecord')] +#[AvroNamespace('org.acme')] +#[AvroType('record')] class SimpleRecord { /** @@ -27,19 +27,19 @@ class SimpleRecord * * @SerDe\AvroDefault(42) */ - #[AvroType("int")] + #[AvroType('int')] #[AvroDefault(42)] private $intType; /** * @SerDe\AvroType("uuid") */ - #[AvroType("uuid")] + #[AvroType('uuid')] private $uuidType; /** * @SerDe\AvroType("timestamp-millis") */ - #[AvroType("timestamp-millis")] + #[AvroType('timestamp-millis')] private $timestampMillisType; } diff --git a/test/Objects/Schema/MapTypeTest.php b/test/Objects/Schema/MapTypeTest.php index e64608d..a24c8c8 100644 --- a/test/Objects/Schema/MapTypeTest.php +++ b/test/Objects/Schema/MapTypeTest.php @@ -4,7 +4,6 @@ namespace FlixTech\AvroSerializer\Test\Objects\Schema; -use PHPUnit\Framework\Attributes\Test; use FlixTech\AvroSerializer\Objects\Schema; use PHPUnit\Framework\Attributes\Test; use PHPUnit\Framework\TestCase; diff --git a/test/Objects/Schema/RecordTypeTest.php b/test/Objects/Schema/RecordTypeTest.php index b56c996..61fb2f9 100644 --- a/test/Objects/Schema/RecordTypeTest.php +++ b/test/Objects/Schema/RecordTypeTest.php @@ -2,7 +2,6 @@ namespace FlixTech\AvroSerializer\Test\Objects\Schema; -use PHPUnit\Framework\Attributes\Test; use FlixTech\AvroSerializer\Objects\Schema; use FlixTech\AvroSerializer\Objects\Schema\Record\FieldOption; use PHPUnit\Framework\Attributes\Test; diff --git a/test/Objects/SchemaResolvers/ChainResolverTest.php b/test/Objects/SchemaResolvers/ChainResolverTest.php index 41cf712..2ade5af 100644 --- a/test/Objects/SchemaResolvers/ChainResolverTest.php +++ b/test/Objects/SchemaResolvers/ChainResolverTest.php @@ -2,7 +2,6 @@ namespace FlixTech\AvroSerializer\Test\Objects\SchemaResolvers; -use PHPUnit\Framework\Attributes\Test; use FlixTech\AvroSerializer\Objects\SchemaResolverInterface; use FlixTech\AvroSerializer\Objects\SchemaResolvers\ChainResolver; use PHPUnit\Framework\Attributes\Test; diff --git a/test/Objects/SchemaResolvers/DefinitionInterfaceResolverTest.php b/test/Objects/SchemaResolvers/DefinitionInterfaceResolverTest.php index 4a2380f..0dcb2ef 100644 --- a/test/Objects/SchemaResolvers/DefinitionInterfaceResolverTest.php +++ b/test/Objects/SchemaResolvers/DefinitionInterfaceResolverTest.php @@ -2,7 +2,6 @@ namespace FlixTech\AvroSerializer\Test\Objects\SchemaResolvers; -use PHPUnit\Framework\Attributes\Test; use FlixTech\AvroSerializer\Objects\HasSchemaDefinitionInterface; use FlixTech\AvroSerializer\Objects\SchemaResolvers\DefinitionInterfaceResolver; use PHPUnit\Framework\Attributes\Test; diff --git a/test/Objects/SchemaResolvers/FileResolverTest.php b/test/Objects/SchemaResolvers/FileResolverTest.php index b4229bd..e99b839 100644 --- a/test/Objects/SchemaResolvers/FileResolverTest.php +++ b/test/Objects/SchemaResolvers/FileResolverTest.php @@ -4,8 +4,6 @@ namespace FlixTech\AvroSerializer\Test\Objects\SchemaResolvers; -use PHPUnit\Framework\Attributes\Test; -use Widmogrod\Common\ValueOfInterface; use FlixTech\AvroSerializer\Objects\SchemaResolvers\FileResolver; use PHPUnit\Framework\Attributes\Test; use PHPUnit\Framework\TestCase; diff --git a/test/ProtocolTest.php b/test/ProtocolTest.php index 8a0ad90..0bcc793 100644 --- a/test/ProtocolTest.php +++ b/test/ProtocolTest.php @@ -2,7 +2,6 @@ namespace FlixTech\AvroSerializer\Test; -use PHPUnit\Framework\Attributes\Test; use FlixTech\AvroSerializer\Objects\Exceptions\AvroDecodingException; use PHPUnit\Framework\Attributes\Test; use Widmogrod\Monad\Either\Left;