Maj Library

7 files changed, 12 insertions, 66 deletions

diff --git a/server/vendor/php-opencloud/common/tests/integration/DefaultLogger.php b/server/vendor/php-opencloud/common/tests/integration/DefaultLogger.php
index a546c70..d367600 100644
--- a/server/vendor/php-opencloud/common/tests/integration/DefaultLogger.php
+++ b/server/vendor/php-opencloud/common/tests/integration/DefaultLogger.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace OpenCloud\integration;
+namespace OpenCloud\Integration;
 
 use Psr\Log\AbstractLogger;
 
diff --git a/server/vendor/php-opencloud/common/tests/integration/Runner.php b/server/vendor/php-opencloud/common/tests/integration/Runner.php
index 98d094c..b1003a2 100644
--- a/server/vendor/php-opencloud/common/tests/integration/Runner.php
+++ b/server/vendor/php-opencloud/common/tests/integration/Runner.php
@@ -1,16 +1,19 @@
 <?php
 
-namespace OpenCloud\integration;
+namespace OpenCloud\Integration;
 
 class Runner
 {
     private $basePath;
     private $logger;
     private $services = [];
+    private $namespace;
 
-    public function __construct($basePath)
+    public function __construct($basePath, $testNamespace)
     {
         $this->basePath = $basePath;
+        $this->namespace = $testNamespace;
+
         $this->logger = new DefaultLogger();
         $this->assembleServicesFromSamples();
     }
@@ -73,15 +76,14 @@ class Runner
      */
     private function getTest($serviceName, $version, $verbosity)
     {
-        $namespace = (new \ReflectionClass($this))->getNamespaceName();
-        $className = sprintf("%s\\%s\\%sTest", $namespace, Utils::toCamelCase($serviceName), ucfirst($version));
+        $className = sprintf("%s\\%s\\%sTest", $this->namespace, Utils::toCamelCase($serviceName), ucfirst($version));
 
         if (!class_exists($className)) {
             throw new \RuntimeException(sprintf("%s does not exist", $className));
         }
 
         $basePath = $this->basePath . DIRECTORY_SEPARATOR . $serviceName . DIRECTORY_SEPARATOR . $version;
-        $smClass = sprintf("%s\\SampleManager", $namespace);
+        $smClass = sprintf("%s\\SampleManager", $this->namespace);
         $class = new $className($this->logger, new $smClass($basePath, $verbosity));
 
         if (!($class instanceof TestInterface)) {
diff --git a/server/vendor/php-opencloud/common/tests/integration/SampleManagerInterface.php b/server/vendor/php-opencloud/common/tests/integration/SampleManagerInterface.php
index f0fe848..c4293ba 100644
--- a/server/vendor/php-opencloud/common/tests/integration/SampleManagerInterface.php
+++ b/server/vendor/php-opencloud/common/tests/integration/SampleManagerInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace OpenCloud\integration;
+namespace OpenCloud\Integration;
 
 interface SampleManagerInterface
 {
diff --git a/server/vendor/php-opencloud/common/tests/integration/TestCase.php b/server/vendor/php-opencloud/common/tests/integration/TestCase.php
index 687760a..cb81381 100644
--- a/server/vendor/php-opencloud/common/tests/integration/TestCase.php
+++ b/server/vendor/php-opencloud/common/tests/integration/TestCase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace OpenCloud\integration;
+namespace OpenCloud\Integration;
 
 use Psr\Log\LoggerInterface;
 
diff --git a/server/vendor/php-opencloud/common/tests/integration/TestInterface.php b/server/vendor/php-opencloud/common/tests/integration/TestInterface.php
index a89e8af..418b407 100644
--- a/server/vendor/php-opencloud/common/tests/integration/TestInterface.php
+++ b/server/vendor/php-opencloud/common/tests/integration/TestInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace OpenCloud\integration;
+namespace OpenCloud\Integration;
 
 use Psr\Log\LoggerInterface;
 
diff --git a/server/vendor/php-opencloud/common/tests/integration/Utils.php b/server/vendor/php-opencloud/common/tests/integration/Utils.php
index daa1426..d24c1bb 100644
--- a/server/vendor/php-opencloud/common/tests/integration/Utils.php
+++ b/server/vendor/php-opencloud/common/tests/integration/Utils.php
@@ -1,57 +1,11 @@
 <?php
 
-namespace OpenCloud\integration;
+namespace OpenCloud\Integration;
 
 use GuzzleHttp\Client;
-use OpenCloud\Identity\v2\Api;
-use OpenCloud\Identity\v2\Service;
-use OpenCloud\Common\Transport\HandlerStack;
-use OpenCloud\Common\Transport\Utils as CommonUtils;
 
 class Utils
 {
-    public static function getAuthOptsV3()
-    {
-        return [
-            'authUrl' => getenv('OS_AUTH_URL'),
-            'region'  => getenv('OS_REGION_NAME'),
-            'user'    => [
-                'id'       => getenv('OS_USER_ID'),
-                'password' => getenv('OS_PASSWORD'),
-            ],
-            'scope'   => [
-                'project' => [
-                    'id' => getenv('OS_PROJECT_ID'),
-                ]
-            ]
-        ];
-    }
-
-    public static function getAuthOptsV2()
-    {
-        $httpClient = new Client([
-            'base_uri' => CommonUtils::normalizeUrl(getenv('OS_AUTH_URL')),
-            'handler'  => HandlerStack::create(),
-        ]);
-        return [
-            'authUrl'         => getenv('OS_AUTH_URL'),
-            'region'          => getenv('OS_REGION_NAME'),
-            'username'        => getenv('OS_USERNAME'),
-            'password'        => getenv('OS_PASSWORD'),
-            'tenantName'      => getenv('OS_TENANT_NAME'),
-            'identityService' => new Service($httpClient, new Api),
-        ];
-    }
-
-    public static function getAuthOpts(array $options = [])
-    {
-        $authOptions = getenv('OS_IDENTITY_API_VERSION') == '2.0'
-            ? self::getAuthOptsV2()
-            : self::getAuthOptsV3();
-
-        return array_merge($authOptions, $options);
-    }
-
     public static function toCamelCase($word, $separator = '_')
     {
         return str_replace($separator, '', ucwords($word, $separator));
diff --git a/server/vendor/php-opencloud/common/tests/integration/run.php b/server/vendor/php-opencloud/common/tests/integration/run.php
deleted file mode 100644
index 5bc5548..0000000
--- a/server/vendor/php-opencloud/common/tests/integration/run.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-$rootDir = dirname(dirname(__DIR__));
-
-require_once $rootDir . '/vendor/autoload.php';
-
-$basePath  = $rootDir . '/samples';
-
-$runner = new \OpenCloud\Integration\Runner($basePath);
-$runner->runServices();