From c3b7ca599ffe35f084c41b9fb1c9c6d9a099516c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Wed, 4 Apr 2018 17:28:04 +0200 Subject: [PATCH] connect branch to upgrade-sf3 other repositories --- composer.json | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index 07bd7fb3b..133b9a4f4 100644 --- a/composer.json +++ b/composer.json @@ -26,21 +26,20 @@ "symfony/yaml": "~2.7", "symfony/symfony": "~2.8", "doctrine/dbal": "~2.5", - "doctrine/orm": "~2.4", + "doctrine/orm": "~2.5", "doctrine/common": "~2.4", "doctrine/doctrine-bundle": "~1.2", - "chill-project/main": "dev-master", - "chill-project/custom-fields": "dev-master@dev", + "chill-project/main": "dev-upgrade-sf3", + "chill-project/custom-fields": "dev-upgrade-sf3@dev", "doctrine/doctrine-fixtures-bundle": "~2.2", "champs-libres/composer-bundle-migration": "~1.0", "doctrine/doctrine-migrations-bundle": "~1.1", - "doctrine/migrations": "~1.0", - "phpoffice/phpspreadsheet": "dev-develop#9e835676a6a2df9f7e445a28d4d89f6bd296a7c5@dev" + "doctrine/migrations": "~1.0" }, "require-dev": { - "symfony/phpunit-bridge": "^2.7", + "symfony/phpunit-bridge": "~2.7", "fzaninotto/faker": "~1", - "phpunit/phpunit": "~5.0" + "phpunit/phpunit": "~5.6" }, "scripts": { "post-install-cmd": [