Router: Have a routes collection interface & support in Tracy router panel

src/Application/ErrorPresenter.php

@@ -41,9 +41,9 @@ public function run(Application\Request $request)
  $this->logger->log($e, ILogger::EXCEPTION);
  }
  }
- ob_start();
- require __DIR__ . '/templates/error.phtml';
- return new Application\Responses\TextResponse(ob_get_clean());
+ return new Application\Responses\CallbackResponse(function () use ($code) {
+  require __DIR__ . '/templates/error.phtml';
+ });
  }
 
 }

src/Application/IRouteList.php

@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * This file is part of the Nette Framework (http://nette.org)
+ * Copyright (c) 2004 David Grudl (http://davidgrudl.com)
+ */
+
+namespace Nette\Application;
+
+use Nette;
+
+
+/**
+ * Routes collection.
+ */
+interface IRouteList extends \IteratorAggregate
+{
+ /**
+ * @return string
+ */
+ function getModule();
+
+}

src/Application/Responses/CallbackResponse.php

@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * This file is part of the Nette Framework (http://nette.org)
+ * Copyright (c) 2004 David Grudl (http://davidgrudl.com)
+ */
+
+namespace Nette\Application\Responses;
+
+use Nette;
+
+
+/**
+ * Callback response.
+ */
+class CallbackResponse extends Nette\Object implements Nette\Application\IResponse
+{
+ /** @var callable */
+ private $callback;
+
+
+ public function __construct(callable $callback)
+ {
+ $this->callback = $callback;
+ }
+
+
+ /**
+ * Sends response to output.
+ * @return void
+ */
+ public function send(Nette\Http\IRequest $httpRequest, Nette\Http\IResponse $httpResponse)
+ {
+ call_user_func($this->callback, $httpRequest, $httpResponse);
+ }
+
+}

src/Application/Routers/RouteList.php

@@ -13,7 +13,7 @@
 /**
  * The router broker.
  */
-class RouteList extends Nette\Utils\ArrayList implements Nette\Application\IRouter
+class RouteList extends Nette\Utils\ArrayList implements Nette\Application\IRouter, Nette\Application\IRouteList
 {
  /** @var array */
  private $cachedRoutes;

src/Bridges/ApplicationTracy/RoutingPanel.php

@@ -96,7 +96,7 @@ public function getPanel()
  */
  private function analyse($router, $module = '')
  {
- if ($router instanceof Routers\RouteList) {
+ if ($router instanceof Nette\Application\IRouteList) {
  foreach ($router as $subRouter) {
  $this->analyse($subRouter, $module . $router->getModule());
  }

tests/Application/CallbackResponse.phpt

@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * Test: Nette\Application\Responses\CallbackResponse.
+ */
+
+use Nette\Application\Responses\CallbackResponse;
+use Nette\Http;
+use Tester\Assert;
+
+
+require __DIR__ . '/../bootstrap.php';
+
+
+test(function () {
+ $response = new CallbackResponse(function (Http\IRequest $request, Http\IResponse $response) use (& $ok) {
+ $ok = TRUE;
+ });
+ $response->send(new Http\Request(new Http\UrlScript), new Http\Response);
+ Assert::true($ok);
+});