Merge branch 'master' of git://github.com/zendframework/zf2 into ZF2-377

zendframework · Jul 17, 2012 · d35c5af · d35c5af
5 parents 86ede54 + bb4f77a + 38e7a18 + 1ddebf3 + 0ffc57a
commit d35c5af
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/File.php b/src/File.php
@@ -20,7 +20,7 @@
  */
 class File extends Uri
 {
-    static protected $validSchemes = array('file');
+    protected static $validSchemes = array('file');
 
     /**
      * Check if the URI is a valid File URI

diff --git a/test/UriTest.php b/test/UriTest.php
@@ -371,7 +371,7 @@ public function testValidUriIsValid($uriString)
         $this->assertTrue($uri->isValid());
     }
 
-	/**
+    /**
      * Test that valid relative URIs pass validation
      *
      * @param string $uriString
@@ -394,7 +394,7 @@ public function testInvalidUriIsInvalid(Uri $uri)
         $this->assertFalse($uri->isValid());
     }
 
-	/**
+    /**
      * Test that invalid relative URIs fail validation
      *
      * @param \Zend\Uri\Uri $uri
@@ -848,7 +848,7 @@ public function validUriStringProvider()
         );
     }
 
-	/**
+    /**
      * Data provider for valid relative URIs, not necessarily complete
      *
      * @return array
@@ -965,7 +965,7 @@ public function invalidUriObjectProvider()
         );
     }
 
-	/**
+    /**
      * Data provider for invalid relative URI objects
      *
      * @return array