Merge pull request #4107 from soyuka/fix/openapi-pathitem

Allow unset PathItem method

Author: soyuka

.github/workflows/ci.yml

@@ -670,7 +670,7 @@ jobs:
       - name: Update project dependencies
         run: composer update --no-interaction --no-progress --ansi
       - name: Require Symfony Uid
-        run: composer require symfony/uid --dev --no-interaction --no-progress --ansi
+        run: composer require symfony/uid symfony/intl --dev --no-interaction --no-progress --ansi
       - name: Flag held back Symfony packages
         env:
           symfony_version: ${{ matrix.symfony }}

src/OpenApi/Model/PathItem.php

@@ -138,31 +138,31 @@ public function withDescription(string $description): self
         return $clone;
     }
 
-    public function withGet(Operation $get): self
+    public function withGet(?Operation $get): self
     {
         $clone = clone $this;
         $clone->get = $get;
 
         return $clone;
     }
 
-    public function withPut(Operation $put): self
+    public function withPut(?Operation $put): self
     {
         $clone = clone $this;
         $clone->put = $put;
 
         return $clone;
     }
 
-    public function withPost(Operation $post): self
+    public function withPost(?Operation $post): self
     {
         $clone = clone $this;
         $clone->post = $post;
 
         return $clone;
     }
 
-    public function withDelete(Operation $delete): self
+    public function withDelete(?Operation $delete): self
     {
         $clone = clone $this;
         $clone->delete = $delete;
@@ -186,7 +186,7 @@ public function withHead(Operation $head): self
         return $clone;
     }
 
-    public function withPatch(Operation $patch): self
+    public function withPatch(?Operation $patch): self
     {
         $clone = clone $this;
         $clone->patch = $patch;

tests/OpenApi/Factory/OpenApiFactoryTest.php

@@ -30,6 +30,7 @@
 use ApiPlatform\Core\Metadata\Resource\ResourceNameCollection;
 use ApiPlatform\Core\OpenApi\Factory\OpenApiFactory;
 use ApiPlatform\Core\OpenApi\Model;
+use ApiPlatform\Core\OpenApi\Model\PathItem;
 use ApiPlatform\Core\OpenApi\OpenApi;
 use ApiPlatform\Core\OpenApi\Options;
 use ApiPlatform\Core\OpenApi\Serializer\OpenApiNormalizer;
@@ -745,4 +746,20 @@ public function testSubresourceDocumentation()
         $normalizer = new OpenApiNormalizer($normalizers[0]);
         $normalizer->normalize($openApi);
     }
+
+    public function testResetPathItem()
+    {
+        $pathItem = new PathItem();
+        $pathItem->withGet(null);
+        $pathItem->withDelete(null);
+        $pathItem->withPost(null);
+        $pathItem->withPut(null);
+        $pathItem->withPatch(null);
+
+        $this->assertNull($pathItem->getGet());
+        $this->assertNull($pathItem->getDelete());
+        $this->assertNull($pathItem->getPost());
+        $this->assertNull($pathItem->getPut());
+        $this->assertNull($pathItem->getPatch());
+    }
 }