diff options
author | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2017-01-27 09:34:32 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-27 09:34:32 +0100 |
commit | 6fb06904ecde15b1b07d0a2af945338b416cf0e2 (patch) | |
tree | e76f3e8142399316ec5660fab8c646b2c34b8336 /composer.json | |
parent | 05fa529bcfde01be5d320cb532900d72cf4b0830 (diff) | |
parent | 78295b99dd1721c613f1ce52e2debbe6f6db7753 (diff) | |
download | wallabag-6fb06904ecde15b1b07d0a2af945338b416cf0e2.tar.gz wallabag-6fb06904ecde15b1b07d0a2af945338b416cf0e2.tar.zst wallabag-6fb06904ecde15b1b07d0a2af945338b416cf0e2.zip |
Merge pull request #2416 from wallabag/2.2
wallabag 2.2.0
Diffstat (limited to 'composer.json')
-rw-r--r-- | composer.json | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/composer.json b/composer.json index 70f5fc99..767d9c82 100644 --- a/composer.json +++ b/composer.json | |||
@@ -43,13 +43,13 @@ | |||
43 | "ext-iconv": "*", | 43 | "ext-iconv": "*", |
44 | "ext-tokenizer": "*", | 44 | "ext-tokenizer": "*", |
45 | "ext-pdo": "*", | 45 | "ext-pdo": "*", |
46 | "symfony/symfony": "3.1.*", | 46 | "symfony/symfony": "3.2.*", |
47 | "doctrine/orm": "^2.5", | 47 | "doctrine/orm": "^2.5", |
48 | "doctrine/doctrine-bundle": "^1.6", | 48 | "doctrine/doctrine-bundle": "^1.6", |
49 | "doctrine/doctrine-cache-bundle": "^1.2", | 49 | "doctrine/doctrine-cache-bundle": "^1.2", |
50 | "twig/extensions": "~1.0", | 50 | "twig/extensions": "~1.0", |
51 | "symfony/swiftmailer-bundle": "^2.3", | 51 | "symfony/swiftmailer-bundle": "^2.3", |
52 | "symfony/monolog-bundle": "^2.8", | 52 | "symfony/monolog-bundle": "^3.0", |
53 | "sensio/distribution-bundle": "^5.0", | 53 | "sensio/distribution-bundle": "^5.0", |
54 | "sensio/framework-extra-bundle": "^3.0.2", | 54 | "sensio/framework-extra-bundle": "^3.0.2", |
55 | "incenteev/composer-parameter-handler": "^2.0", | 55 | "incenteev/composer-parameter-handler": "^2.0", |
@@ -58,37 +58,39 @@ | |||
58 | "jms/serializer-bundle": "~1.1", | 58 | "jms/serializer-bundle": "~1.1", |
59 | "nelmio/api-doc-bundle": "~2.7", | 59 | "nelmio/api-doc-bundle": "~2.7", |
60 | "mgargano/simplehtmldom": "~1.5", | 60 | "mgargano/simplehtmldom": "~1.5", |
61 | "tecnickcom/tcpdf": "~6.2", | 61 | "tecnickcom/tc-lib-pdf": "dev-master", |
62 | "simplepie/simplepie": "~1.3.1", | 62 | "simplepie/simplepie": "~1.3.1", |
63 | "willdurand/hateoas-bundle": "~1.0", | 63 | "willdurand/hateoas-bundle": "~1.0", |
64 | "htmlawed/htmlawed": "~1.1.19", | 64 | "htmlawed/htmlawed": "~1.1.19", |
65 | "liip/theme-bundle": "~1.1", | 65 | "liip/theme-bundle": "~1.1", |
66 | "lexik/form-filter-bundle": "~5.0", | 66 | "lexik/form-filter-bundle": "~5.0", |
67 | "j0k3r/graby": "~1.0", | 67 | "j0k3r/graby": "~1.0", |
68 | "friendsofsymfony/user-bundle": "dev-master#e168ed64629d034cb9cbbffb9d4350f62ef04fab as 2.0.x-dev", | 68 | "friendsofsymfony/user-bundle": "2.0.x-dev", |
69 | "friendsofsymfony/oauth-server-bundle": "^1.5", | 69 | "friendsofsymfony/oauth-server-bundle": "^1.5", |
70 | "stof/doctrine-extensions-bundle": "^1.2", | 70 | "stof/doctrine-extensions-bundle": "^1.2", |
71 | "scheb/two-factor-bundle": "~2.0", | 71 | "scheb/two-factor-bundle": "~2.0", |
72 | "grandt/phpepub": "~4.0", | 72 | "grandt/phpepub": "~4.0", |
73 | "wallabag/php-mobi": "~1.0.0", | 73 | "wallabag/php-mobi": "~1.0.0", |
74 | "kphoen/rulerz-bundle": "~0.10", | 74 | "kphoen/rulerz-bundle": "~0.10", |
75 | "kphoen/rulerz": "0.19.1", | ||
75 | "guzzlehttp/guzzle": "^5.3.1", | 76 | "guzzlehttp/guzzle": "^5.3.1", |
76 | "doctrine/doctrine-migrations-bundle": "^1.0", | 77 | "doctrine/doctrine-migrations-bundle": "^1.0", |
77 | "paragonie/random_compat": "~1.0", | 78 | "paragonie/random_compat": "~1.0", |
78 | "craue/config-bundle": "~1.4", | 79 | "craue/config-bundle": "~1.4", |
79 | "mnapoli/piwik-twig-extension": "^1.0", | 80 | "mnapoli/piwik-twig-extension": "^1.0", |
80 | "lexik/maintenance-bundle": "~2.1", | ||
81 | "ocramius/proxy-manager": "1.*", | 81 | "ocramius/proxy-manager": "1.*", |
82 | "white-october/pagerfanta-bundle": "^1.0", | 82 | "white-october/pagerfanta-bundle": "^1.0", |
83 | "php-amqplib/rabbitmq-bundle": "^1.8", | 83 | "php-amqplib/rabbitmq-bundle": "^1.8", |
84 | "predis/predis": "^1.0", | 84 | "predis/predis": "^1.0", |
85 | "javibravo/simpleue": "^1.0" | 85 | "javibravo/simpleue": "^1.0", |
86 | "symfony/dom-crawler": "^3.1", | ||
87 | "friendsofsymfony/jsrouting-bundle": "^1.6", | ||
88 | "bdunogier/guzzle-site-authenticator": "dev-master" | ||
86 | }, | 89 | }, |
87 | "require-dev": { | 90 | "require-dev": { |
88 | "doctrine/doctrine-fixtures-bundle": "~2.2", | 91 | "doctrine/doctrine-fixtures-bundle": "~2.2", |
89 | "doctrine/data-fixtures": "~1.1.1", | 92 | "doctrine/data-fixtures": "~1.1.1", |
90 | "sensio/generator-bundle": "^3.0", | 93 | "sensio/generator-bundle": "^3.0", |
91 | "phpunit/phpunit": "~4.0", | ||
92 | "symfony/phpunit-bridge": "^3.0", | 94 | "symfony/phpunit-bridge": "^3.0", |
93 | "friendsofphp/php-cs-fixer": "~1.9", | 95 | "friendsofphp/php-cs-fixer": "~1.9", |
94 | "m6web/redis-mock": "^2.0" | 96 | "m6web/redis-mock": "^2.0" |
@@ -98,6 +100,7 @@ | |||
98 | "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters", | 100 | "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters", |
99 | "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap", | 101 | "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap", |
100 | "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache", | 102 | "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache", |
103 | "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets", | ||
101 | "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile" | 104 | "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile" |
102 | ], | 105 | ], |
103 | "post-install-cmd": [ | 106 | "post-install-cmd": [ |
@@ -113,6 +116,7 @@ | |||
113 | "symfony-var-dir": "var", | 116 | "symfony-var-dir": "var", |
114 | "symfony-web-dir": "web", | 117 | "symfony-web-dir": "web", |
115 | "symfony-tests-dir": "tests", | 118 | "symfony-tests-dir": "tests", |
119 | "symfony-assets-install": "symlink", | ||
116 | "incenteev-parameters": { | 120 | "incenteev-parameters": { |
117 | "file": "app/config/parameters.yml" | 121 | "file": "app/config/parameters.yml" |
118 | } | 122 | } |