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

Commit

Permalink
Merge branch 'hotfix/code-cleanup' of https://github.com/Maks3w/zf2 i…
Browse files Browse the repository at this point in the history
…nto hotfix/uses-annotations
  • Loading branch information
Show file tree
Hide file tree
Showing 9 changed files with 9 additions and 15 deletions.
2 changes: 1 addition & 1 deletion src/Exception/ExceptionInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
interface ExceptionInterface
{}
{}
2 changes: 1 addition & 1 deletion src/Exception/InvalidArgumentException.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
class InvalidArgumentException
extends \InvalidArgumentException
implements ExceptionInterface
{}
{}
2 changes: 1 addition & 1 deletion src/Exception/InvalidUriException.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@
class InvalidUriException
extends \InvalidArgumentException
implements ExceptionInterface
{}
{}
2 changes: 1 addition & 1 deletion src/Exception/InvalidUriPartException.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ class InvalidUriPartException
const INVALID_PATH = 32;
const INVALID_QUERY = 64;
const INVALID_FRAGMENT = 128;
}
}
2 changes: 1 addition & 1 deletion src/Exception/InvalidUriTypeException.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@
class InvalidUriTypeException
extends \InvalidArgumentException
implements ExceptionInterface
{}
{}
2 changes: 1 addition & 1 deletion src/File.php
Original file line number Diff line number Diff line change
Expand Up @@ -104,4 +104,4 @@ public static function fromWindowsPath($path)
$url->setPath($path);
return $url;
}
}
}
2 changes: 1 addition & 1 deletion src/Http.php
Original file line number Diff line number Diff line change
Expand Up @@ -177,4 +177,4 @@ public function getPort()
}
return $this->port;
}
}
}
2 changes: 1 addition & 1 deletion src/Uri.php
Original file line number Diff line number Diff line change
Expand Up @@ -1256,4 +1256,4 @@ protected static function decodeUrlEncodedChars($input, $allowed = '')

return preg_replace_callback('/%[A-Fa-f0-9]{2}/', $decodeCb, $input);
}
}
}
8 changes: 1 addition & 7 deletions src/UriFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,6 @@
* Note that this class contains only static methods and should not be
* instanciated
*
* @uses \Zend\Uri\Uri
* @uses \Zend\Uri\Http
* @uses \Zend\Uri\File
* @uses \Zend\Uri\Mailto
* @uses \Zend\Uri\Exception\ExceptionInterface
* @uses \Zend\Loader
* @category Zend
* @package Zend_Uri
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
Expand Down Expand Up @@ -96,4 +90,4 @@ static public function factory($uriString, $defaultScheme = null)

return $uri;
}
}
}

0 comments on commit c9b215a

Please sign in to comment.