Merge branch '2.2' into 2.3

Author: dunglas

CHANGELOG.md

@@ -19,6 +19,12 @@
 * GraphQL: Add a `totalCount` field in GraphQL paginated collections
 * JSONAPI: Allow inclusion of related resources
 
+## 2.2.9
+
+* Fix `ExistsFilter` for inverse side of OneToOne association
+* Fix to not populate subresource inverse side
+* Improve the overall code quality (PHPStan analysis)
+
 ## 2.2.8
 
 * Fix support for max depth when using subresources

features/bootstrap/FeatureContext.php

@@ -34,6 +34,7 @@
 use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\Foo;
 use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\FooDummy;
 use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\FourthLevel;
+use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\Greeting;
 use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\Node;
 use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\Person;
 use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\PersonToPet;
@@ -786,6 +787,7 @@ public function thereIsAnAnswerToTheQuestion(string $a, string $q)
         $this->manager->persist($question);
 
         $this->manager->flush();
+        $this->manager->clear();
     }
 
     /**
@@ -952,4 +954,23 @@ public function thereIsADummyObjectWithAFourthLevelRelation()
 
         $this->manager->flush();
     }
+
+    /**
+     * @Given there is a person named :name greeting with a :message message
+     */
+    public function thereIsAPersonWithAGreeting(string $name, string $message)
+    {
+        $person = new Person();
+        $person->name = $name;
+
+        $greeting = new Greeting();
+        $greeting->message = $message;
+        $greeting->sender = $person;
+
+        $this->manager->persist($person);
+        $this->manager->persist($greeting);
+
+        $this->manager->flush();
+        $this->manager->clear();
+    }
 }

features/main/subresource.feature

@@ -316,6 +316,33 @@ Feature: Subresource support
     }
     """
 
+  Scenario: The recipient of the person's greetings should be empty
+    Given there is a person named "Alice" greeting with a "hello" message
+    When I send a "GET" request to "/people/1/sent_greetings"
+    And the response status code should be 200
+    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/Greeting",
+      "@id": "/people/1/sent_greetings",
+      "@type": "hydra:Collection",
+      "hydra:member": [
+        {
+          "@id": "/greetings/1",
+          "@type": "Greeting",
+          "message": "hello",
+          "sender": "/people/1",
+          "recipient": null,
+          "id": 1
+        }
+      ],
+      "hydra:totalItems": 1
+    }
+    """
+
+  @dropSchema
   Scenario: Recursive resource
     When I send a "GET" request to "/dummy_products/2"
     And the response status code should be 200

src/Serializer/AbstractItemNormalizer.php

@@ -14,7 +14,6 @@
 namespace ApiPlatform\Core\Serializer;
 
 use ApiPlatform\Core\Api\IriConverterInterface;
-use ApiPlatform\Core\Api\OperationType;
 use ApiPlatform\Core\Api\ResourceClassResolverInterface;
 use ApiPlatform\Core\DataProvider\ItemDataProviderInterface;
 use ApiPlatform\Core\Exception\InvalidArgumentException;
@@ -483,12 +482,6 @@ protected function normalizeCollectionOfRelations(PropertyMetadata $propertyMeta
      */
     protected function normalizeRelation(PropertyMetadata $propertyMetadata, $relatedObject, string $resourceClass, string $format = null, array $context)
     {
-        // On a subresource, we know the value of the identifiers.
-        // If attributeValue is null, meaning that it hasn't been returned by the DataProvider, get the item Iri
-        if (null === $relatedObject && isset($context['operation_type'], $context['subresource_resources'][$resourceClass]) && OperationType::SUBRESOURCE === $context['operation_type']) {
-            return $this->iriConverter->getItemIriFromResourceClass($resourceClass, $context['subresource_resources'][$resourceClass]);
-        }
-
         if (null === $relatedObject || $propertyMetadata->isReadableLink() || !empty($context['attributes'])) {
             if (null === $relatedObject) {
                 unset($context['resource_class']);

tests/Fixtures/TestBundle/Entity/Greeting.php

@@ -0,0 +1,53 @@
+<?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 Doctrine\ORM\Mapping as ORM;
+
+/**
+ * @ApiResource
+ * @ORM\Entity
+ */
+class Greeting
+{
+    /**
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     * @ORM\Column(type="integer")
+     */
+    private $id;
+
+    /**
+     * @ORM\Column
+     */
+    public $message = '';
+
+    /**
+     * @ORM\ManyToOne(targetEntity="Person", inversedBy="sentGreetings")
+     * @ORM\JoinColumn(name="sender_id")
+     */
+    public $sender;
+
+    /**
+     * @ORM\ManyToOne(targetEntity="Person")
+     * @ORM\JoinColumn(name="recipient_id", nullable=true)
+     */
+    public $recipient;
+
+    public function getId(): int
+    {
+        return $this->id;
+    }
+}

tests/Fixtures/TestBundle/Entity/Person.php

@@ -14,6 +14,7 @@
 namespace ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity;
 
 use ApiPlatform\Core\Annotation\ApiResource;
+use ApiPlatform\Core\Annotation\ApiSubresource;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Annotation\Groups;
@@ -49,6 +50,12 @@ class Person
      */
     public $pets;
 
+    /**
+     * @ApiSubresource
+     * @ORM\OneToMany(targetEntity="Greeting", mappedBy="sender")
+     */
+    public $sentGreetings;
+
     public function __construct()
     {
         $this->pets = new ArrayCollection();