Merge pull request #191 from magento-gl/MQE-3373A

MQE-3373 Hashicorp Vault PHP lib being instantiated with wrong params

Author: KevinBKozan

composer.json

@@ -25,6 +25,7 @@
         "composer/composer": "^1.9||^2.0",
         "csharpru/vault-php": "^4.2.1",
         "guzzlehttp/guzzle": "^7.3.0",
+        "laminas/laminas-diactoros": "^2.8",
         "monolog/monolog": "^2.3",
         "mustache/mustache": "~2.5",
         "nikic/php-parser": "^4.4",

composer.lock

@@ -6,6 +6,9 @@
 
 namespace Magento\FunctionalTestingFramework\DataGenerator\Handlers\SecretStorage;
 
+use Laminas\Diactoros\RequestFactory;
+use Laminas\Diactoros\StreamFactory;
+use Laminas\Diactoros\Uri;
 use GuzzleHttp\Client as GuzzleClient;
 use Magento\FunctionalTestingFramework\Config\MftfApplicationConfig;
 use Magento\FunctionalTestingFramework\DataGenerator\Handlers\CredentialStore;
@@ -79,13 +82,16 @@ public function __construct($baseUrl, $secretBasePath)
         parent::__construct();
         if (null === $this->client) {
             // client configuration and override http errors settings
-            $config = [
-                'timeout' => 15,
-                'base_uri' => $baseUrl,
-                'http_errors' => false
-            ];
-
-            $this->client = new Client(new GuzzleClient($config));
+            $this->client = new Client(
+                new Uri($baseUrl),
+                new GuzzleClient([
+                    'timeout' => 15,
+                    'base_uri' => $baseUrl,
+                    'http_errors' => false
+                ]),
+                new RequestFactory(),
+                new StreamFactory()
+            );
             $this->secretBasePath = $secretBasePath;
         }
         $this->readVaultTokenFromFileSystem();

src/Magento/FunctionalTestingFramework/DataGenerator/Handlers/SecretStorage/VaultStorage.php

@@ -36,7 +36,7 @@ public function __construct($token)
      * @return Auth
      * @throws TestFrameworkException
      */
-    public function authenticate()
+    public function authenticate(): ?Auth
     {
         try {
             return new Auth(['clientToken' => $this->token]);