Refactor files in src/ (#242)

vjik · web-flow · commit 28e54693f2dd · 2025-09-27T12:20:22.000+03:00
diff --git a/composer.json b/composer.json
@@ -53,10 +53,10 @@
         "yiisoft/log": "^2.1.1",
         "yiisoft/log-target-file": "^3.0",
         "yiisoft/middleware-dispatcher": "^5.3",
-        "yiisoft/request-body-parser": "^1.1.1",
+        "yiisoft/request-body-parser": "^1.2.0",
         "yiisoft/request-provider": "^1.2",
-        "yiisoft/router": "^4.0",
-        "yiisoft/router-fastroute": "^4.0.1",
+        "yiisoft/router": "^4.0.1",
+        "yiisoft/router-fastroute": "^4.0.2",
         "yiisoft/validator": "^2.5",
         "yiisoft/yii-console": "^2.3",
         "yiisoft/yii-event": "^2.1",
@@ -74,7 +74,7 @@
         "codeception/module-phpbrowser": "^3.0.2",
         "codeception/module-rest": "^3.4.1",
         "friendsofphp/php-cs-fixer": "^3.87.2",
-        "phpunit/phpunit": "^11.5.37",
+        "phpunit/phpunit": "^11.5.41",
         "rector/rector": "^2.1.7",
         "roave/infection-static-analysis-plugin": "^1.39",
         "shipmonk/composer-dependency-analyser": "^1.8.3",
diff --git a/config/common/di/application.php b/config/common/di/application.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-use App\ApplicationParams;
+use App\Shared\ApplicationParams;
 
 /** @var array $params */
 
diff --git a/config/common/routes.php b/config/common/routes.php
@@ -2,15 +2,13 @@
 
 declare(strict_types=1);
 
-use App\Controller\IndexAction;
+use App\Api;
 use Yiisoft\Router\Route;
 
 /**
  * @var array $params
  */
 
 return [
-    Route::get('/')
-        ->action(IndexAction::class)
-        ->name('app/index'),
+    Route::get('/')->action(Api\IndexAction::class)->name('app/index'),
 ];
diff --git a/config/console/commands.php b/config/console/commands.php
@@ -2,8 +2,8 @@
 
 declare(strict_types=1);
 
-use App\Command\HelloCommand;
+use App\Console;
 
 return [
-    'hello' => HelloCommand::class,
+    'hello' => Console\HelloCommand::class,
 ];
diff --git a/config/web/di/application.php b/config/web/di/application.php
@@ -2,8 +2,8 @@
 
 declare(strict_types=1);
 
-use App\Http\ExceptionResponderFactory;
-use App\Http\NotFoundMiddleware;
+use App\Api\Shared\ExceptionResponderFactory;
+use App\Api\Shared\NotFoundMiddleware;
 use Yiisoft\DataResponse\Formatter\JsonDataResponseFormatter;
 use Yiisoft\DataResponse\Formatter\XmlDataResponseFormatter;
 use Yiisoft\DataResponse\Middleware\ContentNegotiator;
diff --git a/src/Api/IndexAction.php b/src/Api/IndexAction.php
@@ -2,19 +2,19 @@
 
 declare(strict_types=1);
 
-namespace App\Controller;
+namespace App\Api;
 
-use App\ApplicationParams;
-use App\Http\ApiResponseFactory;
+use App\Api\Shared\ResponseFactory;
+use App\Shared\ApplicationParams;
 use Psr\Http\Message\ResponseInterface;
 
 final class IndexAction
 {
     public function __invoke(
-        ApiResponseFactory $apiResponseFactory,
+        ResponseFactory $responseFactory,
         ApplicationParams $applicationParams,
     ): ResponseInterface {
-        return $apiResponseFactory->success([
+        return $responseFactory->success([
             'name' => $applicationParams->name,
             'version' => $applicationParams->version,
         ]);
diff --git a/src/Api/Shared/ExceptionResponderFactory.php b/src/Api/Shared/ExceptionResponderFactory.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Http;
+namespace App\Api\Shared;
 
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\ResponseInterface;
@@ -15,8 +15,8 @@
 final readonly class ExceptionResponderFactory
 {
     public function __construct(
-        private ResponseFactoryInterface $responseFactory,
-        private ApiResponseFactory $apiResponseFactory,
+        private ResponseFactoryInterface $psrResponseFactory,
+        private ResponseFactory $apiResponseFactory,
         private Injector $injector,
     ) {}
 
@@ -27,7 +27,7 @@ public function create(): ExceptionResponder
                 InputValidationException::class => $this->inputValidationException(...),
                 Throwable::class => $this->throwable(...),
             ],
-            $this->responseFactory,
+            $this->psrResponseFactory,
             $this->injector,
         );
     }
diff --git a/src/Api/Shared/NotFoundMiddleware.php b/src/Api/Shared/NotFoundMiddleware.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Http;
+namespace App\Api\Shared;
 
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
@@ -12,11 +12,11 @@
 final readonly class NotFoundMiddleware implements MiddlewareInterface
 {
     public function __construct(
-        private ApiResponseFactory $apiResponseFactory,
+        private ResponseFactory $responseFactory,
     ) {}
 
     public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
-        return $this->apiResponseFactory->notFound();
+        return $this->responseFactory->notFound();
     }
 }
diff --git a/src/Api/Shared/Presenter/AsIsPresenter.php b/src/Api/Shared/Presenter/AsIsPresenter.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Http\Presenter;
+namespace App\Api\Shared\Presenter;
 
 use Yiisoft\DataResponse\DataResponse;
 
diff --git a/src/Api/Shared/Presenter/CollectionPresenter.php b/src/Api/Shared/Presenter/CollectionPresenter.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Http\Presenter;
+namespace App\Api\Shared\Presenter;
 
 use Yiisoft\DataResponse\DataResponse;
 
diff --git a/src/Api/Shared/Presenter/FailPresenter.php b/src/Api/Shared/Presenter/FailPresenter.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Http\Presenter;
+namespace App\Api\Shared\Presenter;
 
 use Yiisoft\DataResponse\DataResponse;
 use Yiisoft\Http\Status;
diff --git a/src/Api/Shared/Presenter/OffsetPaginatorPresenter.php b/src/Api/Shared/Presenter/OffsetPaginatorPresenter.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Http\Presenter;
+namespace App\Api\Shared\Presenter;
 
 use Yiisoft\Data\Paginator\OffsetPaginator;
 use Yiisoft\DataResponse\DataResponse;
diff --git a/src/Api/Shared/Presenter/PresenterInterface.php b/src/Api/Shared/Presenter/PresenterInterface.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Http\Presenter;
+namespace App\Api\Shared\Presenter;
 
 use Yiisoft\DataResponse\DataResponse;
 
diff --git a/src/Api/Shared/Presenter/SuccessPresenter.php b/src/Api/Shared/Presenter/SuccessPresenter.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Http\Presenter;
+namespace App\Api\Shared\Presenter;
 
 use Yiisoft\DataResponse\DataResponse;
 use Yiisoft\Http\Status;
diff --git a/src/Api/Shared/Presenter/ValidationResultPresenter.php b/src/Api/Shared/Presenter/ValidationResultPresenter.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Http\Presenter;
+namespace App\Api\Shared\Presenter;
 
 use Yiisoft\DataResponse\DataResponse;
 use Yiisoft\Validator\Result;
diff --git a/src/Api/Shared/ResponseFactory.php b/src/Api/Shared/ResponseFactory.php
@@ -2,19 +2,19 @@
 
 declare(strict_types=1);
 
-namespace App\Http;
+namespace App\Api\Shared;
 
-use App\Http\Presenter\AsIsPresenter;
-use App\Http\Presenter\FailPresenter;
-use App\Http\Presenter\PresenterInterface;
-use App\Http\Presenter\SuccessPresenter;
-use App\Http\Presenter\ValidationResultPresenter;
+use App\Api\Shared\Presenter\AsIsPresenter;
+use App\Api\Shared\Presenter\FailPresenter;
+use App\Api\Shared\Presenter\PresenterInterface;
+use App\Api\Shared\Presenter\SuccessPresenter;
+use App\Api\Shared\Presenter\ValidationResultPresenter;
 use Psr\Http\Message\ResponseInterface;
 use Yiisoft\DataResponse\DataResponseFactoryInterface;
 use Yiisoft\Http\Status;
 use Yiisoft\Validator\Result;
 
-final readonly class ApiResponseFactory
+final readonly class ResponseFactory
 {
     public function __construct(
         private DataResponseFactoryInterface $dataResponseFactory,
diff --git a/src/Console/HelloCommand.php b/src/Console/HelloCommand.php
@@ -2,15 +2,18 @@
 
 declare(strict_types=1);
 
-namespace App\Command;
+namespace App\Console;
 
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Yiisoft\Yii\Console\ExitCode;
 
-#[AsCommand(name: 'hello', description: 'An example command', hidden: false)]
+#[AsCommand(
+    name: 'hello',
+    description: 'An example command',
+)]
 final class HelloCommand extends Command
 {
     protected function execute(InputInterface $input, OutputInterface $output): int
diff --git a/src/Shared/ApplicationParams.php b/src/Shared/ApplicationParams.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App;
+namespace App\Shared;
 
 final readonly class ApplicationParams
 {
diff --git a/tests/Unit/HttpPresenter/OffsetPaginatorPresenterTest.php b/tests/Unit/HttpPresenter/OffsetPaginatorPresenterTest.php
@@ -4,8 +4,8 @@
 
 namespace App\Tests\Unit\HttpPresenter;
 
-use App\Http\Presenter\OffsetPaginatorPresenter;
-use App\Http\Presenter\PresenterInterface;
+use App\Api\Shared\Presenter\OffsetPaginatorPresenter;
+use App\Api\Shared\Presenter\PresenterInterface;
 use Codeception\Test\Unit;
 use HttpSoft\Message\ResponseFactory;
 use HttpSoft\Message\StreamFactory;

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`declare(strict_types=1);`
`4`	`4`
`5`		`-namespace App\Http;`
	`5`	`+namespace App\Api\Shared;`
`6`	`6`
`7`	`7`	`use Psr\Http\Message\ResponseInterface;`
`8`	`8`	`use Psr\Http\Message\ServerRequestInterface;`
`@@ -12,11 +12,11 @@`
`12`	`12`	`final readonly class NotFoundMiddleware implements MiddlewareInterface`
`13`	`13`	`{`
`14`	`14`	`public function __construct(`
`15`		`- private ApiResponseFactory $apiResponseFactory,`
	`15`	`+ private ResponseFactory $responseFactory,`
`16`	`16`	`) {}`
`17`	`17`
`18`	`18`	`public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface`
`19`	`19`	`{`
`20`		`- return $this->apiResponseFactory->notFound();`
	`20`	`+ return $this->responseFactory->notFound();`
`21`	`21`	`}`
`22`	`22`	`}`