From 75386b717a79f068c27d9b725d86d86635dde4ce Mon Sep 17 00:00:00 2001
From: Nicolas Raidelet <nicolas.raidelet@irstea.fr>
Date: Thu, 20 Jul 2017 15:50:33 +0200
Subject: [PATCH] =?UTF-8?q?Ebauche=20de=20mont=C3=A9e=20de=20version=20ver?=
=?UTF-8?q?s=20symfony3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
composer.json | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/composer.json b/composer.json
index 4581eda1..779bbf55 100644
--- a/composer.json
+++ b/composer.json
@@ -22,13 +22,13 @@
],
"require": {
"php": ">=5.4",
- "symfony/symfony": "~2.6",
+ "symfony/symfony": "~2.8|~3.0",
"doctrine/orm": "~2.2,>=2.2.3",
"doctrine/doctrine-bundle": "~1.2",
"symfony/assetic-bundle": "~2.3",
- "symfony/monolog-bundle": "~2.4",
+ "symfony/monolog-bundle": "~2.4|~3.0",
"sensio/framework-extra-bundle": "~3.0",
- "irstea/theme-bundle": "~1.5",
+ "irstea/theme-bundle": "^1.5|^2.0",
"knplabs/knp-gaufrette-bundle": "~0.1",
"ramsey/uuid": "~2.8",
"blueimp/jquery-file-upload": "~9.9",
@@ -53,7 +53,8 @@
},
"extra": {
"branch-alias": {
- "dev-master": "0.1-dev"
+ "dev-master": "0.1-dev",
+ "dev-symfony3": "1.0.x-dev"
}
},
"archive": {
--
GitLab