Skip to content

Commit 7598dd5

Browse files
Merge branch '7.4' into 8.0
* 7.4: (21 commits) [ObjectMapper] lazy loading [Filesystem] Unify logic for isAbsolute() in Path [DependencyInjection] Include return type in AppReference shape [Finder] Make method calls explicit in ExcludeDirectoryFilterIterator [Cache] Remove unset call on undefined variable in PhpArrayAdapter [Twig] Ensure WrappedTemplatedEmail::getReturnPath() returns a string [Routing] Simplify importing routes defined on controller services Fix tests [DependendcyInjection] Improve shape for "from_callable" definitions [PHPDoc] Fix various PHPDoc syntax errors [Console] Add missing VERBOSITY_SILENT case in CommandDataCollector [Notifier] Remove unused $transportName argument in EmailChannel::notify() [Translation] Remove an unused argument passed to parseNode() method [HttpClient] Reject 3xx pushed responses [Serializer] Use Asia/Tokyo instead of Japan in tests [ProxyManagerBridge] Remove comment that reference github discussion [JsonPath] Remove unused "nothing" property from JsonCrawler [ErrorHandler] Improve PHPDoc precision in SerializerErrorRenderer [Routing] Fix matching the "0" URL [Form] Fix EnumType choice_label logic for grouped choices ...
2 parents 508c9b1 + 340b9ed commit 7598dd5

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Iterator/ExcludeDirectoryFilterIterator.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,12 @@ public function __construct(\Iterator $iterator, array $directories)
7272
*/
7373
public function accept(): bool
7474
{
75-
if ($this->isRecursive && isset($this->excludedDirs[$this->getFilename()]) && $this->isDir()) {
75+
if ($this->isRecursive && isset($this->excludedDirs[$this->current()->getFilename()]) && $this->current()->isDir()) {
7676
return false;
7777
}
7878

7979
if ($this->excludedPattern) {
80-
$path = $this->isDir() ? $this->current()->getRelativePathname() : $this->current()->getRelativePath();
80+
$path = $this->current()->isDir() ? $this->current()->getRelativePathname() : $this->current()->getRelativePath();
8181
$path = str_replace('\\', '/', $path);
8282

8383
return !preg_match($this->excludedPattern, $path);

0 commit comments

Comments
 (0)