aboutsummaryrefslogtreecommitdiffhomepage
path: root/composer.json
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2015-01-31 21:49:44 +0100
committerNicolas LÅ“uillet <nicolas@loeuillet.org>2015-01-31 21:49:44 +0100
commit8394ab46191f717dc9c32fecfa6809f958951dca (patch)
tree21c6d831608699d746bdaae5c0b9d3e296cfc4ac /composer.json
parent4cfbd5d893aa51fd5d3b349c2695e9913591041f (diff)
parentdaacffefa64c57d0ec767e14477e06efd6c97510 (diff)
downloadwallabag-8394ab46191f717dc9c32fecfa6809f958951dca.tar.gz
wallabag-8394ab46191f717dc9c32fecfa6809f958951dca.tar.zst
wallabag-8394ab46191f717dc9c32fecfa6809f958951dca.zip
Merge pull request #1036 from j0k3r/refactor-update-composer
Update composer
Diffstat (limited to 'composer.json')
-rw-r--r--composer.json23
1 files changed, 11 insertions, 12 deletions
diff --git a/composer.json b/composer.json
index 77bccc2f..d83a497e 100644
--- a/composer.json
+++ b/composer.json
@@ -68,11 +68,11 @@
68 "friendsofsymfony/rest-bundle": "~1.4", 68 "friendsofsymfony/rest-bundle": "~1.4",
69 "jms/serializer-bundle": "~0.13", 69 "jms/serializer-bundle": "~0.13",
70 "nelmio/api-doc-bundle": "~2.7", 70 "nelmio/api-doc-bundle": "~2.7",
71 "ezyang/htmlpurifier": "dev-master", 71 "ezyang/htmlpurifier": "~4.6",
72 "mgargano/simplehtmldom": "dev-master", 72 "mgargano/simplehtmldom": "~1.5",
73 "robmorgan/phinx": "*", 73 "robmorgan/phinx": "~0.4",
74 "tecnick.com/tcpdf": "dev-master", 74 "tecnick.com/tcpdf": "~6.2",
75 "simplepie/simplepie": "dev-master", 75 "simplepie/simplepie": "~1.3.1",
76 "htmlawed/htmlawed": "dev-master", 76 "htmlawed/htmlawed": "dev-master",
77 "wallabag/PHP-Flash-Messages": "dev-master", 77 "wallabag/PHP-Flash-Messages": "dev-master",
78 "wallabag/kriss_php5": "dev-master", 78 "wallabag/kriss_php5": "dev-master",
@@ -83,8 +83,8 @@
83 "wallabag/Fivefilters_Libraries": "dev-master" 83 "wallabag/Fivefilters_Libraries": "dev-master"
84 }, 84 },
85 "require-dev": { 85 "require-dev": {
86 "sensio/generator-bundle": "~2.3", 86 "sensio/generator-bundle": "~2.5",
87 "phpunit/phpunit": "~3.7" 87 "phpunit/phpunit": "~4.4"
88 }, 88 },
89 "scripts": { 89 "scripts": {
90 "post-root-package-install": [ 90 "post-root-package-install": [
@@ -114,9 +114,6 @@
114 "symfony-assets-install": "relative", 114 "symfony-assets-install": "relative",
115 "incenteev-parameters": { 115 "incenteev-parameters": {
116 "file": "app/config/parameters.yml" 116 "file": "app/config/parameters.yml"
117 },
118 "branch-alias": {
119 "dev-master": "2.6-dev"
120 } 117 }
121 }, 118 },
122 "autoload": { 119 "autoload": {
@@ -124,5 +121,7 @@
124 }, 121 },
125 "config": { 122 "config": {
126 "bin-dir": "bin" 123 "bin-dir": "bin"
127 } 124 },
128} \ No newline at end of file 125 "minimum-stability": "dev",
126 "prefer-stable": true
127}