Changeset 1192

Timestamp:

12/26/07 20:37:22 (8 months ago)

Author:

mikey

Message:

added support for is_readable()
As long as file modes are not supported the result will be true for existing pathes and false for non-existing pathes.

Files:

• trunk/build/vfs/package.php (modified) (1 diff)
• trunk/src/main/php/org/stubbles/vfs/vfsStreamAbstractContent.php (modified) (1 diff)
• trunk/src/main/php/org/stubbles/vfs/vfsStreamContent.php (modified) (2 diffs)
• trunk/src/main/php/org/stubbles/vfs/vfsStreamWrapper.php (modified) (3 diffs)
• trunk/src/test/php/org/stubbles/vfs/vfsStreamWrapperTestCase.php (modified) (1 diff)

trunk/build/vfs/package.php

@@ -43 +43 @@
-- added vfsStream::path() method as opposite to vfsStream::url()
-- a call to vfsStreamWrapper::register() will now reset the root to null (implemented because of a hint by David Zülke)
+- added support for is_readable()
-'));
-

trunk/src/main/php/org/stubbles/vfs/vfsStreamAbstractContent.php

@@ -78 +78 @@
-     * returns the type of the container
-     *
-string
+int
-     */
-    public function getType()

trunk/src/main/php/org/stubbles/vfs/vfsStreamContent.php

@@ -15 +15 @@
-    /**
-     * stream content type: file
+     *
+     * @see  getType()
-     */
-'file'
+0100000
-    /**
-     * stream content type: directory
+     *
+     * @see  getType()
-     */
-
+
+
+
+
+
+
+
-
-    /**
@@ -55 +65 @@
-     * returns the type of the container
-     *
-string
+int
-     */
-    public function getType();

trunk/src/main/php/org/stubbles/vfs/vfsStreamWrapper.php

@@ -212 +212 @@
-     *
-     * @return  array
+     * @todo    implement correct group and user id handling based on content
+     * @todo    implement correct file mode handling based on content
-     */
-    public function stream_stat()
-    {
-
+
+
+
+
+
+
+
+
+
+
+
-    }
-
@@ -422 +434 @@
-     * @param   string  $path  path of url to return status for
-     * @return  array
+     * @todo    implement correct group and user id handling based on content
+     * @todo    implement correct file mode handling based on content
-     */
-    public function url_stat($path)
@@ -438 +452 @@
-        }
-        
-
+
+
+
+
+
+
+
+
+
-                     'mtime' => $content->filemtime()
-               );

trunk/src/test/php/org/stubbles/vfs/vfsStreamWrapperTestCase.php

@@ -240 +240 @@
-        $this->assertTrue($another->hasChild('more'));
-    }
+
+    /**
+     * assert dirname() returns correct directory name
+     */
+    public function testDirname()
+    {
+        $this->assertEqual(dirname($this->barURL), $this->fooURL);
+        $this->assertEqual(dirname($this->baz1URL), $this->barURL);
+        # returns "vfs:" instead of "."
+        # however this seems not to be fixable because dirname() does not
+        # call the stream wrapper
+        #$this->assertEqual(dirname(vfsStream::url('doesNotExist')), '.');
+    }
+
+    /**
+     * assert basename() returns correct file name
+     */
+    public function testBasename()
+    {
+        $this->assertEqual(basename($this->barURL), 'bar');
+        $this->assertEqual(basename($this->baz1URL), 'baz1');
+        $this->assertEqual(basename(vfsStream::url('doesNotExist')), 'doesNotExist');
+    }
+
+    /**
+     * assert is_readable() returns always true for existing pathes
+     *
+     * As long as file mode is not supported, existing pathes will lead to true,
+     * and non-existing pathes to false.
+     */
+    public function testIs_readable()
+    {
+        $this->assertTrue(is_readable($this->fooURL));
+        $this->assertTrue(is_readable($this->barURL));
+        $this->assertTrue(is_readable($this->baz1URL));
+        $this->assertTrue(is_readable($this->baz2URL));
+        $this->assertFalse(is_readable($this->fooURL . '/another'));
+        $this->assertFalse(is_readable(vfsStream::url('another')));
+    }
-}
-?>