loic/istic-openstack
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Library maj

Browse source
This commit is contained in:
EoleDev 2016-03-09 16:16:22 +01:00
parent a706b0d565
commit b7ebe1272c
2 changed files with 28 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
server/Test/AppTestClass.php
View file

@ -1,6 +1,15 @@
<?php <?php
include_once("../core/Plugin_Api.php"); include_once("../core/Plugin_Api.php");
include_once("../core/LibOverride/genTokenOptions.php"); include_once("../core/LibOverride/genTokenOptions.php");
<<<<<<< Updated upstream
=======
include_once("../core/ErrorManagement.php");
use OpenCloud\Common\Error\BadResponseError;
use OpenCloud\Common\Error\BaseError;
use OpenCloud\Common\Error\NotImplementedError;
use OpenCloud\Common\Error\UserInputError;
>>>>>>> Stashed changes
class AppTest{ class AppTest{

38
server/composer.lock generated
View file

@ -71,16 +71,16 @@
}, },
{ {
"name": "guzzlehttp/promises", "name": "guzzlehttp/promises",
"version": "1.0.3", "version": "1.1.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/guzzle/promises.git", "url": "https://github.com/guzzle/promises.git",
"reference": "b1e1c0d55f8083c71eda2c28c12a228d708294ea" "reference": "bb9024c526b22f3fe6ae55a561fd70653d470aa8"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/guzzle/promises/zipball/b1e1c0d55f8083c71eda2c28c12a228d708294ea", "url": "https://api.github.com/repos/guzzle/promises/zipball/bb9024c526b22f3fe6ae55a561fd70653d470aa8",
"reference": "b1e1c0d55f8083c71eda2c28c12a228d708294ea", "reference": "bb9024c526b22f3fe6ae55a561fd70653d470aa8",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -118,20 +118,20 @@
"keywords": [ "keywords": [
"promise" "promise"
], ],
"time": "2015-10-15 22:28:00" "time": "2016-03-08 01:15:46"
}, },
{ {
"name": "guzzlehttp/psr7", "name": "guzzlehttp/psr7",
"version": "1.2.2", "version": "1.2.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/guzzle/psr7.git", "url": "https://github.com/guzzle/psr7.git",
"reference": "f5d04bdd2881ac89abde1fb78cc234bce24327bb" "reference": "2e89629ff057ebb49492ba08e6995d3a6a80021b"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/guzzle/psr7/zipball/f5d04bdd2881ac89abde1fb78cc234bce24327bb", "url": "https://api.github.com/repos/guzzle/psr7/zipball/2e89629ff057ebb49492ba08e6995d3a6a80021b",
"reference": "f5d04bdd2881ac89abde1fb78cc234bce24327bb", "reference": "2e89629ff057ebb49492ba08e6995d3a6a80021b",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -176,7 +176,7 @@
"stream", "stream",
"uri" "uri"
], ],
"time": "2016-01-23 01:23:02" "time": "2016-02-18 21:54:00"
}, },
{ {
"name": "justinrainbow/json-schema", "name": "justinrainbow/json-schema",
@ -250,23 +250,25 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/php-opencloud/openstack.git", "url": "https://github.com/php-opencloud/openstack.git",
"reference": "15aca73f423166c7ef8337ba08615c103c66e931" "reference": "f2ee77024843659d970817a9e7055bb40a3724f9"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
<<<<<<< Updated upstream
"url": "https://api.github.com/repos/php-opencloud/openstack/zipball/15aca73f423166c7ef8337ba08615c103c66e931", "url": "https://api.github.com/repos/php-opencloud/openstack/zipball/15aca73f423166c7ef8337ba08615c103c66e931",
"reference": "15aca73f423166c7ef8337ba08615c103c66e931", "reference": "15aca73f423166c7ef8337ba08615c103c66e931",
=======
"url": "https://api.github.com/repos/php-opencloud/openstack/zipball/f2ee77024843659d970817a9e7055bb40a3724f9",
"reference": "f2ee77024843659d970817a9e7055bb40a3724f9",
>>>>>>> Stashed changes
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"guzzlehttp/guzzle": "~6.1", "php-opencloud/common": "dev-master"
"justinrainbow/json-schema": "~1.3",
"php": ">=5.6"
}, },
"require-dev": { "require-dev": {
"fabpot/php-cs-fixer": "~1.0", "fabpot/php-cs-fixer": "~1.0",
"jakub-onderka/php-parallel-lint": "0.*", "jakub-onderka/php-parallel-lint": "0.*",
"phpspec/prophecy-phpunit": "~1.0",
"phpunit/phpunit": "~4.0", "phpunit/phpunit": "~4.0",
"psr/log": "~1.0", "psr/log": "~1.0",
"sami/sami": "dev-master", "sami/sami": "dev-master",
@ -275,9 +277,7 @@
"type": "library", "type": "library",
"autoload": { "autoload": {
"psr-4": { "psr-4": {
"OpenStack\\": "src/", "OpenStack\\": "src/"
"OpenStack\\Test\\": "tests/unit/",
"OpenStack\\Integration\\": "tests/integration/"
} }
}, },
"notification-url": "https://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
@ -288,7 +288,7 @@
"homepage": "https://github.com/jamiehannaford" "homepage": "https://github.com/jamiehannaford"
} }
], ],
"time": "2016-01-25 10:35:10" "time": "2016-03-08 14:37:14"
}, },
{ {
"name": "psr/http-message", "name": "psr/http-message",