X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=composer.json;h=0b162c028e7c507c6891d2088db109b8082fd5a7;hb=73b774438395d0ed74d0fd863194d2ebfb68d9ce;hp=927b4230cef1f3419e52a758db16bef13b2eef7e;hpb=93fd4692f6eb753cae16358131c8049d84cfbb41;p=github%2Fwallabag%2Fwallabag.git

diff --git a/composer.json b/composer.json
index 927b4230..0b162c02 100644
--- a/composer.json
+++ b/composer.json
@@ -64,13 +64,18 @@
         "sensio/distribution-bundle": "~3.0.12",
         "sensio/framework-extra-bundle": "~3.0",
         "incenteev/composer-parameter-handler": "~2.0",
+        "nelmio/cors-bundle": "1.3.*@dev",
         "umpirsky/twig-gettext-extractor": "1.1.*",
-        "ezyang/htmlpurifier": "dev-master",
-        "mgargano/simplehtmldom": "dev-master",
-        "robmorgan/phinx": "*",
-        "tecnick.com/tcpdf": "dev-master",
-        "simplepie/simplepie": "dev-master",
+        "friendsofsymfony/rest-bundle": "~1.4",
+        "jms/serializer-bundle": "~0.13",
+        "nelmio/api-doc-bundle": "~2.7",
+        "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",
+        "liip/theme-bundle": "1.1.3",
         "wallabag/PHP-Flash-Messages": "dev-master",
         "wallabag/kriss_php5": "dev-master",
         "wallabag/pagination": "dev-master",
@@ -80,29 +85,24 @@
         "wallabag/Fivefilters_Libraries": "dev-master"
     },
     "require-dev": {
-        "sensio/generator-bundle": "~2.3",
-        "phpunit/phpunit": "~3.7"
+        "doctrine/doctrine-fixtures-bundle": "dev-master",
+        "sensio/generator-bundle": "~2.5",
+        "phpunit/phpunit": "~4.4"
     },
     "scripts": {
-        "post-root-package-install": [
-            "SymfonyStandard\\Composer::hookRootPackageInstall"
-        ],
         "post-install-cmd": [
             "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
-            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile",
-            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::removeSymfonyStandardFiles",
-            "bin/install"
+            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile"
         ],
         "post-update-cmd": [
             "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
-            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile",
-            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::removeSymfonyStandardFiles"
+            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile"
         ]
     },
     "extra": {
@@ -111,15 +111,14 @@
         "symfony-assets-install": "relative",
         "incenteev-parameters": {
             "file": "app/config/parameters.yml"
-        },
-        "branch-alias": {
-            "dev-master": "2.6-dev"
         }
     },
     "autoload": {
-        "psr-0": { "": "src/", "SymfonyStandard": "app/" }
+        "psr-0": { "": "src/" }
     },
     "config": {
         "bin-dir": "bin"
-    }
-}
\ No newline at end of file
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true
+}