summaryrefslogtreecommitdiff
path: root/server
diff options
context:
space:
mode:
Diffstat (limited to 'server')
-rw-r--r--server/composer.json3
-rw-r--r--server/composer.lock54
-rwxr-xr-xserver/core/App.php8
-rwxr-xr-xserver/core/ErrorManagement.php10
-rwxr-xr-xserver/core/Identity.php2
-rwxr-xr-xserver/core/LibOverride/genTokenOptions.php8
-rw-r--r--server/vendor/composer/autoload_psr4.php3
-rw-r--r--server/vendor/composer/installed.json49
8 files changed, 117 insertions, 20 deletions
diff --git a/server/composer.json b/server/composer.json
index d5e2dbc..9d44d6e 100644
--- a/server/composer.json
+++ b/server/composer.json
@@ -1,5 +1,6 @@
{
"require": {
- "php-opencloud/openstack": "dev-master"
+ "php-opencloud/openstack": "dev-master",
+ "php-opencloud/common": "dev-master"
}
}
diff --git a/server/composer.lock b/server/composer.lock
index c6598db..4a9581a 100644
--- a/server/composer.lock
+++ b/server/composer.lock
@@ -4,8 +4,8 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "hash": "e7cbd5d3df36fb1a3f3378b837068196",
- "content-hash": "125e4702f7a417475a4150c889ac6c3d",
+ "hash": "7647ed348aee68f2db6b71e4d2fb1fe7",
+ "content-hash": "82731500d050a65f09e92b70c1f96ea9",
"packages": [
{
"name": "guzzlehttp/guzzle",
@@ -245,6 +245,51 @@
"time": "2016-01-25 15:43:01"
},
{
+ "name": "php-opencloud/common",
+ "version": "dev-master",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/php-opencloud/common.git",
+ "reference": "fd027b817c3dd8f83b0c8d9fb1df34ebf25f8c62"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/php-opencloud/common/zipball/fd027b817c3dd8f83b0c8d9fb1df34ebf25f8c62",
+ "reference": "fd027b817c3dd8f83b0c8d9fb1df34ebf25f8c62",
+ "shasum": ""
+ },
+ "require": {
+ "guzzlehttp/guzzle": "~6.1",
+ "justinrainbow/json-schema": "~1.3",
+ "php": "~7.0"
+ },
+ "require-dev": {
+ "fabpot/php-cs-fixer": "~1.0",
+ "jakub-onderka/php-parallel-lint": "0.*",
+ "phpunit/phpunit": "~4.0",
+ "psr/log": "~1.0",
+ "sami/sami": "dev-master",
+ "satooshi/php-coveralls": "~1.0"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "OpenCloud\\": "src/",
+ "OpenCloud\\Test\\": "tests/unit/",
+ "OpenCloud\\Integration\\": "tests/integration/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "authors": [
+ {
+ "name": "Jamie Hannaford",
+ "email": "jamie.hannaford@rackspace.com",
+ "homepage": "https://github.com/jamiehannaford"
+ }
+ ],
+ "time": "2016-03-08 12:56:34"
+ },
+ {
"name": "php-opencloud/openstack",
"version": "dev-master",
"source": {
@@ -254,7 +299,7 @@
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-opencloud/openstack/zipball/15aca73f423166c7ef8337ba08615c103c66e931",
+ "url": "https://api.github.com/repos/php-opencloud/openstack/zipball/f2ee77024843659d970817a9e7055bb40a3724f9",
"reference": "15aca73f423166c7ef8337ba08615c103c66e931",
"shasum": ""
},
@@ -344,7 +389,8 @@
"aliases": [],
"minimum-stability": "stable",
"stability-flags": {
- "php-opencloud/openstack": 20
+ "php-opencloud/openstack": 20,
+ "php-opencloud/common": 20
},
"prefer-stable": false,
"prefer-lowest": false,
diff --git a/server/core/App.php b/server/core/App.php
index edb75f6..ceda7c9 100755
--- a/server/core/App.php
+++ b/server/core/App.php
@@ -3,10 +3,10 @@ include_once("core/Plugin_Api.php");
include_once("core/LibOverride/genTokenOptions.php");
include_once("core/ErrorManagement.php");
-use OpenStack\Common\Error\BadResponseError;
-use OpenStack\Common\Error\BaseError;
-use OpenStack\Common\Error\NotImplementedError;
-use OpenStack\Common\Error\UserInputError;
+use OpenCloud\Common\Error\BadResponseError;
+use OpenCloud\Common\Error\BaseError;
+use OpenCloud\Common\Error\NotImplementedError;
+use OpenCloud\Common\Error\UserInputError;
class App{
diff --git a/server/core/ErrorManagement.php b/server/core/ErrorManagement.php
index 6bff61f..4ba3493 100755
--- a/server/core/ErrorManagement.php
+++ b/server/core/ErrorManagement.php
@@ -1,9 +1,9 @@
<?php
-use OpenStack\Common\Error\BadResponseError;
-use OpenStack\Common\Error\BaseError;
-use OpenStack\Common\Error\NotImplementedError;
-use OpenStack\Common\Error\UserInputError;
+use OpenCloud\Common\Error\BadResponseError;
+use OpenCloud\Common\Error\BaseError;
+use OpenCloud\Common\Error\NotImplementedError;
+use OpenCloud\Common\Error\UserInputError;
Class errorManagement{
@@ -36,4 +36,4 @@ Class errorManagement{
}
-?> \ No newline at end of file
+?>
diff --git a/server/core/Identity.php b/server/core/Identity.php
index 2638985..7100c9f 100755
--- a/server/core/Identity.php
+++ b/server/core/Identity.php
@@ -9,7 +9,7 @@
*
* @todo Complete the functions and finish the descriptions
*/
-use OpenStack\Common\Error;
+use OpenCloud\Common\Error;
/**
* Identity Class of the back-end application
diff --git a/server/core/LibOverride/genTokenOptions.php b/server/core/LibOverride/genTokenOptions.php
index 50826ed..18d880f 100755
--- a/server/core/LibOverride/genTokenOptions.php
+++ b/server/core/LibOverride/genTokenOptions.php
@@ -1,12 +1,12 @@
<?php
use GuzzleHttp\Client;
-use OpenStack\Common\Transport\HandlerStack;
-use OpenStack\Common\Transport\Middleware;
+use OpenCloud\Common\Transport\HandlerStack;
+use OpenCloud\Common\Transport\Middleware;
use OpenStack\Identity\v3\Service;
use OpenStack\Identity\v3\Api;
-use OpenStack\Common\Auth\Token;
-use OpenStack\Common\Transport\Utils;
+use OpenCloud\Common\Auth\Token;
+use OpenCloud\Common\Transport\Utils;
use OpenStack\Identity\v3\Models;
class genTokenOptions
diff --git a/server/vendor/composer/autoload_psr4.php b/server/vendor/composer/autoload_psr4.php
index 6c2e482..077c577 100644
--- a/server/vendor/composer/autoload_psr4.php
+++ b/server/vendor/composer/autoload_psr4.php
@@ -10,6 +10,9 @@ return array(
'OpenStack\\Test\\' => array($vendorDir . '/php-opencloud/openstack/tests/unit'),
'OpenStack\\Integration\\' => array($vendorDir . '/php-opencloud/openstack/tests/integration'),
'OpenStack\\' => array($vendorDir . '/php-opencloud/openstack/src'),
+ 'OpenCloud\\Test\\' => array($vendorDir . '/php-opencloud/common/tests/unit'),
+ 'OpenCloud\\Integration\\' => array($vendorDir . '/php-opencloud/common/tests/integration'),
+ 'OpenCloud\\' => array($vendorDir . '/php-opencloud/common/src'),
'JsonSchema\\' => array($vendorDir . '/justinrainbow/json-schema/src/JsonSchema'),
'GuzzleHttp\\Psr7\\' => array($vendorDir . '/guzzlehttp/psr7/src'),
'GuzzleHttp\\Promise\\' => array($vendorDir . '/guzzlehttp/promises/src'),
diff --git a/server/vendor/composer/installed.json b/server/vendor/composer/installed.json
index 1dfb8d2..70c1b5b 100644
--- a/server/vendor/composer/installed.json
+++ b/server/vendor/composer/installed.json
@@ -178,7 +178,7 @@
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-opencloud/openstack/zipball/15aca73f423166c7ef8337ba08615c103c66e931",
+ "url": "https://api.github.com/repos/php-opencloud/openstack/zipball/f2ee77024843659d970817a9e7055bb40a3724f9",
"reference": "15aca73f423166c7ef8337ba08615c103c66e931",
"shasum": ""
},
@@ -342,5 +342,52 @@
"stream",
"uri"
]
+ },
+ {
+ "name": "php-opencloud/common",
+ "version": "dev-master",
+ "version_normalized": "9999999-dev",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/php-opencloud/common.git",
+ "reference": "fd027b817c3dd8f83b0c8d9fb1df34ebf25f8c62"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/php-opencloud/common/zipball/fd027b817c3dd8f83b0c8d9fb1df34ebf25f8c62",
+ "reference": "fd027b817c3dd8f83b0c8d9fb1df34ebf25f8c62",
+ "shasum": ""
+ },
+ "require": {
+ "guzzlehttp/guzzle": "~6.1",
+ "justinrainbow/json-schema": "~1.3",
+ "php": "~7.0"
+ },
+ "require-dev": {
+ "fabpot/php-cs-fixer": "~1.0",
+ "jakub-onderka/php-parallel-lint": "0.*",
+ "phpunit/phpunit": "~4.0",
+ "psr/log": "~1.0",
+ "sami/sami": "dev-master",
+ "satooshi/php-coveralls": "~1.0"
+ },
+ "time": "2016-03-08 12:56:34",
+ "type": "library",
+ "installation-source": "source",
+ "autoload": {
+ "psr-4": {
+ "OpenCloud\\": "src/",
+ "OpenCloud\\Test\\": "tests/unit/",
+ "OpenCloud\\Integration\\": "tests/integration/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "authors": [
+ {
+ "name": "Jamie Hannaford",
+ "email": "jamie.hannaford@rackspace.com",
+ "homepage": "https://github.com/jamiehannaford"
+ }
+ ]
}
]
generated by cgit v1.2.3 (git 2.46.0) at 2026-04-17 08:27:05 +0000