From 5b0956559415bc3a82e78f8e5fb76a3280866ee3 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Tue, 3 Jan 2017 17:06:03 +0100 Subject: [PATCH] remove no longer used fakedir stream wrapper Signed-off-by: Robin Appelman --- lib/base.php | 1 - lib/private/Files/Stream/Dir.php | 67 -------------------------------- tests/lib/StreamWrappersTest.php | 12 ------ 3 files changed, 80 deletions(-) delete mode 100644 lib/private/Files/Stream/Dir.php diff --git a/lib/base.php b/lib/base.php index 7bd14de56b..3ab41f3759 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/private/Files/Stream/Dir.php b/lib/private/Files/Stream/Dir.php deleted file mode 100644 index f8f6b1fa89..0000000000 --- a/lib/private/Files/Stream/Dir.php +++ /dev/null @@ -1,67 +0,0 @@ - - * @author Morris Jobke - * @author Robin Appelman - * - * @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 - * - */ - -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 eb35fd5445..ee2f6a8b0b 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';