Merge pull request #2923 from nextcloud/remove-fakedir-stream

remove no longer used fakedir stream wrapper

5 files changed, 0 insertions, 82 deletions

diff --git a/lib/base.php b/lib/base.php
index 7bd14de56b6..3ab41f37599 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -667,7 +667,6 @@ class OC {
 		}
 
 		// register the stream wrappers
-		stream_wrapper_register('fakedir', 'OC\Files\Stream\Dir');
 		stream_wrapper_register('static', 'OC\Files\Stream\StaticStream');
 		stream_wrapper_register('close', 'OC\Files\Stream\Close');
 		stream_wrapper_register('quota', 'OC\Files\Stream\Quota');
diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php
index 84bd8c15e67..52ace115f66 100644
--- a/lib/composer/composer/autoload_classmap.php
+++ b/lib/composer/composer/autoload_classmap.php
@@ -554,7 +554,6 @@ return array(
     'OC\\Files\\Storage\\Wrapper\\Quota' => $baseDir . '/lib/private/Files/Storage/Wrapper/Quota.php',
     'OC\\Files\\Storage\\Wrapper\\Wrapper' => $baseDir . '/lib/private/Files/Storage/Wrapper/Wrapper.php',
     'OC\\Files\\Stream\\Close' => $baseDir . '/lib/private/Files/Stream/Close.php',
-    'OC\\Files\\Stream\\Dir' => $baseDir . '/lib/private/Files/Stream/Dir.php',
     'OC\\Files\\Stream\\Encryption' => $baseDir . '/lib/private/Files/Stream/Encryption.php',
     'OC\\Files\\Stream\\Quota' => $baseDir . '/lib/private/Files/Stream/Quota.php',
     'OC\\Files\\Stream\\StaticStream' => $baseDir . '/lib/private/Files/Stream/StaticStream.php',
diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php
index 1c7ef9b067b..4387165b0bf 100644
--- a/lib/composer/composer/autoload_static.php
+++ b/lib/composer/composer/autoload_static.php
@@ -584,7 +584,6 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c
         'OC\\Files\\Storage\\Wrapper\\Quota' => __DIR__ . '/../../..' . '/lib/private/Files/Storage/Wrapper/Quota.php',
         'OC\\Files\\Storage\\Wrapper\\Wrapper' => __DIR__ . '/../../..' . '/lib/private/Files/Storage/Wrapper/Wrapper.php',
         'OC\\Files\\Stream\\Close' => __DIR__ . '/../../..' . '/lib/private/Files/Stream/Close.php',
-        'OC\\Files\\Stream\\Dir' => __DIR__ . '/../../..' . '/lib/private/Files/Stream/Dir.php',
         'OC\\Files\\Stream\\Encryption' => __DIR__ . '/../../..' . '/lib/private/Files/Stream/Encryption.php',
         'OC\\Files\\Stream\\Quota' => __DIR__ . '/../../..' . '/lib/private/Files/Stream/Quota.php',
         'OC\\Files\\Stream\\StaticStream' => __DIR__ . '/../../..' . '/lib/private/Files/Stream/StaticStream.php',
diff --git a/lib/private/Files/Stream/Dir.php b/lib/private/Files/Stream/Dir.php
deleted file mode 100644
index f8f6b1fa89a..00000000000
--- a/lib/private/Files/Stream/Dir.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Jörn Friedrich Dreyer <jfd@butonic.de>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Robin Appelman <robin@icewind.nl>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-namespace OC\Files\Stream;
-
-class Dir {
-	private static $dirs = array();
-	private $name;
-	private $index;
-
-	public function dir_opendir($path, $options) {
-		$this->name = substr($path, strlen('fakedir://'));
-		$this->index = 0;
-		if (!isset(self::$dirs[$this->name])) {
-			self::$dirs[$this->name] = array();
-		}
-		return true;
-	}
-
-	public function dir_readdir() {
-		if ($this->index >= count(self::$dirs[$this->name])) {
-			return false;
-		}
-		$filename = self::$dirs[$this->name][$this->index];
-		$this->index++;
-		return $filename;
-	}
-
-	public function dir_closedir() {
-		$this->name = '';
-		return true;
-	}
-
-	public function dir_rewinddir() {
-		$this->index = 0;
-		return true;
-	}
-
-	/**
-	 * @param string $path
-	 * @param string[] $content
-	 */
-	public static function register($path, $content) {
-		self::$dirs[$path] = $content;
-	}
-}
diff --git a/tests/lib/StreamWrappersTest.php b/tests/lib/StreamWrappersTest.php
index eb35fd54454..ee2f6a8b0b2 100644
--- a/tests/lib/StreamWrappersTest.php
+++ b/tests/lib/StreamWrappersTest.php
@@ -42,18 +42,6 @@ class StreamWrappersTest extends \Test\TestCase {
 		}
 	}
 
-	public function testFakeDir() {
-		$items = array('foo', 'bar');
-		\OC\Files\Stream\Dir::register('test', $items);
-		$dh = opendir('fakedir://test');
-		$result = array();
-		while ($file = readdir($dh)) {
-			$result[] = $file;
-			$this->assertContains($file, $items);
-		}
-		$this->assertEquals(count($items), count($result));
-	}
-
 	public function testCloseStream() {
 		//ensure all basic stream stuff works
 		$sourceFile = \OC::$SERVERROOT . '/tests/data/lorem.txt';