X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=composer.json;h=497b80121dbee95bfdca9ee352b7adc91b785a52;hb=eb79e1cc102c1d9020335440194c64ed6691e57d;hp=b9591aa329d4f570efd00a1324a298c8b5f35fe7;hpb=5c895a7fd15822856fb407910264c5d95e1e223c;p=github%2Fwallabag%2Fwallabag.git diff --git a/composer.json b/composer.json index b9591aa3..497b8012 100644 --- a/composer.json +++ b/composer.json @@ -28,8 +28,8 @@ "issues": "https://github.com/wallabag/wallabag/issues" }, "require": { - "php": ">=5.5.0", - "symfony/symfony": "~2.8", + "php": ">=5.5.9", + "symfony/symfony": "3.0.*", "doctrine/orm": "^2.5", "doctrine/doctrine-bundle": "^1.6", "doctrine/doctrine-cache-bundle": "^1.2", @@ -52,23 +52,25 @@ "htmlawed/htmlawed": "~1.1.19", "liip/theme-bundle": "~1.1", "pagerfanta/pagerfanta": "~1.0.3", - "lexik/form-filter-bundle": "~4.0", + "lexik/form-filter-bundle": "~5.0", "j0k3r/graby": "~1.0", - "friendsofsymfony/user-bundle": "dev-master", - "friendsofsymfony/oauth-server-bundle": "^1.4@dev", + "friendsofsymfony/user-bundle": "~2.0@dev", + "friendsofsymfony/oauth-server-bundle": "^1.5", "stof/doctrine-extensions-bundle": "^1.2@dev", - "scheb/two-factor-bundle": "~1.4.0", + "scheb/two-factor-bundle": "~2.0", "grandt/phpepub": "~4.0", "wallabag/php-mobi": "~1.0.0", "kphoen/rulerz-bundle": "~0.10", "guzzlehttp/guzzle": "^5.2.0", - "doctrine/doctrine-migrations-bundle": "^1.0" + "doctrine/doctrine-migrations-bundle": "^1.0", + "paragonie/random_compat": "~1.0", + "craue/config-bundle": "~1.4" }, "require-dev": { "doctrine/doctrine-fixtures-bundle": "~2.2", - "sensio/generator-bundle": "~3.0", + "sensio/generator-bundle": "^3.0", "phpunit/phpunit": "~4.4", - "symfony/phpunit-bridge": "~2.7" + "symfony/phpunit-bridge": "^2.7" }, "scripts": { "build-parameters": [ @@ -91,7 +93,10 @@ }, "extra": { "symfony-app-dir": "app", + "symfony-bin-dir": "bin", + "symfony-var-dir": "var", "symfony-web-dir": "web", + "symfony-tests-dir": "tests", "symfony-assets-install": "relative", "incenteev-parameters": { "file": "app/config/parameters.yml", @@ -104,7 +109,7 @@ } }, "autoload": { - "psr-0": { "": "src/" }, + "psr-4": { "": "src/" }, "classmap": [ "app/AppKernel.php", "app/AppCache.php" ] }, "config": {