X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=composer.json;h=82fe61bd2d77be764ef0d6ef03ead0ffd3961a8a;hb=5e98404dfb701ca6653241496205f828952540db;hp=927b4230cef1f3419e52a758db16bef13b2eef7e;hpb=93fd4692f6eb753cae16358131c8049d84cfbb41;p=github%2Fwallabag%2Fwallabag.git diff --git a/composer.json b/composer.json index 927b4230..82fe61bd 100644 --- a/composer.json +++ b/composer.json @@ -16,46 +16,21 @@ "name": "Thomas Citharel", "homepage": "http://tcit.fr", "role": "Developer" + }, + { + "name": "Jérémy Benoist", + "homepage": "http://www.j0k3r.net", + "role": "Developer" } ], "support": { "email": "hello@wallabag.org", "issues": "https://github.com/wallabag/wallabag/issues" }, - "repositories": [ - { - "type": "vcs", - "url": "https://github.com/wallabag/PHP-Flash-Messages" - }, - { - "type": "vcs", - "url": "https://github.com/wallabag/kriss_php5" - }, - { - "type": "vcs", - "url": "https://github.com/wallabag/pagination" - }, - { - "type": "vcs", - "url": "https://github.com/wallabag/PHPePub" - }, - { - "type": "vcs", - "url": "https://github.com/wallabag/php-readability" - }, - { - "type": "vcs", - "url": "https://github.com/wallabag/phpMobi" - }, - { - "type": "vcs", - "url": "https://github.com/wallabag/Fivefilters_Libraries" - } - ], "require": { "php": ">=5.3.3", - "symfony/symfony": "2.6.*", - "doctrine/orm": "~2.2,>=2.2.3", + "symfony/symfony": "~2.7.0", + "doctrine/orm": "~2.3", "doctrine/doctrine-bundle": "~1.2", "twig/extensions": "~1.0", "symfony/assetic-bundle": "~2.3", @@ -64,45 +39,41 @@ "sensio/distribution-bundle": "~3.0.12", "sensio/framework-extra-bundle": "~3.0", "incenteev/composer-parameter-handler": "~2.0", - "umpirsky/twig-gettext-extractor": "1.1.*", - "ezyang/htmlpurifier": "dev-master", - "mgargano/simplehtmldom": "dev-master", - "robmorgan/phinx": "*", - "tecnick.com/tcpdf": "dev-master", - "simplepie/simplepie": "dev-master", - "htmlawed/htmlawed": "dev-master", - "wallabag/PHP-Flash-Messages": "dev-master", - "wallabag/kriss_php5": "dev-master", - "wallabag/pagination": "dev-master", - "wallabag/PHPePub": "dev-master", - "wallabag/php-readability": "dev-master", - "wallabag/phpMobi": "dev-master", - "wallabag/Fivefilters_Libraries": "dev-master" + "nelmio/cors-bundle": "~1.4.0", + "friendsofsymfony/rest-bundle": "~1.4", + "jms/serializer-bundle": "~0.13", + "nelmio/api-doc-bundle": "~2.7", + "ezyang/htmlpurifier": "~4.6", + "mgargano/simplehtmldom": "~1.5", + "tecnick.com/tcpdf": "~6.2", + "simplepie/simplepie": "~1.3.1", + "willdurand/hateoas-bundle": "~0.5.0", + "htmlawed/htmlawed": "~1.1.19", + "liip/theme-bundle": "~1.1.3", + "pagerfanta/pagerfanta": "~1.0.3", + "lexik/form-filter-bundle": "~4.0", + "j0k3r/graby": "~1.0", + "friendsofsymfony/user-bundle": "dev-master" }, "require-dev": { - "sensio/generator-bundle": "~2.3", - "phpunit/phpunit": "~3.7" + "doctrine/doctrine-fixtures-bundle": "~2.2.0", + "sensio/generator-bundle": "~2.5", + "phpunit/phpunit": "~4.4" }, "scripts": { - "post-root-package-install": [ - "SymfonyStandard\\Composer::hookRootPackageInstall" - ], "post-install-cmd": [ "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters", "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap", "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache", "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets", - "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile", - "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::removeSymfonyStandardFiles", - "bin/install" + "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile" ], "post-update-cmd": [ "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters", "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap", "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache", "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets", - "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile", - "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::removeSymfonyStandardFiles" + "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile" ] }, "extra": { @@ -111,15 +82,14 @@ "symfony-assets-install": "relative", "incenteev-parameters": { "file": "app/config/parameters.yml" - }, - "branch-alias": { - "dev-master": "2.6-dev" } }, "autoload": { - "psr-0": { "": "src/", "SymfonyStandard": "app/" } + "psr-0": { "": "src/" } }, "config": { "bin-dir": "bin" - } -} \ No newline at end of file + }, + "minimum-stability": "dev", + "prefer-stable": true +}