Permalink
Browse files

Fix resources not removed during merge

  • Loading branch information...
1 parent 84a86ac commit 7e8d7eb8a36b722636e9ab6236ff069e37245f9d @cdujeu cdujeu committed Sep 14, 2016
Showing with 10 additions and 9,250 deletions.
  1. +0 −590 core/src/core/classes/guzzle/composer.lock
  2. +0 −4 core/src/core/classes/guzzle/vendor/commerceguys/guzzle-oauth2-plugin/.gitignore
  3. +0 −2 core/src/core/classes/guzzle/vendor/commerceguys/guzzle-oauth2-plugin/.scrutinizer.yml
  4. +0 −27 core/src/core/classes/guzzle/vendor/commerceguys/guzzle-oauth2-plugin/.travis.yml
  5. +0 −20 core/src/core/classes/guzzle/vendor/commerceguys/guzzle-oauth2-plugin/LICENSE
  6. +0 −67 core/src/core/classes/guzzle/vendor/commerceguys/guzzle-oauth2-plugin/README.md
  7. +0 −36 core/src/core/classes/guzzle/vendor/commerceguys/guzzle-oauth2-plugin/composer.json
  8. +0 −1,219 core/src/core/classes/guzzle/vendor/commerceguys/guzzle-oauth2-plugin/composer.lock
  9. +0 −31 core/src/core/classes/guzzle/vendor/commerceguys/guzzle-oauth2-plugin/phpunit.xml.dist
  10. +0 −86 core/src/core/classes/guzzle/vendor/commerceguys/guzzle-oauth2-plugin/src/AccessToken.php
  11. +0 −29 .../core/classes/guzzle/vendor/commerceguys/guzzle-oauth2-plugin/src/GrantType/AuthorizationCode.php
  12. +0 −13 .../core/classes/guzzle/vendor/commerceguys/guzzle-oauth2-plugin/src/GrantType/ClientCredentials.php
  13. +0 −94 .../src/core/classes/guzzle/vendor/commerceguys/guzzle-oauth2-plugin/src/GrantType/GrantTypeBase.php
  14. +0 −15 ...core/classes/guzzle/vendor/commerceguys/guzzle-oauth2-plugin/src/GrantType/GrantTypeInterface.php
  15. +0 −82 core/src/core/classes/guzzle/vendor/commerceguys/guzzle-oauth2-plugin/src/GrantType/JwtBearer.php
  16. +0 −21 ...ore/classes/guzzle/vendor/commerceguys/guzzle-oauth2-plugin/src/GrantType/PasswordCredentials.php
  17. +0 −49 core/src/core/classes/guzzle/vendor/commerceguys/guzzle-oauth2-plugin/src/GrantType/RefreshToken.php
  18. +0 −17 .../guzzle/vendor/commerceguys/guzzle-oauth2-plugin/src/GrantType/RefreshTokenGrantTypeInterface.php
  19. +0 −175 core/src/core/classes/guzzle/vendor/commerceguys/guzzle-oauth2-plugin/src/Oauth2Subscriber.php
  20. +0 −37 core/src/core/classes/guzzle/vendor/commerceguys/guzzle-oauth2-plugin/tests/AccessTokenTest.php
  21. +0 −15 ...classes/guzzle/vendor/commerceguys/guzzle-oauth2-plugin/tests/GrantType/AuthorizationCodeTest.php
  22. +0 −36 ...rc/core/classes/guzzle/vendor/commerceguys/guzzle-oauth2-plugin/tests/GrantType/JwtBearerTest.php
  23. +0 −27 ...asses/guzzle/vendor/commerceguys/guzzle-oauth2-plugin/tests/GrantType/PasswordCredentialsTest.php
  24. +0 −16 ...core/classes/guzzle/vendor/commerceguys/guzzle-oauth2-plugin/tests/GrantType/RefreshTokenTest.php
  25. +0 −173 core/src/core/classes/guzzle/vendor/commerceguys/guzzle-oauth2-plugin/tests/MockOAuth2Server.php
  26. +0 −140 core/src/core/classes/guzzle/vendor/commerceguys/guzzle-oauth2-plugin/tests/OAuth2SubscriberTest.php
  27. +0 −22 core/src/core/classes/guzzle/vendor/commerceguys/guzzle-oauth2-plugin/tests/TestBase.php
  28. +0 −7 core/src/core/classes/guzzle/vendor/commerceguys/guzzle-oauth2-plugin/tests/bootstrap.php
  29. +0 −28 core/src/core/classes/guzzle/vendor/commerceguys/guzzle-oauth2-plugin/tests/private.key
  30. +0 −102 core/src/core/classes/guzzle/vendor/composer/autoload_static.php
  31. +0 −3 core/src/core/classes/guzzle/vendor/firebase/php-jwt/.gitignore
  32. +0 −13 core/src/core/classes/guzzle/vendor/firebase/php-jwt/.travis.yml
  33. +0 −338 core/src/core/classes/guzzle/vendor/firebase/php-jwt/Authentication/JWT.php
  34. +0 −6 core/src/core/classes/guzzle/vendor/firebase/php-jwt/Exceptions/BeforeValidException.php
  35. +0 −6 core/src/core/classes/guzzle/vendor/firebase/php-jwt/Exceptions/ExpiredException.php
  36. +0 −6 core/src/core/classes/guzzle/vendor/firebase/php-jwt/Exceptions/SignatureInvalidException.php
  37. +0 −30 core/src/core/classes/guzzle/vendor/firebase/php-jwt/LICENSE
  38. +0 −101 core/src/core/classes/guzzle/vendor/firebase/php-jwt/README.md
  39. +0 −25 core/src/core/classes/guzzle/vendor/firebase/php-jwt/composer.json
  40. +0 −19 core/src/core/classes/guzzle/vendor/firebase/php-jwt/composer.lock
  41. BIN core/src/core/classes/guzzle/vendor/firebase/php-jwt/composer.phar
  42. +0 −77 core/src/core/classes/guzzle/vendor/firebase/php-jwt/package.xml
  43. +0 −19 core/src/core/classes/guzzle/vendor/firebase/php-jwt/phpunit.xml.dist
  44. +0 −38 core/src/core/classes/guzzle/vendor/firebase/php-jwt/run-tests.sh
  45. +0 −237 core/src/core/classes/guzzle/vendor/firebase/php-jwt/tests/JWTTest.php
  46. +0 −17 core/src/core/classes/guzzle/vendor/firebase/php-jwt/tests/autoload.php.dist
  47. +0 −7 core/src/core/classes/guzzle/vendor/firebase/php-jwt/tests/bootstrap.php
  48. +0 −14 core/src/core/classes/guzzle/vendor/gimler/guzzle-description-loader/tests/bootstrap.php
  49. +0 −24 core/src/core/classes/guzzle/vendor/gimler/guzzle-description-loader/tests/fixtures/description.json
  50. +0 −57 core/src/core/classes/guzzle/vendor/gimler/guzzle-description-loader/tests/fixtures/description.php
  51. +0 −35 core/src/core/classes/guzzle/vendor/gimler/guzzle-description-loader/tests/fixtures/description.yml
  52. +0 −58 ...ore/classes/guzzle/vendor/gimler/guzzle-description-loader/tests/fixtures/description_import.json
  53. +0 −40 ...core/classes/guzzle/vendor/gimler/guzzle-description-loader/tests/fixtures/description_import.php
  54. +0 −23 ...core/classes/guzzle/vendor/gimler/guzzle-description-loader/tests/fixtures/description_import.yml
  55. +0 −25 ...sses/guzzle/vendor/gimler/guzzle-description-loader/tests/fixtures/description_import_import.json
  56. +0 −22 ...asses/guzzle/vendor/gimler/guzzle-description-loader/tests/fixtures/description_import_import.php
  57. +0 −10 ...asses/guzzle/vendor/gimler/guzzle-description-loader/tests/fixtures/description_import_import.yml
  58. +0 −24 core/src/core/classes/guzzle/vendor/gimler/guzzle-description-loader/tests/fixtures/invalid.json
  59. +0 −57 core/src/core/classes/guzzle/vendor/gimler/guzzle-description-loader/tests/fixtures/invalid.php
  60. +0 −2 core/src/core/classes/guzzle/vendor/gimler/guzzle-description-loader/tests/fixtures/invalid.yml
  61. +0 −57 core/src/core/classes/guzzle/vendor/gimler/guzzle-description-loader/tests/suite/JsonLoaderTest.php
  62. +0 −45 core/src/core/classes/guzzle/vendor/gimler/guzzle-description-loader/tests/suite/PhpLoaderTest.php
  63. +0 −57 core/src/core/classes/guzzle/vendor/gimler/guzzle-description-loader/tests/suite/YamlLoaderTest.php
  64. +0 −55 core/src/core/classes/guzzle/vendor/react/promise/src/CancellationQueue.php
  65. +0 −7 core/src/core/classes/guzzle/vendor/react/promise/src/Exception/LengthException.php
  66. +0 −98 core/src/core/classes/guzzle/vendor/react/promise/tests/CancellationQueueTest.php
  67. +0 −42 core/src/core/classes/guzzle/vendor/react/promise/tests/DeferredTest.php
  68. +0 −50 core/src/core/classes/guzzle/vendor/react/promise/tests/FulfilledPromiseTest.php
  69. +0 −97 core/src/core/classes/guzzle/vendor/react/promise/tests/FunctionAllTest.php
  70. +0 −196 core/src/core/classes/guzzle/vendor/react/promise/tests/FunctionAnyTest.php
  71. +0 −118 core/src/core/classes/guzzle/vendor/react/promise/tests/FunctionCheckTypehintTest.php
  72. +0 −173 core/src/core/classes/guzzle/vendor/react/promise/tests/FunctionMapTest.php
  73. +0 −201 core/src/core/classes/guzzle/vendor/react/promise/tests/FunctionRaceTest.php
  74. +0 −341 core/src/core/classes/guzzle/vendor/react/promise/tests/FunctionReduceTest.php
  75. +0 −64 core/src/core/classes/guzzle/vendor/react/promise/tests/FunctionRejectTest.php
  76. +0 −169 core/src/core/classes/guzzle/vendor/react/promise/tests/FunctionResolveTest.php
  77. +0 −248 core/src/core/classes/guzzle/vendor/react/promise/tests/FunctionSomeTest.php
  78. +0 −107 core/src/core/classes/guzzle/vendor/react/promise/tests/LazyPromiseTest.php
  79. +0 −40 core/src/core/classes/guzzle/vendor/react/promise/tests/PromiseAdapter/CallbackPromiseAdapter.php
  80. +0 −14 core/src/core/classes/guzzle/vendor/react/promise/tests/PromiseAdapter/PromiseAdapterInterface.php
  81. +0 −84 core/src/core/classes/guzzle/vendor/react/promise/tests/PromiseTest.php
  82. +0 −231 core/src/core/classes/guzzle/vendor/react/promise/tests/PromiseTest/CancelTestTrait.php
  83. +0 −15 core/src/core/classes/guzzle/vendor/react/promise/tests/PromiseTest/FullTestTrait.php
  84. +0 −336 core/src/core/classes/guzzle/vendor/react/promise/tests/PromiseTest/NotifyTestTrait.php
  85. +0 −351 core/src/core/classes/guzzle/vendor/react/promise/tests/PromiseTest/PromiseFulfilledTestTrait.php
  86. +0 −68 core/src/core/classes/guzzle/vendor/react/promise/tests/PromiseTest/PromisePendingTestTrait.php
  87. +0 −512 core/src/core/classes/guzzle/vendor/react/promise/tests/PromiseTest/PromiseRejectedTestTrait.php
  88. +0 −86 core/src/core/classes/guzzle/vendor/react/promise/tests/PromiseTest/PromiseSettledTestTrait.php
  89. +0 −368 core/src/core/classes/guzzle/vendor/react/promise/tests/PromiseTest/RejectTestTrait.php
  90. +0 −263 core/src/core/classes/guzzle/vendor/react/promise/tests/PromiseTest/ResolveTestTrait.php
  91. +0 −50 core/src/core/classes/guzzle/vendor/react/promise/tests/RejectedPromiseTest.php
  92. +0 −10 core/src/core/classes/guzzle/vendor/react/promise/tests/Stub/CallableStub.php
  93. +0 −41 core/src/core/classes/guzzle/vendor/react/promise/tests/TestCase.php
  94. +0 −7 core/src/core/classes/guzzle/vendor/react/promise/tests/bootstrap.php
  95. +0 −21 core/src/core/classes/guzzle/vendor/react/promise/tests/fixtures/SimpleFulfilledTestPromise.php
  96. +0 −21 core/src/core/classes/guzzle/vendor/react/promise/tests/fixtures/SimpleFulfilledTestThenable.php
  97. +0 −21 core/src/core/classes/guzzle/vendor/react/promise/tests/fixtures/SimpleRejectedTestPromise.php
  98. +0 −13 core/src/core/classes/guzzle/vendor/react/promise/tests/fixtures/SimpleTestCancellable.php
  99. +0 −18 core/src/core/classes/guzzle/vendor/react/promise/tests/fixtures/SimpleTestCancellableThenable.php
  100. +0 −27 .../core/classes/guzzle/vendor/symfony/config/Tests/Definition/Builder/BooleanNodeDefinitionTest.php
  101. BIN core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/Fixtures/arrow.gif
  102. +0 −14 core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/Fixtures/multiple_lines_as_literal_block.yml
  103. +10 −1 core/src/core/{tests/test.PHP_INTL.php → src/pydio/Tests/PHP_INTL.php}
Oops, something went wrong.
@@ -1,4 +0,0 @@
-/bin/
-/build/
-/vendor/
-phpunit.xml
@@ -1,2 +0,0 @@
-tools:
- external_code_coverage: true
@@ -1,27 +0,0 @@
-language: php
-
-sudo: false
-
-php:
- - 5.6
- - 5.5
- - 5.4
- - 7.0
- - hhvm
-
-cache:
- directories:
- - $HOME/.composer/cache
-
-install:
- - composer install --prefer-dist --no-interaction
-
-before_script:
- - mkdir -p build/logs
-
-script:
- - ./bin/phpunit --verbose --coverage-clover build/logs/clover.xml
-
-after_script:
- - wget https://scrutinizer-ci.com/ocular.phar -t 3
- - php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml
@@ -1,20 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2013 Bojan Zivanovic
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
@@ -1,67 +0,0 @@
-guzzle-oauth2-plugin
-====================
-
-Provides an OAuth2 plugin (subscriber) for [Guzzle](http://guzzlephp.org/).
-
-[![Build Status](https://travis-ci.org/commerceguys/guzzle-oauth2-plugin.svg)](https://travis-ci.org/commerceguys/guzzle-oauth2-plugin)
-[![Code Coverage](https://scrutinizer-ci.com/g/commerceguys/guzzle-oauth2-plugin/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/commerceguys/guzzle-oauth2-plugin/?branch=master)
-
-Version 2.x (on the `master` branch) is intended for Guzzle 5:
-```json
- "commerceguys/guzzle-oauth2-plugin": "~2.0"
-```
-
-Guzzle 3 compatibility continues in the [`1.0`](https://github.com/commerceguys/guzzle-oauth2-plugin/tree/1.0) branch:
-```json
- "commerceguys/guzzle-oauth2-plugin": "~1.0"
-```
-
-## Features
-
-- Acquires access tokens via one of the supported grant types (code, client credentials,
- user credentials, refresh token). Or you can set an access token yourself.
-- Supports refresh tokens (stores them and uses them to get new access tokens).
-- Handles token expiration (acquires new tokens and retries failed requests).
-
-## Running the tests
-
-First make sure you have all the dependencies in place by running `composer install --prefer-dist`, then simply run `./bin/phpunit`.
-
-## Example
-```php
-use GuzzleHttp\Client;
-use CommerceGuys\Guzzle\Oauth2\GrantType\RefreshToken;
-use CommerceGuys\Guzzle\Oauth2\GrantType\PasswordCredentials;
-use CommerceGuys\Guzzle\Oauth2\Oauth2Subscriber;
-
-$base_url = 'https://example.com';
-
-$oauth2Client = new Client(['base_url' => $base_url]);
-
-$config = [
- 'username' => 'test@example.com',
- 'password' => 'test password',
- 'client_id' => 'test-client',
- 'scope' => 'administration',
-];
-
-$token = new PasswordCredentials($oauth2Client, $config);
-$refreshToken = new RefreshToken($oauth2Client, $config);
-
-$oauth2 = new Oauth2Subscriber($token, $refreshToken);
-
-$client = new Client([
- 'defaults' => [
- 'auth' => 'oauth2',
- 'subscribers' => [$oauth2],
- ],
-]);
-
-$response = $client->get('https://example.com/api/user/me');
-
-print_r($response->json());
-
-// Use $oauth2->getAccessToken(); and $oauth2->getRefreshToken() to get tokens
-// that can be persisted for subsequent requests.
-
-```
@@ -1,36 +0,0 @@
-{
- "name": "commerceguys/guzzle-oauth2-plugin",
- "description": "An OAuth2 plugin (subscriber) for Guzzle",
- "license": "MIT",
- "require": {
- "guzzlehttp/guzzle": "~5.0",
- "firebase/php-jwt": "~2.0"
- },
- "autoload": {
- "psr-4": {
- "CommerceGuys\\Guzzle\\Oauth2\\": "src"
- }
- },
- "require-dev": {
- "phpunit/phpunit": "~4.5"
- },
- "autoload-dev": {
- "psr-4": {
- "CommerceGuys\\Guzzle\\Oauth2\\Tests\\": "tests"
- }
- },
- "authors": [
- {
- "name": "Bojan Zivanovic"
- },
- {
- "name": "Damien Tournoud"
- },
- {
- "name": "Patrick Dawkins"
- }
- ],
- "config": {
- "bin-dir": "bin"
- }
-}
Oops, something went wrong.

0 comments on commit 7e8d7eb

Please sign in to comment.