From f1c90043a9a8d805797046ffe20542c31d507e88 Mon Sep 17 00:00:00 2001 From: Roland Franssen Date: Tue, 30 May 2017 16:55:30 +0200 Subject: [PATCH 1/3] [Cache] Ignore missing annotations.php --- src/Symfony/Component/Cache/Traits/PhpArrayTrait.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/Cache/Traits/PhpArrayTrait.php b/src/Symfony/Component/Cache/Traits/PhpArrayTrait.php index 2b0ae50f6a1ac..a49130cd9fdce 100644 --- 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 = is_file($this->file) ? @(include $this->file) : array(); } } From 2ee5a7b97513429faf9a4ab59b4652f63e0f0eb9 Mon Sep 17 00:00:00 2001 From: Roland Franssen Date: Tue, 30 May 2017 17:02:27 +0200 Subject: [PATCH 2/3] Update PhpArrayTrait.php --- src/Symfony/Component/Cache/Traits/PhpArrayTrait.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/Cache/Traits/PhpArrayTrait.php b/src/Symfony/Component/Cache/Traits/PhpArrayTrait.php index a49130cd9fdce..bdd043ee8df11 100644 --- 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 = is_file($this->file) ? @(include $this->file) : array(); + $this->values = false !== stream_resolve_include_path($this->file) ? @(include $this->file) : array(); } } From 36893dc405ae17744d45dac6dab267034c57252b Mon Sep 17 00:00:00 2001 From: Roland Franssen Date: Wed, 31 May 2017 09:13:11 +0200 Subject: [PATCH 3/3] Update PhpArrayTrait.php --- src/Symfony/Component/Cache/Traits/PhpArrayTrait.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/Cache/Traits/PhpArrayTrait.php b/src/Symfony/Component/Cache/Traits/PhpArrayTrait.php index bdd043ee8df11..2d2c7db3d014f 100644 --- 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 = false !== stream_resolve_include_path($this->file) ? @(include $this->file) : array(); + $this->values = file_exists($this->file) ? (include $this->file ?: array()) : array(); } }