ISSUE-337: set env test

Author: tatevikg1

composer.json

@@ -106,7 +106,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "5.0.x-dev"
+            "dev-ISSUE-337": "5.0.x-dev"
         },
         "symfony-app-dir": "",
         "symfony-bin-dir": "bin",

public/app_test.php

@@ -8,6 +8,7 @@
 require dirname(__DIR__) . '/vendor/autoload.php';
 
 Bootstrap::getInstance()
+    ->unsetHeaders()
     ->ensureDevelopmentOrTestingEnvironment()
     ->setEnvironment(Environment::TESTING)
     ->configure()

src/Core/Bootstrap.php

@@ -29,31 +29,11 @@
  */
 class Bootstrap
 {
-    /**
-     * @var Bootstrap|null
-     */
     private static ?Bootstrap $instance = null;
-
-    /**
-     * @var bool
-     */
     private bool $isConfigured = false;
-
-    /**
-     * @var string
-     */
     private string $environment = Environment::DEFAULT_ENVIRONMENT;
-
-    /**
-     * @var ApplicationKernel
-     */
-    private $applicationKernel = null;
-
-    /**
-     * @var ApplicationStructure
-     */
+    private ?ApplicationKernel $applicationKernel = null;
     private ApplicationStructure $applicationStructure;
-
     private ErrorHandler $errorHandler;
 
     /**
@@ -115,25 +95,16 @@ public function setEnvironment(string $environment): Bootstrap
         return $this;
     }
 
-    /**
-     * @return string
-     */
     public function getEnvironment(): string
     {
         return $this->environment;
     }
 
-    /**
-     * @return bool
-     */
     private function isSymfonyDebugModeEnabled(): bool
     {
         return $this->environment !== Environment::PRODUCTION;
     }
 
-    /**
-     * @return bool
-     */
     private function isDebugEnabled(): bool
     {
         return $this->environment !== Environment::PRODUCTION;
@@ -166,6 +137,12 @@ public function ensureDevelopmentOrTestingEnvironment(): self
         return $this;
     }
 
+    public function unsetHeaders(): self
+    {
+        unset($_SERVER['HTTP_X_FORWARDED_FOR']);
+        return $this;
+    }
+
     /**
      * Main entry point called at every request usually from global scope. Checks if everything is correct
      * and loads the configuration.

src/TestingSupport/Traits/SymfonyServerTrait.php

@@ -42,7 +42,8 @@ protected function startSymfonyServer(): void
 
         $this->serverProcess = new Process(
             $this->getSymfonyServerStartCommand(),
-            $this->getApplicationRoot()
+            $this->getApplicationRoot(),
+            ['APP_ENV' => 'test']
         );
         $this->serverProcess->start();
 

tests/System/ApplicationBundle/PhpListApplicationBundleTest.php

@@ -22,10 +22,6 @@ class PhpListApplicationBundleTest extends TestCase
     protected function setUp(): void
     {
         parent::setUp();
-
-        putenv('APP_ENV=test');
-        $_ENV['APP_ENV'] = 'test';
-        $_SERVER['APP_ENV'] = 'test';
         $this->httpClient = new Client(['http_errors' => false]);
     }