diff --git a/.gitattributes b/.gitattributes index 434fb00c6..074b7e757 100644 --- a/.gitattributes +++ b/.gitattributes @@ -8,6 +8,7 @@ *.sh text eol=lf *.js text eol=lf *.css text eol=lf +*.tpl text eol=lf # Export ignore - exclude development and test files tests/ export-ignore @@ -26,4 +27,4 @@ phpunit.xml export-ignore rector.php export-ignore .scrutinizer.yml export-ignore composer.lock export-ignore -_config.yml export-ignore \ No newline at end of file +_config.yml export-ignore diff --git a/composer.json b/composer.json index a7e76164b..f401f0ce7 100644 --- a/composer.json +++ b/composer.json @@ -83,7 +83,7 @@ "rector:check": "vendor/bin/rector process --dry-run", "rector:fix": "vendor/bin/rector process", "phpstan": "vendor/bin/phpstan analyse --memory-limit=-1 --error-format=github", - "test": "vendor/bin/phpunit --stderr --testdox --coverage-clover coverage.xml" + "test": "vendor/bin/phpunit --stderr --coverage-clover coverage.xml" }, "minimum-stability": "stable", "prefer-stable": true, diff --git a/src/App/Adapters/ConsoleAppAdapter.php b/src/App/Adapters/ConsoleAppAdapter.php index 1854becd5..2533c6241 100644 --- a/src/App/Adapters/ConsoleAppAdapter.php +++ b/src/App/Adapters/ConsoleAppAdapter.php @@ -25,6 +25,7 @@ use Quantum\App\Stages\LoadAppConfigStage; use Quantum\App\Stages\LoadHelpersStage; use Quantum\App\Traits\ConsoleAppTrait; +use Quantum\App\Enums\ExitCode; use Quantum\App\BootPipeline; use Quantum\App\AppContext; use Exception; @@ -94,7 +95,7 @@ public function start(): ?int stop(null, $exitCode); } catch (StopExecutionException $exception) { - return $exception->getCode(); + return $exception->getCode() ?: ExitCode::SUCCESS; } } } diff --git a/src/App/Adapters/WebAppAdapter.php b/src/App/Adapters/WebAppAdapter.php index 57528cf0c..b954186b9 100644 --- a/src/App/Adapters/WebAppAdapter.php +++ b/src/App/Adapters/WebAppAdapter.php @@ -17,7 +17,6 @@ namespace Quantum\App\Adapters; use Quantum\Middleware\Exceptions\MiddlewareException; -use Quantum\App\Exceptions\StopExecutionException; use Quantum\Loader\Exceptions\LoaderException; use Quantum\Module\Exceptions\ModuleException; use Quantum\Config\Exceptions\ConfigException; @@ -31,10 +30,12 @@ use Quantum\App\Stages\InitDebuggerStage; use Quantum\Middleware\MiddlewareManager; use Quantum\App\Stages\LoadHelpersStage; -use Quantum\App\Stages\InitHttpStage; use Quantum\Di\Exceptions\DiException; +use Quantum\App\Stages\InitHttpStage; use Quantum\App\Traits\WebAppTrait; use Quantum\Router\RouteDispatcher; +use Quantum\Http\Enums\StatusCode; +use Quantum\App\Enums\ExitCode; use Quantum\App\BootPipeline; use Quantum\App\AppContext; use ReflectionException; @@ -69,32 +70,34 @@ public function __construct(AppContext $context) */ public function start(): ?int { - try { - if (request()->isMethod('OPTIONS')) { - stop(); - } + if (request()->isMethod('OPTIONS')) { + $this->sendResponse(response()->setStatusCode(StatusCode::NO_CONTENT)); + return ExitCode::SUCCESS; + } + + $this->loadModules(); - $this->loadModules(); + $matchedRoute = $this->resolveRoute(); - $matchedRoute = $this->resolveRoute(); + if ($matchedRoute === null) { + $this->sendResponse(page_not_found_response()); - $this->loadLanguage(); + return ExitCode::SUCCESS; + } - $this->logDebugInfo(); + $this->loadLanguage(); - $response = (new MiddlewareManager($matchedRoute))->applyMiddlewares(request(), response()); - $request = request(); + $this->logDebugInfo(); - if ($this->setupViewCache()->serveCachedView(request()->getUri() ?? '', $response)) { - stop(); - } + $viewCache = $this->setupViewCache(); - (new RouteDispatcher())->dispatch($matchedRoute, $request); - stop(); - } catch (StopExecutionException $exception) { - $this->sendResponse(); + $terminal = fn ($request) => $viewCache->getCachedResponse($request->getUri() ?? '') + ?? (new RouteDispatcher())->dispatch($matchedRoute, $request); - return $exception->getCode(); - } + $response = (new MiddlewareManager($matchedRoute))->applyMiddlewares(request(), $terminal); + + $this->sendResponse($response); + + return ExitCode::SUCCESS; } } diff --git a/src/App/Enums/ExitCode.php b/src/App/Enums/ExitCode.php new file mode 100644 index 000000000..7ceb37c18 --- /dev/null +++ b/src/App/Enums/ExitCode.php @@ -0,0 +1,14 @@ +find(request()); if ($matchedRoute === null) { - page_not_found(); - stop(); + return null; } request()->setMatchedRoute($matchedRoute); @@ -142,9 +139,9 @@ private function handleCors(Response $response): void /** * @throws ConfigException|LoaderException|DiException|ReflectionException|Exception */ - private function sendResponse(): void + private function sendResponse(Response $response): void { - $this->handleCors(response()); - response()->send(); + $this->handleCors($response); + $response->send(); } } diff --git a/src/Http/Helpers/http.php b/src/Http/Helpers/http.php index efb01fc51..427a19196 100644 --- a/src/Http/Helpers/http.php +++ b/src/Http/Helpers/http.php @@ -123,21 +123,21 @@ function get_referrer(): ?string * Handles page not found * @throws ConfigException|DiException|BaseException|ReflectionException */ -function page_not_found(): void +function page_not_found_response(): Response { - $acceptHeader = response()->getHeader('Accept'); + $acceptHeader = request()->getHeader('Accept'); $isJson = $acceptHeader === ContentType::JSON; if ($isJson) { - response()->json( + return response()->json( ['status' => 'error', 'message' => 'Page not found',], StatusCode::NOT_FOUND ); - } else { - response()->html( - partial('errors' . DS . StatusCode::NOT_FOUND), - StatusCode::NOT_FOUND - ); } + + return response()->html( + partial('errors' . DS . StatusCode::NOT_FOUND), + StatusCode::NOT_FOUND + ); } diff --git a/src/Middleware/MiddlewareManager.php b/src/Middleware/MiddlewareManager.php index b37792a1e..570adf848 100644 --- a/src/Middleware/MiddlewareManager.php +++ b/src/Middleware/MiddlewareManager.php @@ -22,6 +22,7 @@ use Quantum\Http\Response; use Quantum\Http\Request; use ReflectionException; +use Closure; /** * Class MiddlewareManager @@ -49,29 +50,26 @@ public function __construct(MatchedRoute $matchedRoute) } /** - * Apply Middlewares - * @return Response + * Apply Middlewares. * @throws MiddlewareException|BaseException|ReflectionException */ - public function applyMiddlewares(Request $request, Response $response): Response + public function applyMiddlewares(Request $request, Closure $terminal): Response { if (!current($this->middlewares)) { - return $response; + return $terminal($request); } - $currentMiddleware = $this->getMiddleware($request, $response); + $currentMiddleware = $this->getMiddleware($request); next($this->middlewares); - return $currentMiddleware->apply($request, $response, function (Request $request, Response $response): Response { - return $this->applyMiddlewares($request, $response); - }); + return $currentMiddleware->apply($request, fn (Request $request): Response => $this->applyMiddlewares($request, $terminal)); } /** * Loads and gets the current middleware instance * @throws MiddlewareException|BaseException|ReflectionException */ - private function getMiddleware(Request $request, Response $response): QtMiddleware + private function getMiddleware(Request $request): QtMiddleware { $middlewareClass = request()->getModuleBaseNamespace() . '\\' . $this->module . '\\Middlewares\\' . current($this->middlewares); @@ -79,7 +77,7 @@ private function getMiddleware(Request $request, Response $response): QtMiddlewa throw MiddlewareException::middlewareNotFound($middlewareClass); } - $middleware = new $middlewareClass($request, $response); + $middleware = new $middlewareClass($request); if (!$middleware instanceof QtMiddleware) { throw MiddlewareException::notInstanceOf($middlewareClass, QtMiddleware::class); @@ -87,4 +85,5 @@ private function getMiddleware(Request $request, Response $response): QtMiddlewa return $middleware; } + } diff --git a/src/Middleware/QtMiddleware.php b/src/Middleware/QtMiddleware.php index 93e178f54..5dd6cbaa1 100644 --- a/src/Middleware/QtMiddleware.php +++ b/src/Middleware/QtMiddleware.php @@ -16,8 +16,8 @@ namespace Quantum\Middleware; -use Quantum\Http\Request; use Quantum\Http\Response; +use Quantum\Http\Request; use Closure; /** @@ -29,6 +29,6 @@ abstract class QtMiddleware /** * Applies the middleware */ - abstract public function apply(Request $request, Response $response, Closure $next): Response; + abstract public function apply(Request $request, Closure $next): Response; } diff --git a/src/Module/Templates/DefaultApi/src/Controllers/MainController.php.tpl b/src/Module/Templates/DefaultApi/src/Controllers/MainController.php.tpl index f57608cbe..1040b5cfe 100644 --- a/src/Module/Templates/DefaultApi/src/Controllers/MainController.php.tpl +++ b/src/Module/Templates/DefaultApi/src/Controllers/MainController.php.tpl @@ -49,4 +49,4 @@ class MainController 'message' => '{{MODULE_NAME}} module.' ]); } -} \ No newline at end of file +} diff --git a/src/Module/Templates/DefaultApi/src/Controllers/OpenApi/OpenApiController.php.tpl b/src/Module/Templates/DefaultApi/src/Controllers/OpenApi/OpenApiController.php.tpl index d0ffe790a..fbb01bfc3 100644 --- a/src/Module/Templates/DefaultApi/src/Controllers/OpenApi/OpenApiController.php.tpl +++ b/src/Module/Templates/DefaultApi/src/Controllers/OpenApi/OpenApiController.php.tpl @@ -32,4 +32,4 @@ namespace {{MODULE_NAMESPACE}}\Controllers\OpenApi; abstract class OpenApiController { -} \ No newline at end of file +} diff --git a/src/Module/Templates/DefaultApi/src/Controllers/OpenApi/OpenApiMainController.php.tpl b/src/Module/Templates/DefaultApi/src/Controllers/OpenApi/OpenApiMainController.php.tpl index 19f57f9a1..7653c7a73 100644 --- a/src/Module/Templates/DefaultApi/src/Controllers/OpenApi/OpenApiMainController.php.tpl +++ b/src/Module/Templates/DefaultApi/src/Controllers/OpenApi/OpenApiMainController.php.tpl @@ -42,4 +42,4 @@ abstract class OpenApiMainController extends OpenApiController */ abstract public function index(Response $response); -} \ No newline at end of file +} diff --git a/src/Module/Templates/DefaultApi/src/config/cors.php.tpl b/src/Module/Templates/DefaultApi/src/config/cors.php.tpl index a5e098be3..7a3b4da75 100644 --- a/src/Module/Templates/DefaultApi/src/config/cors.php.tpl +++ b/src/Module/Templates/DefaultApi/src/config/cors.php.tpl @@ -11,4 +11,4 @@ return [ 'Access-Control-Allow-Headers' => 'Origin, X-Requested-With, Content-Type, Accept, Authorization, refresh_token', 'Access-Control-Allow-Methods' => 'GET, POST, PUT, DELETE, OPTIONS', 'Access-Control-Allow-Credentials' => true, -]; \ No newline at end of file +]; diff --git a/src/Module/Templates/DefaultApi/src/routes/routes.php.tpl b/src/Module/Templates/DefaultApi/src/routes/routes.php.tpl index 5a52ae844..d56337c27 100644 --- a/src/Module/Templates/DefaultApi/src/routes/routes.php.tpl +++ b/src/Module/Templates/DefaultApi/src/routes/routes.php.tpl @@ -2,4 +2,4 @@ return function ($route) { $route->get('/', 'MainController', 'index'); -}; \ No newline at end of file +}; diff --git a/src/Module/Templates/DefaultWeb/src/Controllers/MainController.php.tpl b/src/Module/Templates/DefaultWeb/src/Controllers/MainController.php.tpl index 02936a4ec..869fc18db 100644 --- a/src/Module/Templates/DefaultWeb/src/Controllers/MainController.php.tpl +++ b/src/Module/Templates/DefaultWeb/src/Controllers/MainController.php.tpl @@ -55,4 +55,4 @@ class MainController return $response->html($view->render('index')); } -} \ No newline at end of file +} diff --git a/src/Module/Templates/DefaultWeb/src/Views/index.php.tpl b/src/Module/Templates/DefaultWeb/src/Views/index.php.tpl index 559bc171e..adaf6e1ac 100644 --- a/src/Module/Templates/DefaultWeb/src/Views/index.php.tpl +++ b/src/Module/Templates/DefaultWeb/src/Views/index.php.tpl @@ -8,4 +8,4 @@ - \ No newline at end of file + diff --git a/src/Module/Templates/DefaultWeb/src/Views/layouts/main.php.tpl b/src/Module/Templates/DefaultWeb/src/Views/layouts/main.php.tpl index ee53a931a..cd7edcb39 100644 --- a/src/Module/Templates/DefaultWeb/src/Views/layouts/main.php.tpl +++ b/src/Module/Templates/DefaultWeb/src/Views/layouts/main.php.tpl @@ -18,4 +18,4 @@ - \ No newline at end of file + diff --git a/src/Module/Templates/DefaultWeb/src/Views/partials/bubbles.php.tpl b/src/Module/Templates/DefaultWeb/src/Views/partials/bubbles.php.tpl index 0d9f8861e..50a14c2a4 100644 --- a/src/Module/Templates/DefaultWeb/src/Views/partials/bubbles.php.tpl +++ b/src/Module/Templates/DefaultWeb/src/Views/partials/bubbles.php.tpl @@ -9,4 +9,4 @@
  • - \ No newline at end of file + diff --git a/src/Module/Templates/DefaultWeb/src/routes/routes.php.tpl b/src/Module/Templates/DefaultWeb/src/routes/routes.php.tpl index 5a52ae844..d56337c27 100644 --- a/src/Module/Templates/DefaultWeb/src/routes/routes.php.tpl +++ b/src/Module/Templates/DefaultWeb/src/routes/routes.php.tpl @@ -2,4 +2,4 @@ return function ($route) { $route->get('/', 'MainController', 'index'); -}; \ No newline at end of file +}; diff --git a/src/Module/Templates/DemoApi/src/Controllers/AccountController.php.tpl b/src/Module/Templates/DemoApi/src/Controllers/AccountController.php.tpl index b66c73e5b..44d56212c 100644 --- a/src/Module/Templates/DemoApi/src/Controllers/AccountController.php.tpl +++ b/src/Module/Templates/DemoApi/src/Controllers/AccountController.php.tpl @@ -98,4 +98,4 @@ class AccountController extends BaseController ]); } } -} \ No newline at end of file +} diff --git a/src/Module/Templates/DemoApi/src/Controllers/AuthController.php.tpl b/src/Module/Templates/DemoApi/src/Controllers/AuthController.php.tpl index 7a68098bc..76f6a022a 100644 --- a/src/Module/Templates/DemoApi/src/Controllers/AuthController.php.tpl +++ b/src/Module/Templates/DemoApi/src/Controllers/AuthController.php.tpl @@ -196,4 +196,4 @@ class AuthController extends BaseController ], StatusCode::UNAUTHORIZED); } } -} \ No newline at end of file +} diff --git a/src/Module/Templates/DemoApi/src/Controllers/BaseController.php.tpl b/src/Module/Templates/DemoApi/src/Controllers/BaseController.php.tpl index 12503b127..eea9bb3a7 100644 --- a/src/Module/Templates/DemoApi/src/Controllers/BaseController.php.tpl +++ b/src/Module/Templates/DemoApi/src/Controllers/BaseController.php.tpl @@ -36,4 +36,4 @@ abstract class BaseController * @var bool */ public bool $csrfVerification = false; -} \ No newline at end of file +} diff --git a/src/Module/Templates/DemoApi/src/Controllers/OpenApi/OpenApiAuthController.php.tpl b/src/Module/Templates/DemoApi/src/Controllers/OpenApi/OpenApiAuthController.php.tpl index f14d2308c..fc5b829ea 100644 --- a/src/Module/Templates/DemoApi/src/Controllers/OpenApi/OpenApiAuthController.php.tpl +++ b/src/Module/Templates/DemoApi/src/Controllers/OpenApi/OpenApiAuthController.php.tpl @@ -395,4 +395,4 @@ abstract class OpenApiAuthController extends OpenApiController * @param Response $response */ abstract public function resend(Response $response); -} \ No newline at end of file +} diff --git a/src/Module/Templates/DemoApi/src/Controllers/OpenApi/OpenApiController.php.tpl b/src/Module/Templates/DemoApi/src/Controllers/OpenApi/OpenApiController.php.tpl index be7f53da9..a7491ff3a 100644 --- a/src/Module/Templates/DemoApi/src/Controllers/OpenApi/OpenApiController.php.tpl +++ b/src/Module/Templates/DemoApi/src/Controllers/OpenApi/OpenApiController.php.tpl @@ -32,4 +32,4 @@ namespace {{MODULE_NAMESPACE}}\Controllers\OpenApi; abstract class OpenApiController { -} \ No newline at end of file +} diff --git a/src/Module/Templates/DemoApi/src/Controllers/OpenApi/OpenApiPostController.php.tpl b/src/Module/Templates/DemoApi/src/Controllers/OpenApi/OpenApiPostController.php.tpl index 53e54285b..19a6bfd95 100644 --- a/src/Module/Templates/DemoApi/src/Controllers/OpenApi/OpenApiPostController.php.tpl +++ b/src/Module/Templates/DemoApi/src/Controllers/OpenApi/OpenApiPostController.php.tpl @@ -329,4 +329,4 @@ abstract class OpenApiPostController extends OpenApiController */ abstract public function deleteImage(Response $response, ?string $lang, string $postId); -} \ No newline at end of file +} diff --git a/src/Module/Templates/DemoApi/src/Controllers/PostController.php.tpl b/src/Module/Templates/DemoApi/src/Controllers/PostController.php.tpl index ae4fca8a9..cf51e13b2 100644 --- a/src/Module/Templates/DemoApi/src/Controllers/PostController.php.tpl +++ b/src/Module/Templates/DemoApi/src/Controllers/PostController.php.tpl @@ -109,4 +109,4 @@ class PostController extends BaseController 'data' => $postData, ]); } -} \ No newline at end of file +} diff --git a/src/Module/Templates/DemoApi/src/Controllers/PostManagementController.php.tpl b/src/Module/Templates/DemoApi/src/Controllers/PostManagementController.php.tpl index 3a2af8a5d..1b0cb16cf 100644 --- a/src/Module/Templates/DemoApi/src/Controllers/PostManagementController.php.tpl +++ b/src/Module/Templates/DemoApi/src/Controllers/PostManagementController.php.tpl @@ -173,4 +173,4 @@ class PostManagementController extends BaseController 'message' => t('common.deleted_successfully') ]); } -} \ No newline at end of file +} diff --git a/src/Module/Templates/DemoApi/src/Enums/Role.php.tpl b/src/Module/Templates/DemoApi/src/Enums/Role.php.tpl index 7b4b4540b..2611c72c4 100644 --- a/src/Module/Templates/DemoApi/src/Enums/Role.php.tpl +++ b/src/Module/Templates/DemoApi/src/Enums/Role.php.tpl @@ -23,4 +23,4 @@ class Role const ADMIN = 'admin'; const EDITOR = 'editor'; -} \ No newline at end of file +} diff --git a/src/Module/Templates/DemoApi/src/Middlewares/Activate.php.tpl b/src/Module/Templates/DemoApi/src/Middlewares/Activate.php.tpl index 2a5bada92..e2d2eb329 100644 --- a/src/Module/Templates/DemoApi/src/Middlewares/Activate.php.tpl +++ b/src/Module/Templates/DemoApi/src/Middlewares/Activate.php.tpl @@ -33,8 +33,9 @@ class Activate extends BaseMiddleware * @param Closure $next * @return Response */ - public function apply(Request $request, Response $response, Closure $next): Response + public function apply(Request $request, Closure $next): Response { + $response = response(); $token = (string)route_param('token'); $request->set('token', $token); @@ -45,7 +46,7 @@ class Activate extends BaseMiddleware $request->set('activation_token', $token); - return $next($request, $response); + return $next($request); } /** @@ -60,4 +61,4 @@ class Activate extends BaseMiddleware ] ]); } -} \ No newline at end of file +} diff --git a/src/Module/Templates/DemoApi/src/Middlewares/Auth.php.tpl b/src/Module/Templates/DemoApi/src/Middlewares/Auth.php.tpl index 6507d3d6c..7e4218f23 100644 --- a/src/Module/Templates/DemoApi/src/Middlewares/Auth.php.tpl +++ b/src/Module/Templates/DemoApi/src/Middlewares/Auth.php.tpl @@ -32,8 +32,9 @@ class Auth extends BaseMiddleware * @param Closure $next * @return Response */ - public function apply(Request $request, Response $response, Closure $next): Response + public function apply(Request $request, Closure $next): Response { + $response = response(); if (!auth()->check()) { $this->respondWithError( $request, @@ -43,6 +44,6 @@ class Auth extends BaseMiddleware ); } - return $next($request, $response); + return $next($request); } -} \ No newline at end of file +} diff --git a/src/Module/Templates/DemoApi/src/Middlewares/Comment.php.tpl b/src/Module/Templates/DemoApi/src/Middlewares/Comment.php.tpl index 14f215f6f..d8b4a09b4 100644 --- a/src/Module/Templates/DemoApi/src/Middlewares/Comment.php.tpl +++ b/src/Module/Templates/DemoApi/src/Middlewares/Comment.php.tpl @@ -31,13 +31,14 @@ class Comment extends BaseMiddleware * @param Response $response * @param Closure $next */ - public function apply(Request $request, Response $response, Closure $next): Response + public function apply(Request $request, Closure $next): Response { + $response = response(); if ($errorResponse = $this->validateRequest($request, $response)) { return $errorResponse; } - return $next($request, $response); + return $next($request); } /** @@ -53,4 +54,4 @@ class Comment extends BaseMiddleware ], ]); } -} \ No newline at end of file +} diff --git a/src/Module/Templates/DemoApi/src/Middlewares/CommentOwner.php.tpl b/src/Module/Templates/DemoApi/src/Middlewares/CommentOwner.php.tpl index 73b9602f3..bdcdc58b5 100644 --- a/src/Module/Templates/DemoApi/src/Middlewares/CommentOwner.php.tpl +++ b/src/Module/Templates/DemoApi/src/Middlewares/CommentOwner.php.tpl @@ -33,8 +33,9 @@ class CommentOwner extends BaseMiddleware * @param Closure $next * @return Response */ - public function apply(Request $request, Response $response, Closure $next): Response + public function apply(Request $request, Closure $next): Response { + $response = response(); $uuid = (string)route_param('uuid'); $request->set('uuid', $uuid); @@ -43,7 +44,7 @@ class CommentOwner extends BaseMiddleware return $errorResponse; } - return $next($request, $response); + return $next($request); } /** @@ -71,4 +72,4 @@ class CommentOwner extends BaseMiddleware return !$comment->isEmpty() && $comment->user_uuid === auth()->user()->uuid; }); } -} \ No newline at end of file +} diff --git a/src/Module/Templates/DemoApi/src/Middlewares/Editor.php.tpl b/src/Module/Templates/DemoApi/src/Middlewares/Editor.php.tpl index f780127ba..06d34fd3f 100644 --- a/src/Module/Templates/DemoApi/src/Middlewares/Editor.php.tpl +++ b/src/Module/Templates/DemoApi/src/Middlewares/Editor.php.tpl @@ -48,8 +48,9 @@ class Editor extends BaseMiddleware * @param Closure $next * @return Response */ - public function apply(Request $request, Response $response, Closure $next): Response + public function apply(Request $request, Closure $next): Response { + $response = response(); if (!in_array(auth()->user()->role, self::ROLES)) { return $this->respondWithError( $request, @@ -65,7 +66,7 @@ class Editor extends BaseMiddleware } } - return $next($request, $response); + return $next($request); } /** @@ -95,4 +96,4 @@ class Editor extends BaseMiddleware ], ]); } -} \ No newline at end of file +} diff --git a/src/Module/Templates/DemoApi/src/Middlewares/Forget.php.tpl b/src/Module/Templates/DemoApi/src/Middlewares/Forget.php.tpl index 279194d95..bea4c628c 100644 --- a/src/Module/Templates/DemoApi/src/Middlewares/Forget.php.tpl +++ b/src/Module/Templates/DemoApi/src/Middlewares/Forget.php.tpl @@ -34,15 +34,16 @@ class Forget extends BaseMiddleware * @param Closure $next * @return Response */ - public function apply(Request $request, Response $response, Closure $next): Response + public function apply(Request $request, Closure $next): Response { + $response = response(); if ($request->isMethod('post')) { if ($errorResponse = $this->validateRequest($request, $response)) { return $errorResponse; } } - return $next($request, $response); + return $next($request); } /** @@ -58,4 +59,4 @@ class Forget extends BaseMiddleware ], ]); } -} \ No newline at end of file +} diff --git a/src/Module/Templates/DemoApi/src/Middlewares/Password.php.tpl b/src/Module/Templates/DemoApi/src/Middlewares/Password.php.tpl index f436ff100..e202988fa 100644 --- a/src/Module/Templates/DemoApi/src/Middlewares/Password.php.tpl +++ b/src/Module/Templates/DemoApi/src/Middlewares/Password.php.tpl @@ -33,15 +33,16 @@ class Password extends BaseMiddleware * @param Response $response * @param Closure $next */ - public function apply(Request $request, Response $response, Closure $next): Response + public function apply(Request $request, Closure $next): Response { + $response = response(); if ($request->isMethod('post')) { if ($errorResponse = $this->validateRequest($request, $response)) { return $errorResponse; } } - return $next($request, $response); + return $next($request); } /** @@ -78,4 +79,4 @@ class Password extends BaseMiddleware return $user && (new Hasher())->check($request->get('current_password'), $user->password); }); } -} \ No newline at end of file +} diff --git a/src/Module/Templates/DemoApi/src/Middlewares/PostOwner.php.tpl b/src/Module/Templates/DemoApi/src/Middlewares/PostOwner.php.tpl index 9701d8a6d..c0597c1d6 100644 --- a/src/Module/Templates/DemoApi/src/Middlewares/PostOwner.php.tpl +++ b/src/Module/Templates/DemoApi/src/Middlewares/PostOwner.php.tpl @@ -33,8 +33,9 @@ class PostOwner extends BaseMiddleware * @param Closure $next * @return Response */ - public function apply(Request $request, Response $response, Closure $next): Response + public function apply(Request $request, Closure $next): Response { + $response = response(); $uuid = (string)route_param('uuid'); $request->set('uuid', $uuid); @@ -43,7 +44,7 @@ class PostOwner extends BaseMiddleware return $errorResponse; } - return $next($request, $response); + return $next($request); } /** @@ -71,4 +72,4 @@ class PostOwner extends BaseMiddleware return !$post->isEmpty() && $post->user_uuid === auth()->user()->uuid; }); } -} \ No newline at end of file +} diff --git a/src/Module/Templates/DemoApi/src/Middlewares/Resend.php.tpl b/src/Module/Templates/DemoApi/src/Middlewares/Resend.php.tpl index 3aa1bd888..7c630acfd 100644 --- a/src/Module/Templates/DemoApi/src/Middlewares/Resend.php.tpl +++ b/src/Module/Templates/DemoApi/src/Middlewares/Resend.php.tpl @@ -33,8 +33,9 @@ class Resend extends BaseMiddleware * @param Closure $next * @return Response */ - public function apply(Request $request, Response $response, Closure $next): Response + public function apply(Request $request, Closure $next): Response { + $response = response(); $code = (string) route_param('code'); $request->set('code', $code); @@ -43,7 +44,7 @@ class Resend extends BaseMiddleware return $errorResponse; } - return $next($request, $response); + return $next($request); } /** @@ -57,4 +58,4 @@ class Resend extends BaseMiddleware ], ]); } -} \ No newline at end of file +} diff --git a/src/Module/Templates/DemoApi/src/Middlewares/Reset.php.tpl b/src/Module/Templates/DemoApi/src/Middlewares/Reset.php.tpl index 6ecd9526c..f52ca4eb4 100644 --- a/src/Module/Templates/DemoApi/src/Middlewares/Reset.php.tpl +++ b/src/Module/Templates/DemoApi/src/Middlewares/Reset.php.tpl @@ -33,8 +33,9 @@ class Reset extends BaseMiddleware * @param Closure $next * @return Response */ - public function apply(Request $request, Response $response, Closure $next): Response + public function apply(Request $request, Closure $next): Response { + $response = response(); $token = (string) route_param('token'); $request->set('token', $token); @@ -45,7 +46,7 @@ class Reset extends BaseMiddleware $request->set('reset_token', $token); - return $next($request, $response); + return $next($request); } /** @@ -69,4 +70,4 @@ class Reset extends BaseMiddleware ], ]); } -} \ No newline at end of file +} diff --git a/src/Module/Templates/DemoApi/src/Middlewares/Signout.php.tpl b/src/Module/Templates/DemoApi/src/Middlewares/Signout.php.tpl index 5e1404492..6c9a295a5 100644 --- a/src/Module/Templates/DemoApi/src/Middlewares/Signout.php.tpl +++ b/src/Module/Templates/DemoApi/src/Middlewares/Signout.php.tpl @@ -31,8 +31,9 @@ class Signout extends BaseMiddleware * @param Closure $next * @return Response */ - public function apply(Request $request, Response $response, Closure $next): Response + public function apply(Request $request, Closure $next): Response { + $response = response(); if (!$request->hasHeader('refresh_token')) { $this->respondWithError( $request, @@ -41,6 +42,6 @@ class Signout extends BaseMiddleware ); } - return $next($request, $response); + return $next($request); } -} \ No newline at end of file +} diff --git a/src/Module/Templates/DemoApi/src/Middlewares/Signup.php.tpl b/src/Module/Templates/DemoApi/src/Middlewares/Signup.php.tpl index 1f2d41032..19dd26699 100644 --- a/src/Module/Templates/DemoApi/src/Middlewares/Signup.php.tpl +++ b/src/Module/Templates/DemoApi/src/Middlewares/Signup.php.tpl @@ -34,13 +34,14 @@ class Signup extends BaseMiddleware * @param Closure $next * @return Response */ - public function apply(Request $request, Response $response, Closure $next): Response + public function apply(Request $request, Closure $next): Response { + $response = response(); if ($errorResponse = $this->validateRequest($request, $response)) { return $errorResponse; } - return $next($request, $response); + return $next($request); } /** @@ -66,4 +67,4 @@ class Signup extends BaseMiddleware ], ]); } -} \ No newline at end of file +} diff --git a/src/Module/Templates/DemoApi/src/Middlewares/Update.php.tpl b/src/Module/Templates/DemoApi/src/Middlewares/Update.php.tpl index 6f3ca6e69..afadb9d45 100644 --- a/src/Module/Templates/DemoApi/src/Middlewares/Update.php.tpl +++ b/src/Module/Templates/DemoApi/src/Middlewares/Update.php.tpl @@ -32,15 +32,16 @@ class Update extends BaseMiddleware * @param Response $response * @param Closure $next */ - public function apply(Request $request, Response $response, Closure $next): Response + public function apply(Request $request, Closure $next): Response { + $response = response(); if ($request->isMethod('post')) { if ($errorResponse = $this->validateRequest($request, $response)) { return $errorResponse; } } - return $next($request, $response); + return $next($request); } /** @@ -57,4 +58,4 @@ class Update extends BaseMiddleware ], ]); } -} \ No newline at end of file +} diff --git a/src/Module/Templates/DemoApi/src/Middlewares/Verify.php.tpl b/src/Module/Templates/DemoApi/src/Middlewares/Verify.php.tpl index ae237a2eb..96e457a01 100644 --- a/src/Module/Templates/DemoApi/src/Middlewares/Verify.php.tpl +++ b/src/Module/Templates/DemoApi/src/Middlewares/Verify.php.tpl @@ -34,15 +34,16 @@ class Verify extends BaseMiddleware * @param Closure $next * @return Response */ - public function apply(Request $request, Response $response, Closure $next): Response + public function apply(Request $request, Closure $next): Response { + $response = response(); if ($request->isMethod('post')) { if ($errorResponse = $this->validateRequest($request, $response)) { return $errorResponse; } } - return $next($request, $response); + return $next($request); } /** @@ -59,4 +60,4 @@ class Verify extends BaseMiddleware ], ]); } -} \ No newline at end of file +} diff --git a/src/Module/Templates/DemoApi/src/Models/Post.php.tpl b/src/Module/Templates/DemoApi/src/Models/Post.php.tpl index 140fff6a4..71a5ec6cc 100644 --- a/src/Module/Templates/DemoApi/src/Models/Post.php.tpl +++ b/src/Module/Templates/DemoApi/src/Models/Post.php.tpl @@ -67,4 +67,4 @@ class Post extends DbModel ] ]; } -} \ No newline at end of file +} diff --git a/src/Module/Templates/DemoApi/src/Models/User.php.tpl b/src/Module/Templates/DemoApi/src/Models/User.php.tpl index d80e57d61..180e4966b 100644 --- a/src/Module/Templates/DemoApi/src/Models/User.php.tpl +++ b/src/Module/Templates/DemoApi/src/Models/User.php.tpl @@ -59,4 +59,4 @@ class User extends DbModel 'otp_expires', 'otp_token', ]; -} \ No newline at end of file +} diff --git a/src/Module/Templates/DemoApi/src/Services/AuthService.php.tpl b/src/Module/Templates/DemoApi/src/Services/AuthService.php.tpl index cd1a0f0fa..5eaf1137d 100644 --- a/src/Module/Templates/DemoApi/src/Services/AuthService.php.tpl +++ b/src/Module/Templates/DemoApi/src/Services/AuthService.php.tpl @@ -180,4 +180,4 @@ class AuthService extends QtService implements AuthServiceInterface fs()->makeDirectory($userDirectory); } } -} \ No newline at end of file +} diff --git a/src/Module/Templates/DemoApi/src/Services/PostService.php.tpl b/src/Module/Templates/DemoApi/src/Services/PostService.php.tpl index 45e91981a..d7311e9e5 100644 --- a/src/Module/Templates/DemoApi/src/Services/PostService.php.tpl +++ b/src/Module/Templates/DemoApi/src/Services/PostService.php.tpl @@ -248,4 +248,4 @@ class PostService extends QtService { return transform($posts, $this->transformer); } -} \ No newline at end of file +} diff --git a/src/Module/Templates/DemoApi/src/Transformers/PostTransformer.php.tpl b/src/Module/Templates/DemoApi/src/Transformers/PostTransformer.php.tpl index 7295b34a2..f81acbd08 100644 --- a/src/Module/Templates/DemoApi/src/Transformers/PostTransformer.php.tpl +++ b/src/Module/Templates/DemoApi/src/Transformers/PostTransformer.php.tpl @@ -39,4 +39,4 @@ class PostTransformer implements TransformerInterface 'author' => $item->firstname . ' ' . $item->lastname ]; } -} \ No newline at end of file +} diff --git a/src/Module/Templates/DemoApi/src/config/auth.php.tpl b/src/Module/Templates/DemoApi/src/config/auth.php.tpl index a36feb64c..384aa1a72 100644 --- a/src/Module/Templates/DemoApi/src/config/auth.php.tpl +++ b/src/Module/Templates/DemoApi/src/config/auth.php.tpl @@ -42,4 +42,4 @@ return [ * OTP expires after minutes defined */ 'otp_expires' => 2, -]; \ No newline at end of file +]; diff --git a/src/Module/Templates/DemoApi/src/config/cors.php.tpl b/src/Module/Templates/DemoApi/src/config/cors.php.tpl index a5e098be3..7a3b4da75 100644 --- a/src/Module/Templates/DemoApi/src/config/cors.php.tpl +++ b/src/Module/Templates/DemoApi/src/config/cors.php.tpl @@ -11,4 +11,4 @@ return [ 'Access-Control-Allow-Headers' => 'Origin, X-Requested-With, Content-Type, Accept, Authorization, refresh_token', 'Access-Control-Allow-Methods' => 'GET, POST, PUT, DELETE, OPTIONS', 'Access-Control-Allow-Credentials' => true, -]; \ No newline at end of file +]; diff --git a/src/Module/Templates/DemoApi/src/config/database.php.tpl b/src/Module/Templates/DemoApi/src/config/database.php.tpl index c5d2c60db..feaa501e7 100644 --- a/src/Module/Templates/DemoApi/src/config/database.php.tpl +++ b/src/Module/Templates/DemoApi/src/config/database.php.tpl @@ -35,4 +35,4 @@ return [ ], 'database_dir' => base_dir() . DS . 'shared' . DS . 'store', ] -]; \ No newline at end of file +]; diff --git a/src/Module/Templates/DemoApi/src/routes/routes.php.tpl b/src/Module/Templates/DemoApi/src/routes/routes.php.tpl index 1bab5af83..ca3142241 100644 --- a/src/Module/Templates/DemoApi/src/routes/routes.php.tpl +++ b/src/Module/Templates/DemoApi/src/routes/routes.php.tpl @@ -27,4 +27,4 @@ return function ($route) { $route->get('[:alpha:2]?/signout', 'AuthController', 'signout')->middlewares(['Signout']); $route->get('[:alpha:2]?/me', 'AuthController', 'me'); })->middlewares(['Auth']); -}; \ No newline at end of file +}; diff --git a/src/Module/Templates/DemoWeb/src/Controllers/AccountController.php.tpl b/src/Module/Templates/DemoWeb/src/Controllers/AccountController.php.tpl index dca04a15e..7a51a07fc 100644 --- a/src/Module/Templates/DemoWeb/src/Controllers/AccountController.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Controllers/AccountController.php.tpl @@ -93,4 +93,4 @@ class AccountController extends BaseController return redirect(base_url(true) . '/' . current_lang() . '/account-settings#account_password'); } -} \ No newline at end of file +} diff --git a/src/Module/Templates/DemoWeb/src/Controllers/AuthController.php.tpl b/src/Module/Templates/DemoWeb/src/Controllers/AuthController.php.tpl index e043193c7..699925340 100644 --- a/src/Module/Templates/DemoWeb/src/Controllers/AuthController.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Controllers/AuthController.php.tpl @@ -214,4 +214,4 @@ class AuthController extends BaseController return redirect(base_url(true) . '/' . current_lang() . '/signin'); } } -} \ No newline at end of file +} diff --git a/src/Module/Templates/DemoWeb/src/Controllers/BaseController.php.tpl b/src/Module/Templates/DemoWeb/src/Controllers/BaseController.php.tpl index dfcd198b1..85bd60b6d 100644 --- a/src/Module/Templates/DemoWeb/src/Controllers/BaseController.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Controllers/BaseController.php.tpl @@ -48,4 +48,4 @@ abstract class BaseController $this->view->setParam('langs', config()->get('lang.supported')); } } -} \ No newline at end of file +} diff --git a/src/Module/Templates/DemoWeb/src/Controllers/PageController.php.tpl b/src/Module/Templates/DemoWeb/src/Controllers/PageController.php.tpl index 0cc577580..505679a38 100644 --- a/src/Module/Templates/DemoWeb/src/Controllers/PageController.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Controllers/PageController.php.tpl @@ -56,4 +56,4 @@ class PageController extends BaseController return $response->html($this->view->render('pages/about', ['commands' => $commands])); } -} \ No newline at end of file +} diff --git a/src/Module/Templates/DemoWeb/src/Controllers/PostController.php.tpl b/src/Module/Templates/DemoWeb/src/Controllers/PostController.php.tpl index a3331aad6..c0a45b2cc 100644 --- a/src/Module/Templates/DemoWeb/src/Controllers/PostController.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Controllers/PostController.php.tpl @@ -112,4 +112,4 @@ class PostController extends BaseController return $response->html($this->view->render('post/single')); } -} \ No newline at end of file +} diff --git a/src/Module/Templates/DemoWeb/src/Controllers/PostManagementController.php.tpl b/src/Module/Templates/DemoWeb/src/Controllers/PostManagementController.php.tpl index 5bfdf9880..a773d1f13 100644 --- a/src/Module/Templates/DemoWeb/src/Controllers/PostManagementController.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Controllers/PostManagementController.php.tpl @@ -202,4 +202,4 @@ class PostManagementController extends BaseController return redirect(base_url(true) . '/' . current_lang() . '/my-posts'); } -} \ No newline at end of file +} diff --git a/src/Module/Templates/DemoWeb/src/Enums/Role.php.tpl b/src/Module/Templates/DemoWeb/src/Enums/Role.php.tpl index 7b4b4540b..2611c72c4 100644 --- a/src/Module/Templates/DemoWeb/src/Enums/Role.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Enums/Role.php.tpl @@ -23,4 +23,4 @@ class Role const ADMIN = 'admin'; const EDITOR = 'editor'; -} \ No newline at end of file +} diff --git a/src/Module/Templates/DemoWeb/src/Middlewares/Activate.php.tpl b/src/Module/Templates/DemoWeb/src/Middlewares/Activate.php.tpl index 908c0ceab..402c0ee7d 100644 --- a/src/Module/Templates/DemoWeb/src/Middlewares/Activate.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Middlewares/Activate.php.tpl @@ -34,8 +34,9 @@ class Activate extends BaseMiddleware * @param Closure $next * @return Response */ - public function apply(Request $request, Response $response, Closure $next): Response + public function apply(Request $request, Closure $next): Response { + $response = response(); $token = (string)route_param('token'); $request->set('token', $token); @@ -46,7 +47,7 @@ class Activate extends BaseMiddleware $request->set('activation_token', $token); - return $next($request, $response); + return $next($request); } /** @@ -69,4 +70,4 @@ class Activate extends BaseMiddleware { return $response->html(partial('errors/404'), StatusCode::NOT_FOUND); } -} \ No newline at end of file +} diff --git a/src/Module/Templates/DemoWeb/src/Middlewares/Auth.php.tpl b/src/Module/Templates/DemoWeb/src/Middlewares/Auth.php.tpl index 9e20255ed..781db5734 100644 --- a/src/Module/Templates/DemoWeb/src/Middlewares/Auth.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Middlewares/Auth.php.tpl @@ -32,12 +32,12 @@ class Auth extends QtMiddleware * @param Closure $next * @return Response */ - public function apply(Request $request, Response $response, Closure $next): Response + public function apply(Request $request, Closure $next): Response { if (!auth()->check()) { redirect(base_url(true) . '/' . current_lang() . '/signin'); } - return $next($request, $response); + return $next($request); } -} \ No newline at end of file +} diff --git a/src/Module/Templates/DemoWeb/src/Middlewares/BaseMiddleware.php.tpl b/src/Module/Templates/DemoWeb/src/Middlewares/BaseMiddleware.php.tpl index 043527a8c..a26b27fb4 100644 --- a/src/Module/Templates/DemoWeb/src/Middlewares/BaseMiddleware.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Middlewares/BaseMiddleware.php.tpl @@ -77,4 +77,4 @@ abstract class BaseMiddleware extends QtMiddleware // default no-op: subclasses override if needed return $response; } -} \ No newline at end of file +} diff --git a/src/Module/Templates/DemoWeb/src/Middlewares/Comment.php.tpl b/src/Module/Templates/DemoWeb/src/Middlewares/Comment.php.tpl index 76040c80c..3818da5c5 100644 --- a/src/Module/Templates/DemoWeb/src/Middlewares/Comment.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Middlewares/Comment.php.tpl @@ -31,13 +31,14 @@ class Comment extends BaseMiddleware * @param Response $response * @param Closure $next */ - public function apply(Request $request, Response $response, Closure $next): Response + public function apply(Request $request, Closure $next): Response { + $response = response(); if ($errorResponse = $this->validateRequest($request, $response)) { return $errorResponse; } - return $next($request, $response); + return $next($request); } /** @@ -68,4 +69,4 @@ class Comment extends BaseMiddleware session()->setFlash('error', $this->validator->getErrors()); return redirectWith(get_referrer() ?? base_url(), $data); } -} \ No newline at end of file +} diff --git a/src/Module/Templates/DemoWeb/src/Middlewares/CommentOwner.php.tpl b/src/Module/Templates/DemoWeb/src/Middlewares/CommentOwner.php.tpl index 73b9602f3..bdcdc58b5 100644 --- a/src/Module/Templates/DemoWeb/src/Middlewares/CommentOwner.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Middlewares/CommentOwner.php.tpl @@ -33,8 +33,9 @@ class CommentOwner extends BaseMiddleware * @param Closure $next * @return Response */ - public function apply(Request $request, Response $response, Closure $next): Response + public function apply(Request $request, Closure $next): Response { + $response = response(); $uuid = (string)route_param('uuid'); $request->set('uuid', $uuid); @@ -43,7 +44,7 @@ class CommentOwner extends BaseMiddleware return $errorResponse; } - return $next($request, $response); + return $next($request); } /** @@ -71,4 +72,4 @@ class CommentOwner extends BaseMiddleware return !$comment->isEmpty() && $comment->user_uuid === auth()->user()->uuid; }); } -} \ No newline at end of file +} diff --git a/src/Module/Templates/DemoWeb/src/Middlewares/Editor.php.tpl b/src/Module/Templates/DemoWeb/src/Middlewares/Editor.php.tpl index 4526e18f5..6e426c36c 100644 --- a/src/Module/Templates/DemoWeb/src/Middlewares/Editor.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Middlewares/Editor.php.tpl @@ -47,8 +47,9 @@ class Editor extends BaseMiddleware * @param Closure $next * @return Response */ - public function apply(Request $request, Response $response, Closure $next): Response + public function apply(Request $request, Closure $next): Response { + $response = response(); if (!in_array(auth()->user()->role, self::ROLES)) { return redirect(base_url(true) . '/' . current_lang()); } @@ -59,7 +60,7 @@ class Editor extends BaseMiddleware } } - return $next($request, $response); + return $next($request); } /** @@ -102,4 +103,4 @@ class Editor extends BaseMiddleware session()->setFlash('error', $this->validator->getErrors()); return redirectWith(get_referrer() ?? base_url(), $data); } -} \ No newline at end of file +} diff --git a/src/Module/Templates/DemoWeb/src/Middlewares/Forget.php.tpl b/src/Module/Templates/DemoWeb/src/Middlewares/Forget.php.tpl index 61d5d05a2..f626cd97a 100644 --- a/src/Module/Templates/DemoWeb/src/Middlewares/Forget.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Middlewares/Forget.php.tpl @@ -34,15 +34,16 @@ class Forget extends BaseMiddleware * @param Closure $next * @return Response */ - public function apply(Request $request, Response $response, Closure $next): Response + public function apply(Request $request, Closure $next): Response { + $response = response(); if ($request->isMethod('post')) { if ($errorResponse = $this->validateRequest($request, $response)) { return $errorResponse; } } - return $next($request, $response); + return $next($request); } /** @@ -76,4 +77,4 @@ class Forget extends BaseMiddleware session()->setFlash('error', $message); return redirectWith(base_url(true) . '/' . current_lang() . '/forget', $data); } -} \ No newline at end of file +} diff --git a/src/Module/Templates/DemoWeb/src/Middlewares/Guest.php.tpl b/src/Module/Templates/DemoWeb/src/Middlewares/Guest.php.tpl index 0933012f7..565312b2a 100644 --- a/src/Module/Templates/DemoWeb/src/Middlewares/Guest.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Middlewares/Guest.php.tpl @@ -32,12 +32,12 @@ class Guest extends QtMiddleware * @param Closure $next * @return Response */ - public function apply(Request $request, Response $response, Closure $next): Response + public function apply(Request $request, Closure $next): Response { if (auth()->check()) { return redirect(get_referrer() ?? base_url(true) . '/' . current_lang()); } - return $next($request, $response); + return $next($request); } -} \ No newline at end of file +} diff --git a/src/Module/Templates/DemoWeb/src/Middlewares/Password.php.tpl b/src/Module/Templates/DemoWeb/src/Middlewares/Password.php.tpl index 3ec5b596f..3470c8e61 100644 --- a/src/Module/Templates/DemoWeb/src/Middlewares/Password.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Middlewares/Password.php.tpl @@ -34,13 +34,14 @@ class Password extends BaseMiddleware * @param Response $response * @param Closure $next */ - public function apply(Request $request, Response $response, Closure $next): Response + public function apply(Request $request, Closure $next): Response { + $response = response(); if ($request->isMethod('post')) { $this->validateRequest($request, $response); } - return $next($request, $response); + return $next($request); } /** @@ -85,4 +86,4 @@ class Password extends BaseMiddleware return $user && (new Hasher())->check($request->get('current_password'), $user->password); }); } -} \ No newline at end of file +} diff --git a/src/Module/Templates/DemoWeb/src/Middlewares/PostOwner.php.tpl b/src/Module/Templates/DemoWeb/src/Middlewares/PostOwner.php.tpl index 48269f5c0..e16b75edf 100644 --- a/src/Module/Templates/DemoWeb/src/Middlewares/PostOwner.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Middlewares/PostOwner.php.tpl @@ -35,8 +35,9 @@ class PostOwner extends BaseMiddleware * @param Closure $next * @return Response */ - public function apply(Request $request, Response $response, Closure $next): Response + public function apply(Request $request, Closure $next): Response { + $response = response(); $uuid = (string)route_param('uuid'); $request->set('uuid', $uuid); @@ -45,7 +46,7 @@ class PostOwner extends BaseMiddleware return $errorResponse; } - return $next($request, $response); + return $next($request); } /** @@ -81,4 +82,4 @@ class PostOwner extends BaseMiddleware return !$post->isEmpty() && $post->user_uuid === auth()->user()->uuid; }); } -} \ No newline at end of file +} diff --git a/src/Module/Templates/DemoWeb/src/Middlewares/Resend.php.tpl b/src/Module/Templates/DemoWeb/src/Middlewares/Resend.php.tpl index 3a78be12a..a71b8350f 100644 --- a/src/Module/Templates/DemoWeb/src/Middlewares/Resend.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Middlewares/Resend.php.tpl @@ -33,8 +33,9 @@ class Resend extends BaseMiddleware * @param Closure $next * @return Response */ - public function apply(Request $request, Response $response, Closure $next): Response + public function apply(Request $request, Closure $next): Response { + $response = response(); $code = (string) route_param('code'); $request->set('code', $code); @@ -43,7 +44,7 @@ class Resend extends BaseMiddleware return $errorResponse; } - return $next($request, $response); + return $next($request); } /** @@ -69,4 +70,4 @@ class Resend extends BaseMiddleware session()->setFlash('error', $message); return redirect(base_url(true) . '/' . current_lang() . '/signin'); } -} \ No newline at end of file +} diff --git a/src/Module/Templates/DemoWeb/src/Middlewares/Reset.php.tpl b/src/Module/Templates/DemoWeb/src/Middlewares/Reset.php.tpl index b295d39bd..690f4a861 100644 --- a/src/Module/Templates/DemoWeb/src/Middlewares/Reset.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Middlewares/Reset.php.tpl @@ -34,8 +34,9 @@ class Reset extends BaseMiddleware * @param Closure $next * @return Response */ - public function apply(Request $request, Response $response, Closure $next): Response + public function apply(Request $request, Closure $next): Response { + $response = response(); $token = (string) route_param('token'); $request->set('token', $token); @@ -46,7 +47,7 @@ class Reset extends BaseMiddleware $request->set('reset_token', $token); - return $next($request, $response); + return $next($request); } /** @@ -88,4 +89,4 @@ class Reset extends BaseMiddleware session()->setFlash('error', $message); return redirect(get_referrer() ?? base_url()); } -} \ No newline at end of file +} diff --git a/src/Module/Templates/DemoWeb/src/Middlewares/Signup.php.tpl b/src/Module/Templates/DemoWeb/src/Middlewares/Signup.php.tpl index db0f7b55f..54d1aee2f 100644 --- a/src/Module/Templates/DemoWeb/src/Middlewares/Signup.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Middlewares/Signup.php.tpl @@ -33,8 +33,9 @@ class Signup extends BaseMiddleware * @param Closure $next * @return Response */ - public function apply(Request $request, Response $response, Closure $next): Response + public function apply(Request $request, Closure $next): Response { + $response = response(); if ($request->isMethod('post')) { $captchaName = captcha()->getName(); @@ -50,7 +51,7 @@ class Signup extends BaseMiddleware $request->delete('captcha'); } - return $next($request, $response); + return $next($request); } /** @@ -89,4 +90,4 @@ class Signup extends BaseMiddleware session()->setFlash('error', $message); return redirectWith(base_url(true) . '/' . current_lang() . '/signup', $request->all()); } -} \ No newline at end of file +} diff --git a/src/Module/Templates/DemoWeb/src/Middlewares/Update.php.tpl b/src/Module/Templates/DemoWeb/src/Middlewares/Update.php.tpl index 08c106573..07bf2f1c7 100644 --- a/src/Module/Templates/DemoWeb/src/Middlewares/Update.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Middlewares/Update.php.tpl @@ -32,15 +32,16 @@ class Update extends BaseMiddleware * @param Response $response * @param Closure $next */ - public function apply(Request $request, Response $response, Closure $next): Response + public function apply(Request $request, Closure $next): Response { + $response = response(); if ($request->isMethod('post')) { if ($errorResponse = $this->validateRequest($request, $response)) { return $errorResponse; } } - return $next($request, $response); + return $next($request); } /** @@ -70,4 +71,4 @@ class Update extends BaseMiddleware session()->setFlash('error', $message); return redirectWith(base_url(true) . '/' . current_lang() . '/account-settings#account_profile', $request->all()); } -} \ No newline at end of file +} diff --git a/src/Module/Templates/DemoWeb/src/Middlewares/Verify.php.tpl b/src/Module/Templates/DemoWeb/src/Middlewares/Verify.php.tpl index 1c70fbc10..276956bef 100644 --- a/src/Module/Templates/DemoWeb/src/Middlewares/Verify.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Middlewares/Verify.php.tpl @@ -34,8 +34,9 @@ class Verify extends BaseMiddleware * @param Closure $next * @return Response */ - public function apply(Request $request, Response $response, Closure $next): Response + public function apply(Request $request, Closure $next): Response { + $response = response(); $code = (string) route_param('code'); $request->set('code', $code); @@ -44,7 +45,7 @@ class Verify extends BaseMiddleware return $errorResponse; } - return $next($request, $response); + return $next($request); } /** @@ -75,4 +76,4 @@ class Verify extends BaseMiddleware session()->setFlash('error', $message); return redirectWith(base_url(true) . '/' . current_lang() . '/verify', $request->all()); } -} \ No newline at end of file +} diff --git a/src/Module/Templates/DemoWeb/src/Models/Post.php.tpl b/src/Module/Templates/DemoWeb/src/Models/Post.php.tpl index 140fff6a4..71a5ec6cc 100644 --- a/src/Module/Templates/DemoWeb/src/Models/Post.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Models/Post.php.tpl @@ -67,4 +67,4 @@ class Post extends DbModel ] ]; } -} \ No newline at end of file +} diff --git a/src/Module/Templates/DemoWeb/src/Models/User.php.tpl b/src/Module/Templates/DemoWeb/src/Models/User.php.tpl index d80e57d61..180e4966b 100644 --- a/src/Module/Templates/DemoWeb/src/Models/User.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Models/User.php.tpl @@ -59,4 +59,4 @@ class User extends DbModel 'otp_expires', 'otp_token', ]; -} \ No newline at end of file +} diff --git a/src/Module/Templates/DemoWeb/src/Services/AuthService.php.tpl b/src/Module/Templates/DemoWeb/src/Services/AuthService.php.tpl index cd1a0f0fa..5eaf1137d 100644 --- a/src/Module/Templates/DemoWeb/src/Services/AuthService.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Services/AuthService.php.tpl @@ -180,4 +180,4 @@ class AuthService extends QtService implements AuthServiceInterface fs()->makeDirectory($userDirectory); } } -} \ No newline at end of file +} diff --git a/src/Module/Templates/DemoWeb/src/Services/CommandService.php.tpl b/src/Module/Templates/DemoWeb/src/Services/CommandService.php.tpl index 4f14f7019..9b7969d4e 100644 --- a/src/Module/Templates/DemoWeb/src/Services/CommandService.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Services/CommandService.php.tpl @@ -44,4 +44,4 @@ class CommandService extends QtService return array_merge($coreCommands, $appCommands); } -} \ No newline at end of file +} diff --git a/src/Module/Templates/DemoWeb/src/Services/PostService.php.tpl b/src/Module/Templates/DemoWeb/src/Services/PostService.php.tpl index fce4fe1b2..36c2754e1 100644 --- a/src/Module/Templates/DemoWeb/src/Services/PostService.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Services/PostService.php.tpl @@ -246,4 +246,4 @@ class PostService extends QtService { return transform($posts, $this->transformer); } -} \ No newline at end of file +} diff --git a/src/Module/Templates/DemoWeb/src/Transformers/PostTransformer.php.tpl b/src/Module/Templates/DemoWeb/src/Transformers/PostTransformer.php.tpl index 7295b34a2..f81acbd08 100644 --- a/src/Module/Templates/DemoWeb/src/Transformers/PostTransformer.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Transformers/PostTransformer.php.tpl @@ -39,4 +39,4 @@ class PostTransformer implements TransformerInterface 'author' => $item->firstname . ' ' . $item->lastname ]; } -} \ No newline at end of file +} diff --git a/src/Module/Templates/DemoWeb/src/Views/account/form.php.tpl b/src/Module/Templates/DemoWeb/src/Views/account/form.php.tpl index 2620ac31f..6d50c1aa1 100644 --- a/src/Module/Templates/DemoWeb/src/Views/account/form.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Views/account/form.php.tpl @@ -30,4 +30,4 @@ - \ No newline at end of file + diff --git a/src/Module/Templates/DemoWeb/src/Views/account/partials/account.php.tpl b/src/Module/Templates/DemoWeb/src/Views/account/partials/account.php.tpl index aa80edb6b..2878a3e39 100644 --- a/src/Module/Templates/DemoWeb/src/Views/account/partials/account.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Views/account/partials/account.php.tpl @@ -20,4 +20,4 @@ - \ No newline at end of file + diff --git a/src/Module/Templates/DemoWeb/src/Views/account/partials/password.php.tpl b/src/Module/Templates/DemoWeb/src/Views/account/partials/password.php.tpl index b60698d67..834ae8554 100644 --- a/src/Module/Templates/DemoWeb/src/Views/account/partials/password.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Views/account/partials/password.php.tpl @@ -26,4 +26,4 @@ - \ No newline at end of file + diff --git a/src/Module/Templates/DemoWeb/src/Views/auth/forget.php.tpl b/src/Module/Templates/DemoWeb/src/Views/auth/forget.php.tpl index 68a811ba1..8774eab5a 100644 --- a/src/Module/Templates/DemoWeb/src/Views/auth/forget.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Views/auth/forget.php.tpl @@ -37,4 +37,4 @@ - \ No newline at end of file + diff --git a/src/Module/Templates/DemoWeb/src/Views/auth/reset.php.tpl b/src/Module/Templates/DemoWeb/src/Views/auth/reset.php.tpl index da1dbe9c6..ab78ad9ce 100644 --- a/src/Module/Templates/DemoWeb/src/Views/auth/reset.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Views/auth/reset.php.tpl @@ -41,4 +41,4 @@ - \ No newline at end of file + diff --git a/src/Module/Templates/DemoWeb/src/Views/auth/signin.php.tpl b/src/Module/Templates/DemoWeb/src/Views/auth/signin.php.tpl index 89726f679..47482e3d1 100644 --- a/src/Module/Templates/DemoWeb/src/Views/auth/signin.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Views/auth/signin.php.tpl @@ -60,4 +60,4 @@ - \ No newline at end of file + diff --git a/src/Module/Templates/DemoWeb/src/Views/auth/signup.php.tpl b/src/Module/Templates/DemoWeb/src/Views/auth/signup.php.tpl index 1a5631374..15e1c6e1f 100644 --- a/src/Module/Templates/DemoWeb/src/Views/auth/signup.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Views/auth/signup.php.tpl @@ -61,4 +61,4 @@ - \ No newline at end of file + diff --git a/src/Module/Templates/DemoWeb/src/Views/auth/verify.php.tpl b/src/Module/Templates/DemoWeb/src/Views/auth/verify.php.tpl index 88f7c3a33..03e7c29ff 100644 --- a/src/Module/Templates/DemoWeb/src/Views/auth/verify.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Views/auth/verify.php.tpl @@ -42,4 +42,4 @@ - \ No newline at end of file + diff --git a/src/Module/Templates/DemoWeb/src/Views/layouts/main.php.tpl b/src/Module/Templates/DemoWeb/src/Views/layouts/main.php.tpl index 11e5a5104..3b64ed805 100644 --- a/src/Module/Templates/DemoWeb/src/Views/layouts/main.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Views/layouts/main.php.tpl @@ -20,4 +20,4 @@ - \ No newline at end of file + diff --git a/src/Module/Templates/DemoWeb/src/Views/pages/about.php.tpl b/src/Module/Templates/DemoWeb/src/Views/pages/about.php.tpl index 42a347b44..4570abaec 100644 --- a/src/Module/Templates/DemoWeb/src/Views/pages/about.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Views/pages/about.php.tpl @@ -33,4 +33,4 @@ - \ No newline at end of file + diff --git a/src/Module/Templates/DemoWeb/src/Views/pages/index.php.tpl b/src/Module/Templates/DemoWeb/src/Views/pages/index.php.tpl index 69c81ed58..5f8b79385 100644 --- a/src/Module/Templates/DemoWeb/src/Views/pages/index.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Views/pages/index.php.tpl @@ -17,4 +17,4 @@ - \ No newline at end of file + diff --git a/src/Module/Templates/DemoWeb/src/Views/partials/bubbles.php.tpl b/src/Module/Templates/DemoWeb/src/Views/partials/bubbles.php.tpl index 0d9f8861e..50a14c2a4 100644 --- a/src/Module/Templates/DemoWeb/src/Views/partials/bubbles.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Views/partials/bubbles.php.tpl @@ -9,4 +9,4 @@
  • - \ No newline at end of file + diff --git a/src/Module/Templates/DemoWeb/src/Views/partials/footer.php.tpl b/src/Module/Templates/DemoWeb/src/Views/partials/footer.php.tpl index a0c265796..d085c4a05 100644 --- a/src/Module/Templates/DemoWeb/src/Views/partials/footer.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Views/partials/footer.php.tpl @@ -2,11 +2,11 @@
    - © 2018 - + © 2018 -
    - \ No newline at end of file + diff --git a/src/Module/Templates/DemoWeb/src/Views/partials/language.php.tpl b/src/Module/Templates/DemoWeb/src/Views/partials/language.php.tpl index e300d81d8..dd91f1ae0 100644 --- a/src/Module/Templates/DemoWeb/src/Views/partials/language.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Views/partials/language.php.tpl @@ -11,4 +11,4 @@ - \ No newline at end of file + diff --git a/src/Module/Templates/DemoWeb/src/Views/partials/logo.php.tpl b/src/Module/Templates/DemoWeb/src/Views/partials/logo.php.tpl index 51a80e4c2..4b66bd3f5 100644 --- a/src/Module/Templates/DemoWeb/src/Views/partials/logo.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Views/partials/logo.php.tpl @@ -1,3 +1,3 @@ <?php echo env('APP_NAME') ?> - \ No newline at end of file + diff --git a/src/Module/Templates/DemoWeb/src/Views/partials/messages/error.php.tpl b/src/Module/Templates/DemoWeb/src/Views/partials/messages/error.php.tpl index 3fdfac4bd..cbea2d022 100644 --- a/src/Module/Templates/DemoWeb/src/Views/partials/messages/error.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Views/partials/messages/error.php.tpl @@ -13,4 +13,4 @@ - \ No newline at end of file + diff --git a/src/Module/Templates/DemoWeb/src/Views/partials/messages/success.php.tpl b/src/Module/Templates/DemoWeb/src/Views/partials/messages/success.php.tpl index b091e00db..ca66ffa03 100644 --- a/src/Module/Templates/DemoWeb/src/Views/partials/messages/success.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Views/partials/messages/success.php.tpl @@ -1,4 +1,4 @@ \ No newline at end of file + diff --git a/src/Module/Templates/DemoWeb/src/Views/partials/navbar.php.tpl b/src/Module/Templates/DemoWeb/src/Views/partials/navbar.php.tpl index e00b941fc..1b4a83260 100644 --- a/src/Module/Templates/DemoWeb/src/Views/partials/navbar.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Views/partials/navbar.php.tpl @@ -67,4 +67,4 @@ - \ No newline at end of file + diff --git a/src/Module/Templates/DemoWeb/src/Views/partials/search.php.tpl b/src/Module/Templates/DemoWeb/src/Views/partials/search.php.tpl index 12ce57ae2..5a01d0e2a 100644 --- a/src/Module/Templates/DemoWeb/src/Views/partials/search.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Views/partials/search.php.tpl @@ -5,4 +5,4 @@ - \ No newline at end of file + diff --git a/src/Module/Templates/DemoWeb/src/Views/partials/sidebar.php.tpl b/src/Module/Templates/DemoWeb/src/Views/partials/sidebar.php.tpl index 2f4377e8a..bb898a0ff 100644 --- a/src/Module/Templates/DemoWeb/src/Views/partials/sidebar.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Views/partials/sidebar.php.tpl @@ -61,4 +61,4 @@ 'sidenav-dropdown2']) ?> - \ No newline at end of file + diff --git a/src/Module/Templates/DemoWeb/src/Views/post/form.php.tpl b/src/Module/Templates/DemoWeb/src/Views/post/form.php.tpl index 18513ee74..22c074106 100644 --- a/src/Module/Templates/DemoWeb/src/Views/post/form.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Views/post/form.php.tpl @@ -60,4 +60,4 @@ - \ No newline at end of file + diff --git a/src/Module/Templates/DemoWeb/src/Views/post/my-posts.php.tpl b/src/Module/Templates/DemoWeb/src/Views/post/my-posts.php.tpl index e97a698d0..b6395cc3b 100644 --- a/src/Module/Templates/DemoWeb/src/Views/post/my-posts.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Views/post/my-posts.php.tpl @@ -20,4 +20,4 @@ href="/my-posts/create?ref=my-posts">add - \ No newline at end of file + diff --git a/src/Module/Templates/DemoWeb/src/Views/post/partials/back.php.tpl b/src/Module/Templates/DemoWeb/src/Views/post/partials/back.php.tpl index fe2fbc38b..2f614825d 100644 --- a/src/Module/Templates/DemoWeb/src/Views/post/partials/back.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Views/post/partials/back.php.tpl @@ -1,3 +1,3 @@ arrow_back - \ No newline at end of file + diff --git a/src/Module/Templates/DemoWeb/src/Views/post/partials/comment-form.php.tpl b/src/Module/Templates/DemoWeb/src/Views/post/partials/comment-form.php.tpl index 7ab0d5c5c..4df2c4842 100644 --- a/src/Module/Templates/DemoWeb/src/Views/post/partials/comment-form.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Views/post/partials/comment-form.php.tpl @@ -11,4 +11,4 @@ - \ No newline at end of file + diff --git a/src/Module/Templates/DemoWeb/src/Views/post/partials/comment-item.php.tpl b/src/Module/Templates/DemoWeb/src/Views/post/partials/comment-item.php.tpl index ca2383d54..b4e7885fd 100644 --- a/src/Module/Templates/DemoWeb/src/Views/post/partials/comment-item.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Views/post/partials/comment-item.php.tpl @@ -23,4 +23,4 @@

    - \ No newline at end of file + diff --git a/src/Module/Templates/DemoWeb/src/Views/post/partials/modal.php.tpl b/src/Module/Templates/DemoWeb/src/Views/post/partials/modal.php.tpl index 644ac3f30..9f6af9c95 100644 --- a/src/Module/Templates/DemoWeb/src/Views/post/partials/modal.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Views/post/partials/modal.php.tpl @@ -6,4 +6,4 @@ - \ No newline at end of file + diff --git a/src/Module/Templates/DemoWeb/src/Views/post/partials/my-post-item.php.tpl b/src/Module/Templates/DemoWeb/src/Views/post/partials/my-post-item.php.tpl index 5d025d604..6461ff8bf 100644 --- a/src/Module/Templates/DemoWeb/src/Views/post/partials/my-post-item.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Views/post/partials/my-post-item.php.tpl @@ -18,4 +18,4 @@ delete - \ No newline at end of file + diff --git a/src/Module/Templates/DemoWeb/src/Views/post/partials/post-item.php.tpl b/src/Module/Templates/DemoWeb/src/Views/post/partials/post-item.php.tpl index 65709777c..f16d11df6 100644 --- a/src/Module/Templates/DemoWeb/src/Views/post/partials/post-item.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Views/post/partials/post-item.php.tpl @@ -26,4 +26,4 @@

    - \ No newline at end of file + diff --git a/src/Module/Templates/DemoWeb/src/Views/post/post.php.tpl b/src/Module/Templates/DemoWeb/src/Views/post/post.php.tpl index 4c2f06dc7..e8bc64be5 100644 --- a/src/Module/Templates/DemoWeb/src/Views/post/post.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Views/post/post.php.tpl @@ -17,4 +17,4 @@ t('common.post')]) ?> - \ No newline at end of file + diff --git a/src/Module/Templates/DemoWeb/src/Views/post/single.php.tpl b/src/Module/Templates/DemoWeb/src/Views/post/single.php.tpl index 4a53d24d7..94b8c6182 100644 --- a/src/Module/Templates/DemoWeb/src/Views/post/single.php.tpl +++ b/src/Module/Templates/DemoWeb/src/Views/post/single.php.tpl @@ -19,4 +19,4 @@ 'comments' => $comments ]) ?> - \ No newline at end of file + diff --git a/src/Module/Templates/DemoWeb/src/config/auth.php.tpl b/src/Module/Templates/DemoWeb/src/config/auth.php.tpl index 3ad8fd671..0d28fb619 100644 --- a/src/Module/Templates/DemoWeb/src/config/auth.php.tpl +++ b/src/Module/Templates/DemoWeb/src/config/auth.php.tpl @@ -42,4 +42,4 @@ return [ * OTP expires after minutes defined */ 'otp_expires' => 2, -]; \ No newline at end of file +]; diff --git a/src/Module/Templates/DemoWeb/src/config/database.php.tpl b/src/Module/Templates/DemoWeb/src/config/database.php.tpl index c5d2c60db..feaa501e7 100644 --- a/src/Module/Templates/DemoWeb/src/config/database.php.tpl +++ b/src/Module/Templates/DemoWeb/src/config/database.php.tpl @@ -35,4 +35,4 @@ return [ ], 'database_dir' => base_dir() . DS . 'shared' . DS . 'store', ] -]; \ No newline at end of file +]; diff --git a/src/Module/Templates/DemoWeb/src/routes/routes.php.tpl b/src/Module/Templates/DemoWeb/src/routes/routes.php.tpl index 942521eed..788c62f8e 100644 --- a/src/Module/Templates/DemoWeb/src/routes/routes.php.tpl +++ b/src/Module/Templates/DemoWeb/src/routes/routes.php.tpl @@ -34,4 +34,4 @@ return function ($route) { $route->post('[:alpha:2]?/account-settings/update-password', 'AccountController', 'updatePassword')->middlewares(['Password']); $route->get('[:alpha:2]?/signout', 'AuthController', 'signout'); })->middlewares(['Auth']); -}; \ No newline at end of file +}; diff --git a/src/Module/Templates/Toolkit/src/Middlewares/BasicAuth.php.tpl b/src/Module/Templates/Toolkit/src/Middlewares/BasicAuth.php.tpl index 7a4d9ef80..767813ebd 100644 --- a/src/Module/Templates/Toolkit/src/Middlewares/BasicAuth.php.tpl +++ b/src/Module/Templates/Toolkit/src/Middlewares/BasicAuth.php.tpl @@ -32,15 +32,16 @@ class BasicAuth extends QtMiddleware * @param Closure $next * @return Response */ - public function apply(Request $request, Response $response, Closure $next): Response + public function apply(Request $request, Closure $next): Response { + $response = response(); $userCredentials = $request->getBasicAuthCredentials(); if (!$userCredentials || !$this->isValidCredentials($userCredentials)) { return $this->unauthorizedResponse($response); } - return $next($request, $response); + return $next($request); } /** diff --git a/src/Module/Templates/Toolkit/src/Middlewares/CreateTable.php.tpl b/src/Module/Templates/Toolkit/src/Middlewares/CreateTable.php.tpl index 77c831ed0..b6b89e718 100644 --- a/src/Module/Templates/Toolkit/src/Middlewares/CreateTable.php.tpl +++ b/src/Module/Templates/Toolkit/src/Middlewares/CreateTable.php.tpl @@ -33,13 +33,14 @@ class CreateTable extends BaseMiddleware * @param Closure $next * @return Response */ - public function apply(Request $request, Response $response, Closure $next): Response + public function apply(Request $request, Closure $next): Response { + $response = response(); if ($errorResponse = $this->validateRequest($request, $response)) { return $errorResponse; } - return $next($request, $response); + return $next($request); } /** diff --git a/src/Module/Templates/Toolkit/src/Views/layouts/iframe.php.tpl b/src/Module/Templates/Toolkit/src/Views/layouts/iframe.php.tpl index 83e3fceb4..4eca0411c 100644 --- a/src/Module/Templates/Toolkit/src/Views/layouts/iframe.php.tpl +++ b/src/Module/Templates/Toolkit/src/Views/layouts/iframe.php.tpl @@ -24,4 +24,4 @@ - \ No newline at end of file + diff --git a/src/Module/Templates/Toolkit/src/Views/layouts/main.php.tpl b/src/Module/Templates/Toolkit/src/Views/layouts/main.php.tpl index 01d965563..10e83cef8 100644 --- a/src/Module/Templates/Toolkit/src/Views/layouts/main.php.tpl +++ b/src/Module/Templates/Toolkit/src/Views/layouts/main.php.tpl @@ -38,4 +38,4 @@ - \ No newline at end of file + diff --git a/src/Module/Templates/Toolkit/src/Views/pages/database/index.php.tpl b/src/Module/Templates/Toolkit/src/Views/pages/database/index.php.tpl index bcdbb48e4..abab3377a 100644 --- a/src/Module/Templates/Toolkit/src/Views/pages/database/index.php.tpl +++ b/src/Module/Templates/Toolkit/src/Views/pages/database/index.php.tpl @@ -30,4 +30,4 @@ ] ]); ?> - \ No newline at end of file + diff --git a/src/Module/Templates/Toolkit/src/Views/pages/database/table.php.tpl b/src/Module/Templates/Toolkit/src/Views/pages/database/table.php.tpl index fbfcaae3e..ff0e7e712 100644 --- a/src/Module/Templates/Toolkit/src/Views/pages/database/table.php.tpl +++ b/src/Module/Templates/Toolkit/src/Views/pages/database/table.php.tpl @@ -41,4 +41,4 @@ echo partial('partials/delete-modal', [ 'modalTitle' => 'Deleting Table Row', 'message' => 'Are you sure you want to delete this row?', ]); -?> \ No newline at end of file +?> diff --git a/src/Module/Templates/Toolkit/src/Views/pages/email/index.php.tpl b/src/Module/Templates/Toolkit/src/Views/pages/email/index.php.tpl index 66fd281ca..80b031a0d 100644 --- a/src/Module/Templates/Toolkit/src/Views/pages/email/index.php.tpl +++ b/src/Module/Templates/Toolkit/src/Views/pages/email/index.php.tpl @@ -30,5 +30,3 @@ echo partial('partials/delete-modal', [ 'message' => 'Are you sure you want to delete this email?', ]); ?> - - diff --git a/src/Module/Templates/Toolkit/src/Views/pages/logs/index.php.tpl b/src/Module/Templates/Toolkit/src/Views/pages/logs/index.php.tpl index 52f43e1e5..939f683af 100644 --- a/src/Module/Templates/Toolkit/src/Views/pages/logs/index.php.tpl +++ b/src/Module/Templates/Toolkit/src/Views/pages/logs/index.php.tpl @@ -18,4 +18,3 @@
    No log found.
    - diff --git a/src/Module/Templates/Toolkit/src/Views/partials/database-row.php.tpl b/src/Module/Templates/Toolkit/src/Views/partials/database-row.php.tpl index bdb9489ee..fb44fe838 100644 --- a/src/Module/Templates/Toolkit/src/Views/partials/database-row.php.tpl +++ b/src/Module/Templates/Toolkit/src/Views/partials/database-row.php.tpl @@ -14,4 +14,4 @@ delete - \ No newline at end of file + diff --git a/src/Module/Templates/Toolkit/src/Views/partials/delete-modal.php.tpl b/src/Module/Templates/Toolkit/src/Views/partials/delete-modal.php.tpl index 51133badc..76c89eaa9 100644 --- a/src/Module/Templates/Toolkit/src/Views/partials/delete-modal.php.tpl +++ b/src/Module/Templates/Toolkit/src/Views/partials/delete-modal.php.tpl @@ -7,4 +7,4 @@ Cancel Delete - \ No newline at end of file + diff --git a/src/Module/Templates/Toolkit/src/Views/partials/email-item.php.tpl b/src/Module/Templates/Toolkit/src/Views/partials/email-item.php.tpl index e62953893..dfc251847 100644 --- a/src/Module/Templates/Toolkit/src/Views/partials/email-item.php.tpl +++ b/src/Module/Templates/Toolkit/src/Views/partials/email-item.php.tpl @@ -18,4 +18,4 @@ - \ No newline at end of file + diff --git a/src/Module/Templates/Toolkit/src/Views/partials/jsoneditor-modal.php.tpl b/src/Module/Templates/Toolkit/src/Views/partials/jsoneditor-modal.php.tpl index 79e110575..f89e1a28a 100644 --- a/src/Module/Templates/Toolkit/src/Views/partials/jsoneditor-modal.php.tpl +++ b/src/Module/Templates/Toolkit/src/Views/partials/jsoneditor-modal.php.tpl @@ -16,4 +16,4 @@ - \ No newline at end of file + diff --git a/src/Module/Templates/Toolkit/src/Views/partials/navbar.php.tpl b/src/Module/Templates/Toolkit/src/Views/partials/navbar.php.tpl index 8415bbe1f..155941074 100644 --- a/src/Module/Templates/Toolkit/src/Views/partials/navbar.php.tpl +++ b/src/Module/Templates/Toolkit/src/Views/partials/navbar.php.tpl @@ -16,4 +16,4 @@
  • table_chart_viewDatabase
    • - \ No newline at end of file + diff --git a/src/Module/Templates/Toolkit/src/config/basic_auth.php.tpl b/src/Module/Templates/Toolkit/src/config/basic_auth.php.tpl index 543e85669..d019cd6ae 100644 --- a/src/Module/Templates/Toolkit/src/config/basic_auth.php.tpl +++ b/src/Module/Templates/Toolkit/src/config/basic_auth.php.tpl @@ -8,4 +8,4 @@ return [ */ "username" => env('BASIC_AUTH_NAME'), "password" => env('BASIC_AUTH_PWD') -]; \ No newline at end of file +]; diff --git a/src/Module/Templates/Toolkit/src/helpers/toolkit.php.tpl b/src/Module/Templates/Toolkit/src/helpers/toolkit.php.tpl index 1c34efb5b..466d4361f 100644 --- a/src/Module/Templates/Toolkit/src/helpers/toolkit.php.tpl +++ b/src/Module/Templates/Toolkit/src/helpers/toolkit.php.tpl @@ -55,4 +55,4 @@ function getLevelIcon(string $level): string function getLevelClass(string $level): string { return LEVEL_ATTRIBUTES[strtolower($level)]['class']; -} \ No newline at end of file +} diff --git a/src/Module/Templates/Toolkit/src/routes/routes.php.tpl b/src/Module/Templates/Toolkit/src/routes/routes.php.tpl index 832d416d6..f8723f077 100644 --- a/src/Module/Templates/Toolkit/src/routes/routes.php.tpl +++ b/src/Module/Templates/Toolkit/src/routes/routes.php.tpl @@ -17,4 +17,4 @@ return function ($route) { $route->post('database/update', 'DatabaseController', 'update'); $route->get('database/delete', 'DatabaseController', 'delete'); })->middlewares(['BasicAuth']); -}; \ No newline at end of file +}; diff --git a/src/ResourceCache/ViewCache.php b/src/ResourceCache/ViewCache.php index 83c700ac1..17eec27c1 100644 --- a/src/ResourceCache/ViewCache.php +++ b/src/ResourceCache/ViewCache.php @@ -79,17 +79,16 @@ public function setup(): void /** * @throws ConfigException|DiException|BaseException|ReflectionException */ - public function serveCachedView(string $uri, Response $response): bool + public function getCachedResponse(string $uri): ?Response { if ($this->isEnabled() && $this->exists($uri)) { $cachedContent = $this->get($uri); if ($cachedContent !== null) { - $response->html($cachedContent); - return true; + return response()->html($cachedContent); } } - return false; + return null; } /** diff --git a/tests/Unit/Cron/CronManagerTest.php b/tests/Unit/Cron/CronManagerTest.php index 5e5ff186d..fe1795977 100644 --- a/tests/Unit/Cron/CronManagerTest.php +++ b/tests/Unit/Cron/CronManagerTest.php @@ -242,7 +242,7 @@ public function testTaskExecutionFailureIsRecorded(): void $this->createTaskFile('failing-task.php', [ 'name' => 'failing-task', 'expression' => '* * * * *', - 'body' => 'throw new \Exception("Execution failed");', + 'body' => "throw new \\Exception('Execution failed');", ]); $manager = new CronManager($this->cronDirectory); @@ -261,7 +261,7 @@ private function createTaskFile(string $filename, array $definition, ?string $di $content .= " 'expression' => '{$definition['expression']}',\n"; $content .= " 'callback' => function () {\n"; $content .= " {$body}\n"; - $content .= " }\n"; + $content .= " },\n"; $content .= "];\n"; file_put_contents($directory . DS . $filename, $content); diff --git a/tests/Unit/Middleware/MiddlewareManagerTest.php b/tests/Unit/Middleware/MiddlewareManagerTest.php index 65cb42df2..cb1ae851a 100644 --- a/tests/Unit/Middleware/MiddlewareManagerTest.php +++ b/tests/Unit/Middleware/MiddlewareManagerTest.php @@ -10,37 +10,39 @@ class TestMwOne extends QtMiddleware { public static array $calls = []; - public function apply(Request $request, Response $response, Closure $next): Response + public function apply(Request $request, Closure $next): Response { self::$calls[] = 'TestMwOne'; - return $next($request, $response); + return $next($request); } } class TestMwTwo extends QtMiddleware { - public function apply(Request $request, Response $response, Closure $next): Response + public function apply(Request $request, Closure $next): Response { TestMwOne::$calls[] = 'TestMwTwo'; + $response = response(); $response->setHeader('X-Test', 'Passed'); - return $next($request, $response); + return $next($request); } } class TestMwBlocker extends QtMiddleware { - public function apply(Request $request, Response $response, Closure $next): Response + public function apply(Request $request, Closure $next): Response { TestMwOne::$calls[] = 'TestMwBlocker'; + $response = response(); return $response->json(['status' => 'blocked']); } } class InvalidMw { - public function apply(Request $request, Response $response, Closure $next) + public function apply(Request $request, Closure $next) { - return $next($request, $response); + return $next($request); } } } @@ -52,6 +54,8 @@ public function apply(Request $request, Response $response, Closure $next) use Quantum\Middleware\Exceptions\MiddlewareException; use Quantum\Router\MatchedRoute; use Quantum\Router\Route; + use Quantum\Http\Request; + use Quantum\Http\Response; use Mockery; use Quantum\Tests\_root\modules\Test\Middlewares\TestMwOne; @@ -74,14 +78,13 @@ public function testMiddlewareManagerExecutesSequentially(): void $matchedRoute = new MatchedRoute($route, []); $request = request(); - $response = response(); - $manager = new MiddlewareManager($matchedRoute); - $result = $manager->applyMiddlewares($request, $response); + $result = $manager->applyMiddlewares($request, fn (Request $request): Response => response()->json(['status' => 'terminal'])); - $this->assertSame($response, $result); + $this->assertSame(response(), $result); $this->assertEquals(['TestMwOne', 'TestMwTwo'], TestMwOne::$calls); $this->assertEquals('Passed', $result->getHeader('X-Test')); + $this->assertEquals('{"status":"terminal"}', $result->getContent()); } public function testMiddlewareManagerCanShortCircuit(): void @@ -95,12 +98,10 @@ public function testMiddlewareManagerCanShortCircuit(): void $matchedRoute = new MatchedRoute($route, []); $request = request(); - $response = response(); - $manager = new MiddlewareManager($matchedRoute); - $result = $manager->applyMiddlewares($request, $response); + $result = $manager->applyMiddlewares($request, fn (Request $request): Response => response()->json(['status' => 'terminal'])); - $this->assertSame($response, $result); + $this->assertSame(response(), $result); $this->assertEquals(['TestMwOne', 'TestMwBlocker'], TestMwOne::$calls); $this->assertEquals('{"status":"blocked"}', $result->getContent()); $this->assertNull($result->getHeader('X-Test')); @@ -117,7 +118,7 @@ public function testMiddlewareManagerThrowsWhenMiddlewareDoesNotExist(): void $matchedRoute = new MatchedRoute($route, []); $manager = new MiddlewareManager($matchedRoute); - $manager->applyMiddlewares(request(), response()); + $manager->applyMiddlewares(request(), fn (Request $request): Response => response()->json([])); } public function testMiddlewareManagerThrowsWhenNotInstanceOfQtMiddleware(): void @@ -131,7 +132,7 @@ public function testMiddlewareManagerThrowsWhenNotInstanceOfQtMiddleware(): void $matchedRoute = new MatchedRoute($route, []); $manager = new MiddlewareManager($matchedRoute); - $manager->applyMiddlewares(request(), response()); + $manager->applyMiddlewares(request(), fn (Request $request): Response => response()->json([])); } } } diff --git a/tests/Unit/ResourceCache/ViewCacheTest.php b/tests/Unit/ResourceCache/ViewCacheTest.php index 2c1c5c7a2..91ba84b3f 100644 --- a/tests/Unit/ResourceCache/ViewCacheTest.php +++ b/tests/Unit/ResourceCache/ViewCacheTest.php @@ -58,19 +58,16 @@ public function tearDown(): void parent::tearDown(); } - public function testServeCachedView(): void + public function testGetCachedResponse(): void { $this->viewCache->enableCaching(true); $this->viewCache->set($this->route, $this->content); - $response = response(); + $result = $this->viewCache->getCachedResponse($this->route); - $result = $this->viewCache->serveCachedView($this->route, $response); - - $this->assertTrue($result); - - $this->assertEquals($this->content, $response->getContent()); + $this->assertSame(response(), $result); + $this->assertEquals($this->content, $result->getContent()); } public function testSetAndGetViewCache(): void