Refactor Application to return Response from processRequest #350
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
|
|
@@ -12,6 +12,7 @@ | |||||||
| use Nette; | ||||||||
| use Nette\Routing\Router; | ||||||||
| use Nette\Utils\Arrays; | ||||||||
| use function count, is_string, str_starts_with, strcasecmp; | ||||||||
|
|
||||||||
|
|
||||||||
| /** | ||||||||
|
|
@@ -73,15 +74,15 @@ public function run(): void | |||||||
| { | ||||||||
| try { | ||||||||
| Arrays::invoke($this->onStartup, $this); | ||||||||
| $this->processRequest($this->createInitialRequest())->send($this->httpRequest, $this->httpResponse); | ||||||||
| Arrays::invoke($this->onShutdown, $this); | ||||||||
|
|
||||||||
| } catch (\Throwable $e) { | ||||||||
| $this->sendHttpCode($e); | ||||||||
| Arrays::invoke($this->onError, $this, $e); | ||||||||
| if ($this->catchExceptions && ($req = $this->createErrorRequest($e))) { | ||||||||
| try { | ||||||||
| $this->processRequest($req)->send($this->httpRequest, $this->httpResponse); | ||||||||
|
There was a problem hiding this comment. [nitpick] For consistency with the run() method, consider assigning the returned Response to a variable before invoking send(), which can help with error handling and debugging.
Suggested change
Copilot uses AI. Check for mistakes. |
||||||||
| Arrays::invoke($this->onShutdown, $this, $e); | ||||||||
| return; | ||||||||
|
|
||||||||
|
|
@@ -120,7 +121,7 @@ public function createInitialRequest(): Request | |||||||
| } | ||||||||
|
|
||||||||
|
|
||||||||
| public function processRequest(Request $request): Response | ||||||||
| { | ||||||||
| process: | ||||||||
| if (count($this->requests) > $this->maxLoop) { | ||||||||
|
|
@@ -155,7 +156,7 @@ public function processRequest(Request $request): void | |||||||
| } | ||||||||
|
|
||||||||
| Arrays::invoke($this->onResponse, $this, $response); | ||||||||
| return $response; | ||||||||
| } | ||||||||
|
|
||||||||
|
|
||||||||
|
|
||||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,6 +10,7 @@ | |
| namespace Nette\Application\Responses; | ||
|
|
||
| use Nette; | ||
| use function strlen; | ||
|
|
||
|
|
||
| /** | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,6 +10,7 @@ | |
| namespace Nette\Application\Routers; | ||
|
|
||
| use Nette; | ||
| use function is_array; | ||
|
|
||
|
|
||
| /** | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,12 +11,13 @@ | |
|
|
||
| use JetBrains\PhpStorm\Language; | ||
| use Nette; | ||
| use function count, is_int, is_string, strlen, strncmp, substr; | ||
|
|
||
|
|
||
| /** | ||
| * The router broker. | ||
| */ | ||
| class RouteList extends Nette\Routing\RouteList implements Nette\Routing\Router, \ArrayAccess | ||
|
Check failure on line 20 in src/Application/Routers/RouteList.php
|
||
| { | ||
| private const PresenterKey = 'presenter'; | ||
|
|
||
|
|
@@ -75,7 +76,7 @@ | |
|
|
||
| public function withModule(string $module): static | ||
| { | ||
| $router = new static; | ||
| $router->module = $module . ':'; | ||
| $router->parent = $this; | ||
| $this->add($router); | ||
|
|
@@ -95,6 +96,13 @@ | |
| */ | ||
| public function offsetSet($index, $router): void | ||
| { | ||
| if ($router instanceof Route) { | ||
| trigger_error('Usage `$router[] = new Route(...)` is deprecated, use `$router->addRoute(...)`.', E_USER_DEPRECATED); | ||
| } else { | ||
| $class = getclass($router); | ||
| trigger_error("Usage `\$router[] = new $class` is deprecated, use `\$router->add(new $class)`.", E_USER_DEPRECATED); | ||
| } | ||
|
|
||
| if ($index === null) { | ||
| $this->add($router); | ||
| } else { | ||
|
|
@@ -109,6 +117,7 @@ | |
| */ | ||
| public function offsetGet($index): Nette\Routing\Router | ||
| { | ||
| trigger_error('Usage `$route = $router[...]` is deprecated, use `$router->getRouters()`.', E_USER_DEPRECATED); | ||
| if (!$this->offsetExists($index)) { | ||
| throw new Nette\OutOfRangeException('Offset invalid or out of range'); | ||
| } | ||
|
|
@@ -122,7 +131,8 @@ | |
| */ | ||
| public function offsetExists($index): bool | ||
| { | ||
| trigger_error('Usage `isset($router[...])` is deprecated.', E_USER_DEPRECATED); | ||
| return is_int($index) && $index >= 0 && $index < count($this->getRouters()); | ||
| } | ||
|
|
||
|
|
||
|
|
@@ -132,13 +142,11 @@ | |
| */ | ||
| public function offsetUnset($index): void | ||
| { | ||
| trigger_error('Usage `unset($router[$index])` is deprecated, use `$router->modify($index, null)`.', E_USER_DEPRECATED); | ||
| if (!$this->offsetExists($index)) { | ||
| throw new Nette\OutOfRangeException('Offset invalid or out of range'); | ||
| } | ||
|
|
||
| $this->modify($index, null); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[nitpick] For enhanced readability and debugging, consider storing the returned Response in a temporary variable before calling send().
Copilot uses AI. Check for mistakes.