From 23634d5d842dabcf5d7475e2becb7e127824239e Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Wed, 1 Jun 2016 21:27:35 +0200 Subject: Jump to Symfony 3.1 --- composer.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'composer.json') diff --git a/composer.json b/composer.json index c4edd3c2..90f3fd1d 100644 --- a/composer.json +++ b/composer.json @@ -43,7 +43,7 @@ "ext-iconv": "*", "ext-tokenizer": "*", "ext-pdo": "*", - "symfony/symfony": "3.0.*", + "symfony/symfony": "3.1.*", "doctrine/orm": "^2.5", "doctrine/doctrine-bundle": "^1.6", "doctrine/doctrine-cache-bundle": "^1.2", @@ -87,7 +87,7 @@ "doctrine/doctrine-fixtures-bundle": "~2.2", "sensio/generator-bundle": "^3.0", "phpunit/phpunit": "~4.4", - "symfony/phpunit-bridge": "^2.7", + "symfony/phpunit-bridge": "^3.0", "friendsofphp/php-cs-fixer": "~1.9" }, "scripts": { @@ -121,6 +121,9 @@ "psr-4": { "Wallabag\\": "src/Wallabag/" }, "classmap": [ "app/AppKernel.php", "app/AppCache.php" ] }, + "autoload-dev": { + "psr-4": { "Tests\\": "tests/" } + }, "config": { "bin-dir": "bin" }, -- cgit v1.2.3 From 99451fe4b76051d61922a6beb7ee9e79cc6e7893 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Wed, 22 Jun 2016 23:15:09 +0200 Subject: Fix bad loading fixtures Since doctrine/data-fixtures 1.2.0 fixtures seems to be badly loaded. No time for investigate but reverting back to 1.1.* is fixing issues. --- composer.json | 1 + 1 file changed, 1 insertion(+) (limited to 'composer.json') diff --git a/composer.json b/composer.json index 90f3fd1d..f3bd7893 100644 --- a/composer.json +++ b/composer.json @@ -85,6 +85,7 @@ }, "require-dev": { "doctrine/doctrine-fixtures-bundle": "~2.2", + "doctrine/data-fixtures": "~1.1.1", "sensio/generator-bundle": "^3.0", "phpunit/phpunit": "~4.4", "symfony/phpunit-bridge": "^3.0", -- cgit v1.2.3