[Config] Improve GlobResource performance

clxmstaab · clxmstaab · commit 172b1f7277a6 · 2023-04-21T10:53:21.000+02:00
diff --git a/src/Symfony/Component/Config/Resource/GlobResource.php b/src/Symfony/Component/Config/Resource/GlobResource.php
@@ -97,7 +97,7 @@ public function __wakeup(): void
 
     public function getIterator(): \Traversable
     {
-        if (!file_exists($this->prefix) || (!$this->recursive && '' === $this->pattern)) {
+        if ((!$this->recursive && '' === $this->pattern) || !file_exists($this->prefix)) {
             return;
         }
 
@@ -148,7 +148,7 @@ public function getIterator(): \Traversable
                     } while ($prefix !== $dirPath && $dirPath !== $normalizedPath = \dirname($dirPath));
                 }
 
-                if (is_file($path) && (null === $regex || preg_match($regex, substr(str_replace('\\', '/', $path), $prefixLen)))) {
+                if ((null === $regex || preg_match($regex, substr(str_replace('\\', '/', $path), $prefixLen))) && is_file($path)) {
                     yield $path => new \SplFileInfo($path);
                 }
                 if (!is_dir($path)) {
@@ -165,7 +165,7 @@ public function getIterator(): \Traversable
                     new \RecursiveCallbackFilterIterator(
                         new \RecursiveDirectoryIterator($path, \FilesystemIterator::SKIP_DOTS | \FilesystemIterator::FOLLOW_SYMLINKS),
                         fn (\SplFileInfo $file, $path) => !isset($this->excludedPrefixes[$path = str_replace('\\', '/', $path)])
-                            && (null === $regex || $file->isDir() || preg_match($regex, substr($path, $prefixLen)))
+                            && (null === $regex || preg_match($regex, substr($path, $prefixLen)) || $file->isDir())
                             && '.' !== $file->getBasename()[0]
                     ),
                     \RecursiveIteratorIterator::LEAVES_ONLY

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ public function __wakeup(): void`
`97`	`97`
`98`	`98`	`public function getIterator(): \Traversable`
`99`	`99`	`{`
`100`		`- if (!file_exists($this->prefix) \|\| (!$this->recursive && '' === $this->pattern)) {`
	`100`	`+ if ((!$this->recursive && '' === $this->pattern) \|\| !file_exists($this->prefix)) {`
`101`	`101`	`return;`
`102`	`102`	`}`
`103`	`103`
`@@ -148,7 +148,7 @@ public function getIterator(): \Traversable`
`148`	`148`	`} while ($prefix !== $dirPath && $dirPath !== $normalizedPath = \dirname($dirPath));`
`149`	`149`	`}`
`150`	`150`
`151`		`- if (is_file($path) && (null === $regex \|\| preg_match($regex, substr(str_replace('\\', '/', $path), $prefixLen)))) {`
	`151`	`+ if ((null === $regex \|\| preg_match($regex, substr(str_replace('\\', '/', $path), $prefixLen))) && is_file($path)) {`
`152`	`152`	`yield $path => new \SplFileInfo($path);`
`153`	`153`	`}`
`154`	`154`	`if (!is_dir($path)) {`
`@@ -165,7 +165,7 @@ public function getIterator(): \Traversable`
`165`	`165`	`new \RecursiveCallbackFilterIterator(`
`166`	`166`	`new \RecursiveDirectoryIterator($path, \FilesystemIterator::SKIP_DOTS \| \FilesystemIterator::FOLLOW_SYMLINKS),`
`167`	`167`	`fn (\SplFileInfo $file, $path) => !isset($this->excludedPrefixes[$path = str_replace('\\', '/', $path)])`
`168`		`- && (null === $regex \|\| $file->isDir() \|\| preg_match($regex, substr($path, $prefixLen)))`
	`168`	`+ && (null === $regex \|\| preg_match($regex, substr($path, $prefixLen)) \|\| $file->isDir())`
`169`	`169`	`&& '.' !== $file->getBasename()[0]`
`170`	`170`	`),`
`171`	`171`	`\RecursiveIteratorIterator::LEAVES_ONLY`