Zend\Uri: completed File implementation

- Added tests for expected behavior
- Implemented isValid() method

src/File.php

@@ -40,15 +40,19 @@ class File extends Uri
     /**
      * Check if the URI is a valid File URI
      * 
-     * This applys additional specific validation rules beyond the ones 
-     * required by the generic URI syntax
+     * This applies additional specific validation rules beyond the ones 
+     * required by the generic URI syntax.
      * 
      * @return boolean
      * @see    Uri::isValid()
      */
     public function isValid()
     {
-
+        if ($this->query) {
+            return false;
+        }
+
+        return parent::isValid();
     }
 
     /**
@@ -76,17 +80,17 @@ public function setFragment($fragment)
     /**
      * Convert a UNIX file path to a valid file:// URL
      * 
-     * @param  srting $path
+     * @param  string $path
      * @return File
      */
-    static public function fromUnixPath($path)
+    public static function fromUnixPath($path)
     {
         $url = new self('file:');
         if (substr($path, 0, 1) == '/') {
             $url->setHost('');
         }
+
         $url->setPath($path);
-
         return $url;
     }
 
@@ -96,7 +100,7 @@ static public function fromUnixPath($path)
      * @param  string $path
      * @return File
      */
-    static public function fromWindowsPath($path)
+    public static function fromWindowsPath($path)
     {
         $url = new self('file:');
 
@@ -107,6 +111,8 @@ static public function fromWindowsPath($path)
         if (preg_match('|^([a-zA-Z]:)?/|', $path)) {
             $url->setHost('');
         }
+
         $url->setPath($path);
+        return $url;
     }
 }

test/FileTest.php

@@ -0,0 +1,223 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Uri
+ * @subpackage UnitTests
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/**
+ * @namespace
+ */
+namespace ZendTest\Uri;
+
+use Zend\Uri\File as FileUri,
+    PHPUnit_Framework_TestCase as TestCase;
+
+/**
+ * @category   Zend
+ * @package    Zend_Uri
+ * @subpackage UnitTests
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @group      Zend_Uri
+ * @group      Zend_Uri_Http
+ * @group      Zend_Http
+ */
+class FileTest extends TestCase
+{
+    /**
+     * Data Providers
+     */
+
+    /**
+     * Valid schemes
+     * 
+     * @return array
+     */
+    public static function validSchemeProvider()
+    {
+        return array(
+            array('file'),
+            array('FILE'),
+            array('File'),
+        );
+    }
+
+    /**
+     * Invalid schemes
+     * 
+     * @return array
+     */
+    public static function invalidSchemeProvider()
+    {
+        return array(
+            array('mailto'),
+            array('http'),
+            array('g'),
+            array('file:')
+        );
+    }
+
+    public static function invalidUris()
+    {
+        return array(
+            array('file:foo.bar/baz?bat=boo'),
+            array('file://foo.bar:80/baz?bat=boo'),
+            array('file://user:pass@foo.bar:80/baz?bat=boo'),
+            array('file:///baz?bat=boo'),
+        );
+    }
+
+    public static function validUris()
+    {
+        return array(
+            array('file:///baz'),
+            array('file://example.com/baz'),
+            array('file://example.com:2132/baz'),
+            array('file://example.com:2132/baz#fragment'),
+            array('file://user:info@example.com:2132/baz'),
+            array('file://C:/foo bar/baz'),
+        );
+    }
+
+    public static function unixUris()
+    {
+        return array(
+            array('/foo/bar/baz.bat', '/foo/bar/baz.bat'),
+            array('/foo/bar/../baz.bat', '/foo/baz.bat'),
+            array('/foo/bar/../../baz.bat', '/baz.bat'),
+            array('/foo/bar baz.bat', '/foo/bar%20baz.bat'),
+        );
+    }
+
+    public static function windowsUris()
+    {
+        return array(
+            array('C:\Program Files\Zend Framework\README', 'C:/Program%20Files/Zend%20Framework/README'),
+        );
+    }
+
+    /**
+     * Tests
+     */
+
+    /**
+     * Test that specific schemes are valid for this class
+     * 
+     * @param string $scheme
+     * @dataProvider validSchemeProvider
+     */
+    public function testValidScheme($scheme)
+    {
+        $uri = new FileUri;
+        $uri->setScheme($scheme);
+        $this->assertEquals($scheme, $uri->getScheme());
+    }
+
+    /**
+     * Test that specific schemes are invalid for this class
+     * 
+     * @param string $scheme
+     * @dataProvider invalidSchemeProvider
+     */
+    public function testInvalidScheme($scheme)
+    {
+        $uri = new FileUri;
+        $this->setExpectedException('Zend\Uri\Exception\InvalidUriPartException');
+        $uri->setScheme($scheme);
+    }
+
+    /**
+     * Test that validateScheme returns false for schemes not valid for use
+     * with the File class
+     * 
+     * @param string $scheme
+     * @dataProvider invalidSchemeProvider
+     */
+    public function testValidateSchemeInvalid($scheme)
+    {
+        $this->assertFalse(FileUri::validateScheme($scheme));
+    }
+
+    /**
+     * @dataProvider invalidUris
+     */
+    public function testInvalidFileUris($uri)
+    {
+        $uri = new FileUri($uri);
+        $parts = array(
+            'scheme'    => $uri->getScheme(),
+            'user_info' => $uri->getUserInfo(),
+            'host'      => $uri->getHost(),
+            'port'      => $uri->getPort(),
+            'path'      => $uri->getPath(),
+            'query'     => $uri->getQueryAsArray(),
+            'fragment'  => $uri->getFragment(),
+        );
+        $this->assertFalse($uri->isValid(), var_export($parts, 1));
+    }
+
+    /**
+     * @dataProvider validUris
+     */
+    public function testValidFileUris($uri)
+    {
+        $uri = new FileUri($uri);
+        $parts = array(
+            'scheme'    => $uri->getScheme(),
+            'user_info' => $uri->getUserInfo(),
+            'host'      => $uri->getHost(),
+            'port'      => $uri->getPort(),
+            'path'      => $uri->getPath(),
+            'query'     => $uri->getQueryAsArray(),
+            'fragment'  => $uri->getFragment(),
+        );
+        $this->assertTrue($uri->isValid(), var_export($parts, 1));
+    }
+
+    public function testUserInfoIsAlwaysNull()
+    {
+        $uri = new FileUri('file://user:pass@host/foo/bar');
+        $this->assertNull($uri->getUserInfo());
+    }
+
+    public function testFragmentIsAlwaysNull()
+    {
+        $uri = new FileUri('file:///foo/bar#fragment');
+        $this->assertNull($uri->getFragment());
+    }
+
+    /**
+     * @dataProvider unixUris
+     */
+    public function testCanCreateUriObjectFromUnixPath($path, $expected)
+    {
+        $uri = FileUri::fromUnixPath($path);
+        $uri->normalize();
+        $this->assertEquals($expected, $uri->getPath());
+    }
+
+    /**
+     * @dataProvider windowsUris
+     */
+    public function testCanCreateUriObjectFromWindowsPath($path, $expected)
+    {
+        $uri = FileUri::fromWindowsPath($path);
+        $uri->normalize();
+        $this->assertEquals($expected, $uri->getPath());
+    }
+}