fix(schema): Preserve extension keys after sorting (#3515245 by andriy khomych)

Author: Andriy Khomych

src/Plugin/SchemaExtensionPluginManager.php

@@ -93,7 +93,7 @@ public function getExtensions($id) {
    *   The sorted schema extension plugins.
    */
   public static function sortByPriority(array $extensions): array {
-    usort($extensions, function (SchemaExtensionPluginInterface $a, SchemaExtensionPluginInterface $b) {
+    uasort($extensions, function (SchemaExtensionPluginInterface $a, SchemaExtensionPluginInterface $b) {
       $priority_a = $a->getPluginDefinition()['priority'] ?? 0;
       $priority_b = $b->getPluginDefinition()['priority'] ?? 0;
       return $priority_b <=> $priority_a;

tests/src/Kernel/AlterableSchemaTest.php

@@ -2,8 +2,8 @@
 
 namespace Drupal\Tests\graphql\Kernel;
 
-use Drupal\Tests\graphql\Kernel\Schema\AlterableComposableTestSchema;
 use Drupal\graphql\GraphQL\ResolverRegistry;
+use Drupal\graphql\Plugin\GraphQL\Schema\AlterableComposableSchema;
 use Drupal\graphql\Plugin\SchemaExtensionPluginInterface;
 use Drupal\graphql\Plugin\SchemaExtensionPluginManager;
 
@@ -144,7 +144,7 @@ protected function mockSchema($id, $schema, array $extensions = []): void {
     /** @var \PHPUnit\Framework\MockObject\MockObject $extensionManager */
     $extensionManager = $this->getMockBuilder(SchemaExtensionPluginManager::class)
       ->disableOriginalConstructor()
-      ->onlyMethods(['getExtensions'])
+      ->onlyMethods(['getExtensions', 'createInstance'])
       ->getMock();
 
     // Adds extra extension in order to test alter extension data event.
@@ -179,9 +179,12 @@ protected function mockSchema($id, $schema, array $extensions = []): void {
     $extensionManager->expects(static::any())
       ->method('getExtensions')
       ->willReturn($extensions);
+    $extensionManager->expects(static::any())
+      ->method('createInstance')
+      ->willReturn($extensions['graphql_alterable_schema_test']);
 
     // Replace mock schema with our own implementation.
-    $this->schema = $this->getMockBuilder(AlterableComposableTestSchema::class)
+    $this->schema = $this->getMockBuilder(AlterableComposableSchema::class)
       ->setConstructorArgs([
         [],
         $id,
@@ -192,7 +195,7 @@ protected function mockSchema($id, $schema, array $extensions = []): void {
         ['development' => FALSE],
         $this->container->get('event_dispatcher'),
       ])
-      ->onlyMethods(['getSchemaDefinition', 'getResolverRegistry'])
+      ->onlyMethods(['getSchemaDefinition', 'getResolverRegistry', 'getConfiguration'])
       ->getMock();
 
     $this->schema->expects(static::any())
@@ -203,6 +206,9 @@ protected function mockSchema($id, $schema, array $extensions = []): void {
     $this->schema->expects($this->any())
       ->method('getResolverRegistry')
       ->willReturn($this->registry);
+    $this->schema->expects($this->any())
+      ->method('getConfiguration')
+      ->willReturn(['extensions' => ['graphql_alterable_schema_test' => 'graphql_alterable_schema_test']]);
   }
 
 }

tests/src/Kernel/Schema/AlterableComposableTestSchema.php

@@ -34,7 +34,11 @@ public function testSchemaExtensionPluginPriority(): void {
     $extensions = $schemaExtensionPluginManager->getExtensions('composable');
 
     // Check that the returned extensions are ordered by priority.
-    $expected_order = ['high_priority_test', 'test', 'low_priority_test'];
+    $expected_order = [
+      'high_priority_test' => 'high_priority_test',
+      'test' => 'test',
+      'low_priority_test' => 'low_priority_test',
+    ];
     $actual_order = array_map(static fn ($extension) => $extension->getPluginId(), $extensions);
     static::assertEquals($expected_order, $actual_order);
   }