Merge pull request #1696 from dunglas/revert-1528

Revert "alwaysIdentifier annotation option implementation"

Author: dunglas

features/bootstrap/FeatureContext.php

@@ -11,7 +11,6 @@
 
 declare(strict_types=1);
 
-use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\AlwaysIdentifierDummy;
 use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\Answer;
 use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\CompositeItem;
 use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\CompositeLabel;
@@ -862,24 +861,6 @@ public function thereAreDummyDateObjectsWithDummyDate(int $nb)
         $this->manager->flush();
     }
 
-    /**
-     * @Given there are AlwaysIdentifierDummies
-     */
-    public function thereAreAlwaysIdentifierDummies()
-    {
-        $mainDummy = new AlwaysIdentifierDummy();
-        $relatedDummy = new AlwaysIdentifierDummy();
-
-        $this->manager->persist($relatedDummy);
-
-        $mainDummy->setParent($relatedDummy);
-        $mainDummy->setChildren([$relatedDummy]);
-        $mainDummy->setRelated([$relatedDummy]);
-
-        $this->manager->persist($mainDummy);
-        $this->manager->flush();
-    }
-
     /**
      * @Given there are :nb dummyimmutabledate objects with dummyDate
      */

features/hal/always_identifier.feature

@@ -67,9 +67,4 @@ final class ApiProperty
      * @var array
      */
     public $attributes = [];
-
-    /**
-     * @var bool
-     */
-    public $alwaysIdentifier;
 }

features/json/always_identifier.feature

@@ -117,14 +117,12 @@ private function createMetadata(ApiProperty $annotation, PropertyMetadata $paren
                 $annotation->identifier,
                 $annotation->iri,
                 null,
-                $annotation->attributes,
-                null,
-                $annotation->alwaysIdentifier
+                $annotation->attributes
             );
         }
 
         $propertyMetadata = $parentPropertyMetadata;
-        foreach ([['get', 'description'], ['is', 'readable'], ['is', 'writable'], ['is', 'readableLink'], ['is', 'writableLink'], ['is', 'required'], ['get', 'iri'], ['is', 'identifier'], ['get', 'attributes'], ['is', 'alwaysIdentifier']] as $property) {
+        foreach ([['get', 'description'], ['is', 'readable'], ['is', 'writable'], ['is', 'readableLink'], ['is', 'writableLink'], ['is', 'required'], ['get', 'iri'], ['is', 'identifier'], ['get', 'attributes']] as $property) {
             if (null !== $value = $annotation->{$property[1]}) {
                 $propertyMetadata = $this->createWith($propertyMetadata, $property, $value);
             }

features/jsonld/always_identifier.feature

@@ -34,9 +34,8 @@ final class PropertyMetadata
     private $childInherited;
     private $attributes;
     private $subresource;
-    private $alwaysIdentifier;
 
-    public function __construct(Type $type = null, string $description = null, bool $readable = null, bool $writable = null, bool $readableLink = null, bool $writableLink = null, bool $required = null, bool $identifier = null, string $iri = null, $childInherited = null, array $attributes = null, SubresourceMetadata $subresource = null, bool $alwaysIdentifier = null)
+    public function __construct(Type $type = null, string $description = null, bool $readable = null, bool $writable = null, bool $readableLink = null, bool $writableLink = null, bool $required = null, bool $identifier = null, string $iri = null, $childInherited = null, array $attributes = null, SubresourceMetadata $subresource = null)
     {
         $this->type = $type;
         $this->description = $description;
@@ -50,7 +49,6 @@ public function __construct(Type $type = null, string $description = null, bool
         $this->childInherited = $childInherited;
         $this->attributes = $attributes;
         $this->subresource = $subresource;
-        $this->alwaysIdentifier = $alwaysIdentifier;
     }
 
     /**
@@ -383,25 +381,4 @@ public function withSubresource(SubresourceMetadata $subresource = null): self
 
         return $metadata;
     }
-
-    /**
-     * Returns a new instance with the given alwaysIdentifier flag.
-     */
-    public function withAlwaysIdentifier(bool $alwaysIdentifier): self
-    {
-        $metadata = clone $this;
-        $metadata->alwaysIdentifier = $alwaysIdentifier;
-
-        return $metadata;
-    }
-
-    /**
-     * Is the property should be serialized as identifier  ?
-     *
-     * @return bool|null
-     */
-    public function isAlwaysIdentifier()
-    {
-        return $this->alwaysIdentifier;
-    }
 }

src/Annotation/ApiProperty.php

@@ -39,8 +39,6 @@ abstract class AbstractItemNormalizer extends AbstractObjectNormalizer
 {
     use ContextTrait;
 
-    const ALWAYS_IDENTIFIER = 'always_identifier';
-
     protected $propertyNameCollectionFactory;
     protected $propertyMetadataFactory;
     protected $iriConverter;
@@ -99,10 +97,6 @@ public function normalize($object, $format = null, array $context = [])
             $context['resources'][$resource] = $resource;
         }
 
-        if ($context[self::ALWAYS_IDENTIFIER] ?? false) {
-            return $context['iri'] ?? $this->iriConverter->getIriFromItem($object);
-        }
-
         return parent::normalize($object, $format, $context);
     }
 
@@ -403,8 +397,6 @@ protected function getAttributeValue($object, $attribute, $format = null, array
     {
         $propertyMetadata = $this->propertyMetadataFactory->create($context['resource_class'], $attribute, $this->getFactoryOptions($context));
 
-        $context[self::ALWAYS_IDENTIFIER] = $propertyMetadata->isAlwaysIdentifier();
-
         try {
             $attributeValue = $this->propertyAccessor->getValue($object, $attribute);
         } catch (NoSuchPropertyException $e) {