Merge 3.4

Author: soyuka

src/JsonSchema/DefinitionNameFactory.php

@@ -21,6 +21,9 @@ final class DefinitionNameFactory implements DefinitionNameFactoryInterface
 {
     use ResourceClassInfoTrait;
 
+    private const GLUE = '.';
+    private array $prefixCache = [];
+
     public function __construct(private ?array $distinctFormats)
     {
     }
@@ -32,18 +35,18 @@ public function create(string $className, string $format = 'json', ?string $inpu
         }
 
         if (!isset($prefix)) {
-            $prefix = (new \ReflectionClass($className))->getShortName();
+            $prefix = $this->createPrefixFromClass($className);
         }
 
         if (null !== $inputOrOutputClass && $className !== $inputOrOutputClass) {
             $parts = explode('\\', $inputOrOutputClass);
             $shortName = end($parts);
-            $prefix .= '.'.$shortName;
+            $prefix .= self::GLUE.$shortName;
         }
 
         if ('json' !== $format && ($this->distinctFormats[$format] ?? false)) {
             // JSON is the default, and so isn't included in the definition name
-            $prefix .= '.'.$format;
+            $prefix .= self::GLUE.$format;
         }
 
         $definitionName = $serializerContext[SchemaFactory::OPENAPI_DEFINITION_NAME] ?? null;
@@ -61,4 +64,22 @@ private function encodeDefinitionName(string $name): string
     {
         return preg_replace('/[^a-zA-Z0-9.\-_]/', '.', $name);
     }
+
+    private function createPrefixFromClass(string $fullyQualifiedClassName, int $namespaceParts = 1): string
+    {
+        $parts = explode('\\', $fullyQualifiedClassName);
+        $name = implode(self::GLUE, \array_slice($parts, -$namespaceParts));
+
+        if (!isset($this->prefixCache[$name])) {
+            $this->prefixCache[$name] = $fullyQualifiedClassName;
+
+            return $name;
+        }
+
+        if ($this->prefixCache[$name] !== $fullyQualifiedClassName) {
+            $name = $this->createPrefixFromClass($fullyQualifiedClassName, ++$namespaceParts);
+        }
+
+        return $name;
+    }
 }

src/State/Provider/ParameterProvider.php

@@ -52,6 +52,10 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
         $context = ['operation' => $operation] + $context;
         $parameters = $operation->getParameters();
         foreach ($parameters ?? [] as $parameter) {
+            $extraProperties = $parameter->getExtraProperties();
+            unset($extraProperties['_api_values']);
+            $parameters->add($parameter->getKey(), $parameter = $parameter->withExtraProperties($extraProperties));
+
             $values = $this->getParameterValues($parameter, $request, $context);
             $value = $this->extractParameterValues($parameter, $values);
 

src/State/Tests/ParameterProviderTest.php

@@ -18,6 +18,7 @@
 use ApiPlatform\Metadata\Parameter;
 use ApiPlatform\Metadata\Parameters;
 use ApiPlatform\Metadata\QueryParameter;
+use ApiPlatform\State\ParameterNotFound;
 use ApiPlatform\State\ParameterProviderInterface;
 use ApiPlatform\State\Provider\ParameterProvider;
 use PHPUnit\Framework\TestCase;
@@ -51,16 +52,20 @@ public function has(string $id): bool
             'order' => new QueryParameter(key: 'order', provider: 'test'),
             'search[:property]' => new QueryParameter(key: 'search[:property]', provider: [self::class, 'provide']),
             'foo' => new QueryParameter(key: 'foo', provider: [self::class, 'shouldNotBeCalled']),
+            'baz' => (new QueryParameter(key: 'baz'))->withExtraProperties(['_api_values' => 'test1']),
+            'fas' => (new QueryParameter(key: 'fas'))->withExtraProperties(['_api_values' => '42']),
         ]));
         $parameterProvider = new ParameterProvider(null, $locator);
-        $request = new Request(server: ['QUERY_STRING' => 'order[foo]=asc&search[a]=bar']);
+        $request = new Request(server: ['QUERY_STRING' => 'order[foo]=asc&search[a]=bar&baz=t42']);
         $context = ['request' => $request, 'operation' => $operation];
         $parameterProvider->provide($operation, [], $context);
         $operation = $request->attributes->get('_api_operation');
 
         $this->assertEquals('ok', $operation->getName());
         $this->assertEquals(['foo' => 'asc'], $operation->getParameters()->get('order', QueryParameter::class)->getValue());
         $this->assertEquals(['a' => 'bar'], $operation->getParameters()->get('search[:property]', QueryParameter::class)->getValue());
+        $this->assertEquals('t42', $operation->getParameters()->get('baz', QueryParameter::class)->getValue());
+        $this->assertEquals(new ParameterNotFound(), $operation->getParameters()->get('fas', QueryParameter::class)->getValue());
     }
 
     public static function provide(): void

tests/JsonSchema/DefinitionNameFactoryTest.php

@@ -69,4 +69,29 @@ public function testCreate(string $expected, string $className, string $format =
 
         static::assertSame($expected, $definitionNameFactory->create($className, $format, $inputOrOutputClass, $operation, $serializerContext));
     }
+
+    public function testCreateDifferentPrefixesForClassesWithTheSameShortName(): void
+    {
+        $definitionNameFactory = new DefinitionNameFactory(['jsonapi' => true, 'jsonhal' => true]);
+
+        self::assertEquals(
+            'DummyClass.jsonapi',
+            $definitionNameFactory->create(\ApiPlatform\Tests\JsonSchema\Dummy\NamespaceA\Module\DummyClass::class, 'jsonapi')
+        );
+
+        self::assertEquals(
+            'Module.DummyClass.jsonapi',
+            $definitionNameFactory->create(\ApiPlatform\Tests\JsonSchema\Dummy\NamespaceB\Module\DummyClass::class, 'jsonapi')
+        );
+
+        self::assertEquals(
+            'NamespaceC.Module.DummyClass.jsonapi',
+            $definitionNameFactory->create(\ApiPlatform\Tests\JsonSchema\Dummy\NamespaceC\Module\DummyClass::class, 'jsonapi')
+        );
+
+        self::assertEquals(
+            'DummyClass.jsonhal',
+            $definitionNameFactory->create(\ApiPlatform\Tests\JsonSchema\Dummy\NamespaceA\Module\DummyClass::class, 'jsonhal')
+        );
+    }
 }

tests/JsonSchema/Dummy/NamespaceA/Module/DummyClass.php

@@ -0,0 +1,18 @@
+<?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\Tests\JsonSchema\Dummy\NamespaceA\Module;
+
+class DummyClass
+{
+}

tests/JsonSchema/Dummy/NamespaceB/Module/DummyClass.php

@@ -0,0 +1,18 @@
+<?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\Tests\JsonSchema\Dummy\NamespaceB\Module;
+
+class DummyClass
+{
+}

tests/JsonSchema/Dummy/NamespaceC/Module/DummyClass.php

@@ -0,0 +1,18 @@
+<?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\Tests\JsonSchema\Dummy\NamespaceC\Module;
+
+class DummyClass
+{
+}