Clean-up some remaining readdir calls with undesirable false evaluati…

…on potential Signed-off-by: Josh Richards <josh.t.richards@gmail.com>
nextcloud · Jun 6, 2023 · 84cc3a2 · 84cc3a2
1 parent 2fd7feb
commit 84cc3a2
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/apps/files_external/lib/Lib/Storage/Swift.php b/apps/files_external/lib/Lib/Storage/Swift.php
@@ -260,7 +260,7 @@ public function rmdir($path) {
 		}
 
 		$dh = $this->opendir($path);
-		while ($file = readdir($dh)) {
+		while (($file = readdir($dh)) !== false) {
 			if (\OC\Files\Filesystem::isIgnoredDir($file)) {
 				continue;
 			}
@@ -526,7 +526,7 @@ public function copy($source, $target) {
 			}
 
 			$dh = $this->opendir($source);
-			while ($file = readdir($dh)) {
+			while (($file = readdir($dh)) !== false) {
 				if (\OC\Files\Filesystem::isIgnoredDir($file)) {
 					continue;
 				}

diff --git a/apps/files_trashbin/lib/Trashbin.php b/apps/files_trashbin/lib/Trashbin.php
@@ -1109,7 +1109,7 @@ private static function getTrashbinSize($user) {
 	public static function isEmpty($user) {
 		$view = new View('/' . $user . '/files_trashbin');
 		if ($view->is_dir('/files') && $dh = $view->opendir('/files')) {
-			while ($file = readdir($dh)) {
+			while (($file = readdir($dh)) !== false) {
 				if (!Filesystem::isIgnoredDir($file)) {
 					return false;
 				}

diff --git a/lib/private/Files/Storage/Common.php b/lib/private/Files/Storage/Common.php
@@ -228,7 +228,7 @@ public function copy($source, $target) {
 			$this->remove($target);
 			$dir = $this->opendir($source);
 			$this->mkdir($target);
-			while ($file = readdir($dir)) {
+			while (($file = readdir($dir)) !== false) {
 				if (!Filesystem::isIgnoredDir($file)) {
 					if (!$this->copy($source . '/' . $file, $target . '/' . $file)) {
 						closedir($dir);

diff --git a/lib/private/Files/Storage/PolyFill/CopyDirectory.php b/lib/private/Files/Storage/PolyFill/CopyDirectory.php
@@ -86,7 +86,7 @@ public function copy($source, $target) {
 	protected function copyRecursive($source, $target) {
 		$dh = $this->opendir($source);
 		$result = true;
-		while ($file = readdir($dh)) {
+		while (($file = readdir($dh)) !== false) {
 			if (!\OC\Files\Filesystem::isIgnoredDir($file)) {
 				if ($this->is_dir($source . '/' . $file)) {
 					$this->mkdir($target . '/' . $file);

diff --git a/tests/apps.php b/tests/apps.php
@@ -14,7 +14,7 @@ function loadDirectory($path) {
 		return;
 	}
 	if ($dh = opendir($path)) {
-		while ($name = readdir($dh)) {
+		while (($name = readdir($dh)) !== false) {
 			if ($name[0] !== '.') {
 				$file = $path . '/' . $name;
 				if (is_dir($file)) {

diff --git a/tests/lib/Files/Storage/Storage.php b/tests/lib/Files/Storage/Storage.php
@@ -81,7 +81,7 @@ public function testDirectories($directory) {
 
 		$dh = $this->instance->opendir('/');
 		$content = [];
-		while ($file = readdir($dh)) {
+		while (($file = readdir($dh)) !== false) {
 			if ($file != '.' and $file != '..') {
 				$content[] = $file;
 			}
@@ -113,7 +113,7 @@ public function testDirectories($directory) {
 
 		$dh = $this->instance->opendir('/');
 		$content = [];
-		while ($file = readdir($dh)) {
+		while (($file = readdir($dh)) !== false) {
 			if ($file != '.' and $file != '..') {
 				$content[] = $file;
 			}

diff --git a/tests/lib/Files/Storage/Wrapper/EncodingTest.php b/tests/lib/Files/Storage/Wrapper/EncodingTest.php
@@ -209,7 +209,7 @@ public function testNormalizedDirectoryEntriesOpenDir() {
 
 		$dh = $this->instance->opendir('/test');
 		$content = [];
-		while ($file = readdir($dh)) {
+		while (($file = readdir($dh)) !== false) {
 			if ($file != '.' and $file != '..') {
 				$content[] = $file;
 			}

diff --git a/tests/lib/Files/Storage/Wrapper/JailTest.php b/tests/lib/Files/Storage/Wrapper/JailTest.php
@@ -28,7 +28,7 @@ protected function tearDown(): void {
 		// test that nothing outside our jail is touched
 		$contents = [];
 		$dh = $this->sourceStorage->opendir('');
-		while ($file = readdir($dh)) {
+		while (($file = readdir($dh)) !== false) {
 			if (!\OC\Files\Filesystem::isIgnoredDir($file)) {
 				$contents[] = $file;
 			}