Merge pull request #859 from schmittjoh/php-attributes-support

Add support for php8 attributes

Author: goetas

DependencyInjection/JMSSerializerExtension.php

@@ -7,6 +7,7 @@
 use JMS\Serializer\EventDispatcher\EventSubscriberInterface;
 use JMS\Serializer\Exception\RuntimeException;
 use JMS\Serializer\Handler\SubscribingHandlerInterface;
+use JMS\Serializer\Metadata\Driver\AttributeDriver\AttributeReader;
 use JMS\Serializer\Metadata\Driver\DocBlockDriver;
 use JMS\Serializer\Metadata\Driver\TypedPropertiesDriver;
 use Symfony\Component\Config\FileLocator;
@@ -113,8 +114,7 @@ public function loadInternal(array $config, ContainerBuilder $container)
         if ($config['metadata']['infer_types_from_doc_block'] && class_exists(DocBlockDriver::class)) {
             $container->getDefinition('jms_serializer.metadata.doc_block_driver')
                 ->setDecoratedService('jms_serializer.metadata_driver')
-                ->setPublic(false)
-            ;
+                ->setPublic(false);
         }
 
         if (PHP_VERSION_ID >= 70400 && class_exists(TypedPropertiesDriver::class)) {
@@ -123,6 +123,14 @@ public function loadInternal(array $config, ContainerBuilder $container)
                 ->setPublic(false);
         }
 
+        if (PHP_VERSION_ID >= 80000 && class_exists(AttributeReader::class)) {
+            $container->register('jms_serializer.metadata.annotation_and_attributes_reader', AttributeReader::class)
+                ->setArgument(0, new Reference('annotation_reader'));
+
+            $container->findDefinition('jms_serializer.metadata.annotation_driver')
+                ->setArgument(0, new Reference('jms_serializer.metadata.annotation_and_attributes_reader'));
+        }
+
         $container
             ->getDefinition('jms_serializer.metadata_factory')
             ->replaceArgument(2, $config['metadata']['debug'])

Tests/DependencyInjection/ConfigurationTest.php

@@ -59,10 +59,8 @@ public function testCacheServicesRemovedWhenMetadataCachingIsDisabled(): void
     {
         $container = $this->getContainer([
             [
-                'metadata' => [
-                    'cache' => 'none',
-                ],
-            ]
+                'metadata' => ['cache' => 'none'],
+            ],
         ]);
 
         self::assertFalse($container->has('jms_serializer.metadata.cache'));

Tests/DependencyInjection/Fixture/IncludeInterfaces/AnInterface.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace JMS\SerializerBundle\Tests\DependencyInjection\Fixture\IncludeInterfaces;
 
 use JMS\Serializer\Annotation\Discriminator;

Tests/DependencyInjection/Fixture/IncludeInterfaces/AnInterfaceImplementation.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace JMS\SerializerBundle\Tests\DependencyInjection\Fixture\IncludeInterfaces;
 
 use JMS\Serializer\Annotation\Type;

Tests/DependencyInjection/Fixture/IncludeInterfaces/AnObject.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace JMS\SerializerBundle\Tests\DependencyInjection\Fixture\IncludeInterfaces;
 
 use JMS\Serializer\Annotation\Type;

Tests/DependencyInjection/JMSSerializerExtensionTest.php

@@ -650,10 +650,8 @@ public function testIncludeInterfaces()
     {
         $container = $this->getContainerForConfig([
             [
-                'metadata' => [
-                    'include_interfaces' => true,
-                ],
-            ]
+                'metadata' => ['include_interfaces' => true],
+            ],
         ]);
         $serializer = $container->get('jms_serializer');