remove unneded SendResponseListener detach

samsonasik · Jan 4, 2019 · 87826af · 87826af
1 parent 98741f9
commit 87826af
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 39 deletions.
diff --git a/spec/Listener/ForceHttpsSpec.php b/spec/Listener/ForceHttpsSpec.php
@@ -12,7 +12,6 @@
 use Zend\Http\PhpEnvironment\Response;
 use Zend\Mvc\Application;
 use Zend\Mvc\MvcEvent;
-use Zend\Mvc\SendResponseListener;
 use Zend\Router\RouteMatch;
 use Zend\Uri\Uri;
 
@@ -76,8 +75,6 @@
 
         beforeEach(function () {
             $this->mvcEvent             = Double::instance(['extends' => MvcEvent::class, 'methods' => '__construct']);
-            $this->application          = Double::instance(['extends' => Application::class, 'methods' => '__construct']);
-            $this->sendResponseListener = Double::instance(['extends' => SendResponseListener::class, 'methods' => '__construct']);
             $this->response             = Double::instance(['extends' => Response::class]);
             $this->request              = Double::instance(['extends' => Request::class]);
             $this->uri                  = Double::instance(['extends' => Uri::class]);
@@ -157,12 +154,6 @@
                 allow($this->response)->toReceive('getHeaders', 'addHeaderLine')->with('Location', 'https://example.com/about');
                 allow($this->response)->toReceive('send');
 
-                allow($this->mvcEvent)->toReceive('getApplication')->andReturn($this->application);
-                allow($this->application)->toReceive('getEventManager')->andReturn($this->eventManager);
-                allow($this->application)->toReceive('getServiceManager', 'get')
-                                 ->with('SendResponseListener')
-                                 ->andReturn($this->sendResponseListener);
-
                 $closure = function () use ($listener) {
                     $listener->forceHttpsScheme($this->mvcEvent);
                 };
@@ -198,12 +189,6 @@
                 allow($this->response)->toReceive('getHeaders', 'addHeaderLine')->with('Location', 'https://example.com/about');
                 allow($this->response)->toReceive('send');
 
-                allow($this->mvcEvent)->toReceive('getApplication')->andReturn($this->application);
-                allow($this->application)->toReceive('getEventManager')->andReturn($this->eventManager);
-                allow($this->application)->toReceive('getServiceManager', 'get')
-                                 ->with('SendResponseListener')
-                                 ->andReturn($this->sendResponseListener);
-
                 $closure = function () use ($listener) {
                     $listener->forceHttpsScheme($this->mvcEvent);
                 };
@@ -237,12 +222,6 @@
                 allow($this->response)->toReceive('getHeaders', 'addHeaderLine')->with('Location', 'https://example.com/about');
                 allow($this->response)->toReceive('send');
 
-                allow($this->mvcEvent)->toReceive('getApplication')->andReturn($this->application);
-                allow($this->application)->toReceive('getEventManager')->andReturn($this->eventManager);
-                allow($this->application)->toReceive('getServiceManager', 'get')
-                                 ->with('SendResponseListener')
-                                 ->andReturn($this->sendResponseListener);
-
                 $closure = function () use ($listener) {
                     $listener->forceHttpsScheme($this->mvcEvent);
                 };
@@ -278,12 +257,6 @@
                 allow($this->response)->toReceive('getHeaders', 'addHeaderLine')->with('Location', 'https://example.com/about');
                 allow($this->response)->toReceive('send');
 
-                allow($this->mvcEvent)->toReceive('getApplication')->andReturn($this->application);
-                allow($this->application)->toReceive('getEventManager')->andReturn($this->eventManager);
-                allow($this->application)->toReceive('getServiceManager', 'get')
-                                 ->with('SendResponseListener')
-                                 ->andReturn($this->sendResponseListener);
-
                 $closure = function () use ($listener) {
                     $listener->forceHttpsScheme($this->mvcEvent);
                 };
@@ -321,12 +294,6 @@
                                       ->with('Location', 'https://example.com/about')
                                       ->andReturn($this->response);
 
-                allow($this->mvcEvent)->toReceive('getApplication')->andReturn($this->application);
-                allow($this->application)->toReceive('getEventManager')->andReturn($this->eventManager);
-                allow($this->application)->toReceive('getServiceManager', 'get')
-                                 ->with('SendResponseListener')
-                                 ->andReturn($this->sendResponseListener);
-
                 allow($this->response)->toReceive('setStatusCode')->with(308)->andReturn($this->response);
                 allow($this->response)->toReceive('send');
 

diff --git a/src/Listener/ForceHttps.php b/src/Listener/ForceHttps.php
@@ -88,12 +88,6 @@ public function forceHttpsScheme(MvcEvent $e) : void
             $httpsRequestUri = $this->getFinalhttpsRequestUri($uriString);
         }
 
-        $application    = $e->getApplication();
-        $events         = $application->getEventManager();
-        $serviceManager = $application->getServiceManager();
-        $serviceManager->get('SendResponseListener')
-                       ->detach($events);
-
         // 308 keeps headers, request method, and request body
         $response->setStatusCode(308);
         $response->getHeaders()