Refactor de SYMFONY_ENV en APP_ENV (#2052)

Author: Mopolo

Makefile

@@ -106,16 +106,16 @@ test-functional: data config htdocs/uploads tmp
 	$(DOCKER_COMP) stop dbtest apachephptest mailcatcher
 	$(DOCKER_COMP) up -d dbtest apachephptest mailcatcher
 	make clean-test-deprecated-log
-	$(DOCKER_COMP) run --no-deps --rm -u localUser apachephp ./bin/behat
+	$(DOCKER_COMP) run --no-deps --rm -u localUser apachephptest ./bin/behat
 	make var/logs/test.deprecations_grouped.log
 	$(DOCKER_COMP) stop dbtest apachephptest mailcatcher
 
 ### Tests d'intégration avec start/stop des images docker
 test-integration-ci:
 	$(DOCKER_COMP) stop dbtest apachephptest
 	$(DOCKER_COMP) up -d dbtest apachephptest
-	$(DOCKER_COMP) run --no-deps --rm -u localUser apachephp make vendor
-	$(DOCKER_COMP) run --no-deps --rm -u localUser apachephp ./bin/phpunit --testsuite integration
+	$(DOCKER_COMP) run --no-deps --rm -u localUser apachephptest make vendor
+	$(DOCKER_COMP) run --no-deps --rm -u localUser apachephptest ./bin/phpunit --testsuite integration
 	$(DOCKER_COMP) stop dbtest apachephptest
 
 ### Analyse PHPStan

bin/console

@@ -15,7 +15,7 @@ set_time_limit(0);
 $loader = require __DIR__.'/../vendor/autoload.php';
 
 $input = new ArgvInput();
-$env = $input->getParameterOption(['--env', '-e'], getenv('SYMFONY_ENV') ?: 'dev');
+$env = $input->getParameterOption(['--env', '-e'], getenv('APP_ENV') ?: 'dev');
 $debug = getenv('SYMFONY_DEBUG') !== '0' && !$input->hasParameterOption(['--no-debug', '']) && $env !== 'prod';
 
 $kernel = new AppKernel($env, $debug);

compose.yml

@@ -32,7 +32,7 @@ services:
         gid: "1001"
         ENABLE_XDEBUG: ${ENABLE_XDEBUG:-false}
     environment:
-      SYMFONY_ENV: "dev"
+      APP_ENV: "dev"
       HOST_PWD: ${PWD}
       SYMFONY_IDE: "%env(IDE_USED)%://open?url=file://%%f&line=%%l&/var/www/html/>%env(HOST_PWD)%/"
     env_file:
@@ -51,7 +51,7 @@ services:
         gid: "1001"
         ENABLE_XDEBUG: ${ENABLE_XDEBUG:-false}
     environment:
-      SYMFONY_ENV: "test"
+      APP_ENV: "test"
       HOST_PWD: ${PWD}
       SYMFONY_IDE: "%env(IDE_USED)%://open?url=file://%%f&line=%%l&/var/www/html/>%env(HOST_PWD)%/"
     env_file:

htdocs/app.php

@@ -6,8 +6,8 @@
 use Composer\Autoload\ClassLoader;
 use Symfony\Component\HttpFoundation\Request;
 
-$isDevEnv = isset($_ENV['SYMFONY_ENV']) && $_ENV['SYMFONY_ENV'] == 'dev';
-$isTestEnv = isset($_ENV['SYMFONY_ENV']) && $_ENV['SYMFONY_ENV'] == 'test';
+$isDevEnv = isset($_ENV['APP_ENV']) && $_ENV['APP_ENV'] == 'dev';
+$isTestEnv = isset($_ENV['APP_ENV']) && $_ENV['APP_ENV'] == 'test';
 
 if ($_SERVER['HTTP_HOST'] === 'afup.dev' || $isDevEnv || $isTestEnv) {
     if (!$isDevEnv && !$isTestEnv

sources/Afup/Bootstrap/Http.php

@@ -34,7 +34,7 @@
 
 // mise à jour des paramétrages PHP en fonction de la configuration
 
-if (getenv('SYMFONY_ENV') === 'prod') {
+if (getenv('APP_ENV') === 'prod') {
     ini_set('error_reporting',  (string) (E_ALL ^ E_WARNING ^ E_NOTICE));
     ini_set('display_errors', '0');
 } else {

sources/Afup/Utils/Configuration.php

@@ -44,8 +44,8 @@ private function loadSymfonyParameters(): array
         $parameters = [];
         $basePath = __DIR__ . '/../../../app/config';
 
-        if (isset($_ENV['SYMFONY_ENV'])) {
-            $file = $basePath . '/config_' . $_ENV['SYMFONY_ENV'] . '.yml';
+        if (isset($_ENV['APP_ENV'])) {
+            $file = $basePath . '/config_' . $_ENV['APP_ENV'] . '.yml';
             if (is_file($file)) {
                 $values = Yaml::parseFile($file);
                 if (isset($values['parameters'])) {

sources/Afup/Utils/SymfonyKernel.php

@@ -20,12 +20,12 @@ public function __construct(Request $request = null)
         $env = 'prod';
         $debug = false;
 
-        if (isset($_ENV['SYMFONY_ENV']) && $_ENV['SYMFONY_ENV'] === 'dev') {
+        if (isset($_ENV['APP_ENV']) && $_ENV['APP_ENV'] === 'dev') {
             $debug = true;
             $env = 'dev';
         }
 
-        if (isset($_ENV['SYMFONY_ENV']) && $_ENV['SYMFONY_ENV'] === 'test') {
+        if (isset($_ENV['APP_ENV']) && $_ENV['APP_ENV'] === 'test') {
             $env = 'test';
         }