bug #22965 [Cache] Ignore missing annotations.php (ro0NL)

fabpot · fabpot · commit 7a9875c3cd50 · 2017-05-31T11:18:45.000-07:00
This PR was squashed before being merged into the 3.3 branch (closes #22965). Discussion ---------- [Cache] Ignore missing annotations.php | Q | A | ------------- | --- | Branch? | 3.3 | Bug fix? | yes (different in 3.2) | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #...  | License | MIT | Doc PR | symfony/symfony-docs#...  Avoids the following notices if cache is not warmed up (i.e. `cache:clear --no-warmup` > hit the browser). ``` Warning: include(<base-path>/app/cache/<env>/annotations.php): failed to open stream: No such file or directory Warning: include(): Failed opening '<base-path>/app/cache/<env>/annotations.php' for inclusion (include_path='.:/usr/share/pear:/usr/share/php') ``` Commits ------- e8f70c7 [Cache] Ignore missing annotations.php
diff --git a/src/Symfony/Component/Cache/Traits/PhpArrayTrait.php b/src/Symfony/Component/Cache/Traits/PhpArrayTrait.php
@@ -126,6 +126,6 @@ public function clear()
      */
     private function initialize()
     {
-        $this->values = @(include $this->file) ?: array();
+        $this->values = file_exists($this->file) ? (include $this->file ?: array()) : array();
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -126,6 +126,6 @@ public function clear()`
`126`	`126`	`*/`
`127`	`127`	`private function initialize()`
`128`	`128`	`{`
`129`		`- $this->values = @(include $this->file) ?: array();`
	`129`	`+ $this->values = file_exists($this->file) ? (include $this->file ?: array()) : array();`
`130`	`130`	`}`
`131`	`131`	`}`