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

Commit

Permalink
Merge branch 'master', remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@EpeeCheeze
EpeeCheeze committed Oct 3, 2013
163 parents 82cdcc8 + 4583c52 + 27420a4 + 2e7e46b + f51e1ec + e6b286e + d5c10b6 + 0eabc04 + fed2583 + af2d845 + e8e4ce2 + f4be937 + 9323faa + 65deb5a + d5a4f17 + 94b36e8 + 62824a2 + 6378cbe + a10281c + cd0ff39 + 02e8122 + a667dd4 + 02ccc35 + 7d61487 + ab2f663 + a27ca10 + 75af0e5 + 24f498b + d2dd157 + 6c759d8 + 51b0320 + aabe1c0 + e76b67c + 5d85a78 + d285b08 + c5df6b0 + ff58ff4 + 5675884 + a55ead5 + 47eb5a8 + a36e34a + 3e520ad + 7b0d374 + 461c28b + 3890e69 + 316384e + 1431343 + debad5a + 1680741 + 4497a00 + bb6633a + 6b7ed03 + 35fcae3 + 0737e9d + c31bf4c + 918649e + ecbe771 + b4124fc + f4e1da0 + a8c70a8 + 50d3c5d + 79180fa + f6f9386 + 8ed6590 + d79a4a4 + 3958052 + eae6146 + 1cc7a46 + 1d9542f + a22d6e2 + 3496b67 + 9398e77 + 687d980 + 900dc7d + 21f6363 + 0eeb6ff + 8c442a3 + adf1f8e + c2ceb18 + 9b17a1c + d5dab4a + 346a62a + 9808633 + bdeec54 + 1a2506a + f5f3d02 + b623064 + 4338bf4 + bdababf + 4054000 + 4449c16 + d3d8b33 + 8427cf8 + 8d162ec + a988e9a + 3e9d597 + ee93c08 + 9d3ce53 + f04a59c + 0c3f2de + a654383 + 502d937 + 93350ca + 23a0ccc + 15dc071 + 6ca79e9 + 7645850 + 7b0843e + b9f38cc + 53d4205 + 0ba91ba + 7ad75c4 + 35376fd + e6713be + b15c871 + 4121ed2 + 905626d + 529973a + e28e80a + b64275a + 2f43075 + 05dea5f + b0f56ea + a0ae2ac + 8b01bd8 + fc7acfc + 87b1ffc + c00475b + 6d05c34 + 2f2787b + 229c668 + c164e00 + e5c1ff6 + 5023ed3 + 3c689b8 + 789b92c + ae927c2 + 7741eac + ab3bdcd + 6c02989 + 0d17da2 + 1035d13 + 361c1cf + b31816b + 0102405 + 84330e4 + 50b28a7 + 196892e + 55ecf0a + cdf2159 + 97a5f0f + 2951d73 + bbfc15c + 7aff06a + 2ec87c8 + 9fd7105 + 090f966 + 295dff4 + d43b026 + 827fd02 + 5559cd9 + cfb3de6 + 5e5614b commit 66a84a1
Show file tree
Hide file tree
Showing 13 changed files with 5 additions and 58 deletions.
8 changes: 4 additions & 4 deletions src/AbstractContainer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public function notifyOrderUpdated()
* calling {@link Page\AbstractPage::setParent()}.
*
* @param Page\AbstractPage|array|Traversable $page page to add
* @return AbstractContainer fluent interface, returns self
* @return self fluent interface, returns self
* @throws Exception\InvalidArgumentException if page is invalid
*/
public function addPage($page)
Expand Down Expand Up @@ -136,7 +136,7 @@ public function addPage($page)
* Adds several pages at once
*
* @param array|Traversable|AbstractContainer $pages pages to add
* @return AbstractContainer fluent interface, returns self
* @return self fluent interface, returns self
* @throws Exception\InvalidArgumentException if $pages is not array,
* Traversable or AbstractContainer
*/
Expand Down Expand Up @@ -172,7 +172,7 @@ public function addPages($pages)
* Sets pages this container should have, removing existing pages
*
* @param array $pages pages to set
* @return AbstractContainer fluent interface, returns self
* @return self fluent interface, returns self
*/
public function setPages(array $pages)
{
Expand Down Expand Up @@ -223,7 +223,7 @@ public function removePage($page)
/**
* Removes all pages in container
*
* @return AbstractContainer fluent interface, returns self
* @return self fluent interface, returns self
*/
public function removePages()
{
Expand Down
4 changes: 0 additions & 4 deletions test/ContainerTest.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_Navigation
*/

namespace ZendTest\Navigation;
Expand All @@ -17,9 +16,6 @@
/**
* Tests the class Zend_Navigation_Container
*
* @category Zend
* @package Zend_Navigation
* @subpackage UnitTests
* @group Zend_Navigation
*/
class ContainerTest extends \PHPUnit_Framework_TestCase
Expand Down
4 changes: 0 additions & 4 deletions test/NavigationTest.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_Navigation
*/

namespace ZendTest\Navigation;
Expand All @@ -17,9 +16,6 @@
*/

/**
* @category Zend
* @package Zend_Navigation
* @subpackage UnitTests
* @group Zend_Navigation
*/
class NavigationTest extends \PHPUnit_Framework_TestCase
Expand Down
4 changes: 0 additions & 4 deletions test/Page/MvcTest.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_Navigation
*/

namespace ZendTest\Navigation\Page;
Expand All @@ -25,9 +24,6 @@
/**
* Tests the class Zend_Navigation_Page_Mvc
*
* @category Zend
* @package Zend_Navigation
* @subpackage UnitTests
* @group Zend_Navigation
*/
class MvcTest extends TestCase
Expand Down
4 changes: 0 additions & 4 deletions test/Page/PageFactoryTest.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_Navigation
*/

namespace ZendTest\Navigation;
Expand All @@ -17,9 +16,6 @@
* Tests Zend_Navigation_Page::factory()
*
/**
* @category Zend
* @package Zend_Navigation
* @subpackage UnitTests
* @group Zend_Navigation
*/
class PageFactoryTest extends \PHPUnit_Framework_TestCase
Expand Down
4 changes: 0 additions & 4 deletions test/Page/PageTest.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_Navigation
*/

namespace ZendTest\Navigation\Page;
Expand All @@ -20,9 +19,6 @@
* Tests the class Zend_Navigation_Page
*
* @author Robin Skoglund
* @category Zend
* @package Zend_Navigation
* @subpackage UnitTests
* @group Zend_Navigation
*/
class PageTest extends \PHPUnit_Framework_TestCase
Expand Down
4 changes: 0 additions & 4 deletions test/Page/UriTest.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_Navigation
*/

namespace ZendTest\Navigation\Page;
Expand All @@ -16,9 +15,6 @@
/**
* Tests the class Zend_Navigation_Page_Uri
*
* @category Zend
* @package Zend_Navigation
* @subpackage UnitTests
* @group Zend_Navigation
*/
class UriTest extends \PHPUnit_Framework_TestCase
Expand Down
6 changes: 1 addition & 5 deletions test/ServiceFactoryTest.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_Navigation
*/

namespace ZendTest\Navigation;
Expand All @@ -22,9 +21,6 @@
/**
* Tests the class Zend\Navigation\MvcNavigationFactory
*
* @category Zend
* @package Zend_Navigation
* @subpackage UnitTests
* @group Zend_Navigation
*/
class ServiceFactoryTest extends \PHPUnit_Framework_TestCase
Expand Down Expand Up @@ -149,7 +145,7 @@ public function testConstructedNavigationFactoryInjectRouterAndMatcher()
$this->isInstanceOf("Zend\Mvc\Router\RouteMatch"),
$this->isInstanceOf("Zend\Mvc\Router\RouteStackInterface"));

$this->serviceManager->setFactory('Navigation', function ($serviceLocator) use ($factory){
$this->serviceManager->setFactory('Navigation', function ($serviceLocator) use ($factory) {
return $factory->createService($serviceLocator);
});

Expand Down
6 changes: 0 additions & 6 deletions test/TestAsset/AbstractContainer.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_Navigation
*/

namespace ZendTest\Navigation\TestAsset;

/**
* @category Zend
* @package Zend_Navigation
* @subpackage UnitTests
*/
class AbstractContainer extends \Zend\Navigation\AbstractContainer
{
public function addPage($page)
Expand Down
1 change: 0 additions & 1 deletion test/TestAsset/FileNavigationFactory.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_Navigation
*/

namespace ZendTest\Navigation\TestAsset;
Expand Down
6 changes: 0 additions & 6 deletions test/TestAsset/InvalidPage.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_Navigation
*/

namespace ZendTest\Navigation\TestAsset;

/**
* @category Zend
* @package Zend_Navigation
* @subpackage UnitTests
*/
class InvalidPage
{
/**
Expand Down
6 changes: 0 additions & 6 deletions test/TestAsset/Page.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +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_Navigation
*/

namespace ZendTest\Navigation\TestAsset;

use Zend\Navigation\Page\AbstractPage;

/**
* @category Zend
* @package Zend_Navigation
* @subpackage UnitTests
*/
class Page extends AbstractPage
{
/**
Expand Down
6 changes: 0 additions & 6 deletions test/TestAsset/Router.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_Navigation
*/

namespace ZendTest\Navigation\TestAsset;

/**
* @category Zend
* @package Zend_Navigation
* @subpackage UnitTests
*/
class Router extends \Zend\Mvc\Router\Http\TreeRouteStack
{
const RETURN_URL = 'spotify:track:2nd6CTjR9zjHGT0QtpfLHe';
Expand Down

0 comments on commit 66a84a1

Please sign in to comment.