diff options
| author | Nicolas Lœuillet <nicolas@loeuillet.org> | 2015-06-08 16:35:02 +0200 |
|---|---|---|
| committer | Nicolas Lœuillet <nicolas@loeuillet.org> | 2015-06-08 16:35:02 +0200 |
| commit | ac9d58211e1c6676485ef15d023215e5a465f3a8 (patch) | |
| tree | 8b73ad50783cf8066ec4171367e2dd1e26026636 /composer.json | |
| parent | 82d6d9cb06a1486e2e3b05fa6ce857b3b8655180 (diff) | |
| parent | 3cf22a05416b9994aa458ea045d232264006e7cf (diff) | |
| download | wallabag-ac9d58211e1c6676485ef15d023215e5a465f3a8.tar.gz wallabag-ac9d58211e1c6676485ef15d023215e5a465f3a8.tar.zst wallabag-ac9d58211e1c6676485ef15d023215e5a465f3a8.zip | |
Merge branch 'v2' into v2-edit-title
Diffstat (limited to 'composer.json')
| -rw-r--r-- | composer.json | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/composer.json b/composer.json index 590e2629..5fe6eb02 100644 --- a/composer.json +++ b/composer.json | |||
| @@ -54,7 +54,7 @@ | |||
| 54 | ], | 54 | ], |
| 55 | "require": { | 55 | "require": { |
| 56 | "php": ">=5.3.3", | 56 | "php": ">=5.3.3", |
| 57 | "symfony/symfony": "2.6.*", | 57 | "symfony/symfony": "~2.7.0", |
| 58 | "doctrine/orm": "~2.2,>=2.2.3", | 58 | "doctrine/orm": "~2.2,>=2.2.3", |
| 59 | "doctrine/doctrine-bundle": "~1.2", | 59 | "doctrine/doctrine-bundle": "~1.2", |
| 60 | "twig/extensions": "~1.0", | 60 | "twig/extensions": "~1.0", |
| @@ -64,19 +64,18 @@ | |||
| 64 | "sensio/distribution-bundle": "~3.0.12", | 64 | "sensio/distribution-bundle": "~3.0.12", |
| 65 | "sensio/framework-extra-bundle": "~3.0", | 65 | "sensio/framework-extra-bundle": "~3.0", |
| 66 | "incenteev/composer-parameter-handler": "~2.0", | 66 | "incenteev/composer-parameter-handler": "~2.0", |
| 67 | "nelmio/cors-bundle": "1.3.*@dev", | 67 | "nelmio/cors-bundle": "~1.4.0", |
| 68 | "umpirsky/twig-gettext-extractor": "1.1.*", | 68 | "umpirsky/twig-gettext-extractor": "~1.1.5", |
| 69 | "friendsofsymfony/rest-bundle": "~1.4", | 69 | "friendsofsymfony/rest-bundle": "~1.4", |
| 70 | "jms/serializer-bundle": "~0.13", | 70 | "jms/serializer-bundle": "~0.13", |
| 71 | "nelmio/api-doc-bundle": "~2.7", | 71 | "nelmio/api-doc-bundle": "~2.7", |
| 72 | "ezyang/htmlpurifier": "~4.6", | 72 | "ezyang/htmlpurifier": "~4.6", |
| 73 | "mgargano/simplehtmldom": "~1.5", | 73 | "mgargano/simplehtmldom": "~1.5", |
| 74 | "robmorgan/phinx": "~0.4", | ||
| 75 | "tecnick.com/tcpdf": "~6.2", | 74 | "tecnick.com/tcpdf": "~6.2", |
| 76 | "simplepie/simplepie": "~1.3.1", | 75 | "simplepie/simplepie": "~1.3.1", |
| 77 | "willdurand/hateoas-bundle": "1.0.*@dev", | 76 | "willdurand/hateoas-bundle": "~0.5.0", |
| 78 | "htmlawed/htmlawed": "dev-master", | 77 | "htmlawed/htmlawed": "~1.1.19", |
| 79 | "liip/theme-bundle": "1.1.3", | 78 | "liip/theme-bundle": "~1.1.3", |
| 80 | "wallabag/PHP-Flash-Messages": "dev-master", | 79 | "wallabag/PHP-Flash-Messages": "dev-master", |
| 81 | "wallabag/kriss_php5": "dev-master", | 80 | "wallabag/kriss_php5": "dev-master", |
| 82 | "wallabag/pagination": "dev-master", | 81 | "wallabag/pagination": "dev-master", |
| @@ -84,10 +83,10 @@ | |||
| 84 | "wallabag/php-readability": "dev-master", | 83 | "wallabag/php-readability": "dev-master", |
| 85 | "wallabag/phpMobi": "dev-master", | 84 | "wallabag/phpMobi": "dev-master", |
| 86 | "wallabag/Fivefilters_Libraries": "dev-master", | 85 | "wallabag/Fivefilters_Libraries": "dev-master", |
| 87 | "pagerfanta/pagerfanta": "~1.0@dev" | 86 | "pagerfanta/pagerfanta": "~1.0.3" |
| 88 | }, | 87 | }, |
| 89 | "require-dev": { | 88 | "require-dev": { |
| 90 | "doctrine/doctrine-fixtures-bundle": "dev-master", | 89 | "doctrine/doctrine-fixtures-bundle": "~2.2.0", |
| 91 | "sensio/generator-bundle": "~2.5", | 90 | "sensio/generator-bundle": "~2.5", |
| 92 | "phpunit/phpunit": "~4.4" | 91 | "phpunit/phpunit": "~4.4" |
| 93 | }, | 92 | }, |