bug #34398 [Config] fix id-generation for GlobResource (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit a90de43a8e6f · 2019-11-16T09:51:12.000+01:00
This PR was merged into the 4.3 branch. Discussion ---------- [Config] fix id-generation for GlobResource | Q | A | ------------- | --- | Branch? | 4.3 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - I never encountered any issues related to this but still, it's a fix. Commits ------- 6adbfa2 [Config] fix id-generation for GlobResource
diff --git a/src/Symfony/Component/Config/Resource/GlobResource.php b/src/Symfony/Component/Config/Resource/GlobResource.php
@@ -41,6 +41,7 @@ class GlobResource implements \IteratorAggregate, SelfCheckingResourceInterface
      */
     public function __construct(?string $prefix, string $pattern, bool $recursive, bool $forExclusion = false, array $excludedPrefixes = [])
     {
+        ksort($excludedPrefixes);
         $this->prefix = realpath($prefix) ?: (file_exists($prefix) ? $prefix : false);
         $this->pattern = $pattern;
         $this->recursive = $recursive;
@@ -62,7 +63,7 @@ public function getPrefix()
      */
     public function __toString()
     {
-        return 'glob.'.$this->prefix.$this->pattern.(int) $this->recursive;
+        return 'glob.'.$this->prefix.(int) $this->recursive.$this->pattern.(int) $this->forExclusion.implode("\0", $this->excludedPrefixes);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@ class GlobResource implements \IteratorAggregate, SelfCheckingResourceInterface`
`41`	`41`	`*/`
`42`	`42`	`public function __construct(?string $prefix, string $pattern, bool $recursive, bool $forExclusion = false, array $excludedPrefixes = [])`
`43`	`43`	`{`
	`44`	`+ ksort($excludedPrefixes);`
`44`	`45`	`$this->prefix = realpath($prefix) ?: (file_exists($prefix) ? $prefix : false);`
`45`	`46`	`$this->pattern = $pattern;`
`46`	`47`	`$this->recursive = $recursive;`
`@@ -62,7 +63,7 @@ public function getPrefix()`
`62`	`63`	`*/`
`63`	`64`	`public function __toString()`
`64`	`65`	`{`
`65`		`- return 'glob.'.$this->prefix.$this->pattern.(int) $this->recursive;`
	`66`	`+ return 'glob.'.$this->prefix.(int) $this->recursive.$this->pattern.(int) $this->forExclusion.implode("\0", $this->excludedPrefixes);`
`66`	`67`	`}`
`67`	`68`
`68`	`69`	`/**`