diff --git a/README.md b/README.md index 81e156f6..0bd6ef86 100644 --- a/README.md +++ b/README.md @@ -126,6 +126,8 @@ The api doc on the other hand is dynamically created from the php annotations in Those are served from [localhost:3141/api/doc](http://localhost:3141/api/doc). ## Changes +### 1.0.2 <2018-03-28> + - Fix login via GitHub (#172) ### 1.0.1 <2018-03-27> - Breaking change: Change method of listing scinames API to POST - Update biom-format to 2.1.6 diff --git a/app/config/version.yml b/app/config/version.yml index 7707d809..6215505e 100755 --- a/app/config/version.yml +++ b/app/config/version.yml @@ -1,2 +1,2 @@ parameters: - application_version: 1.0.1 + application_version: 1.0.2 diff --git a/composer.json b/composer.json index d3de5c9d..036946de 100644 --- a/composer.json +++ b/composer.json @@ -31,6 +31,7 @@ "friendsofsymfony/jsrouting-bundle": "^2.1", "iimog/biom-conversion-server": "^1.0.5", "hwi/oauth-bundle": "^0.5.3", + "kriswallsmith/buzz": "^0.16.1", "doctrine/dbal": "^2.6", "doctrine/common": "2.7.1", "shivas/versioning-bundle": "^2.0", diff --git a/composer.lock b/composer.lock index e9a3c6ea..d65cf7f7 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "52698fe09077945261e04182c1b3d490", + "content-hash": "c52ab854a1f9d7eaf00570366a29d684", "packages": [ { "name": "composer/ca-bundle", @@ -1354,33 +1354,42 @@ "time": "2018-03-08T08:59:27+00:00" }, { - "name": "http-interop/http-factory", - "version": "0.3.0", + "name": "guzzlehttp/psr7", + "version": "1.4.2", "source": { "type": "git", - "url": "https://github.com/http-interop/http-factory.git", - "reference": "c2587cc0a6f74987fefb5b8074acfd32c69a4b0f" + "url": "https://github.com/guzzle/psr7.git", + "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/http-interop/http-factory/zipball/c2587cc0a6f74987fefb5b8074acfd32c69a4b0f", - "reference": "c2587cc0a6f74987fefb5b8074acfd32c69a4b0f", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/f5b8a8512e2b58b0071a7280e39f14f72e05d87c", + "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c", "shasum": "" }, "require": { - "php": ">=5.3.0", - "psr/http-message": "^1.0" + "php": ">=5.4.0", + "psr/http-message": "~1.0" + }, + "provide": { + "psr/http-message-implementation": "1.0" + }, + "require-dev": { + "phpunit/phpunit": "~4.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.4-dev" } }, "autoload": { "psr-4": { - "Interop\\Http\\Factory\\": "src/" - } + "GuzzleHttp\\Psr7\\": "src/" + }, + "files": [ + "src/functions_include.php" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1388,22 +1397,26 @@ ], "authors": [ { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + }, + { + "name": "Tobias Schultze", + "homepage": "https://github.com/Tobion" } ], - "description": "Common interface for HTTP message factories", + "description": "PSR-7 message implementation that also provides common utility methods", "keywords": [ - "factory", "http", "message", - "psr", - "psr-17", - "psr-7", "request", - "response" + "response", + "stream", + "uri", + "url" ], - "time": "2017-03-24T14:48:51+00:00" + "time": "2017-03-20T17:10:46+00:00" }, { "name": "hwi/oauth-bundle", @@ -1697,32 +1710,25 @@ }, { "name": "kriswallsmith/buzz", - "version": "v0.17.0", + "version": "v0.16.1", "source": { "type": "git", "url": "https://github.com/kriswallsmith/Buzz.git", - "reference": "0d9ae422aaceca78b832a2bbc6152a004f356702" + "reference": "4977b7d44dbef49cdc641f14be6512fdcfe32f12" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/kriswallsmith/Buzz/zipball/0d9ae422aaceca78b832a2bbc6152a004f356702", - "reference": "0d9ae422aaceca78b832a2bbc6152a004f356702", + "url": "https://api.github.com/repos/kriswallsmith/Buzz/zipball/4977b7d44dbef49cdc641f14be6512fdcfe32f12", + "reference": "4977b7d44dbef49cdc641f14be6512fdcfe32f12", "shasum": "" }, "require": { - "nyholm/psr7": "^0.3", - "php": "^7.1", - "php-http/httplug": "^1.1", - "psr/http-client": "^0.1", - "psr/http-message": "^1.0", - "symfony/options-resolver": "^3.4 || ^4.0" + "guzzlehttp/psr7": "^1.4", + "php": "^5.4 || ^7.0" }, "require-dev": { - "friendsofphp/php-cs-fixer": "^2.11", "php-http/client-integration-tests": "^0.6.2", - "phpunit/phpunit": "^6.5.7", - "psr/log": "^1.0", - "symfony/phpunit-bridge": "^4.0" + "symfony/phpunit-bridge": "^3.4 || ^4.0" }, "suggest": { "ext-curl": "*" @@ -1730,7 +1736,7 @@ "type": "library", "autoload": { "psr-4": { - "Buzz\\": "lib" + "Buzz\\": "lib/Buzz" } }, "notification-url": "https://packagist.org/downloads/", @@ -1742,11 +1748,6 @@ "name": "Kris Wallsmith", "email": "kris.wallsmith@gmail.com", "homepage": "http://kriswallsmith.net/" - }, - { - "name": "Tobias Nyholm", - "email": "tobias.nyholm@gmail.com", - "homepage": "http://tnyholm.se/" } ], "description": "Lightweight HTTP client", @@ -1755,7 +1756,7 @@ "curl", "http client" ], - "time": "2018-03-25T20:37:00+00:00" + "time": "2018-03-19T10:34:40+00:00" }, { "name": "monolog/monolog", @@ -1973,59 +1974,6 @@ ], "time": "2017-01-01T15:53:22+00:00" }, - { - "name": "nyholm/psr7", - "version": "0.3.0", - "source": { - "type": "git", - "url": "https://github.com/Nyholm/psr7.git", - "reference": "ec2c453decfc5f8ee5a8cf43694b8ca392503d32" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Nyholm/psr7/zipball/ec2c453decfc5f8ee5a8cf43694b8ca392503d32", - "reference": "ec2c453decfc5f8ee5a8cf43694b8ca392503d32", - "shasum": "" - }, - "require": { - "http-interop/http-factory": "^0.3", - "php": "^7.1", - "php-http/message-factory": "^1.0", - "psr/http-message": "^1.0" - }, - "provide": { - "psr/http-factory-implementation": "1.0", - "psr/http-message-implementation": "1.0" - }, - "require-dev": { - "http-interop/http-factory-tests": "dev-master", - "php-http/psr7-integration-tests": "dev-master", - "phpunit/phpunit": "^7.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Nyholm\\Psr7\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Tobias Nyholm", - "email": "tobias.nyholm@gmail.com" - } - ], - "description": "A fast PHP7 implementation of PSR-7", - "homepage": "http://tnyholm.se", - "keywords": [ - "psr-17", - "psr-7" - ], - "time": "2018-02-06T12:01:53+00:00" - }, { "name": "ocramius/package-versions", "version": "1.3.0", @@ -2261,162 +2209,6 @@ ], "time": "2017-09-27T21:40:39+00:00" }, - { - "name": "php-http/httplug", - "version": "v1.1.0", - "source": { - "type": "git", - "url": "https://github.com/php-http/httplug.git", - "reference": "1c6381726c18579c4ca2ef1ec1498fdae8bdf018" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-http/httplug/zipball/1c6381726c18579c4ca2ef1ec1498fdae8bdf018", - "reference": "1c6381726c18579c4ca2ef1ec1498fdae8bdf018", - "shasum": "" - }, - "require": { - "php": ">=5.4", - "php-http/promise": "^1.0", - "psr/http-message": "^1.0" - }, - "require-dev": { - "henrikbjorn/phpspec-code-coverage": "^1.0", - "phpspec/phpspec": "^2.4" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.1-dev" - } - }, - "autoload": { - "psr-4": { - "Http\\Client\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Eric GELOEN", - "email": "geloen.eric@gmail.com" - }, - { - "name": "Márk Sági-Kazár", - "email": "mark.sagikazar@gmail.com" - } - ], - "description": "HTTPlug, the HTTP client abstraction for PHP", - "homepage": "http://httplug.io", - "keywords": [ - "client", - "http" - ], - "time": "2016-08-31T08:30:17+00:00" - }, - { - "name": "php-http/message-factory", - "version": "v1.0.2", - "source": { - "type": "git", - "url": "https://github.com/php-http/message-factory.git", - "reference": "a478cb11f66a6ac48d8954216cfed9aa06a501a1" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-http/message-factory/zipball/a478cb11f66a6ac48d8954216cfed9aa06a501a1", - "reference": "a478cb11f66a6ac48d8954216cfed9aa06a501a1", - "shasum": "" - }, - "require": { - "php": ">=5.4", - "psr/http-message": "^1.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - } - }, - "autoload": { - "psr-4": { - "Http\\Message\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Márk Sági-Kazár", - "email": "mark.sagikazar@gmail.com" - } - ], - "description": "Factory interfaces for PSR-7 HTTP Message", - "homepage": "http://php-http.org", - "keywords": [ - "factory", - "http", - "message", - "stream", - "uri" - ], - "time": "2015-12-19T14:08:53+00:00" - }, - { - "name": "php-http/promise", - "version": "v1.0.0", - "source": { - "type": "git", - "url": "https://github.com/php-http/promise.git", - "reference": "dc494cdc9d7160b9a09bd5573272195242ce7980" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-http/promise/zipball/dc494cdc9d7160b9a09bd5573272195242ce7980", - "reference": "dc494cdc9d7160b9a09bd5573272195242ce7980", - "shasum": "" - }, - "require-dev": { - "henrikbjorn/phpspec-code-coverage": "^1.0", - "phpspec/phpspec": "^2.4" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.1-dev" - } - }, - "autoload": { - "psr-4": { - "Http\\Promise\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Márk Sági-Kazár", - "email": "mark.sagikazar@gmail.com" - }, - { - "name": "Joel Wurtz", - "email": "joel.wurtz@gmail.com" - } - ], - "description": "Promise used for asynchronous HTTP requests", - "homepage": "http://httplug.io", - "keywords": [ - "promise" - ], - "time": "2016-01-26T13:27:02+00:00" - }, { "name": "phpdocumentor/reflection-common", "version": "1.0.1", @@ -2664,55 +2456,6 @@ ], "time": "2017-02-14T16:28:37+00:00" }, - { - "name": "psr/http-client", - "version": "0.1.0", - "source": { - "type": "git", - "url": "https://github.com/php-fig/http-client.git", - "reference": "d4d3ec04b034120b0591ad9722a4c2be33a7dfec" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-client/zipball/d4d3ec04b034120b0591ad9722a4c2be33a7dfec", - "reference": "d4d3ec04b034120b0591ad9722a4c2be33a7dfec", - "shasum": "" - }, - "require": { - "php": "^7.0", - "psr/http-message": "^1.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "Psr\\Http\\Client\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" - } - ], - "description": "Common interface for HTTP clients", - "homepage": "https://github.com/php-fig/http-client", - "keywords": [ - "http", - "http-client", - "psr", - "psr-18" - ], - "time": "2018-02-03T12:55:20+00:00" - }, { "name": "psr/http-message", "version": "1.0.1", diff --git a/package.json b/package.json index 9935c469..3770c427 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,5 @@ { - "name": "fennec-web", - "version": "0.6.1", + "name": "fennec", "description": "Fennec", "directories": { "test": "test"