Merge branch 'compute'

Conflicts:
	server/core/LibOverride/genTokenOptions.php

1 files changed, 0 insertions, 75 deletions

diff --git a/server/vendor/php-opencloud/common/tests/unit/Fixtures/IdentityV3Api.php b/server/vendor/php-opencloud/common/tests/unit/Fixtures/IdentityV3Api.php
deleted file mode 100755
index 2fc922f..0000000
--- a/server/vendor/php-opencloud/common/tests/unit/Fixtures/IdentityV3Api.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-namespace OpenCloud\Test\Fixtures;
-
-class IdentityV3Api
-{
-    private function domainParam()
-    {
-        return [
-            'type' => 'object',
-            'params' => [
-                'id'   => ['type' => 'string'],
-                'name' => ['type' => 'string']
-            ]
-        ];
-    }
-
-    private function projectParam()
-    {
-        return [
-            'type' => 'object',
-            'params' => [
-                'id'     => ['type' => 'string'],
-                'name'   => ['type' => 'string'],
-                'domain' => $this->domainParam(),
-            ]
-        ];
-    }
-
-    public function postTokens()
-    {
-        return [
-            'method' => 'POST',
-            'path'   => 'tokens',
-            'params' => [
-                'methods' => [
-                    'type' => 'array',
-                    'path' => 'auth.identity',
-                    'items' => [
-                        'type' => 'string'
-                    ]
-                ],
-                'user' => [
-                    'path'   => 'auth.identity.password',
-                    'type'   => 'object',
-                    'properties' => [
-                        'id'       => [
-                            'type' => 'string',
-                        ],
-                        'name'     => [
-                            'type' => 'string',
-                        ],
-                        'password' => [
-                            'type' => 'string',
-                        ],
-                        'domain'   => $this->domainParam()
-                    ]
-                ],
-                'tokenId' => [
-                    'type'   => 'string',
-                    'path'   => 'auth.identity.token',
-                    'sentAs' => 'id',
-                ],
-                'scope' => [
-                    'type' => 'object',
-                    'path' => 'auth',
-                    'properties' => [
-                        'project' => $this->projectParam(),
-                        'domain'  => $this->domainParam()
-                    ]
-                ]
-            ]
-        ];
-    }
-}