projects
/
yaffs-website
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated to Drupal 8.5. Core Media not yet in use.
[yaffs-website]
/
vendor
/
symfony
/
finder
/
Iterator
/
RecursiveDirectoryIterator.php
diff --git
a/vendor/symfony/finder/Iterator/RecursiveDirectoryIterator.php
b/vendor/symfony/finder/Iterator/RecursiveDirectoryIterator.php
index 1df2f5014f6221b6c2042c7ecc9a27538b9c4fe7..c1c0e2f18cfbf8febfaf7bcc16bcca186d7504f3 100644
(file)
--- a/
vendor/symfony/finder/Iterator/RecursiveDirectoryIterator.php
+++ b/
vendor/symfony/finder/Iterator/RecursiveDirectoryIterator.php
@@
-37,8
+37,6
@@
class RecursiveDirectoryIterator extends \RecursiveDirectoryIterator
private $directorySeparator = '/';
/**
private $directorySeparator = '/';
/**
- * Constructor.
- *
* @param string $path
* @param int $flags
* @param bool $ignoreUnreadableDirs
* @param string $path
* @param int $flags
* @param bool $ignoreUnreadableDirs
@@
-53,7
+51,7
@@
class RecursiveDirectoryIterator extends \RecursiveDirectoryIterator
parent::__construct($path, $flags);
$this->ignoreUnreadableDirs = $ignoreUnreadableDirs;
parent::__construct($path, $flags);
$this->ignoreUnreadableDirs = $ignoreUnreadableDirs;
- $this->rootPath =
(string)
$path;
+ $this->rootPath = $path;
if ('/' !== DIRECTORY_SEPARATOR && !($flags & self::UNIX_PATHS)) {
$this->directorySeparator = DIRECTORY_SEPARATOR;
}
if ('/' !== DIRECTORY_SEPARATOR && !($flags & self::UNIX_PATHS)) {
$this->directorySeparator = DIRECTORY_SEPARATOR;
}
@@
-119,7
+117,7
@@
class RecursiveDirectoryIterator extends \RecursiveDirectoryIterator
}
// @see https://bugs.php.net/68557
}
// @see https://bugs.php.net/68557
- if (
PHP_VERSION_ID < 50523 || PHP_VERSION_ID >= 50600 &&
PHP_VERSION_ID < 50607) {
+ if (
\PHP_VERSION_ID < 50523 || \PHP_VERSION_ID >= 50600 && \
PHP_VERSION_ID < 50607) {
parent::next();
}
parent::next();
}