fixes for php 7

Author: soyuka

.github/workflows/ci.yml

@@ -7,6 +7,7 @@ on:
 env:
   COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   COVERAGE: '0'
+  SYMFONY_DEPRECATIONS_HELPER: 'disabled=1'
 
 jobs:
   php-cs-fixer:
@@ -134,10 +135,6 @@ jobs:
           composer remove --dev --no-interaction --no-progress --no-update --ansi \
             doctrine/mongodb-odm \
             doctrine/mongodb-odm-bundle \
-      - name: Set Composer platform config
-        if: (startsWith(matrix.php, '8.0'))
-        run: |
-            composer config platform.php 7.4.99
       - name: Update project dependencies
         run: composer update --no-interaction --no-progress --ansi
       - name: Require Symfony components
@@ -146,11 +143,7 @@ jobs:
       - name: Install PHPUnit
         run: vendor/bin/simple-phpunit --version
       - name: Clear test app cache
-        if: (!startsWith(matrix.php, '8.0'))
         run: tests/Fixtures/app/console cache:clear --ansi
-      - name: Clear test app cache (php 8.0)
-        if: (startsWith(matrix.php, '8.0'))
-        run: rm -Rf tests/Fixtures/app/var/cache/*
       - name: Run PHPUnit tests
         run: |
           mkdir -p build/logs/phpunit

src/Api/IdentifiersExtractor.php

@@ -62,7 +62,8 @@ public function getIdentifiersFromItem($item, string $operationName = null, arra
                 throw new RuntimeException('No identifier value found, did you forgot to persist the entity?');
             }
 
-            if (is_scalar($identifierValue) || $identifierValue instanceof \Stringable) {
+            // TODO: php 8 remove method_exists
+            if (is_scalar($identifierValue) || method_exists($identifierValue, '__toString') || $identifierValue instanceof \Stringable) {
                 $identifiers[$parameterName] = (string) $identifierValue;
                 continue;
             }
@@ -76,7 +77,7 @@ public function getIdentifiersFromItem($item, string $operationName = null, arra
                 if (1 === \count($relatedIdentifiers)) {
                     $identifierValue = $this->resolveIdentifierValue($identifierValue, $relatedResourceClass, current($relatedIdentifiers)[1]);
 
-                    if (is_scalar($identifierValue) || $identifierValue instanceof \Stringable) {
+                    if (is_scalar($identifierValue) || method_exists($identifierValue, '__toString') || $identifierValue instanceof \Stringable) {
                         $identifiers[$parameterName] = (string) $identifierValue;
                         continue;
                     }

src/Core/Bridge/Doctrine/EventListener/PublishMercureUpdatesListener.php

@@ -20,6 +20,7 @@
 use ApiPlatform\Core\Exception\InvalidArgumentException;
 use ApiPlatform\Core\Exception\RuntimeException;
 use ApiPlatform\Core\Util\ResourceClassInfoTrait;
+use ApiPlatform\Exception\OperationNotFoundException;
 use ApiPlatform\GraphQl\Subscription\MercureSubscriptionIriGeneratorInterface as GraphQlMercureSubscriptionIriGeneratorInterface;
 use ApiPlatform\GraphQl\Subscription\SubscriptionManagerInterface as GraphQlSubscriptionManagerInterface;
 use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface;
@@ -72,7 +73,7 @@ final class PublishMercureUpdatesListener
      * @param array<string, string[]|string> $formats
      * @param HubRegistry|callable           $hubRegistry
      */
-    public function __construct(ResourceClassResolverInterface $resourceClassResolver, IriConverterInterface $iriConverter, $resourceMetadataFactory, SerializerInterface $serializer, array $formats, MessageBusInterface $messageBus = null, $hubRegistry = null, ?GraphQlSubscriptionManagerInterface $graphQlSubscriptionManager = null, ?GraphQlMercureSubscriptionIriGeneratorInterface $graphQlMercureSubscriptionIriGenerator = null, ExpressionLanguage $expressionLanguage = null)
+    public function __construct(ResourceClassResolverInterface $resourceClassResolver, IriConverterInterface $iriConverter, ResourceMetadataCollectionFactoryInterface $resourceMetadataFactory, SerializerInterface $serializer, array $formats, MessageBusInterface $messageBus = null, $hubRegistry = null, ?GraphQlSubscriptionManagerInterface $graphQlSubscriptionManager = null, ?GraphQlMercureSubscriptionIriGeneratorInterface $graphQlMercureSubscriptionIriGenerator = null, ExpressionLanguage $expressionLanguage = null)
     {
         if (null === $messageBus && null === $hubRegistry) {
             throw new InvalidArgumentException('A message bus or a hub registry must be provided.');
@@ -172,7 +173,11 @@ private function storeObjectToPublish($object, string $property): void
             return;
         }
 
-        $options = $this->resourceMetadataFactory->create($resourceClass)->getAttribute('mercure', false);
+        try {
+            $options = $this->resourceMetadataFactory->create($resourceClass)->getOperation()->getMercure() ?? false;
+        } catch (OperationNotFoundException $e) {
+            return;
+        }
 
         if (\is_string($options)) {
             if (null === $this->expressionLanguage) {
@@ -264,12 +269,7 @@ private function publishUpdate($object, array $options, string $type): void
             $data = json_encode(['@id' => $object->id]);
         } else {
             $resourceClass = $this->getObjectClass($object);
-            if ($this->resourceMetadataFactory instanceof ResourceMetadataCollectionFactoryInterface) {
-                $context = $options['normalization_context'] ?? $this->resourceMetadataFactory->create($resourceClass)->getOperation()->getNormalizationContext();
-            } else {
-                // TODO: remove in 3.0
-                $context = $options['normalization_context'] ?? $this->resourceMetadataFactory->create($resourceClass)->getAttribute('normalization_context', []);
-            }
+            $context = $options['normalization_context'] ?? $this->resourceMetadataFactory->create($resourceClass)->getOperation()->getNormalizationContext();
 
             $iri = $options['topics'] ?? $this->iriConverter->getIriFromItem($object, null, UrlGeneratorInterface::ABS_URL);
             $data = $options['data'] ?? $this->serializer->serialize($object, key($this->formats), $context);

src/Core/Bridge/Symfony/Bundle/Resources/config/doctrine_orm_mercure_publisher.xml

@@ -11,7 +11,7 @@
         <service id="api_platform.doctrine.orm.listener.mercure.publish" class="ApiPlatform\Core\Bridge\Doctrine\EventListener\PublishMercureUpdatesListener">
             <argument type="service" id="api_platform.resource_class_resolver" />
             <argument type="service" id="api_platform.iri_converter" />
-            <argument type="service" id="api_platform.metadata.resource.metadata_factory" />
+            <argument type="service" id="api_platform.metadata.resource.metadata_collection_factory" />
             <argument type="service" id="api_platform.serializer" />
             <argument>%api_platform.formats%</argument>
             <argument type="service" id="messenger.default_bus" on-invalid="ignore" />

src/Core/JsonLd/Serializer/ItemNormalizer.php

@@ -84,10 +84,8 @@ public function normalize($object, $format = null, array $context = [])
         $context = $this->initContext($resourceClass, $context);
         $metadata = $this->addJsonLdContext($this->contextBuilder, $resourceClass, $context);
 
-        if (isset($context['operation'])) {
-            if ($previousResourceClass !== $resourceClass) {
-                unset($context['operation'], $context['operation_name']);
-            }
+        if (isset($context['operation']) && $previousResourceClass !== $resourceClass) {
+            unset($context['operation'], $context['operation_name']);
         }
 
         if ($this->iriConverter instanceof IriConverterInterface) {