Update Zend\Mvc unit tests for changes

- Fixed a couple of bugs exposed by the unit tests
- Zend\Mvc unit tests no longer expect Zend\Mvc\SendableResponse
- Remove leftover unit test files

library/Zend/Http/PhpEnvironment/Request.php

@@ -4,6 +4,7 @@
 
 use Zend\Http\Request as HttpRequest,
     Zend\Uri\Http as HttpUri,
+    Zend\Http\Header\Cookie,
     Zend\Stdlib\Parameters,
     Zend\Stdlib\ParametersDescription;
 
@@ -16,13 +17,19 @@ public function __construct()
         $this->setQuery(new Parameters($_GET));
         $this->setServer(new Parameters($_SERVER));
         if ($_COOKIE) {
-            $this->setCookies(new Parameters($_COOKIE));
+            $this->setCookies($_COOKIE);
         }
         if ($_FILES) {
-            $this->setFiles(new Parameters($_FILES));
+            $this->setFile(new Parameters($_FILES));
         }
     }
 
+    public function setCookies($cookie)
+    {
+        $this->headers()->addHeader(new Cookie((array) $cookie));
+        return $this;
+    }
+
     /**
      * Provide an alternate Parameter Container implementation for server parameters in this object, (this is NOT the
      * primary API for value setting, for that see server())

tests/Zend/Mvc/ApplicationTest.php

@@ -10,7 +10,7 @@
     Zend\EventManager\EventManager,
     Zend\EventManager\StaticEventManager,
     Zend\Http\Request,
-    Zend\Http\Response,
+    Zend\Http\PhpEnvironment\Response,
     Zend\Mvc\Application,
     Zend\Mvc\Router,
     Zend\Uri\UriFactory;
@@ -234,26 +234,26 @@ public function testAllowsReturningEarlyFromRouting()
         });
 
         $result = $app->run();
-        $this->assertSame($response, $result->getResponse());
+        $this->assertSame($response, $result);
     }
 
     public function testControllerIsDispatchedDuringRun()
     {
         $app = $this->setupPathController();
 
-        $response = $app->run()->getResponse();
+        $response = $app->run();
         $this->assertContains('PathController', $response->getContent());
-        $this->assertContains('dispatch', $response->getContent());
+        $this->assertContains('dispatch', $response->toString());
     }
 
     public function testDefaultRequestObjectContainsPhpEnvironmentContainers()
     {
         $app = new Application();
         $request = $app->getRequest();
         $query = $request->query();
-        $this->assertInstanceOf('Zend\Mvc\PhpEnvironment\GetContainer', $query);
+        $this->assertInstanceOf('Zend\Stdlib\Parameters', $query);
         $post = $request->post();
-        $this->assertInstanceOf('Zend\Mvc\PhpEnvironment\PostContainer', $post);
+        $this->assertInstanceOf('Zend\Stdlib\Parameters', $post);
     }
 
     public function testDefaultRequestObjectMirrorsEnvSuperglobal()
@@ -344,7 +344,10 @@ public function testDefaultRequestObjectRequestMethodMirrorsServerHttpMethodKey(
 
     public function testDefaultRequestObjectContainsUriCreatedFromServerRequestUri()
     {
-        $_SERVER['REQUEST_URI'] = 'http://framework.zend.com/api/zf-version?test=this';
+        $_SERVER['HTTP_HOST'] = 'framework.zend.com';
+        $_SERVER['REQUEST_URI'] = '/api/zf-version?test=this';
+        $_SERVER['QUERY_STRING'] = 'test=this';
+
         $app = new Application();
         $req = $app->getRequest();
 
@@ -378,7 +381,7 @@ public function testPostDispatchResultIsPassedByReferenceToEventListeners()
             return $response;
         });
 
-        $response = $app->run()->getResponse();
+        $response = $app->run();
         $response = json_decode($response->getContent());
         $this->assertTrue(isset($response->foo), var_export($response, 1));
         $this->assertEquals('bar', $response->foo);
@@ -428,7 +431,7 @@ public function testFinishEventIsTriggeredAfterDispatching()
         $app->events()->attach('finish', function($e) {
             return $e->getResponse()->setContent($e->getResponse()->getBody() . 'foobar');
         });
-        $this->assertContains('foobar', $app->run()->getResponse()->getBody(), 'The "finish" event was not triggered ("foobar" not in response)');
+        $this->assertContains('foobar', $app->run()->getBody(), 'The "finish" event was not triggered ("foobar" not in response)');
     }
 
     public function testCanProvideAlternateEventManagerToDisableDefaultRouteAndDispatchEventListeners()
@@ -561,6 +564,6 @@ public function testLocatorExceptionShouldTriggerDispatchError()
         });
 
         $result = $app->run();
-        $this->assertSame($response, $result->getResponse());
+        $this->assertSame($response, $result);
     }
 }