Merge branch 'master' into fix_test_class_names

src/Common/Service/Builder.php

@@ -6,10 +6,11 @@
 
 use GuzzleHttp\Client;
 use GuzzleHttp\ClientInterface;
+use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Middleware as GuzzleMiddleware;
 use OpenStack\Common\Auth\IdentityService;
 use OpenStack\Common\Auth\Token;
-use OpenStack\Common\Transport\HandlerStack;
+use OpenStack\Common\Transport\HandlerStackFactory;
 use OpenStack\Common\Transport\Middleware;
 use OpenStack\Common\Transport\Utils;
 
@@ -79,7 +80,7 @@ public function createService(string $namespace, array $serviceOptions = []): Se
         $this->stockAuthHandler($options);
         $this->stockHttpClient($options, $namespace);
 
-        list($apiClass, $serviceClass) = $this->getClasses($namespace);
+        [$apiClass, $serviceClass] = $this->getClasses($namespace);
 
         return new $serviceClass($options['httpClient'], new $apiClass());
     }
@@ -91,7 +92,7 @@ private function stockHttpClient(array &$options, string $serviceName)
                 $baseUrl = $options['authUrl'];
                 $stack   = $this->getStack($options['authHandler']);
             } else {
-                list($token, $baseUrl) = $options['identityService']->authenticate($options);
+                [$token, $baseUrl]     = $options['identityService']->authenticate($options);
                 $stack                 = $this->getStack($options['authHandler'], $token);
             }
 
@@ -130,7 +131,7 @@ private function stockAuthHandler(array &$options)
 
     private function getStack(callable $authHandler, Token $token = null): HandlerStack
     {
-        $stack = HandlerStack::create();
+        $stack = HandlerStackFactory::create();
         $stack->push(Middleware::authHandler($authHandler, $token));
 
         return $stack;

src/Common/Transport/HandlerStack.php → src/Common/Transport/HandlerStackFactory.php

@@ -4,14 +4,14 @@
 
 namespace OpenStack\Common\Transport;
 
-use GuzzleHttp\HandlerStack as GuzzleStack;
+use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Utils;
 
-class HandlerStack extends GuzzleStack
+class HandlerStackFactory
 {
-    public static function create(callable $handler = null): GuzzleStack
+    public static function create(callable $handler = null): HandlerStack
     {
-        $stack = new self($handler ?: Utils::chooseHandler());
+        $stack = new HandlerStack($handler ?: Utils::chooseHandler());
         $stack->push(Middleware::httpErrors(), 'http_errors');
         $stack->push(Middleware::prepareBody(), 'prepare_body');
 

src/OpenStack.php

@@ -7,7 +7,7 @@
 use GuzzleHttp\Client;
 use GuzzleHttp\Middleware as GuzzleMiddleware;
 use OpenStack\Common\Service\Builder;
-use OpenStack\Common\Transport\HandlerStack;
+use OpenStack\Common\Transport\HandlerStackFactory;
 use OpenStack\Common\Transport\Utils;
 use OpenStack\Identity\v3\Service;
 
@@ -49,7 +49,7 @@ private function getDefaultIdentityService(array $options): Service
             throw new \InvalidArgumentException("'authUrl' is a required option");
         }
 
-        $stack = HandlerStack::create();
+        $stack = HandlerStackFactory::create();
 
         if (!empty($options['debugLog'])
             && !empty($options['logger'])

tests/unit/Common/Transport/HandlerStackTest.php

@@ -3,13 +3,14 @@
 namespace OpenStack\Test\Common\Transport;
 
 use GuzzleHttp\Handler\MockHandler;
-use OpenStack\Common\Transport\HandlerStack;
+use GuzzleHttp\HandlerStack;
+use OpenStack\Common\Transport\HandlerStackFactory;
 use OpenStack\Test\TestCase;
 
 class HandlerStackTest extends TestCase
 {
     public function test_it_is_created()
     {
-        self::assertInstanceOf(HandlerStack::class, HandlerStack::create(new MockHandler()));
+        self::assertInstanceOf(HandlerStack::class, HandlerStackFactory::create(new MockHandler()));
     }
 }