From eac860ce5092c301068725e5743561c598e924f0 Mon Sep 17 00:00:00 2001 From: josselin Date: Mon, 25 Jan 2016 22:00:35 +0100 Subject: [PATCH] Try to correct the error with php-opencloud import --- server/composer.lock | 12 +- server/vendor/composer/autoload_psr4.php | 2 + server/vendor/composer/installed.json | 268 ++++++++++++----------- server/vendor/php-opencloud/openstack | 2 +- 4 files changed, 145 insertions(+), 139 deletions(-) diff --git a/server/composer.lock b/server/composer.lock index e8976df..d8a8c3a 100644 --- a/server/composer.lock +++ b/server/composer.lock @@ -250,12 +250,12 @@ "source": { "type": "git", "url": "https://github.com/php-opencloud/openstack.git", - "reference": "8a6ec703597f0440e558d8f1f21b2ff303117dbd" + "reference": "15aca73f423166c7ef8337ba08615c103c66e931" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-opencloud/openstack/zipball/8a6ec703597f0440e558d8f1f21b2ff303117dbd", - "reference": "8a6ec703597f0440e558d8f1f21b2ff303117dbd", + "url": "https://api.github.com/repos/php-opencloud/openstack/zipball/15aca73f423166c7ef8337ba08615c103c66e931", + "reference": "15aca73f423166c7ef8337ba08615c103c66e931", "shasum": "" }, "require": { @@ -275,7 +275,9 @@ "type": "library", "autoload": { "psr-4": { - "OpenStack\\": "src/" + "OpenStack\\": "src/", + "OpenStack\\Test\\": "tests/unit/", + "OpenStack\\Integration\\": "tests/integration/" } }, "notification-url": "https://packagist.org/downloads/", @@ -286,7 +288,7 @@ "homepage": "https://github.com/jamiehannaford" } ], - "time": "2016-01-20 12:27:59" + "time": "2016-01-25 10:35:10" }, { "name": "psr/http-message", diff --git a/server/vendor/composer/autoload_psr4.php b/server/vendor/composer/autoload_psr4.php index 0ba35e5..6c2e482 100644 --- a/server/vendor/composer/autoload_psr4.php +++ b/server/vendor/composer/autoload_psr4.php @@ -7,6 +7,8 @@ $baseDir = dirname($vendorDir); return array( 'Psr\\Http\\Message\\' => array($vendorDir . '/psr/http-message/src'), + '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'), 'JsonSchema\\' => array($vendorDir . '/justinrainbow/json-schema/src/JsonSchema'), 'GuzzleHttp\\Psr7\\' => array($vendorDir . '/guzzlehttp/psr7/src'), diff --git a/server/vendor/composer/installed.json b/server/vendor/composer/installed.json index 8e3f2ec..1452a4a 100644 --- a/server/vendor/composer/installed.json +++ b/server/vendor/composer/installed.json @@ -1,72 +1,4 @@ [ - { - "name": "justinrainbow/json-schema", - "version": "v1.6.0", - "version_normalized": "1.6.0.0", - "source": { - "type": "git", - "url": "https://github.com/justinrainbow/json-schema.git", - "reference": "f9e27c3e202faf14fd581ef41355d83bb4b7eb7d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/f9e27c3e202faf14fd581ef41355d83bb4b7eb7d", - "reference": "f9e27c3e202faf14fd581ef41355d83bb4b7eb7d", - "shasum": "" - }, - "require": { - "php": ">=5.3.2" - }, - "require-dev": { - "json-schema/json-schema-test-suite": "1.1.0", - "phpdocumentor/phpdocumentor": "~2", - "phpunit/phpunit": "~3.7" - }, - "time": "2016-01-06 14:37:04", - "bin": [ - "bin/validate-json" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.4.x-dev" - } - }, - "installation-source": "dist", - "autoload": { - "psr-4": { - "JsonSchema\\": "src/JsonSchema/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Bruno Prieto Reis", - "email": "bruno.p.reis@gmail.com" - }, - { - "name": "Justin Rainbow", - "email": "justin.rainbow@gmail.com" - }, - { - "name": "Igor Wiedler", - "email": "igor@wiedler.ch" - }, - { - "name": "Robert Schönthal", - "email": "seroscho@googlemail.com" - } - ], - "description": "A library to validate a json schema.", - "homepage": "https://github.com/justinrainbow/json-schema", - "keywords": [ - "json", - "schema" - ] - }, { "name": "guzzlehttp/promises", "version": "1.0.3", @@ -171,66 +103,6 @@ "response" ] }, - { - "name": "guzzlehttp/psr7", - "version": "1.2.1", - "version_normalized": "1.2.1.0", - "source": { - "type": "git", - "url": "https://github.com/guzzle/psr7.git", - "reference": "4d0bdbe1206df7440219ce14c972aa57cc5e4982" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/4d0bdbe1206df7440219ce14c972aa57cc5e4982", - "reference": "4d0bdbe1206df7440219ce14c972aa57cc5e4982", - "shasum": "" - }, - "require": { - "php": ">=5.4.0", - "psr/http-message": "~1.0" - }, - "provide": { - "psr/http-message-implementation": "1.0" - }, - "require-dev": { - "phpunit/phpunit": "~4.0" - }, - "time": "2015-11-03 01:34:55", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - } - }, - "installation-source": "dist", - "autoload": { - "psr-4": { - "GuzzleHttp\\Psr7\\": "src/" - }, - "files": [ - "src/functions_include.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" - } - ], - "description": "PSR-7 message implementation", - "keywords": [ - "http", - "message", - "stream", - "uri" - ] - }, { "name": "guzzlehttp/guzzle", "version": "6.1.1", @@ -295,6 +167,134 @@ "web service" ] }, + { + "name": "guzzlehttp/psr7", + "version": "1.2.1", + "version_normalized": "1.2.1.0", + "source": { + "type": "git", + "url": "https://github.com/guzzle/psr7.git", + "reference": "4d0bdbe1206df7440219ce14c972aa57cc5e4982" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/4d0bdbe1206df7440219ce14c972aa57cc5e4982", + "reference": "4d0bdbe1206df7440219ce14c972aa57cc5e4982", + "shasum": "" + }, + "require": { + "php": ">=5.4.0", + "psr/http-message": "~1.0" + }, + "provide": { + "psr/http-message-implementation": "1.0" + }, + "require-dev": { + "phpunit/phpunit": "~4.0" + }, + "time": "2015-11-03 01:34:55", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "GuzzleHttp\\Psr7\\": "src/" + }, + "files": [ + "src/functions_include.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + } + ], + "description": "PSR-7 message implementation", + "keywords": [ + "http", + "message", + "stream", + "uri" + ] + }, + { + "name": "justinrainbow/json-schema", + "version": "v1.6.0", + "version_normalized": "1.6.0.0", + "source": { + "type": "git", + "url": "https://github.com/justinrainbow/json-schema.git", + "reference": "f9e27c3e202faf14fd581ef41355d83bb4b7eb7d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/f9e27c3e202faf14fd581ef41355d83bb4b7eb7d", + "reference": "f9e27c3e202faf14fd581ef41355d83bb4b7eb7d", + "shasum": "" + }, + "require": { + "php": ">=5.3.2" + }, + "require-dev": { + "json-schema/json-schema-test-suite": "1.1.0", + "phpdocumentor/phpdocumentor": "~2", + "phpunit/phpunit": "~3.7" + }, + "time": "2016-01-06 14:37:04", + "bin": [ + "bin/validate-json" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.4.x-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "JsonSchema\\": "src/JsonSchema/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Bruno Prieto Reis", + "email": "bruno.p.reis@gmail.com" + }, + { + "name": "Justin Rainbow", + "email": "justin.rainbow@gmail.com" + }, + { + "name": "Igor Wiedler", + "email": "igor@wiedler.ch" + }, + { + "name": "Robert Schönthal", + "email": "seroscho@googlemail.com" + } + ], + "description": "A library to validate a json schema.", + "homepage": "https://github.com/justinrainbow/json-schema", + "keywords": [ + "json", + "schema" + ] + }, { "name": "php-opencloud/openstack", "version": "dev-master", @@ -302,12 +302,12 @@ "source": { "type": "git", "url": "https://github.com/php-opencloud/openstack.git", - "reference": "8a6ec703597f0440e558d8f1f21b2ff303117dbd" + "reference": "15aca73f423166c7ef8337ba08615c103c66e931" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-opencloud/openstack/zipball/8a6ec703597f0440e558d8f1f21b2ff303117dbd", - "reference": "8a6ec703597f0440e558d8f1f21b2ff303117dbd", + "url": "https://api.github.com/repos/php-opencloud/openstack/zipball/15aca73f423166c7ef8337ba08615c103c66e931", + "reference": "15aca73f423166c7ef8337ba08615c103c66e931", "shasum": "" }, "require": { @@ -324,12 +324,14 @@ "sami/sami": "dev-master", "satooshi/php-coveralls": "~1.0" }, - "time": "2016-01-20 12:27:59", + "time": "2016-01-25 10:35:10", "type": "library", "installation-source": "source", "autoload": { "psr-4": { - "OpenStack\\": "src/" + "OpenStack\\": "src/", + "OpenStack\\Test\\": "tests/unit/", + "OpenStack\\Integration\\": "tests/integration/" } }, "notification-url": "https://packagist.org/downloads/", diff --git a/server/vendor/php-opencloud/openstack b/server/vendor/php-opencloud/openstack index 8a6ec70..15aca73 160000 --- a/server/vendor/php-opencloud/openstack +++ b/server/vendor/php-opencloud/openstack @@ -1 +1 @@ -Subproject commit 8a6ec703597f0440e558d8f1f21b2ff303117dbd +Subproject commit 15aca73f423166c7ef8337ba08615c103c66e931