diff --git a/composer.json b/composer.json index d5eddadb77..8fdcd55e4a 100644 --- a/composer.json +++ b/composer.json @@ -39,6 +39,7 @@ "alchemy/google-plus-api-client": "~0.6.2", "alchemy/oauth2php": "1.0.0", "alchemy/phlickr": "0.2.9", + "alchemy/rest-bundle": "master@dev", "alchemy/task-manager": "2.0.x-dev@dev", "alchemy/zippy": "0.2.x-dev@dev", "beberlei/assert": "^2.3", @@ -78,7 +79,7 @@ "phpexiftool/phpexiftool": "dev-0.4.1-mwg-metadata-copy as 0.4.1", "ramsey/uuid": "^3.0", "roave/security-advisories": "dev-master", - "silex/silex": "~1.2", + "silex/silex": "^1.3.0", "silex/web-profiler": "~1.0", "simple-bus/message-bus": "^2.1", "simple-bus/serialization": "^2.0", @@ -89,7 +90,7 @@ "twig/extensions": "dev-improved-i18n", "twig/twig": "~1.14, >=1.14.2", "vierbergenlars/php-semver": "~2.1", - "willdurand/negotiation": "~1.3", + "willdurand/negotiation": "^2.0.0-alpha1", "zend/gdata": "~1.12.1" }, "require-dev": { diff --git a/composer.lock b/composer.lock index a93c4f6c45..1a05490f5f 100644 --- a/composer.lock +++ b/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": "3580bd1a47f7160cdfdef3a85ea8988c", - "content-hash": "3f1082f75c156723b27060f2156e617a", + "hash": "0d009e4f04af2e11c229217285f99c31", + "content-hash": "27269c3a6c84d09c7af04e640fa2188c", "packages": [ { "name": "alchemy-fr/tcpdf-clone", @@ -294,6 +294,57 @@ "notification-url": "https://packagist.org/downloads/", "time": "2014-12-15 14:27:57" }, + { + "name": "alchemy/rest-bundle", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/alchemy-fr/rest-bundle.git", + "reference": "7b1c88c02ab8c0d4e997fd61c13c8fd4c3ce5216" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/alchemy-fr/rest-bundle/zipball/7b1c88c02ab8c0d4e997fd61c13c8fd4c3ce5216", + "reference": "7b1c88c02ab8c0d4e997fd61c13c8fd4c3ce5216", + "shasum": "" + }, + "require": { + "league/fractal": "^0.12.0", + "willdurand/negotiation": "~2.0@dev" + }, + "require-dev": { + "pagerfanta/pagerfanta": "^1.0.3", + "phpunit/phpunit": "^4.7", + "silex/silex": "^1.0.0", + "squizlabs/php_codesniffer": "^2.3", + "symfony/symfony": "~2.6" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Alchemy\\Rest\\": "src/Component", + "Alchemy\\RestBundle\\": "src/Bundle", + "Alchemy\\RestProvider\\": "src/Provider" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Thibaud Fabre", + "email": "thibaud@aztech.io" + } + ], + "description": "Simple REST utility bundle", + "time": "2015-09-22 06:58:52" + }, { "name": "alchemy/task-manager", "version": "dev-master", @@ -2896,6 +2947,69 @@ ], "time": "2015-07-13 05:06:53" }, + { + "name": "league/fractal", + "version": "0.12.0", + "source": { + "type": "git", + "url": "https://github.com/thephpleague/fractal.git", + "reference": "0a51dcb6398dc2377d086210d0624996a1df8322" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/thephpleague/fractal/zipball/0a51dcb6398dc2377d086210d0624996a1df8322", + "reference": "0a51dcb6398dc2377d086210d0624996a1df8322", + "shasum": "" + }, + "require": { + "php": ">=5.4" + }, + "require-dev": { + "illuminate/contracts": "~5.0", + "mockery/mockery": "~0.9", + "pagerfanta/pagerfanta": "~1.0.0", + "phpunit/phpunit": "~4.0", + "squizlabs/php_codesniffer": "~1.5", + "zendframework/zend-paginator": "~2.3" + }, + "suggest": { + "illuminate/pagination": "The Illuminate Pagination component.", + "pagerfanta/pagerfanta": "Pagerfanta Paginator", + "zendframework/zend-paginator": "Zend Framework Paginator" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "0.13-dev" + } + }, + "autoload": { + "psr-4": { + "League\\Fractal\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Phil Sturgeon", + "email": "me@philsturgeon.uk", + "homepage": "http://philsturgeon.uk/", + "role": "Developer" + } + ], + "description": "Handle the output of complex data structures ready for API output.", + "homepage": "http://fractal.thephpleague.com/", + "keywords": [ + "api", + "json", + "league", + "rest" + ], + "time": "2015-03-19 15:16:43" + }, { "name": "media-alchemyst/media-alchemyst", "version": "0.4.8", @@ -4791,30 +4905,30 @@ }, { "name": "willdurand/negotiation", - "version": "1.3.4", + "version": "v2.0.1", "source": { "type": "git", "url": "https://github.com/willdurand/Negotiation.git", - "reference": "d7fa4ce4a0436915b9ba9f7cb5ff37719f0a834c" + "reference": "a99d19330bfaa050fd09c3b8a10fc8ac258b9a55" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/willdurand/Negotiation/zipball/d7fa4ce4a0436915b9ba9f7cb5ff37719f0a834c", - "reference": "d7fa4ce4a0436915b9ba9f7cb5ff37719f0a834c", + "url": "https://api.github.com/repos/willdurand/Negotiation/zipball/a99d19330bfaa050fd09c3b8a10fc8ac258b9a55", + "reference": "a99d19330bfaa050fd09c3b8a10fc8ac258b9a55", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": ">=5.4.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.3-dev" + "dev-master": "2.0-dev" } }, "autoload": { - "psr-0": { - "Negotiation": "src/" + "psr-4": { + "Negotiation\\": "src/Negotiation" } }, "notification-url": "https://packagist.org/downloads/", @@ -4824,7 +4938,7 @@ "authors": [ { "name": "William Durand", - "email": "william.durand1@gmail.com" + "email": "will+git@drnd.me" } ], "description": "Content Negotiation tools for PHP provided as a standalone library.", @@ -4836,7 +4950,7 @@ "header", "negotiation" ], - "time": "2014-10-02 07:26:00" + "time": "2015-10-02 12:52:52" }, { "name": "zend/gdata", @@ -5851,6 +5965,7 @@ ], "minimum-stability": "stable", "stability-flags": { + "alchemy/rest-bundle": 20, "alchemy/task-manager": 20, "alchemy/zippy": 20, "doctrine/migrations": 20, @@ -5860,7 +5975,8 @@ "neutron/process-manager": 20, "phpexiftool/phpexiftool": 20, "roave/security-advisories": 20, - "twig/extensions": 20 + "twig/extensions": 20, + "willdurand/negotiation": 15 }, "prefer-stable": false, "prefer-lowest": false,