Merge pull request #1036 from j0k3r/refactor-update-composer

Update composer

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 @@
         "friendsofsymfony/rest-bundle": "~1.4",
         "jms/serializer-bundle": "~0.13",
         "nelmio/api-doc-bundle": "~2.7",
-        "ezyang/htmlpurifier": "dev-master",
-        "mgargano/simplehtmldom": "dev-master",
-        "robmorgan/phinx": "*",
-        "tecnick.com/tcpdf": "dev-master",
-        "simplepie/simplepie": "dev-master",
+        "ezyang/htmlpurifier": "~4.6",
+        "mgargano/simplehtmldom": "~1.5",
+        "robmorgan/phinx": "~0.4",
+        "tecnick.com/tcpdf": "~6.2",
+        "simplepie/simplepie": "~1.3.1",
         "htmlawed/htmlawed": "dev-master",
         "wallabag/PHP-Flash-Messages": "dev-master",
         "wallabag/kriss_php5": "dev-master",
@@ -83,8 +83,8 @@
         "wallabag/Fivefilters_Libraries": "dev-master"
     },
     "require-dev": {
-        "sensio/generator-bundle": "~2.3",
-        "phpunit/phpunit": "~3.7"
+        "sensio/generator-bundle": "~2.5",
+        "phpunit/phpunit": "~4.4"
     },
     "scripts": {
         "post-root-package-install": [
@@ -114,9 +114,6 @@
         "symfony-assets-install": "relative",
         "incenteev-parameters": {
             "file": "app/config/parameters.yml"
-        },
-        "branch-alias": {
-            "dev-master": "2.6-dev"
         }
     },
     "autoload": {
@@ -124,5 +121,7 @@
     },
     "config": {
         "bin-dir": "bin"
-    }
-}
\ No newline at end of file
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true
+}