Get ride of SensioLabs namespace

lyrixx · lyrixx · commit 5913776b9d5b · 2022-05-03T23:23:48.000+02:00
diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ Instantiate a services, and start using it:
 
 ```php
 
-$kv = new SensioLabs\Consul\Services\KV();
+$kv = new Consul\Services\KV();
 
 $kv->put('test/foo/bar', 'bazinga');
 $kv->get('test/foo/bar', ['raw' => true]);
@@ -49,7 +49,7 @@ So if you want to acquire an exclusive lock:
 ```php
 // Start a session
 
-$session = new SensioLabs\Consul\Services\Session();
+$session = new Consul\Services\Session();
 
 $sessionId = $session->create()->json()['ID'];
 
diff --git a/composer.json b/composer.json
@@ -20,7 +20,12 @@
     },
     "autoload": {
         "psr-4": {
-            "SensioLabs\\Consul\\": "Consul"
+            "Consul\\": "src/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Consul\\Tests\\": "tests/"
         }
     },
     "extra": {
diff --git a/phpstan.neon b/phpstan.neon
@@ -4,6 +4,4 @@ includes:
 parameters:
     level: 5
     paths:
-        - Consul
-    excludePaths:
-        - Consul/Tests
+        - src
diff --git a/phpunit.xml b/phpunit.xml
@@ -13,17 +13,14 @@
          verbose="true">
     <testsuites>
         <testsuite name="default">
-            <directory>Consul/Tests</directory>
+            <directory>tests/</directory>
         </testsuite>
     </testsuites>
 
     <coverage cacheDirectory=".phpunit.cache/code-coverage"
               processUncoveredFiles="true">
         <include>
-            <directory suffix=".php">Consul</directory>
+            <directory suffix=".php">src/</directory>
         </include>
-        <exclude>
-            <directory suffix=".php">Consul/Tests</directory>
-        </exclude>
     </coverage>
 </phpunit>
diff --git a/src/Client.php b/src/Client.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace SensioLabs\Consul;
+namespace Consul;
 
+use Consul\Exception\ClientException;
+use Consul\Exception\ServerException;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
-use SensioLabs\Consul\Exception\ClientException;
-use SensioLabs\Consul\Exception\ServerException;
 use Symfony\Component\HttpClient\HttpClient;
 use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
diff --git a/src/ClientInterface.php b/src/ClientInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace SensioLabs\Consul;
+namespace Consul;
 
 interface ClientInterface
 {
diff --git a/src/ConsulResponse.php b/src/ConsulResponse.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace SensioLabs\Consul;
+namespace Consul;
 
 final class ConsulResponse
 {
diff --git a/src/Exception/ClientException.php b/src/Exception/ClientException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace SensioLabs\Consul\Exception;
+namespace Consul\Exception;
 
 class ClientException extends \RuntimeException implements ConsulExceptionInterface
 {
diff --git a/src/Exception/ConsulExceptionInterface.php b/src/Exception/ConsulExceptionInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace SensioLabs\Consul\Exception;
+namespace Consul\Exception;
 
 interface ConsulExceptionInterface
 {
diff --git a/src/Exception/ServerException.php b/src/Exception/ServerException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace SensioLabs\Consul\Exception;
+namespace Consul\Exception;
 
 class ServerException extends \RuntimeException implements ConsulExceptionInterface
 {
diff --git a/src/Helper/LockHandler.php b/src/Helper/LockHandler.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace SensioLabs\Consul\Helper;
+namespace Consul\Helper;
 
-use SensioLabs\Consul\Services\KV;
-use SensioLabs\Consul\Services\Session;
+use Consul\Services\KV;
+use Consul\Services\Session;
 
 final class LockHandler
 {
diff --git a/src/OptionsResolver.php b/src/OptionsResolver.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace SensioLabs\Consul;
+namespace Consul;
 
 final class OptionsResolver
 {
diff --git a/src/Services/Agent.php b/src/Services/Agent.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace SensioLabs\Consul\Services;
+namespace Consul\Services;
 
-use SensioLabs\Consul\Client;
-use SensioLabs\Consul\ConsulResponse;
-use SensioLabs\Consul\OptionsResolver;
+use Consul\Client;
+use Consul\ConsulResponse;
+use Consul\OptionsResolver;
 
 final class Agent
 {
diff --git a/src/Services/Catalog.php b/src/Services/Catalog.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace SensioLabs\Consul\Services;
+namespace Consul\Services;
 
-use SensioLabs\Consul\Client;
-use SensioLabs\Consul\ConsulResponse;
-use SensioLabs\Consul\OptionsResolver;
+use Consul\Client;
+use Consul\ConsulResponse;
+use Consul\OptionsResolver;
 
 final class Catalog
 {
diff --git a/src/Services/Health.php b/src/Services/Health.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace SensioLabs\Consul\Services;
+namespace Consul\Services;
 
-use SensioLabs\Consul\Client;
-use SensioLabs\Consul\ConsulResponse;
-use SensioLabs\Consul\OptionsResolver;
+use Consul\Client;
+use Consul\ConsulResponse;
+use Consul\OptionsResolver;
 
 final class Health
 {
diff --git a/src/Services/KV.php b/src/Services/KV.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace SensioLabs\Consul\Services;
+namespace Consul\Services;
 
-use SensioLabs\Consul\Client;
-use SensioLabs\Consul\ConsulResponse;
-use SensioLabs\Consul\OptionsResolver;
+use Consul\Client;
+use Consul\ConsulResponse;
+use Consul\OptionsResolver;
 
 final class KV
 {
diff --git a/src/Services/Session.php b/src/Services/Session.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace SensioLabs\Consul\Services;
+namespace Consul\Services;
 
-use SensioLabs\Consul\Client;
-use SensioLabs\Consul\ConsulResponse;
-use SensioLabs\Consul\OptionsResolver;
+use Consul\Client;
+use Consul\ConsulResponse;
+use Consul\OptionsResolver;
 
 final class Session
 {
diff --git a/src/Services/TXN.php b/src/Services/TXN.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace SensioLabs\Consul\Services;
+namespace Consul\Services;
 
-use SensioLabs\Consul\Client;
-use SensioLabs\Consul\ConsulResponse;
-use SensioLabs\Consul\OptionsResolver;
+use Consul\Client;
+use Consul\ConsulResponse;
+use Consul\OptionsResolver;
 
 final class TXN
 {
diff --git a/tests/OptionsResolverTest.php b/tests/OptionsResolverTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace SensioLabs\Consul\Tests;
+namespace Consul\Tests;
 
+use Consul\OptionsResolver;
 use PHPUnit\Framework\TestCase;
-use SensioLabs\Consul\OptionsResolver;
 
 class OptionsResolverTest extends TestCase
 {
diff --git a/tests/Services/KVTest.php b/tests/Services/KVTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace SensioLabs\Consul\Tests\Services;
+namespace Consul\Tests\Services;
 
+use Consul\ConsulResponse;
+use Consul\Exception\ClientException;
+use Consul\Services\KV;
 use PHPUnit\Framework\TestCase;
-use SensioLabs\Consul\ConsulResponse;
-use SensioLabs\Consul\Exception\ClientException;
-use SensioLabs\Consul\Services\KV;
 
 class KVTest extends TestCase
 {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-namespace SensioLabs\Consul;`
	`3`	`+namespace Consul;`
`4`	`4`
`5`	`5`	`interface ClientInterface`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-namespace SensioLabs\Consul\Exception;`
	`3`	`+namespace Consul\Exception;`
`4`	`4`
`5`	`5`	`class ClientException extends \RuntimeException implements ConsulExceptionInterface`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-namespace SensioLabs\Consul\Tests;`
	`3`	`+namespace Consul\Tests;`
`4`	`4`
	`5`	`+use Consul\OptionsResolver;`
`5`	`6`	`use PHPUnit\Framework\TestCase;`
`6`		`-use SensioLabs\Consul\OptionsResolver;`
`7`	`7`
`8`	`8`	`class OptionsResolverTest extends TestCase`
`9`	`9`	`{`