Skip to content
This repository has been archived by the owner on Jan 31, 2020. It is now read-only.

Commit

Permalink
Merge branch 'master' of git://github.com/zendframework/zf2
Browse files Browse the repository at this point in the history 
Fixed files permissions
  • Loading branch information
Grzegorz Drozd committed Feb 28, 2013
122 parents a2ed322 + b6ad313 + f726ae3 + 7ad284f + 93b2293 + 6b9f3a9 + 8651985 + ed49c8f + 861b59b + ab368b3 + 42e779e + e446b23 + a77df97 + 83bebb3 + fac5fe1 + 0ecf55e + 6c9ab93 + d1576fd + 452dcfd + a5c8053 + 47591a8 + 4632b67 + 93389c9 + 59d4a69 + 6d7b139 + d060759 + a69361e + 65d2077 + ab34f04 + 16dc336 + 5ee0e7c + a3c5b47 + 0482e7d + 7349022 + 870fdc6 + 41980d5 + 8191f6d + 28e1f24 + c13913c + a787df2 + 700bec3 + 6279a0a + 59e1371 + 384145a + 2186cf3 + 266dd39 + 58cda5f + 6880bda + 9c58077 + f0a7ffa + af9ffb6 + 3a4f745 + f6ee3fa + ab1f64f + 37055aa + 785b6c6 + 965cde0 + b50b4db + cdc3a1d + d0638c2 + d2d69cb + f47f0b9 + c9b215a + 29a471c + fa67382 + e387fdb + 151cf71 + fa153f9 + e1db920 + 8f7f720 + 721f353 + 38e7a18 + 86ede54 + bb4f77a + 1ddebf3 + 0ffc57a + b946607 + 6f5587c + 315d8f1 + 1914f43 + 0110db8 + 6cf95f3 + 3fe2af7 + fd2330d + d35c5af + 1360dd2 + 2d02d6c + f8c3676 + 478c122 + a64da1c + 56683e0 + f63f002 + b4c274d + 0183709 + 98549f4 + 9c7f3f3 + 94cf692 + 587a532 + a7779dc + e521397 + 018e2f8 + e7b79bc + d16a9d9 + b5fb5a8 + 32d1d88 + 87f6119 + 650b106 + 1911da8 + 7572e2b + 538d40c + dd11fea + db9d7ab + 30cabda + 5b6dcb4 + 0a224b1 + f2a96ec + e5b3b36 + 6ef088b + d28a29d + 6fd65f7 + f16fcce + 914239b commit 54ababd
Show file tree
Hide file tree
Showing 11 changed files with 19 additions and 41 deletions.
4 changes: 2 additions & 2 deletions composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
},
"extra": {
"branch-alias": {
"dev-master": "2.4-dev",
"dev-develop": "2.5-dev"
"dev-master": "2.1-dev",
"dev-develop": "2.2-dev"
}
},
"autoload-dev": {
Expand Down
4 changes: 0 additions & 4 deletions src/Exception/ExceptionInterface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,12 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Uri
*/

namespace Zend\Uri\Exception;

/**
* Exception for Zend_Uri
*
* @category Zend
* @package Zend_Uri
*/
interface ExceptionInterface
{}
1 change: 0 additions & 1 deletion src/Exception/InvalidArgumentException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Uri
*/

namespace Zend\Uri\Exception;
Expand Down
4 changes: 0 additions & 4 deletions src/Exception/InvalidUriException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,12 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Uri
*/

namespace Zend\Uri\Exception;

/**
* Exceptions for Zend_Uri
*
* @category Zend
* @package Zend_Uri
*/
class InvalidUriException extends InvalidArgumentException implements ExceptionInterface
{}
6 changes: 0 additions & 6 deletions src/Exception/InvalidUriPartException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,10 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Uri
*/

namespace Zend\Uri\Exception;

/**
* @category Zend
* @package Zend_Uri
* @subpackage Exception
*/
class InvalidUriPartException extends InvalidArgumentException
{
/**
Expand Down
4 changes: 0 additions & 4 deletions src/File.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Uri
*/

namespace Zend\Uri;
Expand All @@ -14,9 +13,6 @@
* File URI handler
*
* The 'file:...' scheme is loosely defined in RFC-1738
*
* @category Zend
* @package Zend_Uri
*/
class File extends Uri
{
Expand Down
4 changes: 0 additions & 4 deletions src/Http.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,12 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Uri
*/

namespace Zend\Uri;

/**
* HTTP URI handler
*
* @category Zend
* @package Zend_Uri
*/
class Http extends Uri
{
Expand Down
4 changes: 0 additions & 4 deletions src/Mailto.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Uri
*/

namespace Zend\Uri;
Expand All @@ -17,9 +16,6 @@
* "Mailto" URI handler
*
* The 'mailto:...' scheme is loosely defined in RFC-1738
*
* @category Zend
* @package Zend_Uri
*/
class Mailto extends Uri
{
Expand Down
4 changes: 0 additions & 4 deletions src/Uri.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Uri
*/

namespace Zend\Uri;
Expand All @@ -15,9 +14,6 @@

/**
* Generic URI handler
*
* @category Zend
* @package Zend_Uri
*/
class Uri implements UriInterface
{
Expand Down
21 changes: 17 additions & 4 deletions src/UriFactory.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Uri
*/

namespace Zend\Uri;
Expand All @@ -21,9 +20,6 @@
*
* Note that this class contains only static methods and should not be
* instantiated
*
* @category Zend
* @package Zend_Uri
*/
abstract class UriFactory
{
Expand Down Expand Up @@ -66,6 +62,23 @@ public static function unregisterScheme($scheme)
}
}

/**
* Get the class name for a registered scheme
*
* If provided scheme is not registered, will return NULL
*
* @param string $scheme
* @return string|null
*/
public static function getRegisteredSchemeClass($scheme)
{
if (isset(static::$schemeClasses[$scheme])) {
return static::$schemeClasses[$scheme];
} else {
return null;
}
}

/**
* Create a URI from a string
*
Expand Down
4 changes: 0 additions & 4 deletions src/UriInterface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,12 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Uri
*/

namespace Zend\Uri;

/**
* Interface defining an URI
*
* @category Zend
* @package Zend_Uri
*/
interface UriInterface
{
Expand Down

0 comments on commit 54ababd

Please sign in to comment.