Skip to content

Commit 8ffa8fc

Browse files
committed
removed prefix I from interfaces (except for IPresenter & IPresenterLoader)
1 parent aaa4d0a commit 8ffa8fc

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+175
-102
lines changed

src/Application/Application.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class Application
4141
/** @var callable[]&(callable(Application $sender, IPresenter $presenter): void)[]; Occurs when a presenter is created */
4242
public $onPresenter;
4343

44-
/** @var callable[]&(callable(Application $sender, IResponse $response): void)[]; Occurs when a new response is ready for dispatch */
44+
/** @var callable[]&(callable(Application $sender, Response $response): void)[]; Occurs when a new response is ready for dispatch */
4545
public $onResponse;
4646

4747
/** @var callable[]&(callable(Application $sender, \Throwable $e): void)[]; Occurs when an unhandled exception occurs in the application */

src/Application/ErrorPresenter.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public function __construct(ILogger $logger = null)
3232
}
3333

3434

35-
public function run(Application\Request $request): Application\IResponse
35+
public function run(Application\Request $request): Application\Response
3636
{
3737
$e = $request->getParameter('exception');
3838
if ($e instanceof Application\BadRequestException) {

src/Application/IPresenter.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111

1212

1313
/**
14-
* Presenter converts Request to IResponse.
14+
* Presenter converts Request to Response.
1515
*/
1616
interface IPresenter
1717
{
18-
function run(Request $request): IResponse;
18+
function run(Request $request): Response;
1919
}

src/Application/MicroPresenter.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public function getContext(): ?Nette\DI\Container
5757
}
5858

5959

60-
public function run(Application\Request $request): Application\IResponse
60+
public function run(Application\Request $request): Application\Response
6161
{
6262
$this->request = $request;
6363

@@ -108,7 +108,7 @@ public function run(Application\Request $request): Application\IResponse
108108
}
109109
$response->setFile((string) $templateSource);
110110
}
111-
if ($response instanceof Application\UI\ITemplate) {
111+
if ($response instanceof Application\UI\Template) {
112112
return new Responses\TextResponse($response);
113113
} else {
114114
return $response ?: new Responses\VoidResponse;
@@ -119,11 +119,11 @@ public function run(Application\Request $request): Application\IResponse
119119
/**
120120
* Template factory.
121121
*/
122-
public function createTemplate(string $class = null, callable $latteFactory = null): Application\UI\ITemplate
122+
public function createTemplate(string $class = null, callable $latteFactory = null): Application\UI\Template
123123
{
124124
$latte = $latteFactory
125125
? $latteFactory()
126-
: $this->getContext()->getByType(Nette\Bridges\ApplicationLatte\ILatteFactory::class)->create();
126+
: $this->getContext()->getByType(Nette\Bridges\ApplicationLatte\LatteFactory::class)->create();
127127
$template = $class
128128
? new $class
129129
: new Nette\Bridges\ApplicationLatte\DefaultTemplate($latte);

src/Application/IResponse.php renamed to src/Application/Response.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,13 @@
1515
/**
1616
* Any response returned by presenter.
1717
*/
18-
interface IResponse
18+
interface Response
1919
{
2020
/**
2121
* Sends response to output.
2222
*/
2323
function send(Nette\Http\IRequest $httpRequest, Nette\Http\IResponse $httpResponse): void;
2424
}
25+
26+
27+
interface_exists(IResponse::class);

src/Application/Responses/CallbackResponse.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
/**
1616
* Callback response.
1717
*/
18-
final class CallbackResponse implements Nette\Application\IResponse
18+
final class CallbackResponse implements Nette\Application\Response
1919
{
2020
use Nette\SmartObject;
2121

@@ -24,7 +24,7 @@ final class CallbackResponse implements Nette\Application\IResponse
2424

2525

2626
/**
27-
* @param callable&callable(Nette\Http\IRequest $httpRequest, Nette\Http\IResponse $httpResponse): void $callback
27+
* @param callable&callable(Nette\Http\IRequest $httpRequest, Nette\Http\Response $httpResponse): void $callback
2828
*/
2929
public function __construct(callable $callback)
3030
{

src/Application/Responses/FileResponse.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
/**
1616
* File download response.
1717
*/
18-
final class FileResponse implements Nette\Application\IResponse
18+
final class FileResponse implements Nette\Application\Response
1919
{
2020
use Nette\SmartObject;
2121

src/Application/Responses/ForwardResponse.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
/**
1616
* Forwards to new request.
1717
*/
18-
final class ForwardResponse implements Nette\Application\IResponse
18+
final class ForwardResponse implements Nette\Application\Response
1919
{
2020
use Nette\SmartObject;
2121

src/Application/Responses/JsonResponse.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
/**
1616
* JSON response used mainly for AJAX requests.
1717
*/
18-
final class JsonResponse implements Nette\Application\IResponse
18+
final class JsonResponse implements Nette\Application\Response
1919
{
2020
use Nette\SmartObject;
2121

src/Application/Responses/RedirectResponse.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
/**
1717
* Redirects to new URI.
1818
*/
19-
final class RedirectResponse implements Nette\Application\IResponse
19+
final class RedirectResponse implements Nette\Application\Response
2020
{
2121
use Nette\SmartObject;
2222

0 commit comments

Comments
 (0)