Moved MVC code and tests into root library and tests dirs, respectively

- Updated tests to use ZendTest namespace, and added imports for classes under test
zendframework · Sep 29, 2011 · 7bdbc72 · 7bdbc72
1 parent e4cb5f4
commit 7bdbc72
Show file tree

Hide file tree

Showing 37 changed files with 13 additions and 13 deletions.
diff --git a/modules/ZendMvc/src/Zend/Mvc/AppContext.php → library/Zend/Mvc/AppContext.php b/modules/ZendMvc/src/Zend/Mvc/AppContext.php → library/Zend/Mvc/AppContext.php
diff --git a/modules/ZendMvc/src/Zend/Mvc/Application.php → library/Zend/Mvc/Application.php b/modules/ZendMvc/src/Zend/Mvc/Application.php → library/Zend/Mvc/Application.php
diff --git a/.../Zend/Mvc/Controller/ActionController.php → .../Zend/Mvc/Controller/ActionController.php b/.../Zend/Mvc/Controller/ActionController.php → .../Zend/Mvc/Controller/ActionController.php
diff --git a/...Zend/Mvc/Controller/RestfulController.php → ...Zend/Mvc/Controller/RestfulController.php b/...Zend/Mvc/Controller/RestfulController.php → ...Zend/Mvc/Controller/RestfulController.php
diff --git a/modules/ZendMvc/src/Zend/Mvc/Exception.php → library/Zend/Mvc/Exception.php b/modules/ZendMvc/src/Zend/Mvc/Exception.php → library/Zend/Mvc/Exception.php
diff --git a/...vc/Exception/InvalidArgumentException.php → ...vc/Exception/InvalidArgumentException.php b/...vc/Exception/InvalidArgumentException.php → ...vc/Exception/InvalidArgumentException.php
diff --git a/...Mvc/Exception/MissingLocatorException.php → ...Mvc/Exception/MissingLocatorException.php b/...Mvc/Exception/MissingLocatorException.php → ...Mvc/Exception/MissingLocatorException.php
diff --git a/...les/ZendMvc/src/Zend/Mvc/LocatorAware.php → library/Zend/Mvc/LocatorAware.php b/...les/ZendMvc/src/Zend/Mvc/LocatorAware.php → library/Zend/Mvc/LocatorAware.php
diff --git a/modules/ZendMvc/src/Zend/Mvc/MvcEvent.php → library/Zend/Mvc/MvcEvent.php b/modules/ZendMvc/src/Zend/Mvc/MvcEvent.php → library/Zend/Mvc/MvcEvent.php
diff --git a/.../Zend/Mvc/PhpEnvironment/GetContainer.php → .../Zend/Mvc/PhpEnvironment/GetContainer.php b/.../Zend/Mvc/PhpEnvironment/GetContainer.php → .../Zend/Mvc/PhpEnvironment/GetContainer.php
diff --git a/...Zend/Mvc/PhpEnvironment/PostContainer.php → ...Zend/Mvc/PhpEnvironment/PostContainer.php b/...Zend/Mvc/PhpEnvironment/PostContainer.php → ...Zend/Mvc/PhpEnvironment/PostContainer.php
diff --git a/...ZendMvc/src/Zend/Mvc/Router/Exception.php → library/Zend/Mvc/Router/Exception.php b/...ZendMvc/src/Zend/Mvc/Router/Exception.php → library/Zend/Mvc/Router/Exception.php
diff --git a/...er/Exception/InvalidArgumentException.php → ...er/Exception/InvalidArgumentException.php b/...er/Exception/InvalidArgumentException.php → ...er/Exception/InvalidArgumentException.php
diff --git a/...Mvc/Router/Exception/RuntimeException.php → ...Mvc/Router/Exception/RuntimeException.php b/...Mvc/Router/Exception/RuntimeException.php → ...Mvc/Router/Exception/RuntimeException.php
diff --git a/...dMvc/src/Zend/Mvc/Router/Http/Literal.php → library/Zend/Mvc/Router/Http/Literal.php b/...dMvc/src/Zend/Mvc/Router/Http/Literal.php → library/Zend/Mvc/Router/Http/Literal.php
diff --git a/...ZendMvc/src/Zend/Mvc/Router/Http/Part.php → library/Zend/Mvc/Router/Http/Part.php b/...ZendMvc/src/Zend/Mvc/Router/Http/Part.php → library/Zend/Mvc/Router/Http/Part.php
diff --git a/...endMvc/src/Zend/Mvc/Router/Http/Regex.php → library/Zend/Mvc/Router/Http/Regex.php b/...endMvc/src/Zend/Mvc/Router/Http/Regex.php → library/Zend/Mvc/Router/Http/Regex.php
diff --git a/...c/Zend/Mvc/Router/Http/TreeRouteStack.php → ...y/Zend/Mvc/Router/Http/TreeRouteStack.php b/...c/Zend/Mvc/Router/Http/TreeRouteStack.php → ...y/Zend/Mvc/Router/Http/TreeRouteStack.php
diff --git a/...dMvc/src/Zend/Mvc/Router/PriorityList.php → library/Zend/Mvc/Router/PriorityList.php b/...dMvc/src/Zend/Mvc/Router/PriorityList.php → library/Zend/Mvc/Router/PriorityList.php
diff --git a/...les/ZendMvc/src/Zend/Mvc/Router/Route.php → library/Zend/Mvc/Router/Route.php b/...les/ZendMvc/src/Zend/Mvc/Router/Route.php → library/Zend/Mvc/Router/Route.php
diff --git a/...endMvc/src/Zend/Mvc/Router/RouteMatch.php → library/Zend/Mvc/Router/RouteMatch.php b/...endMvc/src/Zend/Mvc/Router/RouteMatch.php → library/Zend/Mvc/Router/RouteMatch.php
diff --git a/...endMvc/src/Zend/Mvc/Router/RouteStack.php → library/Zend/Mvc/Router/RouteStack.php b/...endMvc/src/Zend/Mvc/Router/RouteStack.php → library/Zend/Mvc/Router/RouteStack.php
diff --git a/.../src/Zend/Mvc/Router/SimpleRouteStack.php → library/Zend/Mvc/Router/SimpleRouteStack.php b/.../src/Zend/Mvc/Router/SimpleRouteStack.php → library/Zend/Mvc/Router/SimpleRouteStack.php
diff --git a/...ZendMvc/src/Zend/Mvc/SendableResponse.php → library/Zend/Mvc/SendableResponse.php b/...ZendMvc/src/Zend/Mvc/SendableResponse.php → library/Zend/Mvc/SendableResponse.php
diff --git a/modules/ZendMvc/tests/Zend/Mvc/Controller/TestAsset/RestfulController.php b/modules/ZendMvc/tests/Zend/Mvc/Controller/TestAsset/RestfulController.php
diff --git a/...endMvc/tests/Zend/Mvc/ApplicationTest.php → tests/Zend/Mvc/ApplicationTest.php b/...endMvc/tests/Zend/Mvc/ApplicationTest.php → tests/Zend/Mvc/ApplicationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Zend\Mvc;
+namespace ZendTest\Mvc;
 
 use ArrayObject,
     PHPUnit_Framework_TestCase as TestCase,
@@ -11,6 +11,8 @@
     Zend\EventManager\StaticEventManager,
     Zend\Http\Request,
     Zend\Http\Response,
+    Zend\Mvc\Application,
+    Zend\Mvc\Router,
     Zend\Uri\UriFactory;
 
 class ApplicationTest extends TestCase
@@ -395,7 +397,7 @@ public function testDispatchingInjectsLocatorInLocatorAwareControllers()
 
         $storage = new ArrayObject();
         $events  = StaticEventManager::getInstance();
-        $events->attach('Zend\Mvc\TestAsset\LocatorAwareController', 'dispatch', function ($e) use ($storage) {
+        $events->attach('ZendTest\Mvc\TestAsset\LocatorAwareController', 'dispatch', function ($e) use ($storage) {
             $controller = $e->getTarget();
             $storage['locator'] = $controller->getLocator();
             return $e->getResponse();
@@ -426,8 +428,8 @@ public function testCanProvideAlternateEventManagerToDisableDefaultRouteAndDispa
             $response->setContent($content);
         };
         $events = StaticEventManager::getInstance();
-        $events->attach('Zend\Mvc\Controller\TestAsset\SampleController', 'dispatch', $listener1, 10);
-        $events->attach('Zend\Mvc\Controller\TestAsset\SampleController', 'dispatch', $listener2, -10);
+        $events->attach('ZendTest\Mvc\Controller\TestAsset\SampleController', 'dispatch', $listener1, 10);
+        $events->attach('ZendTest\Mvc\Controller\TestAsset\SampleController', 'dispatch', $listener2, -10);
 
         $app->run();
         $response = $app->getResponse();

diff --git a/...d/Mvc/Controller/ActionControllerTest.php → ...d/Mvc/Controller/ActionControllerTest.php b/...d/Mvc/Controller/ActionControllerTest.php → ...d/Mvc/Controller/ActionControllerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Zend\Mvc\Controller;
+namespace ZendTest\Mvc\Controller;
 
 use PHPUnit_Framework_TestCase as TestCase,
     Zend\EventManager\StaticEventManager,

diff --git a/.../Mvc/Controller/RestfulControllerTest.php → .../Mvc/Controller/RestfulControllerTest.php b/.../Mvc/Controller/RestfulControllerTest.php → .../Mvc/Controller/RestfulControllerTest.php
diff --git a/...vc/Controller/TestAsset/BadController.php → ...vc/Controller/TestAsset/BadController.php b/...vc/Controller/TestAsset/BadController.php → ...vc/Controller/TestAsset/BadController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Zend\Mvc\Controller\TestAsset;
+namespace ZendTest\Mvc\Controller\TestAsset;
 
 use Zend\Mvc\Controller\ActionController;
 

diff --git a/...oller/TestAsset/RestfulTestController.php → ...oller/TestAsset/RestfulTestController.php b/...oller/TestAsset/RestfulTestController.php → ...oller/TestAsset/RestfulTestController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Zend\Mvc\Controller\TestAsset;
+namespace ZendTest\Mvc\Controller\TestAsset;
 
 use Zend\Mvc\Controller\RestfulController;
 

diff --git a/...Controller/TestAsset/SampleController.php → ...Controller/TestAsset/SampleController.php b/...Controller/TestAsset/SampleController.php → ...Controller/TestAsset/SampleController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Zend\Mvc\Controller\TestAsset;
+namespace ZendTest\Mvc\Controller\TestAsset;
 
 use Zend\Mvc\Controller\ActionController;
 

diff --git a/.../PhpEnvironment/AbstractContainerTest.php → .../PhpEnvironment/AbstractContainerTest.php b/.../PhpEnvironment/AbstractContainerTest.php → .../PhpEnvironment/AbstractContainerTest.php
diff --git a/...d/Mvc/PhpEnvironment/GetContainerTest.php → ...d/Mvc/PhpEnvironment/GetContainerTest.php b/...d/Mvc/PhpEnvironment/GetContainerTest.php → ...d/Mvc/PhpEnvironment/GetContainerTest.php
diff --git a/.../Mvc/PhpEnvironment/PostContainerTest.php → .../Mvc/PhpEnvironment/PostContainerTest.php b/.../Mvc/PhpEnvironment/PostContainerTest.php → .../Mvc/PhpEnvironment/PostContainerTest.php
diff --git a/...dMvc/tests/Zend/Mvc/TestAsset/Locator.php → tests/Zend/Mvc/TestAsset/Locator.php b/...dMvc/tests/Zend/Mvc/TestAsset/Locator.php → tests/Zend/Mvc/TestAsset/Locator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Zend\Mvc\TestAsset;
+namespace ZendTest\Mvc\TestAsset;
 
 use Zend\Di\Locator as LocatorDefinition,
     Zend\Di\Exception\ClassNotFoundException;

diff --git a/.../Mvc/TestAsset/LocatorAwareController.php → .../Mvc/TestAsset/LocatorAwareController.php b/.../Mvc/TestAsset/LocatorAwareController.php → .../Mvc/TestAsset/LocatorAwareController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Zend\Mvc\TestAsset;
+namespace ZendTest\Mvc\TestAsset;
 
 use Zend\Di\Locator as DiLocator,
     Zend\Mvc\Controller\ActionController,

diff --git a/...sts/Zend/Mvc/TestAsset/PathController.php → tests/Zend/Mvc/TestAsset/PathController.php b/...sts/Zend/Mvc/TestAsset/PathController.php → tests/Zend/Mvc/TestAsset/PathController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Zend\Mvc\TestAsset;
+namespace ZendTest\Mvc\TestAsset;
 
 use Zend\Stdlib\Dispatchable,
     Zend\Stdlib\RequestDescription as Request,