aboutsummaryrefslogtreecommitdiffhomepage
path: root/composer.json
diff options
context:
space:
mode:
authorPaulino Michelazzo <paulino@michelazzo.com.br>2016-10-18 22:48:23 +0200
committerPaulino Michelazzo <paulino@michelazzo.com.br>2016-10-18 22:48:23 +0200
commit99731f0bb1f6fd2815eeb9af504ce86df927657b (patch)
treeb080efc608d2bbd52b77a4a0067402007f50c5a8 /composer.json
parent3a3c6b866b52721431bed22426d9abfcd0d2dfe0 (diff)
parent7180aaed45dce62e40620a9e4b202526ebd6a3bb (diff)
downloadwallabag-99731f0bb1f6fd2815eeb9af504ce86df927657b.tar.gz
wallabag-99731f0bb1f6fd2815eeb9af504ce86df927657b.tar.zst
wallabag-99731f0bb1f6fd2815eeb9af504ce86df927657b.zip
Merge remote-tracking branch 'wallabag/master'
Diffstat (limited to 'composer.json')
-rw-r--r--composer.json21
1 files changed, 10 insertions, 11 deletions
diff --git a/composer.json b/composer.json
index c7830a14..79de337b 100644
--- a/composer.json
+++ b/composer.json
@@ -48,7 +48,6 @@
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/assetic-bundle": "~2.3",
52 "symfony/swiftmailer-bundle": "^2.3", 51 "symfony/swiftmailer-bundle": "^2.3",
53 "symfony/monolog-bundle": "^2.8", 52 "symfony/monolog-bundle": "^2.8",
54 "sensio/distribution-bundle": "^5.0", 53 "sensio/distribution-bundle": "^5.0",
@@ -64,12 +63,11 @@
64 "willdurand/hateoas-bundle": "~1.0", 63 "willdurand/hateoas-bundle": "~1.0",
65 "htmlawed/htmlawed": "~1.1.19", 64 "htmlawed/htmlawed": "~1.1.19",
66 "liip/theme-bundle": "~1.1", 65 "liip/theme-bundle": "~1.1",
67 "pagerfanta/pagerfanta": "~1.0.3",
68 "lexik/form-filter-bundle": "~5.0", 66 "lexik/form-filter-bundle": "~5.0",
69 "j0k3r/graby": "~1.0", 67 "j0k3r/graby": "~1.0",
70 "friendsofsymfony/user-bundle": "~2.0@dev", 68 "friendsofsymfony/user-bundle": "dev-master#e168ed64629d034cb9cbbffb9d4350f62ef04fab as 2.0.x-dev",
71 "friendsofsymfony/oauth-server-bundle": "^1.5", 69 "friendsofsymfony/oauth-server-bundle": "^1.5",
72 "stof/doctrine-extensions-bundle": "^1.2@dev", 70 "stof/doctrine-extensions-bundle": "^1.2",
73 "scheb/two-factor-bundle": "~2.0", 71 "scheb/two-factor-bundle": "~2.0",
74 "grandt/phpepub": "~4.0", 72 "grandt/phpepub": "~4.0",
75 "wallabag/php-mobi": "~1.0.0", 73 "wallabag/php-mobi": "~1.0.0",
@@ -81,24 +79,26 @@
81 "mnapoli/piwik-twig-extension": "^1.0", 79 "mnapoli/piwik-twig-extension": "^1.0",
82 "lexik/maintenance-bundle": "~2.1", 80 "lexik/maintenance-bundle": "~2.1",
83 "ocramius/proxy-manager": "1.*", 81 "ocramius/proxy-manager": "1.*",
84 "white-october/pagerfanta-bundle": "^1.0" 82 "white-october/pagerfanta-bundle": "^1.0",
83 "php-amqplib/rabbitmq-bundle": "^1.8",
84 "predis/predis": "^1.0",
85 "javibravo/simpleue": "^1.0"
85 }, 86 },
86 "require-dev": { 87 "require-dev": {
87 "doctrine/doctrine-fixtures-bundle": "~2.2", 88 "doctrine/doctrine-fixtures-bundle": "~2.2",
88 "doctrine/data-fixtures": "~1.1.1", 89 "doctrine/data-fixtures": "~1.1.1",
89 "sensio/generator-bundle": "^3.0", 90 "sensio/generator-bundle": "^3.0",
90 "phpunit/phpunit": "~4.4", 91 "phpunit/phpunit": "~5.0",
91 "symfony/phpunit-bridge": "^3.0", 92 "symfony/phpunit-bridge": "^3.0",
92 "friendsofphp/php-cs-fixer": "~1.9" 93 "friendsofphp/php-cs-fixer": "~1.9",
94 "m6web/redis-mock": "^2.0"
93 }, 95 },
94 "scripts": { 96 "scripts": {
95 "post-cmd": [ 97 "post-cmd": [
96 "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters", 98 "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters",
97 "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap", 99 "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
98 "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache", 100 "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
99 "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets", 101 "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile"
100 "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile",
101 "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::prepareDeploymentTarget"
102 ], 102 ],
103 "post-install-cmd": [ 103 "post-install-cmd": [
104 "@post-cmd" 104 "@post-cmd"
@@ -113,7 +113,6 @@
113 "symfony-var-dir": "var", 113 "symfony-var-dir": "var",
114 "symfony-web-dir": "web", 114 "symfony-web-dir": "web",
115 "symfony-tests-dir": "tests", 115 "symfony-tests-dir": "tests",
116 "symfony-assets-install": "relative",
117 "incenteev-parameters": { 116 "incenteev-parameters": {
118 "file": "app/config/parameters.yml" 117 "file": "app/config/parameters.yml"
119 } 118 }