Merge pull request #126 from AlexeyDsov/staticUrlParse

GenericUri::parse now static

Author: AlexeyDsov

doc/ChangeLog

@@ -1,3 +1,10 @@
+2012-09-12	Alexey S. Denisov
+	* main/Net/GenericUri.class.php
+		main/Net/HttpUrl.class.php
+		main/Net/Url.class.php
+		main/Net/Urn.class.php:
+			GenericUri::parse now static
+
 2012-09-12	Alexey S. Denisov
 
 	* main/Flow/HttpRequest.class.php

main/Net/GenericUri.class.php

@@ -41,24 +41,22 @@ public static function create()
 		/**
 		 * @return GenericUri
 		**/
-		final public function parse($uri, $guessClass = false)
+		final public static function parse($uri, $guessClass = false)
 		{
-			$schemePattern = '([^:/?#]+):';
-			$authorityPattern = '(//([^/?#]*))';
-			$restPattern = '([^?#]*)(\?([^#]*))?(#(.*))?';
+			static $schemePattern = '([^:/?#]+):';
+			static $authorityPattern = '(//([^/?#]*))';
+			static $restPattern = '([^?#]*)(\?([^#]*))?(#(.*))?';
 			$matches = array();
 
 			if (
 				$guessClass
-				&& ($knownSubSchemes = $this->getKnownSubSchemes())
+				&& ($knownSubSchemes = static::getKnownSubSchemes())
 				&& preg_match("~^{$schemePattern}~", $uri, $matches)
 				&& isset($knownSubSchemes[strtolower($matches[1])])
 			)
-				$class = $knownSubSchemes[strtolower($matches[1])];
+				$result = new $knownSubSchemes[strtolower($matches[1])];
 			else
-				$class = get_class($this);
-			
-			$result = new $class;
+				$result = new static;
 
 			if ($result instanceof Url)
 				$pattern = "({$schemePattern}{$authorityPattern})?";
@@ -171,11 +169,11 @@ final public function transform(GenericUri $reference, $strict = true)
 			return $result;
 		}
 
-		public function getKnownSubSchemes()
+		public static function getKnownSubSchemes()
 		{
 			return array_merge(
-				Urn::create()->getKnownSubSchemes(),
-				Url::create()->getKnownSubSchemes()
+				Urn::getKnownSubSchemes(),
+				Url::getKnownSubSchemes()
 			);
 		}
 

main/Net/HttpUrl.class.php

@@ -14,7 +14,7 @@
 	**/
 	final class HttpUrl extends Url
 	{
-		protected $knownSubSchemes	= array();
+		protected static $knownSubSchemes	= array();
 
 		/**
 		 * @return HttpUrl

main/Net/Url.class.php

@@ -17,7 +17,7 @@
 	**/
 	class Url extends GenericUri
 	{
-		protected $knownSubSchemes	= array(
+		protected static $knownSubSchemes	= array(
 			'http'		=> 'HttpUrl',
 			'https'		=> 'HttpUrl',
 			'ftp'		=> 'Url',
@@ -37,9 +37,9 @@ public static function create()
 			return new self;
 		}
 
-		public function getKnownSubSchemes()
+		public static function getKnownSubSchemes()
 		{
-			return $this->knownSubSchemes;
+			return static::$knownSubSchemes;
 		}
 
 		public function isValid()

main/Net/Urn.class.php

@@ -18,7 +18,7 @@ final class Urn extends GenericUri
 	{
 		protected $schemeSpecificPart	= null;
 
-		protected $knownSubSchemes	= array(
+		protected static $knownSubSchemes	= array(
 			'urn'		=> 'Urn',
 			'mailto'	=> 'Urn',
 			'news'		=> 'Urn',
@@ -35,9 +35,9 @@ public static function create()
 			return new self;
 		}
 
-		public function getKnownSubSchemes()
+		public static function getKnownSubSchemes()
 		{
-			return $this->knownSubSchemes;
+			return static::$knownSubSchemes;
 		}
 
 		public function isValid()

test/main/GenericUriTest.class.php

@@ -3,7 +3,6 @@
  *   Copyright (C) 2007 by Ivan Khvostishkov                               *
  *   [email protected]                                                 *
  ***************************************************************************/
-/* $Id$ */
 
 	final class GenericUriTest extends TestCase
 	{
@@ -92,11 +91,9 @@ public function testParser()
 
 				if (!$parserClass)
 					$parserClass = 'GenericUri';
-					
-				$parser = new $parserClass;
 
 				try {
-					$url = $parser->parse($testUrl, true);
+					$url = ClassUtils::callStaticMethod("$parserClass::parse", $testUrl, true);
 				} catch (WrongArgumentException $e) {
 					$exception = $e;
 				}