From bc550d048ee63a67f83f4c33d80552c7c4ede183 Mon Sep 17 00:00:00 2001
From: Victor Bocharsky <bocharsky.bw@gmail.com>
Date: Mon, 6 Jan 2020 18:27:23 +0200
Subject: [PATCH] Rollback to the actual service id as a snake-case version
 (#35)

* Rollback to the actual service id as a snake-case version

This really should have been done in the other direction: we typically make the actual service id the snake-case version and then create an alias for the autowiring.

* Fix tests
---
 src/Resources/config/client.xml                    |  4 ++--
 .../DependencyInjection/NexySlackExtensionTest.php | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Resources/config/client.xml b/src/Resources/config/client.xml
index 4f85e1a..7e66bc8 100644
--- a/src/Resources/config/client.xml
+++ b/src/Resources/config/client.xml
@@ -5,7 +5,7 @@
            xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <services>
-        <service id="Nexy\Slack\Client" public="true">
+        <service id="nexy_slack.client" class="Nexy\Slack\Client" public="true">
             <argument type="service" id="nexy_slack.http.client" />
             <argument type="service" id="nexy_slack.http.request_factory" />
             <argument type="service" id="nexy_slack.http.stream_factory" />
@@ -13,7 +13,7 @@
             <argument>%nexy_slack.config%</argument>
         </service>
 
-        <service id="nexy_slack.client" alias="Nexy\Slack\Client"/>
+        <service id="Nexy\Slack\Client" alias="nexy_slack.client"/>
 
         <service id="nexy_slack.request_factory.default" class="Psr\Http\Message\RequestFactoryInterface">
             <factory class="Http\Discovery\Psr17FactoryDiscovery" method="findRequestFactory" />
diff --git a/tests/DependencyInjection/NexySlackExtensionTest.php b/tests/DependencyInjection/NexySlackExtensionTest.php
index 6d27ea1..b4db2c2 100644
--- a/tests/DependencyInjection/NexySlackExtensionTest.php
+++ b/tests/DependencyInjection/NexySlackExtensionTest.php
@@ -47,15 +47,15 @@ public function testLoadWithMinimalConfiguration(): void
         $this->assertContainerBuilderHasParameter('nexy_slack.endpoint', $endpoint);
         $this->assertContainerBuilderHasParameter('nexy_slack.config', $slackConfig);
 
-        $this->assertContainerBuilderHasService(Client::class);
+        $this->assertContainerBuilderHasService('nexy_slack.client');
 
-        $this->assertContainerBuilderHasServiceDefinitionWithArgument(Client::class, 0, new Reference('nexy_slack.http.client'));
-        $this->assertContainerBuilderHasServiceDefinitionWithArgument(Client::class, 1, new Reference('nexy_slack.http.request_factory'));
-        $this->assertContainerBuilderHasServiceDefinitionWithArgument(Client::class, 2, new Reference('nexy_slack.http.stream_factory'));
-        $this->assertContainerBuilderHasServiceDefinitionWithArgument(Client::class, 3, '%nexy_slack.endpoint%');
-        $this->assertContainerBuilderHasServiceDefinitionWithArgument(Client::class, 4, '%nexy_slack.config%');
+        $this->assertContainerBuilderHasServiceDefinitionWithArgument('nexy_slack.client', 0, new Reference('nexy_slack.http.client'));
+        $this->assertContainerBuilderHasServiceDefinitionWithArgument('nexy_slack.client', 1, new Reference('nexy_slack.http.request_factory'));
+        $this->assertContainerBuilderHasServiceDefinitionWithArgument('nexy_slack.client', 2, new Reference('nexy_slack.http.stream_factory'));
+        $this->assertContainerBuilderHasServiceDefinitionWithArgument('nexy_slack.client', 3, '%nexy_slack.endpoint%');
+        $this->assertContainerBuilderHasServiceDefinitionWithArgument('nexy_slack.client', 4, '%nexy_slack.config%');
 
-        $this->assertContainerBuilderHasAlias('nexy_slack.client', Client::class);
+        $this->assertContainerBuilderHasAlias(Client::class, 'nexy_slack.client');
         $this->assertContainerBuilderHasAlias('nexy_slack.http.client', 'httplug.client');
         $this->assertContainerBuilderHasAlias('nexy_slack.http.request_factory', 'nexy_slack.request_factory.default');
         $this->assertContainerBuilderHasAlias('nexy_slack.http.stream_factory', 'nexy_slack.stream_factory.default');