From cda62553eb7e9367352b2cf0c334b9e2a93d7e1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 24 Apr 2018 14:14:53 +0200
Subject: [PATCH] switch composer.json to sf-3

---
 .gitlab-ci.yml                                |  4 +--
 .../Fixtures/App/app/config/config_test.yml   |  1 -
 composer.json                                 | 29 +++++++++----------
 phpunit.xml.dist                              |  3 +-
 4 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b1af21fb0..aae7e4183 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,13 +22,13 @@ test:php-7.1:
     stage: test
     <<: *test_definition
     image: chill/ci-image:php-7.1
-    script: vendor/bin/phpunit
+    script: APP_ENV=test vendor/bin/phpunit
 
 test:php-7.2:
     stage: test
     <<: *test_definition
     image: chill/ci-image:php-7.2
-    script: vendor/bin/phpunit
+    script: APP_ENV=test vendor/bin/phpunit
 
 # deploy documentation
 api-doc-build:
diff --git a/Resources/test/Fixtures/App/app/config/config_test.yml b/Resources/test/Fixtures/App/app/config/config_test.yml
index b4f6d786a..e4b38ba73 100644
--- a/Resources/test/Fixtures/App/app/config/config_test.yml
+++ b/Resources/test/Fixtures/App/app/config/config_test.yml
@@ -41,7 +41,6 @@ security:
             form_login:
                 csrf_parameter: _csrf_token
                 csrf_token_id: authenticate
-                csrf_provider: form.csrf_provider
             
             logout: ~
             
diff --git a/composer.json b/composer.json
index 5dea8e5f2..2defc5ef3 100644
--- a/composer.json
+++ b/composer.json
@@ -25,28 +25,25 @@
         }
     ],
     "require": {
-        "php": "~5.5|~7.0",
-        "twig/extensions": "~1.0",
-        "symfony/assetic-bundle": "~2.3",
-        "symfony/monolog-bundle": "~2.4",
-        "symfony/framework-bundle": "~2.8",
-        "symfony/yaml": "~2.7",
-        "symfony/symfony": "~2.7",
-        "doctrine/dbal": "~2.5",
-        "doctrine/orm": "~2.4",
-        "doctrine/common": "~2.4",
-        "doctrine/doctrine-bundle": "~1.2",
+        "php": "~7.2",
+        "twig/extensions": "~1.5",
+        "symfony/assetic-bundle": "~2.8",
+        "symfony/monolog-bundle": "~3.2",
+        "symfony/symfony": "~3.4",
+        "doctrine/dbal": "~2.7",
+        "doctrine/orm": "~2.6",
+        "doctrine/common": "~2.8",
+        "doctrine/doctrine-bundle": "~1.9",
         "champs-libres/composer-bundle-migration": "~1.0",
-        "doctrine/doctrine-migrations-bundle": "~1.1",
+        "doctrine/doctrine-migrations-bundle": "~1.3",
         "doctrine/migrations": "~1.0",
         "phpoffice/phpspreadsheet": "~1.2",
         "sensio/distribution-bundle": "^5.0"
     },
     "require-dev": {
-        "symfony/dom-crawler": "2.5",
-        "doctrine/doctrine-fixtures-bundle": "~2.2",
-        "symfony/security": "~2.5",
-        "symfony/phpunit-bridge": "^2.7",
+        "symfony/dom-crawler": "~3.4",
+        "doctrine/doctrine-fixtures-bundle": "~3.0",
+        "symfony/phpunit-bridge": "~3.4",
         "phpunit/phpunit": "~5.6"
     },
     "scripts": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 4375057ed..f1f2cfc65 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit bootstrap="./Resources/test/Fixtures/App/app/autoload.php" colors="true">
+<phpunit bootstrap="./vendor/autoload.php" colors="true">
     <testsuites>
         <testsuite name="ChillMain test suite">
             <directory suffix="Test.php">./Tests</directory>
@@ -19,5 +19,6 @@
     <php>
         <server name="KERNEL_DIR" value="./Resources/test/Fixtures/App/app" />
         <env name="SYMFONY_DEPRECATIONS_HELPER" value="weak" />
+        <env name="APP_ENV" value="test" />
     </php>
 </phpunit>