Merge branch '2.0'

Author: dunglas

features/main/uuid.feature

@@ -78,6 +78,24 @@ Feature: Using uuid identifier on resource
     }
     """
 
+  Scenario: Create a resource with custom id generator
+    When I add "Content-Type" header equal to "application/ld+json"
+    And I send a "POST" request to "/custom_generated_identifiers" with body:
+    """
+    {}
+    """
+    Then the response status code should be 201
+    And the response should be in JSON
+    And the header "Content-Type" should be equal to "application/ld+json; charset=utf-8"
+    And the JSON should be equal to:
+    """
+    {
+      "@context": "/contexts/CustomGeneratedIdentifier",
+      "@id": "/custom_generated_identifiers/foo",
+      "@type": "CustomGeneratedIdentifier",
+      "id": "foo"
+    }
+    """
 
   @dropSchema
   Scenario: Delete a resource

src/Api/IdentifiersExtractor.php

@@ -47,43 +47,35 @@ public function getIdentifiersFromItem($item): array
     {
         $identifiers = [];
         $resourceClass = $this->getObjectClass($item);
-
         foreach ($this->propertyNameCollectionFactory->create($resourceClass) as $propertyName) {
             $propertyMetadata = $this->propertyMetadataFactory->create($resourceClass, $propertyName);
-
             $identifier = $propertyMetadata->isIdentifier();
             if (null === $identifier || false === $identifier) {
                 continue;
             }
-
-            $identifiers[$propertyName] = $this->propertyAccessor->getValue($item, $propertyName);
-
-            if (!is_object($identifiers[$propertyName])) {
+            $identifier = $identifiers[$propertyName] = $this->propertyAccessor->getValue($item, $propertyName);
+            if (!is_object($identifier)) {
+                continue;
+            } elseif (method_exists($identifier, '__toString')) {
+                $identifiers[$propertyName] = (string) $identifier;
                 continue;
             }
-
-            $relatedResourceClass = $this->getObjectClass($identifiers[$propertyName]);
-            $relatedItem = $identifiers[$propertyName];
-
+            $relatedResourceClass = $this->getObjectClass($identifier);
+            $relatedItem = $identifier;
             unset($identifiers[$propertyName]);
-
             foreach ($this->propertyNameCollectionFactory->create($relatedResourceClass) as $relatedPropertyName) {
                 $propertyMetadata = $this->propertyMetadataFactory->create($relatedResourceClass, $relatedPropertyName);
-
                 if ($propertyMetadata->isIdentifier()) {
                     if (isset($identifiers[$propertyName])) {
                         throw new RuntimeException(sprintf('Composite identifiers not supported in "%s" through relation "%s" of "%s" used as identifier', $relatedResourceClass, $propertyName, $resourceClass));
                     }
-
                     $identifiers[$propertyName] = $this->propertyAccessor->getValue($relatedItem, $relatedPropertyName);
                 }
             }
-
             if (!isset($identifiers[$propertyName])) {
                 throw new RuntimeException(sprintf('No identifier found in "%s" through relation "%s" of "%s" used as identifier', $relatedResourceClass, $propertyName, $resourceClass));
             }
         }
-
         return $identifiers;
     }
 }

tests/Fixtures/TestBundle/Doctrine/Generator/Uuid.php

@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of the API Platform project.
+ *
+ * (c) Kévin Dunglas <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace ApiPlatform\Core\Tests\Fixtures\TestBundle\Doctrine\Generator;
+
+class Uuid
+{
+    private $id;
+
+    public function __construct()
+    {
+        $this->id = 'foo';
+    }
+
+    public function __toString()
+    {
+        return $this->id;
+    }
+}

tests/Fixtures/TestBundle/Doctrine/Generator/UuidGenerator.php

@@ -0,0 +1,25 @@
+<?php
+
+/*
+ * This file is part of the API Platform project.
+ *
+ * (c) Kévin Dunglas <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace ApiPlatform\Core\Tests\Fixtures\TestBundle\Doctrine\Generator;
+
+use Doctrine\ORM\EntityManager;
+use Doctrine\ORM\Id\AbstractIdGenerator;
+
+class UuidGenerator extends AbstractIdGenerator
+{
+    public function generate(EntityManager $em, $entity): Uuid
+    {
+        return new Uuid();
+    }
+}

tests/Fixtures/TestBundle/Entity/CustomGeneratedIdentifier.php

@@ -0,0 +1,42 @@
+<?php
+
+/*
+ * This file is part of the API Platform project.
+ *
+ * (c) Kévin Dunglas <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity;
+
+use ApiPlatform\Core\Annotation\ApiResource;
+use ApiPlatform\Core\Tests\Fixtures\TestBundle\Doctrine\Generator\Uuid;
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * Custom identifier.
+ *
+ * @ApiResource
+ * @ORM\Entity
+ */
+class CustomGeneratedIdentifier
+{
+    /**
+     * @var Uuid
+     *
+     * @ORM\Id
+     * @ORM\Column(type="string")
+     * @ORM\GeneratedValue(strategy="CUSTOM")
+     * @ORM\CustomIdGenerator(class="ApiPlatform\Core\Tests\Fixtures\TestBundle\Doctrine\Generator\UuidGenerator")
+     */
+    private $id;
+
+    public function getId()
+    {
+        return (string) $this->id;
+    }
+}