Merge branch '3.4' into 4.0

nicolas-grekas · nicolas-grekas · commit 641ecbb74bd5 · 2018-06-20T13:15:04.000+02:00
* 3.4:
  [Cache] Improve resiliency when calling doFetch() in AbstractTrait
  Fixing GlobResource when inside phar archive
diff --git a/src/Symfony/Component/Cache/Traits/AbstractTrait.php b/src/Symfony/Component/Cache/Traits/AbstractTrait.php
@@ -108,8 +108,11 @@ public function clear()
         try {
             if ($cleared = $this->versioningIsEnabled) {
                 $namespaceVersion = 2;
-                foreach ($this->doFetch(array('@'.$this->namespace)) as $v) {
-                    $namespaceVersion = 1 + (int) $v;
+                try {
+                    foreach ($this->doFetch(array('@'.$this->namespace)) as $v) {
+                        $namespaceVersion = 1 + (int) $v;
+                    }
+                } catch (\Exception $e) {
                 }
                 $namespaceVersion .= ':';
                 $cleared = $this->doSave(array('@'.$this->namespace => $namespaceVersion), 0);
@@ -236,8 +239,11 @@ private function getId($key)
 
         if ($this->versioningIsEnabled && '' === $this->namespaceVersion) {
             $this->namespaceVersion = '1:';
-            foreach ($this->doFetch(array('@'.$this->namespace)) as $v) {
-                $this->namespaceVersion = $v;
+            try {
+                foreach ($this->doFetch(array('@'.$this->namespace)) as $v) {
+                    $this->namespaceVersion = $v;
+                }
+            } catch (\Exception $e) {
             }
         }
 
diff --git a/src/Symfony/Component/Config/Resource/GlobResource.php b/src/Symfony/Component/Config/Resource/GlobResource.php
@@ -93,7 +93,7 @@ public function getIterator()
             return;
         }
 
-        if (false === strpos($this->pattern, '/**/') && (defined('GLOB_BRACE') || false === strpos($this->pattern, '{'))) {
+        if (0 !== strpos($this->prefix, 'phar://') && false === strpos($this->pattern, '/**/') && (defined('GLOB_BRACE') || false === strpos($this->pattern, '{'))) {
             foreach (glob($this->prefix.$this->pattern, defined('GLOB_BRACE') ? GLOB_BRACE : 0) as $path) {
                 if ($this->recursive && is_dir($path)) {
                     $files = iterator_to_array(new \RecursiveIteratorIterator(

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ public function getIterator()`
`93`	`93`	`return;`
`94`	`94`	`}`
`95`	`95`
`96`		`- if (false === strpos($this->pattern, '/**/') && (defined('GLOB_BRACE') \|\| false === strpos($this->pattern, '{'))) {`
	`96`	`+ if (0 !== strpos($this->prefix, 'phar://') && false === strpos($this->pattern, '/**/') && (defined('GLOB_BRACE') \|\| false === strpos($this->pattern, '{'))) {`
`97`	`97`	`foreach (glob($this->prefix.$this->pattern, defined('GLOB_BRACE') ? GLOB_BRACE : 0) as $path) {`
`98`	`98`	`if ($this->recursive && is_dir($path)) {`
`99`	`99`	`$files = iterator_to_array(new \RecursiveIteratorIterator(`