Permalink
Browse files

[hotfix/ZF-11122] Documentation

- fixed year within copyright headers
  • Loading branch information...
1 parent e76d957 commit 7fb12ddbbc4b9ed70f73f79d065baa74bfe0db47 @thomasweidner thomasweidner committed Jul 26, 2011
View
2 demos/Zend/Gdata/3LeggedOAuth/Gdata_OAuth_Helper.php 100755 → 100644
@@ -10,7 +10,7 @@
* @category Zend
* @package Zend_Gdata
* @subpackage Demos
- * @copyright Copyright (c) 2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
View
8 library/Zend/Config/Json.php 100755 → 100644
@@ -14,7 +14,7 @@
*
* @category Zend
* @package Zend_Config
- * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -27,7 +27,7 @@
*
* @category Zend
* @package Zend_Config
- * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Json extends Config
@@ -229,8 +229,8 @@ protected function _getConstants()
/**
* Flatten JSON object structure to associative array
- *
- * @param object|array $config
+ *
+ * @param object|array $config
* @return array
*/
protected function flattenObjects($config)
View
4 library/Zend/Config/Writer/Json.php 100755 → 100644
@@ -14,7 +14,7 @@
*
* @category Zend
* @package Zend_Config
- * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -26,7 +26,7 @@
/**
* @category Zend
* @package Zend_Config
- * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Json extends AbstractFileWriter
View
4 library/Zend/Config/Writer/Yaml.php 100755 → 100644
@@ -14,7 +14,7 @@
*
* @category Zend
* @package Zend_Config
- * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@@ -27,7 +27,7 @@
/**
* @category Zend
* @package Zend_Config
- * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Yaml extends AbstractFileWriter
View
32 library/Zend/GData/Spreadsheets.php
@@ -29,22 +29,22 @@
*
* @link http://code.google.com/apis/gdata/spreadsheets.html
*
- * @uses \Zend\GData\GData
- * @uses \Zend\GData\Spreadsheets\CellEntry
- * @uses \Zend\GData\Spreadsheets\CellFeed
- * @uses \Zend\GData\Spreadsheets\CellQuery
- * @uses \Zend\GData\Spreadsheets\DocumentQuery
- * @uses \Zend\GData\Spreadsheets\ListEntry
- * @uses \Zend\GData\Spreadsheets\ListFeed
- * @uses \Zend\GData\Spreadsheets\ListQuery
- * @uses \Zend\GData\Spreadsheets\SpreadsheetEntry
- * @uses \Zend\GData\Spreadsheets\SpreadsheetFeed
- * @uses \Zend\GData\Spreadsheets\WorksheetEntry
- * @category Zend
- * @package Zend_Gdata
- * @subpackage Spreadsheets
- * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @uses \Zend\GData\GData
+ * @uses \Zend\GData\Spreadsheets\CellEntry
+ * @uses \Zend\GData\Spreadsheets\CellFeed
+ * @uses \Zend\GData\Spreadsheets\CellQuery
+ * @uses \Zend\GData\Spreadsheets\DocumentQuery
+ * @uses \Zend\GData\Spreadsheets\ListEntry
+ * @uses \Zend\GData\Spreadsheets\ListFeed
+ * @uses \Zend\GData\Spreadsheets\ListQuery
+ * @uses \Zend\GData\Spreadsheets\SpreadsheetEntry
+ * @uses \Zend\GData\Spreadsheets\SpreadsheetFeed
+ * @uses \Zend\GData\Spreadsheets\WorksheetEntry
+ * @category Zend
+ * @package Zend_Gdata
+ * @subpackage Spreadsheets
+ * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Spreadsheets extends GData
{
View
10 library/Zend/Uri/Exception/InvalidUriException.php
@@ -15,7 +15,7 @@
*
* @category Zend
* @package Zend_Uri
- * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@@ -31,12 +31,12 @@
* @uses \Zend\URI\Exception
* @category Zend
* @package Zend_Uri
- * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
-class InvalidUriException
- extends \InvalidArgumentException
+class InvalidUriException
+ extends \InvalidArgumentException
implements \Zend\Uri\Exception
{
-
+
}
View
10 library/Zend/Uri/Exception/InvalidUriTypeException.php
@@ -15,7 +15,7 @@
*
* @category Zend
* @package Zend_Uri
- * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@@ -31,12 +31,12 @@
* @uses \Zend\URI\Exception
* @category Zend
* @package Zend_Uri
- * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
-class InvalidUriTypeException
- extends \InvalidArgumentException
+class InvalidUriTypeException
+ extends \InvalidArgumentException
implements \Zend\Uri\Exception
{
-
+
}
View
30 library/Zend/Uri/File.php
@@ -14,7 +14,7 @@
*
* @category Zend
* @package Zend_Uri
- * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -27,10 +27,10 @@
* File URI handler
*
* The 'file:...' scheme is loosly defined in RFC-1738
- *
+ *
* @category Zend
* @package Zend_Uri
- * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class File extends Uri
@@ -39,10 +39,10 @@ class File extends Uri
/**
* Check if the URI is a valid File URI
- *
- * This applies additional specific validation rules beyond the ones
+ *
+ * This applies additional specific validation rules beyond the ones
* required by the generic URI syntax.
- *
+ *
* @return boolean
* @see Uri::isValid()
*/
@@ -54,32 +54,32 @@ public function isValid()
return parent::isValid();
}
-
+
/**
* User Info part is not used in file URIs
- *
+ *
* @see Uri::setUserInfo()
* @throws Exception\InvalidUriPartException
*/
public function setUserInfo($userInfo)
{
return $this;
}
-
+
/**
* Fragment part is not used in file URIs
- *
+ *
* @see Uri::setFragment()
* @throws Exception\InvalidUriPartException
*/
public function setFragment($fragment)
{
return $this;
}
-
+
/**
* Convert a UNIX file path to a valid file:// URL
- *
+ *
* @param string $path
* @return File
*/
@@ -93,10 +93,10 @@ public static function fromUnixPath($path)
$url->setPath($path);
return $url;
}
-
+
/**
* Convert a Windows file path to a valid file:// URL
- *
+ *
* @param string $path
* @return File
*/
@@ -106,7 +106,7 @@ public static function fromWindowsPath($path)
// Convert directory separators
$path = str_replace(array('/', '\\'), array('%2F', '/'), $path);
-
+
// Is this an absolute path?
if (preg_match('|^([a-zA-Z]:)?/|', $path)) {
$url->setHost('');
View
38 library/Zend/Uri/Http.php
@@ -14,7 +14,7 @@
*
* @category Zend
* @package Zend_Uri
- * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -28,7 +28,7 @@
*
* @category Zend
* @package Zend_Uri
- * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Http extends Uri
@@ -37,15 +37,15 @@ class Http extends Uri
* @see Uri::$validSchemes
*/
protected static $validSchemes = array('http', 'https');
-
+
/**
* @see Uri::$defaultPorts
*/
protected static $defaultPorts = array(
'http' => 80,
'https' => 443,
);
-
+
/**
* @see Uri::$validHostTypes
*/
@@ -62,13 +62,13 @@ class Http extends Uri
* @var null|string
*/
protected $password;
-
+
/**
* Check if the URI is a valid HTTP URI
- *
- * This applys additional HTTP specific validation rules beyond the ones
+ *
+ * This applys additional HTTP specific validation rules beyond the ones
* required by the generic URI syntax
- *
+ *
* @return boolean
* @see Uri::isValid()
*/
@@ -79,7 +79,7 @@ public function isValid()
/**
* Get the username part (before the ':') of the userInfo URI part
- *
+ *
* @return null|string
*/
public function getUser()
@@ -91,10 +91,10 @@ public function getUser()
$this->parseUserInfo();
return $this->user;
}
-
+
/**
* Get the password part (after the ':') of the userInfo URI part
- *
+ *
* @return string
*/
public function getPassword()
@@ -109,7 +109,7 @@ public function getPassword()
/**
* Set the username part (before the ':') of the userInfo URI part
- *
+ *
* @param string $user
* @return Http
*/
@@ -118,10 +118,10 @@ public function setUser($user)
$this->user = $user;
return $this;
}
-
+
/**
* Set the password part (after the ':') of the userInfo URI part
- *
+ *
* @param string $password
* @return Http
*/
@@ -130,13 +130,13 @@ public function setPassword($password)
$this->password = $password;
return $this;
}
-
+
/**
* Validate the host part of an HTTP URI
- *
+ *
* This overrides the common URI validation method with a DNS or IPv4 only
* default. Users may still enforce allowing other host types.
- *
+ *
* @param string $host
* @param integer $allowed
* @return boolean
@@ -149,9 +149,9 @@ public static function validateHost($host, $allowed = self::HOST_DNSORIPV4)
/**
* Parse the user info into username and password segments
*
- * Parses the user information into username and password segments, and
+ * Parses the user information into username and password segments, and
* then sets the appropriate values.
- *
+ *
* @return void
*/
protected function parseUserInfo()
View
32 library/Zend/Uri/Mailto.php
@@ -14,7 +14,7 @@
*
* @category Zend
* @package Zend_Uri
- * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -30,10 +30,10 @@
* "Mailto" URI handler
*
* The 'mailto:...' scheme is loosly defined in RFC-1738
- *
+ *
* @category Zend
* @package Zend_Uri
- * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Mailto extends Uri
@@ -45,13 +45,13 @@ class Mailto extends Uri
* @var Validator
*/
protected $emailValidator;
-
+
/**
* Check if the URI is a valid Mailto URI
- *
- * This applys additional specific validation rules beyond the ones
+ *
+ * This applys additional specific validation rules beyond the ones
* required by the generic URI syntax
- *
+ *
* @return boolean
* @see Uri::isValid()
*/
@@ -72,25 +72,25 @@ public function isValid()
$validator = $this->getValidator();
return $validator->isValid($this->path);
}
-
+
/**
* Set the email address
- *
+ *
* This is infact equivalent to setPath() - but provides a more clear interface
- *
+ *
* @param string $email
* @return Mailto
*/
public function setEmail($email)
{
return $this->setPath($email);
}
-
+
/**
* Get the email address
- *
+ *
* This is infact equivalent to getPath() - but provides a more clear interface
- *
+ *
* @return string
*/
public function getEmail()
@@ -100,8 +100,8 @@ public function getEmail()
/**
* Set validator to use when validating email address
- *
- * @param Validator $validator
+ *
+ * @param Validator $validator
* @return Mailto
*/
public function setValidator(Validator $validator)
@@ -115,7 +115,7 @@ public function setValidator(Validator $validator)
*
* If none is currently set, an EmailValidator instance with default options
* will be used.
- *
+ *
* @return Validator
*/
public function getValidator()
View
592 library/Zend/Uri/Uri.php
@@ -14,7 +14,7 @@
*
* @category Zend
* @package Zend_Uri
- * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@@ -31,7 +31,7 @@
*
* @category Zend
* @package Zend_Uri
- * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Uri
@@ -43,64 +43,64 @@ class Uri
const CHAR_GEN_DELIMS = ':\/\?#\[\]@';
const CHAR_SUB_DELIMS = '!\$&\'\(\)\*\+,;=';
const CHAR_RESERVED = ':\/\?#\[\]@!\$&\'\(\)\*\+,;=';
-
+
/**
* Host part types
*/
const HOST_IPV4 = 1;
const HOST_IPV6 = 2;
const HOST_IPVF = 4;
- const HOST_IPVANY = 7;
+ const HOST_IPVANY = 7;
const HOST_DNSNAME = 8;
- const HOST_DNSORIPV4 = 9;
+ const HOST_DNSORIPV4 = 9;
const HOST_REGNAME = 16;
const HOST_ALL = 31;
-
+
/**
- * URI scheme
- *
+ * URI scheme
+ *
* @var string
*/
protected $scheme;
-
+
/**
* URI userInfo part (usually user:password in HTTP URLs)
- *
+ *
* @var string
*/
protected $userInfo;
-
+
/**
* URI hostname
- *
+ *
* @var string
*/
protected $host;
-
+
/**
* URI port
- *
+ *
* @var integer
*/
protected $port;
-
+
/**
* URI path
- *
+ *
* @var string
*/
protected $path;
-
+
/**
* URI query string
- *
+ *
* @var string
*/
protected $query;
-
+
/**
* URI fragment
- *
+ *
* @var string
*/
protected $fragment;
@@ -111,36 +111,36 @@ class Uri
* @var integer
*/
protected $validHostTypes = self::HOST_ALL;
-
+
/**
* Array of valid schemes.
- *
+ *
* Subclasses of this class that only accept specific schemes may set the
* list of accepted schemes here. If not empty, when setScheme() is called
- * it will only accept the schemes listed here.
+ * it will only accept the schemes listed here.
*
* @var array
*/
protected static $validSchemes = array();
-
+
/**
* List of default ports per scheme
- *
+ *
* Inheriting URI classes may set this, and the normalization methods will
* automatically remove the port if it is equal to the default port for the
* current scheme
- *
+ *
* @var array
*/
protected static $defaultPorts = array();
-
+
/**
* Create a new URI object
- *
+ *
* @param \Zend\Uri\Uri|string|null $uri
* @throws Exception\InvalidArgumentException
*/
- public function __construct($uri = null)
+ public function __construct($uri = null)
{
if (is_string($uri)) {
$this->parse($uri);
@@ -163,50 +163,50 @@ public function __construct($uri = null)
/**
* Check if the URI is valid
- *
+ *
* Note that a relative URI may still be valid
- *
+ *
* @return boolean
*/
public function isValid()
{
if ($this->host) {
if (strlen($this->path) > 0 && substr($this->path, 0, 1) != '/') {
- return false;
+ return false;
}
return true;
}
if ($this->userInfo || $this->port) {
return false;
}
-
- if ($this->path) {
+
+ if ($this->path) {
// Check path-only (no host) URI
if (substr($this->path, 0, 2) == '//') {
- return false;
+ return false;
}
return true;
- }
+ }
if (! ($this->query || $this->fragment)) {
- // No host, path, query or fragment - this is not a valid URI
+ // No host, path, query or fragment - this is not a valid URI
return false;
}
-
+
return true;
}
-
+
/**
* Check if the URI is an absolute or relative URI
- *
+ *
* @return boolean
*/
public function isAbsolute()
{
return ($this->scheme !== null);
}
-
+
/**
* Parse a URI string
*
@@ -216,16 +216,16 @@ public function isAbsolute()
public function parse($uri)
{
// Capture scheme
- if (($scheme = self::parseScheme($uri)) !== null) {
+ if (($scheme = self::parseScheme($uri)) !== null) {
$this->setScheme($scheme);
$uri = substr($uri, strlen($scheme) + 1);
}
-
+
// Capture authority part
if (preg_match('|^//([^/\?#]*)|', $uri, $match)) {
$authority = $match[1];
$uri = substr($uri, strlen($match[0]));
-
+
// Split authority into userInfo and host
if (strpos($authority, '@') !== false) {
// The userInfo can also contain '@' symbols; split $authority
@@ -236,7 +236,7 @@ public function parse($uri)
unset($segments);
$this->setUserInfo($userInfo);
}
-
+
$colonPos = strrpos($authority, ':');
if ($colonPos !== false) {
$port = substr($authority, $colonPos + 1);
@@ -245,14 +245,14 @@ public function parse($uri)
}
$authority = substr($authority, 0, $colonPos);
}
-
+
$this->setHost($authority);
}
if (!$uri) {
return $this;
}
-
+
// Capture the path
if (preg_match('|^[^\?#]*|', $uri, $match)) {
$this->setPath($match[0]);
@@ -261,7 +261,7 @@ public function parse($uri)
if (!$uri) {
return $this;
}
-
+
// Capture the query
if (preg_match('|^\?([^#]*)|', $uri, $match)) {
$this->setQuery($match[1]);
@@ -270,32 +270,32 @@ public function parse($uri)
if (!$uri) {
return $this;
}
-
+
// All that's left is the fragment
if ($uri && substr($uri, 0, 1) == '#') {
$this->setFragment(substr($uri, 1));
}
-
+
return $this;
}
/**
* Compose the URI into a string
- *
+ *
* @return string
*/
public function toString()
{
if (!$this->isValid()) {
throw new Exception\InvalidUriException('URI is not valid and cannot be converted into a string');
}
-
+
$uri = '';
if ($this->scheme) {
- $uri .= $this->scheme . ':';
+ $uri .= $this->scheme . ':';
}
-
+
if ($this->host !== null) {
$uri .= '//';
if ($this->userInfo) {
@@ -312,7 +312,7 @@ public function toString()
} elseif ($this->host && ($this->query || $this->fragment)) {
$uri .= '/';
}
-
+
if ($this->query) {
$uri .= "?" . self::encodeQueryFragment($this->query);
}
@@ -323,64 +323,64 @@ public function toString()
return $uri;
}
-
+
/**
* Normalize the URI
- *
- * Normalizing a URI includes removing any redundant parent directory or
+ *
+ * Normalizing a URI includes removing any redundant parent directory or
* current directory references from the path (e.g. foo/bar/../baz becomes
- * foo/baz), normalizing the scheme case, decoding any over-encoded
- * characters etc.
- *
- * Eventually, two normalized URLs pointing to the same resource should be
- * equal even if they were originally represented by two different strings
- *
+ * foo/baz), normalizing the scheme case, decoding any over-encoded
+ * characters etc.
+ *
+ * Eventually, two normalized URLs pointing to the same resource should be
+ * equal even if they were originally represented by two different strings
+ *
* @return Uri
*/
public function normalize()
{
- if ($this->scheme) {
+ if ($this->scheme) {
$this->scheme = static::normalizeScheme($this->scheme);
}
-
- if ($this->host) {
+
+ if ($this->host) {
$this->host = static::normalizeHost($this->host);
}
-
- if ($this->port) {
+
+ if ($this->port) {
$this->port = static::normalizePort($this->port, $this->scheme);
}
-
- if ($this->path) {
+
+ if ($this->path) {
$this->path = static::normalizePath($this->path);
}
-
- if ($this->query) {
+
+ if ($this->query) {
$this->query = static::normalizeQuery($this->query);
}
-
- if ($this->fragment) {
+
+ if ($this->fragment) {
$this->fragment = static::normalizeFragment($this->fragment);
}
-
+
// If path is empty (and we have a host), path should be '/'
- if ($this->host && empty($this->path)) {
+ if ($this->host && empty($this->path)) {
$this->path = '/';
}
-
+
return $this;
}
-
+
/**
- * Convert a relative URI into an absolute URI using a base absolute URI as
+ * Convert a relative URI into an absolute URI using a base absolute URI as
* a reference.
- *
- * This is similar to merge() - only it uses the supplied URI as the
+ *
+ * This is similar to merge() - only it uses the supplied URI as the
* base reference instead of using the current URI as the base reference.
- *
- * Merging algorithm is adapted from RFC-3986 section 5.2
+ *
+ * Merging algorithm is adapted from RFC-3986 section 5.2
* (@link http://tools.ietf.org/html/rfc3986#section-5.2)
- *
+ *
* @param Uri|string $baseUri
* @return Uri
*/
@@ -390,22 +390,22 @@ public function resolve($baseUri)
if ($this->isAbsolute()) {
return $this;
}
-
+
if (is_string($baseUri)) {
$baseUri = new static($baseUri);
}
-
+
if (!$baseUri instanceof static) {
throw new Exception\InvalidUriTypeException(sprintf(
'Provided base URL is not an instance of "%s"',
get_class($this)
));
}
-
+
// Merging starts here...
if ($this->getHost()) {
$this->setPath(static::removePathDotSegments($this->getPath()));
- } else {
+ } else {
$basePath = $baseUri->getPath();
$relPath = $this->getPath();
if (!$relPath) {
@@ -425,80 +425,80 @@ public function resolve($baseUri)
$this->setPath(static::removePathDotSegments($mergedPath . $relPath));
}
}
-
+
// Set the authority part
$this->setUserInfo($baseUri->getUserInfo());
$this->setHost($baseUri->getHost());
$this->setPort($baseUri->getPort());
}
-
+
$this->setScheme($baseUri->getScheme());
return $this;
- }
-
+ }
+
/**
* Convert the link to a relative link by substracting a base URI
- *
- * This is the opposite of resolving a relative link - i.e. creating a
- * relative reference link from an original URI and a base URI.
- *
+ *
+ * This is the opposite of resolving a relative link - i.e. creating a
+ * relative reference link from an original URI and a base URI.
+ *
* If the two URIs do not intersect (e.g. the original URI is not in any
- * way related to the base URI) the URI will not be modified.
- *
- * @param Uri|string $baseUri
+ * way related to the base URI) the URI will not be modified.
+ *
+ * @param Uri|string $baseUri
* @return Uri
*/
public function makeRelative($baseUri)
{
// Copy base URI, we should not modify it
$baseUri = new static($baseUri);
-
+
$this->normalize();
$baseUri->normalize();
-
+
$host = $this->getHost();
$baseHost = $baseUri->getHost();
if ($host && $baseHost && ($host != $baseHost)) {
- // Not the same hostname
- return $this;
+ // Not the same hostname
+ return $this;
}
-
+
$port = $this->getPort();
$basePort = $baseUri->getPort();
if ($port && $basePort && ($port != $basePort)) {
// Not the same port
return $this;
}
-
+
$scheme = $this->getScheme();
$baseScheme = $baseUri->getScheme();
if ($scheme && $baseScheme && ($scheme != $baseScheme)) {
- // Not the same scheme (e.g. HTTP vs. HTTPS)
+ // Not the same scheme (e.g. HTTP vs. HTTPS)
return $this;
}
-
+
// Remove host, port and scheme
$this->setHost(null)
->setPort(null)
->setScheme(null);
-
- // Is path the same?
- if ($this->getPath() == $baseUri->getPath()) {
+
+ // Is path the same?
+ if ($this->getPath() == $baseUri->getPath()) {
$this->setPath('');
return $this;
}
-
+
$pathParts = preg_split('|(/)|', $this->getPath(), null, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
$baseParts = preg_split('|(/)|', $baseUri->getPath(), null, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
-
- // Get the intersection of existing path parts and those from the
+
+ // Get the intersection of existing path parts and those from the
// provided URI
$matchingParts = array_intersect_assoc($pathParts, $baseParts);
// Loop through the matches
foreach ($matchingParts as $index => $segment) {
- // If we skip an index at any point, we have parent traversal, and
+ // If we skip an index at any point, we have parent traversal, and
// need to prepend the path accordingly
if ($index && !isset($matchingParts[$index - 1])) {
array_unshift($pathParts, '../');
@@ -514,10 +514,10 @@ public function makeRelative($baseUri)
return $this;
}
-
+
/**
- * Get the scheme part of the URI
- *
+ * Get the scheme part of the URI
+ *
* @return string|null
*/
public function getScheme()
@@ -527,7 +527,7 @@ public function getScheme()
/**
* Get the User-info (usually user:password) part
- *
+ *
* @return string|null
*/
public function getUserInfo()
@@ -537,7 +537,7 @@ public function getUserInfo()
/**
* Get the URI host
- *
+ *
* @return string|null
*/
public function getHost()
@@ -547,7 +547,7 @@ public function getHost()
/**
* Get the URI port
- *
+ *
* @return integer|null
*/
public function getPort()
@@ -557,7 +557,7 @@ public function getPort()
/**
* Get the URI path
- *
+ *
* @return string|null
*/
public function getPath()
@@ -567,20 +567,20 @@ public function getPath()
/**
* Get the URI query
- *
+ *
* @return string|null
*/
public function getQuery()
{
return $this->query;
}
-
+
/**
* Return the query string as an associative array of key => value pairs
*
* This is an extension to RFC-3986 but is quite useful when working with
* most common URI types
- *
+ *
* @return array
*/
public function getQueryAsArray()
@@ -589,31 +589,31 @@ public function getQueryAsArray()
if ($this->query) {
parse_str($this->query, $query);
}
-
+
return $query;
}
/**
* Get the URI fragment
- *
+ *
* @return string|null
*/
public function getFragment()
{
return $this->fragment;
}
- /**
- * Set the URI scheme
- *
- * If the scheme is not valid according to the generic scheme syntax or
- * is not acceptable by the specific URI class (e.g. 'http' or 'https' are
- * the only acceptable schemes for the Zend\Uri\Http class) an exception
- * will be thrown.
- *
- * You can check if a scheme is valid before setting it using the
- * validateScheme() method.
- *
+ /**
+ * Set the URI scheme
+ *
+ * If the scheme is not valid according to the generic scheme syntax or
+ * is not acceptable by the specific URI class (e.g. 'http' or 'https' are
+ * the only acceptable schemes for the Zend\Uri\Http class) an exception
+ * will be thrown.
+ *
+ * You can check if a scheme is valid before setting it using the
+ * validateScheme() method.
+ *
* @param string $scheme
* @throws Exception\InvalidUriPartException
* @return Uri
@@ -622,19 +622,19 @@ public function setScheme($scheme)
{
if (($scheme !== null) && (!self::validateScheme($scheme))) {
throw new Exception\InvalidUriPartException(sprintf(
- 'Scheme "%s" is not valid or is not accepted by %s',
+ 'Scheme "%s" is not valid or is not accepted by %s',
$scheme,
get_class($this)
), Exception\InvalidUriPartException::INVALID_SCHEME);
}
-
+
$this->scheme = $scheme;
return $this;
}
/**
* Set the URI User-info part (usually user:password)
- *
+ *
* @param string $userInfo
* @return Uri
*/
@@ -646,25 +646,25 @@ public function setUserInfo($userInfo)
/**
* Set the URI host
- *
+ *
* Note that the generic syntax for URIs allows using host names which
- * are not neceserily IPv4 addresses or valid DNS host names. For example,
+ * are not neceserily IPv4 addresses or valid DNS host names. For example,
* IPv6 addresses are allowed as well, and also an abstract "registered name"
- * which may be any name composed of a valid set of characters, including,
+ * which may be any name composed of a valid set of characters, including,
* for example, tilda (~) and underscore (_) which are not allowed in DNS
- * names.
- *
- * Subclasses of Uri may impose more strict validation of host names - for
- * example the HTTP RFC clearly states that only IPv4 and valid DNS names
- * are allowed in HTTP URIs.
- *
+ * names.
+ *
+ * Subclasses of Uri may impose more strict validation of host names - for
+ * example the HTTP RFC clearly states that only IPv4 and valid DNS names
+ * are allowed in HTTP URIs.
+ *
* @param string $host
* @return Uri
*/
public function setHost($host)
{
- if (($host !== '')
- && ($host !== null)
+ if (($host !== '')
+ && ($host !== null)
&& !self::validateHost($host, $this->validHostTypes)
) {
throw new Exception\InvalidUriPartException(sprintf(
@@ -673,14 +673,14 @@ public function setHost($host)
get_class($this)
), Exception\InvalidUriPartException::INVALID_HOSTNAME);
}
-
+
$this->host = $host;
return $this;
}
/**
* Set the port part of the URI
- *
+ *
* @param integer $port
* @return Uri
*/
@@ -692,7 +692,7 @@ public function setPort($port)
/**
* Set the path
- *
+ *
* @param string $path
* @return Uri
*/
@@ -704,29 +704,29 @@ public function setPath($path)
/**
* Set the query string
- *
- * If an array is provided, will encode this array of parameters into a
+ *
+ * If an array is provided, will encode this array of parameters into a
* query string. Array values will be represented in the query string using
- * PHP's common square bracket notation.
- *
+ * PHP's common square bracket notation.
+ *
* @param string|array $query
* @return Uri
*/
public function setQuery($query)
{
if (is_array($query)) {
- // We replace the + used for spaces by http_build_query with the
- // more standard %20.
+ // We replace the + used for spaces by http_build_query with the
+ // more standard %20.
$query = str_replace('+', '%20', http_build_query($query));
}
-
+
$this->query = $query;
return $this;
}
/**
* Set the URI fragment part
- *
+ *
* @param string $fragment
* @return Uri
*/
@@ -738,46 +738,46 @@ public function setFragment($fragment)
/**
* Magic method to convert the URI to a string
- *
+ *
* @return string
*/
- public function __toString()
+ public function __toString()
{
try {
return $this->toString();
- } catch (\Exception $e) {
+ } catch (\Exception $e) {
return '';
}
}
-
+
/**
* Encoding and Validation Methods
*/
/**
* Check if a scheme is valid or not
- *
+ *
* Will check $scheme to be valid against the generic scheme syntax defined
* in RFC-3986. If the class also defines specific acceptable schemes, will
* also check that $scheme is one of them.
- *
+ *
* @param string $scheme
* @return boolean
*/
public static function validateScheme($scheme)
{
- if (!empty(static::$validSchemes)
+ if (!empty(static::$validSchemes)
&& !in_array(strtolower($scheme), static::$validSchemes)
) {
return false;
}
-
+
return (bool) preg_match('/^[A-Za-z][A-Za-z0-9\-\.+]*$/', $scheme);
}
-
+
/**
* Check that the userInfo part of a URI is valid
- *
+ *
* @param string $userInfo
* @return boolean
*/
@@ -786,74 +786,74 @@ public static function validateUserInfo($userInfo)
$regex = '/^(?:[' . self::CHAR_UNRESERVED . self::CHAR_SUB_DELIMS . ':]+|%[A-Fa-f0-9]{2})*$/';
return (boolean) preg_match($regex, $userInfo);
}
-
+
/**
* Validate the host part
- *
+ *
* Users may control which host types to allow by passing a second parameter
* with a bitmask of HOST_* constants which are allowed. If not specified,
- * all address types will be allowed.
- *
- * Note that the generic URI syntax allows different host representations,
- * including IPv4 addresses, IPv6 addresses and future IP address formats
- * enclosed in square brackets, and registered names which may be DNS names
- * or even more complex names. This is different (and is much more loose)
+ * all address types will be allowed.
+ *
+ * Note that the generic URI syntax allows different host representations,
+ * including IPv4 addresses, IPv6 addresses and future IP address formats
+ * enclosed in square brackets, and registered names which may be DNS names
+ * or even more complex names. This is different (and is much more loose)
* from what is commonly accepted as valid HTTP URLs for example.
- *
+ *
* @param string $host
- * @param integer $allowed bitmask of allowed host types
+ * @param integer $allowed bitmask of allowed host types
* @return boolean
*/
public static function validateHost($host, $allowed = self::HOST_ALL)
{
- if ($allowed & self::HOST_REGNAME) {
+ if ($allowed & self::HOST_REGNAME) {
if (static::isValidRegName($host)) {
return true;
}
}
-
- if ($allowed & self::HOST_DNSNAME) {
+
+ if ($allowed & self::HOST_DNSNAME) {
if (static::isValidDnsHostname($host)) {
return true;
}
}
-
+
if ($allowed & self::HOST_IPVANY) {
if (static::isValidIpAddress($host, $allowed)) {
- return true;
+ return true;
}
}
-
+
return false;
}
-
+
/**
- * Validate the port
- *
+ * Validate the port
+ *
* Valid values include numbers between 1 and 65535, and empty values
- *
+ *
* @param integer $port
* @return boolean
*/
public static function validatePort($port)
{
if ($port === 0) {
- return false;
+ return false;
}
-
+
if ($port) {
$port = (int) $port;
if ($port < 1 || $port > 0xffff) {
return false;
}
}
-
+
return true;
}
-
+
/**
- * Validate the path
- *
+ * Validate the path
+ *
* @param string $path
* @return boolean
*/
@@ -867,25 +867,25 @@ public static function validatePath($path)
/**
* Check if a URI query or fragment part is valid or not
- *
- * Query and Fragment parts are both restricted by the same syntax rules,
- * so the same validation method can be used for both.
- *
+ *
+ * Query and Fragment parts are both restricted by the same syntax rules,
+ * so the same validation method can be used for both.
+ *
* You can encode a query or fragment part to ensure it is valid by passing
* it through the encodeQueryFragment() method.
- *
+ *
* @param string $input
- * @return boolean
+ * @return boolean
*/
public static function validateQueryFragment($input)
{
$regex = '/^(?:[' . self::CHAR_UNRESERVED . self::CHAR_SUB_DELIMS . ':@\/\?]+|%[A-Fa-f0-9]{2})*$/';
return (boolean) preg_match($regex, $input);
}
-
+
/**
- * URL-encode the user info part of a URI
- *
+ * URL-encode the user info part of a URI
+ *
* @param string $userInfo
* @return string
* @throws Exception\InvalidArgumentException
@@ -898,21 +898,21 @@ public static function encodeUserInfo($userInfo)
(is_object($userInfo) ? get_class($userInfo) : gettype($userInfo))
));
}
-
- $regex = '/(?:[^' . self::CHAR_UNRESERVED . self::CHAR_SUB_DELIMS . '%:]|%(?![A-Fa-f0-9]{2}))/';
+
+ $regex = '/(?:[^' . self::CHAR_UNRESERVED . self::CHAR_SUB_DELIMS . '%:]|%(?![A-Fa-f0-9]{2}))/';
$replace = function($match) {
return rawurlencode($match[0]);
};
-
+
return preg_replace_callback($regex, $replace, $userInfo);
}
-
+
/**
* Encode the path
- *
+ *
* Will replace all characters which are not strictly allowed in the path
* part with percent-encoded representation
- *
+ *
* @param string $path
* @return string
*/
@@ -923,23 +923,23 @@ public static function encodePath($path)
'Expecting a string, got %s',
(is_object($path) ? get_class($path) : gettype($path))
));
- }
-
+ }
+
$regex = '/(?:[^' . self::CHAR_UNRESERVED . ':@&=\+\$,\/;%]+|%(?![A-Fa-f0-9]{2}))/';
$replace = function($match) {
return rawurlencode($match[0]);
};
-
+
return preg_replace_callback($regex, $replace, $path);
}
-
+
/**
- * URL-encode a query string or fragment based on RFC-3986 guidelines.
- *
- * Note that query and fragment encoding allows more unencoded characters
- * than the usual rawurlencode() function would usually return - for example
+ * URL-encode a query string or fragment based on RFC-3986 guidelines.
+ *
+ * Note that query and fragment encoding allows more unencoded characters
+ * than the usual rawurlencode() function would usually return - for example
* '/' and ':' are allowed as literals.
- *
+ *
* @param string $input
* @return string
*/
@@ -950,26 +950,26 @@ public static function encodeQueryFragment($input)
'Expecting a string, got %s',
(is_object($input) ? get_class($input) : gettype($input))
));
- }
-
- $regex = '/(?:[^' . self::CHAR_UNRESERVED . self::CHAR_SUB_DELIMS . '%:@\/\?]+|%(?![A-Fa-f0-9]{2}))/';
+ }
+
+ $regex = '/(?:[^' . self::CHAR_UNRESERVED . self::CHAR_SUB_DELIMS . '%:@\/\?]+|%(?![A-Fa-f0-9]{2}))/';
$replace = function($match) {
return rawurlencode($match[0]);
};
-
+
return preg_replace_callback($regex, $replace, $input);
}
-
+
/**
- * Extract only the scheme part out of a URI string.
- *
+ * Extract only the scheme part out of a URI string.
+ *
* This is used by the parse() method, but is useful as a standalone public
* method if one wants to test a URI string for it's scheme before doing
* anything with it.
- *
- * Will return the scmeme if found, or NULL if no scheme found (URI may
+ *
+ * Will return the scmeme if found, or NULL if no scheme found (URI may
* still be valid, but not full)
- *
+ *
* @param string $uriString
* @return string|null
* @throws InvalidArgumentException
@@ -982,34 +982,34 @@ public static function parseScheme($uriString)
(is_object($uriString) ? get_class($uriString) : gettype($uriString))
));
}
-
+
if (preg_match('/^([A-Za-z][A-Za-z0-9\.\+\-]*):/', $uriString, $match)) {
return $match[1];
- }
+ }
return null;
}
-
+
/**
* Remove any extra dot segments (/../, /./) from a path
*
* Algorithm is adapted from RFC-3986 section 5.2.4
* (@link http://tools.ietf.org/html/rfc3986#section-5.2.4)
- *
+ *
* @todo consider optimizing
- *
+ *
* @param string $path
* @return string
*/
public static function removePathDotSegments($path)
{
$output = '';
-
+
while ($path) {
if ($path == '..' || $path == '.') {
break;
}
-
+
switch (true) {
case ($path == '/.'):
$path = '/';
@@ -1033,43 +1033,43 @@ public static function removePathDotSegments($path)
break;
default:
$slash = strpos($path, '/', 1);
- if ($slash === false) {
+ if ($slash === false) {
$seg = $path;
} else {
- $seg = substr($path, 0, $slash);
+ $seg = substr($path, 0, $slash);
}
-
+
$output .= $seg;
$path = substr($path, strlen($seg));
break;
}
}
-
- return $output;
+
+ return $output;
}
-
+
/**
* Merge a base URI and a relative URI into a new URI object
- *
+ *
* This convenience method wraps ::resolve() to allow users to quickly
- * create new absolute URLs without the need to instantiate and clone
+ * create new absolute URLs without the need to instantiate and clone
* URI objects.
- *
+ *
* If objects are passed in, none of the passed objects will be modified.
- *
+ *
* @param Uri|string $baseUri
- * @param Uri|string $relativeUri
+ * @param Uri|string $relativeUri
* @return Uri
*/
public static function merge($baseUri, $relativeUri)
{
$uri = new self($relativeUri);
return $uri->resolve($baseUri);
}
-
+
/**
* Check if a host name is a valid IP address, depending on allowed IP address types
- *
+ *
* @param string $host
* @param integer $allowed allowed address types
* @return boolean
@@ -1080,29 +1080,29 @@ protected static function isValidIpAddress($host, $allowed)
'allowipv4' => (bool) ($allowed & self::HOST_IPV4),
'allowipv6' => (bool) ($allowed & self::HOST_IPV6),
);
-
+
if ($allowed & (self::HOST_IPV6 | self::HOST_IPVF)) {
- if (preg_match('/^\[(.+)\]$/', $host, $match)) {
+ if (preg_match('/^\[(.+)\]$/', $host, $match)) {
$host = $match[1];
$validatorParams['allowipv4'] = false;
}
}
-
+
if ($allowed & (self::HOST_IPV4 | self::HOST_IPV6)) {
$validator = new Validator\Ip($validatorParams);
if ($validator->isValid($host)) {
return true;
}
}
-
- if ($allowed & self::HOST_IPVF) {
+
+ if ($allowed & self::HOST_IPVF) {
$regex = '/^v\.[[:xdigit:]]+[' . self::CHAR_UNRESERVED . self::CHAR_SUB_DELIMS . ':]+$/';
return (bool) preg_match($regex, $host);
}
-
+
return false;
}
-
+
/**
* Check if an address is a valid DNS hostname
*
@@ -1114,10 +1114,10 @@ protected static function isValidDnsHostname($host)
$validator = new Validator\Hostname(array(
'allow' => Validator\Hostname::ALLOW_DNS | Validator\Hostname::ALLOW_LOCAL,
));
-
+
return $validator->isValid($host);
}
-
+
/**
* Check if an address is a valid registerd name (as defined by RFC-3986) address
*
@@ -1129,69 +1129,69 @@ protected static function isValidRegName($host)
$regex = '/^(?:[' . self::CHAR_UNRESERVED . self::CHAR_SUB_DELIMS . ':@\/\?]+|%[A-Fa-f0-9]{2})+$/';
return (bool) preg_match($regex, $host);
}
-
+
/**
* Part normalization methods
- *
+ *
* These are called by normalize() using static::_normalize*() so they may
* be extended or overridden by extending classes to implement additional
* scheme specific normalization rules
*/
-
+
/**
* Normalize the scheme
- *
+ *
* Usually this means simpy converting the scheme to lower case
- *
+ *
* @param string $scheme
* @return string
*/
protected static function normalizeScheme($scheme)
{
return strtolower($scheme);
}
-
+
/**
* Normalize the host part
- *
+ *
* By default this converts host names to lower case
- *
+ *
* @param string $host
* @return string
*/
protected static function normalizeHost($host)
{
return strtolower($host);
- }
-
+ }
+
/**
* Normalize the port
- *
+ *
* If the class defines a default port for the current scheme, and the
- * current port is default, it will be unset.
- *
+ * current port is default, it will be unset.
+ *
* @param integer $port
- * @param string $scheme
+ * @param string $scheme
* @return integer|null
*/
protected static function normalizePort($port, $scheme = null)
{
- if ($scheme
- && isset(static::$defaultPorts[$scheme])
+ if ($scheme
+ && isset(static::$defaultPorts[$scheme])
&& ($port == static::$defaultPorts[$scheme])
) {
return null;
}
-
- return $port;
+
+ return $port;
}
-
+
/**
* Normalize the path
- *
+ *
* This involves removing redundant dot segments, decoding any over-encoded
* characters and encoding everything that needs to be encoded and is not
- *
+ *
* @param string $path
* @return string
*/
@@ -1203,16 +1203,16 @@ protected static function normalizePath($path)
'/[' . self::CHAR_UNRESERVED . ':@&=\+\$,\/;%]/'
)
);
-
+
return $path;
}
-
+
/**
* Normalize the query part
- *
+ *
* This involves decoding everything that doesn't need to be encoded, and
* encoding everything else
- *
+ *
* @param string $query
* @return string
*/
@@ -1224,41 +1224,41 @@ protected static function normalizeQuery($query)
'/[' . self::CHAR_UNRESERVED . self::CHAR_SUB_DELIMS . '%:@\/\?]/'
)
);
-
+
return $query;
}
-
+
/**
* Normalize the fragment part
- *
+ *
* Currently this is exactly the same as _normalizeQuery().
- *
+ *
* @param string $fragment
* @return string
*/
protected static function normalizeFragment($fragment)
{
return static::normalizeQuery($fragment);
}
-
+
/**
* Decode all percent encoded characters which are allowed to be represented literally
- *
+ *
* Will not decode any characters which are not listed in the 'allowed' list
- *
+ *
* @param string $input
* @param string $allowed Pattern of allowed characters
*/
protected static function decodeUrlEncodedChars($input, $allowed = '')
{
$decodeCb = function($match) use ($allowed) {
$char = rawurldecode($match[0]);
- if (preg_match($allowed, $char)) {
+ if (preg_match($allowed, $char)) {
return $char;
}
return $match[0];
};
-
+
return preg_replace_callback('/%[A-Fa-f0-9]{2}/', $decodeCb, $input);
}
}
View
40 library/Zend/Uri/UriFactory.php
@@ -15,7 +15,7 @@
*
* @category Zend
* @package Zend_Uri
- * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@@ -28,13 +28,13 @@
/**
* URI Factory Class
- *
- * The URI factory can be used to generate URI objects from strings, using a
+ *
+ * The URI factory can be used to generate URI objects from strings, using a
* different URI subclass depending on the input URI scheme. New scheme-specific
- * classes can be registered using the registerScheme() method.
- *
- * Note that this class contains only static methods and should not be
- * instanciated
+ * classes can be registered using the registerScheme() method.
+ *
+ * Note that this class contains only static methods and should not be
+ * instanciated
*
* @uses \Zend\Uri\Uri
* @uses \Zend\Uri\Http
@@ -44,14 +44,14 @@
* @uses \Zend\Loader
* @category Zend
* @package Zend_Uri
- * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
-abstract class UriFactory
+abstract class UriFactory
{
/**
* Registered scheme-specific classes
- *
+ *
* @var array
*/
static protected $schemeClasses = array(
@@ -60,10 +60,10 @@
'mailto' => 'Zend\Uri\Mailto',
'file' => 'Zend\Uri\File