minor #37232 [APP_CACHE_DIR] Ensure a split per environment when using that new variable (Plopix)

fabpot · fabpot · commit 5c52d9a2d6e4 · 2020-06-12T08:08:05.000+02:00
This PR was merged into the 5.2-dev branch. Discussion ---------- [APP_CACHE_DIR] Ensure a split per environment when using that new variable | Q | A | ------------- | --- | Branch | master | Bug fix? | no | New feature? | no | Deprecations? | no | License | MIT | Doc PR | symfony/symfony-docs#13819 All the explanation here: symfony/symfony-docs#13819 Commits ------- 06b793f59e Ensure a split per environment
diff --git a/Kernel/MicroKernelTrait.php b/Kernel/MicroKernelTrait.php
@@ -68,7 +68,11 @@ trait MicroKernelTrait
      */
     public function getCacheDir(): string
     {
-        return $_SERVER['APP_CACHE_DIR'] ?? parent::getCacheDir();
+        if (isset($_SERVER['APP_CACHE_DIR'])) {
+            return $_SERVER['APP_CACHE_DIR'].'/'.$this->environment;
+        }
+
+        return parent::getCacheDir();
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,11 @@ trait MicroKernelTrait`
`68`	`68`	`*/`
`69`	`69`	`public function getCacheDir(): string`
`70`	`70`	`{`
`71`		`- return $_SERVER['APP_CACHE_DIR'] ?? parent::getCacheDir();`
	`71`	`+ if (isset($_SERVER['APP_CACHE_DIR'])) {`
	`72`	`+ return $_SERVER['APP_CACHE_DIR'].'/'.$this->environment;`
	`73`	`+ }`
	`74`	`+`
	`75`	`+ return parent::getCacheDir();`
`72`	`76`	`}`
`73`	`77`
`74`	`78`	`/**`