Named service arguments.

FriendsOfSymfony · Feb 19, 2025 · 11d5b17 · 11d5b17
1 parent 7798ba3
commit 11d5b17
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/CHANGELOG-7.0.md b/CHANGELOG-7.0.md
@@ -5,3 +5,4 @@
 * **[BC break]** Arguments for the service `FOS\ElasticaBundle\Elastica\Client` have changed. See definition of `FOS\ElasticaBundle\Elastica\Client::__construct`.
 * **[BC break]** Client configuration now reflects configuration of `Elastica\Client`.
 * **[BC break]** Index template configuration `index_template` option `template` is renamed to `index_patterns` and accepts array of strings.
+* **[BC break]** Arguments for the service `FOS\ElasticaBundle\Elastica\Client` (`fos_elastica.client..`) are now named, instead of indexed.
diff --git a/src/DependencyInjection/FOSElasticaExtension.php b/src/DependencyInjection/FOSElasticaExtension.php
@@ -198,12 +198,14 @@ private function loadClients(array $clients, ContainerBuilder $container): void
             }
 
             $clientDef = new ChildDefinition('fos_elastica.client_prototype');
-            $clientDef->replaceArgument(0, $config);
-            $clientDef->replaceArgument(1, $httpErrorCodes);
+            $clientDef->replaceArgument('$config', $config);
+            $clientDef->replaceArgument('$forbiddenCodes', $httpErrorCodes);
 
             $logger = $clientConfig['logger'];
             if (false !== $logger) {
-                $clientDef->replaceArgument(2, new Reference($logger));
+                $clientDef->replaceArgument('$logger', new Reference($logger));
+            } else {
+                $clientDef->replaceArgument('$logger', null);
             }
 
             $clientDef->addTag('fos_elastica.client');

diff --git a/src/Resources/config/config.xml b/src/Resources/config/config.xml
@@ -11,9 +11,9 @@
 
     <services>
         <service id="fos_elastica.client_prototype" class="FOS\ElasticaBundle\Elastica\Client" abstract="true">
-            <argument type="collection" /> <!-- configuration -->
-            <argument type="collection"/> <!-- forbidden codes -->
-            <argument /> <!-- logger -->
+            <argument key="$config" type="abstract">configuration for Ruflin Client</argument>
+            <argument key="$forbiddenCodes" type="abstract">list of forbidden codes for Client</argument>
+            <argument key="$logger" type="abstract">logger for Ruflin Client</argument>
 
             <call method="setStopwatch">
                 <argument type="service" id="debug.stopwatch" on-invalid="null" />

diff --git a/tests/Unit/DependencyInjection/FOSElasticaExtensionTest.php b/tests/Unit/DependencyInjection/FOSElasticaExtensionTest.php
@@ -73,7 +73,7 @@ public function testYamlConfiguration()
                 \CURLOPT_RANDOM_FILE => '/dev/urandom',
             ],
             'node_pool' => null,
-        ], $defaultClientDefinition->getArgument(0)['transport_config']);
+        ], $defaultClientDefinition->getArgument('$config')['transport_config']);
     }
 
     public function testShouldRegisterDoctrineORMPagerProviderIfEnabled()