Skip to content

Commit

Permalink
Merge branch '5.3' into 5.4
Browse files Browse the repository at this point in the history
* 5.3:
  [Process] intersect with getenv() in case-insensitive manner to get default envs
  [Serializer] fix support for lazy/unset properties
  Fix redundant type casts
  [Notifier] Fix AllMySms bridge body content
  Revert "[DoctrineBridge] add support for the JSON type"
  • Loading branch information
nicolas-grekas committed Nov 28, 2021
2 parents 76673e9 + b558296 commit d2f29da
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Iterator/RecursiveDirectoryIterator.php
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public function current()
// the logic here avoids redoing the same work in all iterations

if (null === $subPathname = $this->subPath) {
$subPathname = $this->subPath = (string) $this->getSubPath();
$subPathname = $this->subPath = $this->getSubPath();
}
if ('' !== $subPathname) {
$subPathname .= $this->directorySeparator;
Expand Down

0 comments on commit d2f29da

Please sign in to comment.