Presenter: returns VoidResponse when has no response

Author: dg

src/Application/MicroPresenter.php

@@ -100,7 +100,7 @@ public function run(Application\Request $request)
 		if ($response instanceof Application\UI\ITemplate) {
 			return new Responses\TextResponse($response);
 		} else {
-			return $response;
+			return $response ?: new Responses\VoidResponse;
 		}
 	}
 

src/Application/Responses/VoidResponse.php

@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * This file is part of the Nette Framework (https://nette.org)
+ * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
+ */
+
+namespace Nette\Application\Responses;
+
+use Nette;
+
+
+/**
+ * No response.
+ */
+class VoidResponse implements Nette\Application\IResponse
+{
+	use Nette\SmartObject;
+
+	/**
+	 * @return void
+	 */
+	public function send(Nette\Http\IRequest $httpRequest, Nette\Http\IResponse $httpResponse)
+	{
+	}
+
+}

src/Application/UI/Presenter.php

@@ -222,33 +222,36 @@ public function run(Application\Request $request)
 			}
 
 		} catch (Application\AbortException $e) {
-			// continue with shutting down
-			if ($this->isAjax()) {
-				try {
-					$hasPayload = (array) $this->payload;
-					unset($hasPayload['state']);
-					if ($this->response instanceof Responses\TextResponse && $this->isControlInvalid()) {
-						$this->snippetMode = TRUE;
-						$this->response->send($this->httpRequest, $this->httpResponse);
-						$this->sendPayload();
-					} elseif (!$this->response && $hasPayload) { // back compatibility for use terminate() instead of sendPayload()
-						trigger_error('Use $presenter->sendPayload() instead of terminate() to send payload.');
-						$this->sendPayload();
-					}
-				} catch (Application\AbortException $e) {
-				}
-			}
+		}
 
-			if ($this->hasFlashSession()) {
-				$this->getFlashSession()->setExpiration($this->response instanceof Responses\RedirectResponse ? '+ 30 seconds' : '+ 3 seconds');
+		if ($this->isAjax()) {
+			try {
+				$hasPayload = (array) $this->payload;
+				unset($hasPayload['state']);
+				if ($this->response instanceof Responses\TextResponse && $this->isControlInvalid()) {
+					$this->snippetMode = TRUE;
+					$this->response->send($this->httpRequest, $this->httpResponse);
+					$this->sendPayload();
+				} elseif (!$this->response && $hasPayload) { // back compatibility for use terminate() instead of sendPayload()
+					trigger_error('Use $presenter->sendPayload() instead of terminate() to send payload.');
+					$this->sendPayload();
+				}
+			} catch (Application\AbortException $e) {
 			}
+		}
 
-			// SHUTDOWN
-			$this->onShutdown($this, $this->response);
-			$this->shutdown($this->response);
+		if ($this->hasFlashSession()) {
+			$this->getFlashSession()->setExpiration($this->response instanceof Responses\RedirectResponse ? '+ 30 seconds' : '+ 3 seconds');
+		}
 
-			return $this->response;
+		if (!$this->response) {
+			$this->response = new Responses\VoidResponse;
 		}
+
+		$this->onShutdown($this, $this->response);
+		$this->shutdown($this->response);
+
+		return $this->response;
 	}