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

Commit

Permalink
Merge branch 'cs/zendframework/zendframework#6872-php-cs-fixer-automa…
Browse files Browse the repository at this point in the history
  • Loading branch information
Ocramius committed Nov 14, 2014
148 parents d143906 + 326da10 + 7b56a57 + ecdf449 + 0ca1913 + 739bb00 + 1a55887 + 5d1699c + c3abd2b + 52a85cc + 09fac67 + fa67382 + e387fdb + 151cf71 + fa153f9 + e1db920 + 8f7f720 + 721f353 + 38e7a18 + 86ede54 + bb4f77a + 1ddebf3 + 0ffc57a + b946607 + 6f5587c + 315d8f1 + 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 + 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 + 7dfef7f + 21286c5 + e2cfbb1 + e17e6ff + 4a6cbed + 852ab61 + 54ababd + 963112c + 0bf4aec + f43e36c + 060bc4d + a0e4c2d + 3b96602 + 31c3210 + ebb98d4 + 598a029 commit 500e7ea
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
3 changes: 2 additions & 1 deletion src/Exception/ExceptionInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,5 @@
* Exception for Zend\Uri
*/
interface ExceptionInterface
{}
{
}
3 changes: 2 additions & 1 deletion src/Exception/InvalidArgumentException.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@
class InvalidArgumentException
extends \InvalidArgumentException
implements ExceptionInterface
{}
{
}
3 changes: 2 additions & 1 deletion src/Exception/InvalidUriException.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,5 @@
* Exceptions for Zend\Uri
*/
class InvalidUriException extends InvalidArgumentException implements ExceptionInterface
{}
{
}
1 change: 0 additions & 1 deletion src/UriInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
*/
interface UriInterface
{

/**
* Create a new URI object
*
Expand Down
1 change: 0 additions & 1 deletion test/UriFactoryTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ public function testRegisteringNewScheme($scheme, $class)
$this->assertAttributeContains($class, 'schemeClasses', '\Zend\Uri\UriFactory');
UriFactory::unregisterScheme($scheme);
$this->assertAttributeNotContains($class, 'schemeClasses', '\Zend\Uri\UriFactory');

}

/**
Expand Down
1 change: 0 additions & 1 deletion test/UriTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -1346,5 +1346,4 @@ public function testParseTwice()
$this->assertNull($uri->getQuery());
$this->assertNull($uri->getFragment());
}

}

0 comments on commit 500e7ea

Please sign in to comment.