lint

alksily · alksily · commit 0717fc1e1095 · 2025-12-18T15:53:49.000+02:00
diff --git a/src/Application/Actions/Api/v1/EntityAction.php b/src/Application/Actions/Api/v1/EntityAction.php
@@ -32,7 +32,7 @@ protected function action(): \Slim\Psr7\Response
 
         try {
             $apikey = (bool) $this->request->getAttribute('apikey', false);
-            $entity = ltrim($this->resolveArg('args'), '/');
+            $entity = mb_ltrim($this->resolveArg('args'), '/');
             $params = $this->getParamsQuery();
             $service = $this->getService($entity);
 
diff --git a/src/Application/Actions/Api/v1/SearchAction.php b/src/Application/Actions/Api/v1/SearchAction.php
@@ -14,7 +14,7 @@ class SearchAction extends ActionApi
     protected function action(): \Slim\Psr7\Response
     {
         try {
-            $query = trim(str_escape($this->getParam('query', $this->getParam('q', ''))));
+            $query = mb_trim(str_escape($this->getParam('query', $this->getParam('q', ''))));
             $index_type = $this->getParam('type', $this->getParam('t', ''));
             $limit = (int) $this->getParam('limit', $this->parameter('search_limit', 10));
             $result = collect();
diff --git a/src/Application/Actions/Common/Catalog/ListAction.php b/src/Application/Actions/Common/Catalog/ListAction.php
@@ -49,10 +49,10 @@ private function parsePath(): array
 
         // remove starting prefix /catalog
         if (str_starts_with($path, '/catalog')) {
-            $path = substr($path, strlen('/catalog'));
+            $path = mb_substr($path, mb_strlen('/catalog'));
         }
 
-        $parts = explode('/', ltrim($path, '/'));
+        $parts = explode('/', mb_ltrim($path, '/'));
         $offset = 0;
 
         if ($parts && ctype_digit(end($parts))) {
diff --git a/src/Application/Actions/Common/PageAction.php b/src/Application/Actions/Common/PageAction.php
@@ -14,7 +14,7 @@ protected function action(): \Slim\Psr7\Response
         $pageService = $this->container->get(PageService::class);
 
         try {
-            $page = $pageService->read(['address' => ltrim($this->resolveArg('args'), '/')]);
+            $page = $pageService->read(['address' => mb_ltrim($this->resolveArg('args'), '/')]);
 
             return $this->respond($page->template, [
                 'page' => $page,
diff --git a/src/Application/Actions/Common/SearchAction.php b/src/Application/Actions/Common/SearchAction.php
@@ -12,7 +12,7 @@ class SearchAction extends AbstractAction
 {
     protected function action(): \Slim\Psr7\Response
     {
-        $query = trim(str_escape(strip_tags($this->getParam('query', $this->getParam('q', '')))));
+        $query = mb_trim(str_escape(strip_tags($this->getParam('query', $this->getParam('q', '')))));
         $index_type = $this->getParam('type', $this->getParam('t', ''));
         $limit = (int) $this->getParam('limit', $this->parameter('search_limit', 10));
         $result = collect();
diff --git a/src/Application/Actions/Cup/Catalog/Product/ProductExportAction.php b/src/Application/Actions/Cup/Catalog/Product/ProductExportAction.php
@@ -28,7 +28,7 @@ protected function getCellCoordinate($index, $row = 1)
     protected function action(): \Slim\Psr7\Response
     {
         // Fields
-        $fields = trim($this->parameter('catalog_export_columns', implode(PHP_EOL, \App\Domain\References\Catalog::IMPORT_EXPORT_FIELDS_DEFAULT)));
+        $fields = mb_trim($this->parameter('catalog_export_columns', implode(PHP_EOL, \App\Domain\References\Catalog::IMPORT_EXPORT_FIELDS_DEFAULT)));
 
         if ($fields) {
             $fields = array_map('trim', explode(PHP_EOL, $fields));
@@ -103,9 +103,9 @@ protected function action(): \Slim\Psr7\Response
                         ->setHorizontal(\PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_CENTER);
 
                     $sheet->mergeCells(
-                        $this->getCellCoordinate(0 + $offset['cols'], $row + 1 + $offset['rows']) .
-                        ':' .
-                        $this->getCellCoordinate(count($fields) - 1 + $offset['cols'], $row + 1 + $offset['rows'])
+                        $this->getCellCoordinate(0 + $offset['cols'], $row + 1 + $offset['rows'])
+                        . ':'
+                        . $this->getCellCoordinate(count($fields) - 1 + $offset['cols'], $row + 1 + $offset['rows'])
                     );
 
                     $lastCategory = $model->category_uuid;
@@ -116,7 +116,7 @@ protected function action(): \Slim\Psr7\Response
                 $attributes = $model->attributes;
 
                 foreach ($fields as $index => $field) {
-                    if (trim($field)) {
+                    if (mb_trim($field)) {
                         $cell = $sheet->getCell($this->getCellCoordinate($index + $offset['cols'], $row + 1 + $offset['rows']));
 
                         // set default vertical aligment
diff --git a/src/Application/Actions/Cup/ParametersPageAction.php b/src/Application/Actions/Cup/ParametersPageAction.php
@@ -23,7 +23,7 @@ protected function action(): \Slim\Psr7\Response
             foreach ($this->request->getParsedBody() as $group => $params) {
                 foreach ($params as $key => $value) {
                     $data = [
-                        'name' => trim($group . '_' . $key),
+                        'name' => mb_trim($group . '_' . $key),
                         'value' => is_array($value) ? implode(',', $value) : $value,
                     ];
 
diff --git a/src/Application/Auth/OpenAuthProvider.php b/src/Application/Auth/OpenAuthProvider.php
@@ -49,7 +49,7 @@ protected function revokeState(): void
 
     protected function getRedirectUrl($path): string
     {
-        return rtrim($this->parameter('common_homepage', ''), '/') . $path;
+        return mb_rtrim($this->parameter('common_homepage', ''), '/') . $path;
     }
 
     /**
diff --git a/src/Application/Middlewares/MultipartParserMiddleware.php b/src/Application/Middlewares/MultipartParserMiddleware.php
@@ -1,19 +1,18 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace App\Application\Middlewares;
 
 use App\Domain\AbstractMiddleware;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use Slim\Psr7\UploadedFile;
 
 class MultipartParserMiddleware extends AbstractMiddleware
 {
     public function __invoke(ServerRequestInterface $request, RequestHandlerInterface $handler): \Slim\Psr7\Response
     {
         $method = $request->getMethod();
 
-        if (in_array($method, ['PATCH', 'PUT'])) {
+        if (in_array($method, ['PATCH', 'PUT'], true)) {
             $contentType = $request->getHeaderLine('Content-Type');
 
             if (str_contains($contentType, 'multipart/form-data')) {
diff --git a/src/Application/Twig/LocaleNode.php b/src/Application/Twig/LocaleNode.php
@@ -44,7 +44,7 @@ public function compile(Compiler $compiler): void
         }
 
         if ($this->hasNode('notes')) {
-            $message = trim($this->getNode('notes')->getAttribute('data'));
+            $message = mb_trim($this->getNode('notes')->getAttribute('data'));
 
             // line breaks are not allowed cause we want a single line comment
             $message = str_replace(["\n", "\r"], ' ', $message);
@@ -134,7 +134,7 @@ protected function compileString(Node $body): array
 
         return [
             new Node([
-                new ConstantExpression(trim(preg_replace('/\s\s+/', ' ', $msg)), $body->getTemplateLine()),
+                new ConstantExpression(mb_trim(preg_replace('/\s\s+/', ' ', $msg)), $body->getTemplateLine()),
             ]),
             $vars,
         ];
diff --git a/src/Application/TwigExtension.php b/src/Application/TwigExtension.php
@@ -195,12 +195,12 @@ public function fullUrlFor(string $name, array $data = [], array $queryParams =
     // base address without slash in end
     public function baseUrl()
     {
-        return rtrim($this->parameter('common_homepage', ''), '/');
+        return mb_rtrim($this->parameter('common_homepage', ''), '/');
     }
 
     public function isCurrentPath($name, $data = [])
     {
-        return $this->routeCollector->pathFor($name, $data) === $this->baseUrl() . '/' . ltrim($this->currentUrl(), '/');
+        return $this->routeCollector->pathFor($name, $data) === $this->baseUrl() . '/' . mb_ltrim($this->currentUrl(), '/');
     }
 
     /**
@@ -212,7 +212,7 @@ public function isCurrentPath($name, $data = [])
      */
     public function currentPath($withQueryString = false)
     {
-        $path = ltrim($this->currentUrl(), '/');
+        $path = mb_ltrim($this->currentUrl(), '/');
 
         return $withQueryString || !mb_strrpos($path, '?') ? $path : mb_strstr($path, '?', true);
     }
@@ -311,7 +311,7 @@ public function collect(array|Collection $array = []): Collection
     public function non_page_path(): string
     {
         $url = $this->parseUrl();
-        $path = explode('/', ltrim($url['path'], '/'));
+        $path = explode('/', mb_ltrim($url['path'], '/'));
 
         if (($key = count($path) - 1) && ($buf = $path[$key]) && ctype_digit($buf)) {
             unset($path[$key]);
@@ -323,7 +323,7 @@ public function non_page_path(): string
     public function current_page_number(): int
     {
         $url = $this->parseUrl();
-        $path = explode('/', ltrim($url['path'], '/'));
+        $path = explode('/', mb_ltrim($url['path'], '/'));
         $page = 0;
 
         if (($key = count($path) - 1) && ($buf = $path[$key]) && ctype_digit($buf)) {
@@ -381,9 +381,9 @@ public function json_decode(string $json, ?bool $associative = true, int $depth
         return json_decode($json, $associative, $depth, $flags);
     }
 
-    function cache_put(string $key, mixed $value, int $seconds, string $type = 'memory'): void
+    public function cache_put(string $key, mixed $value, int $seconds, string $type = 'memory'): void
     {
-        /** @var FileCache|ArrayCache $cache */
+        /** @var ArrayCache|FileCache $cache */
         $cache = match ($type) {
             'file' => $this->container->get(FileCache::class),
             'memory' => $this->container->get(ArrayCache::class),
@@ -392,9 +392,9 @@ function cache_put(string $key, mixed $value, int $seconds, string $type = 'memo
         $cache->put('twig-' . $key, $value, $seconds);
     }
 
-    function cache_get(string $key, mixed $default = null, string $type = 'memory'): mixed
+    public function cache_get(string $key, mixed $default = null, string $type = 'memory'): mixed
     {
-        /** @var FileCache|ArrayCache $cache */
+        /** @var ArrayCache|FileCache $cache */
         $cache = match ($type) {
             'file' => $this->container->get(FileCache::class),
             'memory' => $this->container->get(ArrayCache::class),
@@ -412,7 +412,7 @@ public function convert_size(int $size): string
     {
         $unit = ['b', 'kb', 'mb', 'gb', 'tb', 'pb'];
 
-        return @round($size / pow(1024, ($i = floor(log($size, 1024)))), 2) . ' ' . $unit[(int)$i];
+        return @round($size / pow(1024, ($i = floor(log($size, 1024)))), 2) . ' ' . $unit[(int) $i];
     }
 
     public function qr_code(mixed $value, $size = 256, $margin = 0): string
@@ -596,14 +596,14 @@ public function catalog_product_popular(int $limit = 10, string $type = \App\Dom
             ->join('catalog_order_product as cop', 'cp.uuid', '=', 'cop.product_uuid')
             ->where('cp.type', '=', $type)
             ->where('cp.status', '=', \App\Domain\Casts\Catalog\Status::WORK)
-            ->groupBy('cp.uuid', ...array_map(fn($col) => "cp.{$col}", array_keys((new \App\Domain\Models\CatalogProduct())->getAttributes())))
+            ->groupBy('cp.uuid', ...array_map(fn ($col) => "cp.{$col}", array_keys((new \App\Domain\Models\CatalogProduct())->getAttributes())))
             ->orderByDesc('order_count')
             ->limit($limit)
             ->get();
     }
 
     // save uuid of product in session or return saved list
-    public function catalog_product_view(string $uuid = null, int $limit = 10)
+    public function catalog_product_view(?string $uuid = null, int $limit = 10)
     {
         $list = $_SESSION['catalog_product_view'] ?? [];
 
@@ -636,9 +636,9 @@ public function catalog_product_dimensional_weight($context, $product = null): f
                 $length_value = $length_class ? $length_class->value()['value'] : 1;
 
                 return round(
-                    ($product->dimension['length'] * $length_value) *
-                    ($product->dimension['width'] * $length_value) *
-                    ($product->dimension['height'] * $length_value) / $ratio,
+                    ($product->dimension['length'] * $length_value)
+                    * ($product->dimension['width'] * $length_value)
+                    * ($product->dimension['height'] * $length_value) / $ratio,
                     4
                 );
             }
diff --git a/src/Domain/AbstractAction.php b/src/Domain/AbstractAction.php
@@ -346,8 +346,8 @@ protected function isRecaptchaChecked(): bool
             $verify = json_decode(file_get_contents('https://www.google.com/recaptcha/api/siteverify', false, stream_context_create([
                 'http' => [
                     'method' => 'POST',
-                    'header' => "Content-Type: application/x-www-form-urlencoded\r\n" .
-                        'Content-Length: ' . mb_strlen($query) . "\r\n",
+                    'header' => "Content-Type: application/x-www-form-urlencoded\r\n"
+                        . 'Content-Length: ' . mb_strlen($query) . "\r\n",
                     'content' => $query,
                     'timeout' => 10,
                 ],
diff --git a/src/Domain/AbstractMiddleware.php b/src/Domain/AbstractMiddleware.php
@@ -35,9 +35,9 @@ abstract public function __invoke(Request $request, RequestHandlerInterface $han
     protected function getRequestRemoteIP(Request $request): string
     {
         return
-            $request->getServerParams()['HTTP_X_REAL_IP'] ??
-            $request->getServerParams()['HTTP_X_FORWARDED_FOR'] ??
-            $request->getServerParams()['REMOTE_ADDR'] ??
-            '';
+            $request->getServerParams()['HTTP_X_REAL_IP']
+            ?? $request->getServerParams()['HTTP_X_FORWARDED_FOR']
+            ?? $request->getServerParams()['REMOTE_ADDR']
+            ?? '';
     }
 }
diff --git a/src/Domain/AbstractPlugin.php b/src/Domain/AbstractPlugin.php
@@ -75,7 +75,7 @@ public function __construct(ContainerInterface $container)
         $this->renderer = $container->get('view');
     }
 
-    public function getCredentials(?string $field = null): null|array|string
+    public function getCredentials(?string $field = null): array|string|null
     {
         $credentials = [
             'title' => static::TITLE,
@@ -220,8 +220,8 @@ protected function enableNavigationItem(array $params = []): RouteInterface
             'handler' => function (Request $request, Response $response) use ($self) {
                 $response = $response->withHeader('Content-Type', 'text/plain');
                 $response->getBody()->write(
-                    'This is empty route for plugin: ' . $self::NAME . PHP_EOL .
-                    'Change "handler" key in function arguments enableNavigationItem(["handler" => ??]).'
+                    'This is empty route for plugin: ' . $self::NAME . PHP_EOL
+                    . 'Change "handler" key in function arguments enableNavigationItem(["handler" => ??]).'
                 );
 
                 return $response;
@@ -244,8 +244,8 @@ protected function map(array $params): RouteInterface
             'handler' => function (Request $request, Response $response) {
                 $response = $response->withHeader('Content-Type', 'text/plain');
                 $response->getBody()->write(
-                    'This is empty route for plugin: ' . static::NAME . PHP_EOL .
-                    'Change "handler" key in function arguments map(["methods" => "..", "pattern" => "..", "handler" => ??]).'
+                    'This is empty route for plugin: ' . static::NAME . PHP_EOL
+                    . 'Change "handler" key in function arguments map(["methods" => "..", "pattern" => "..", "handler" => ??]).'
                 );
 
                 return $response;
diff --git a/src/Domain/AbstractTask.php b/src/Domain/AbstractTask.php
@@ -75,10 +75,10 @@ public static function workerHasPidFile(string $action = ''): bool
 
         // remove pid file
         unlink($pidFilePath);
+
         return false;
     }
 
-
     /**
      * After work remove PID file
      */
diff --git a/src/Domain/Casts/AddressUrl.php b/src/Domain/Casts/AddressUrl.php
@@ -20,7 +20,7 @@ public function set($model, string $key, mixed $value, array $attributes): strin
 
         $value = mb_strtolower($value);
         $value = i18n::getTranslatedText($value);
-        $value = trim($value);
+        $value = mb_trim($value);
         $value = preg_replace(['/[^\w\s\/-]/', '/\s+/'], ['', '-'], $value);
 
         return implode('/', array_unique(explode('/', $value))); // for fix duplicate parts
diff --git a/src/Domain/Casts/Boolean.php b/src/Domain/Casts/Boolean.php
@@ -15,10 +15,10 @@ public function set($model, string $key, mixed $value, array $attributes): bool
     {
         if (is_string($value) || is_int($value) || is_bool($value)) {
             switch (true) {
-                case $value === true || in_array(mb_strtolower(trim((string) $value)), ['1', 'on', 'true', 't', 'yes', 'y'], true):
+                case $value === true || in_array(mb_strtolower(mb_trim((string) $value)), ['1', 'on', 'true', 't', 'yes', 'y'], true):
                     return true;
 
-                case $value === false || in_array(mb_strtolower(trim((string) $value)), ['0', 'off', 'false', 'f', 'no', 'n'], true):
+                case $value === false || in_array(mb_strtolower(mb_trim((string) $value)), ['0', 'off', 'false', 'f', 'no', 'n'], true):
                     return false;
             }
         }
diff --git a/src/Domain/Models/User.php b/src/Domain/Models/User.php
@@ -184,13 +184,13 @@ public function name(string $type = 'full'): string
         if ($this->lastname || $this->patronymic || $this->firstname) {
             switch ($type) {
                 case 'full':
-                    return trim(implode(' ', [$this->lastname, $this->firstname, $this->patronymic]));
+                    return mb_trim(implode(' ', [$this->lastname, $this->firstname, $this->patronymic]));
 
                 case 'name':
-                    return trim(implode(' ', [$this->lastname, $this->firstname]));
+                    return mb_trim(implode(' ', [$this->lastname, $this->firstname]));
 
                 case 'initials':
-                    return trim(
+                    return mb_trim(
                         implode(' ', array_filter(
                             [
                                 $this->lastname ? mb_substr($this->lastname, 0, 1) . '.' : '',
@@ -202,7 +202,7 @@ public function name(string $type = 'full'): string
                     );
 
                 case 'short':
-                    return trim(
+                    return mb_trim(
                         implode(' ', [
                             $this->lastname ? mb_substr($this->lastname, 0, 1) . '.' : '',
                             $this->firstname,
diff --git a/src/Domain/Schedules/Test.php b/src/Domain/Schedules/Test.php
@@ -4,6 +4,9 @@
 
 use App\Domain\AbstractSchedule;
 
+/**
+ * @internal
+ */
 class Test extends AbstractSchedule
 {
     public function run(): void
diff --git a/src/Domain/Service/Catalog/ProductService.php b/src/Domain/Service/Catalog/ProductService.php
@@ -120,9 +120,6 @@ protected function buildCriteria(array $data = []): array
         return $criteria;
     }
 
-    /**
-     * @return int
-     */
     public function count(array $data = []): int
     {
         $default = [
@@ -189,7 +186,7 @@ public function read(array $data = [])
 
                 return $catalogProduct ?: throw new ProductNotFoundException();
 
-            // cup search by name
+                // cup search by name
             case !is_array($data['title']) && $data['title'] !== null:
                 $query = CatalogProduct::query();
                 /** @var Builder $query */
diff --git a/src/Domain/Service/Parameter/ParameterService.php b/src/Domain/Service/Parameter/ParameterService.php
@@ -28,7 +28,7 @@ public function create(array $data = []): Parameter
         return $parameter;
     }
 
-    public function read(array $data = [], mixed $fallback = null): null|Collection|Parameter
+    public function read(array $data = [], mixed $fallback = null): Collection|Parameter|null
     {
         $default = [
             'name' => null,
diff --git a/src/Domain/Service/User/UserService.php b/src/Domain/Service/User/UserService.php
diff --git a/src/Domain/Tasks/Catalog/ProductImportTask.php b/src/Domain/Tasks/Catalog/ProductImportTask.php
diff --git a/src/Domain/Tasks/SearchIndexTask.php b/src/Domain/Tasks/SearchIndexTask.php
diff --git a/src/Domain/Traits/HasRenderer.php b/src/Domain/Traits/HasRenderer.php
diff --git a/src/helpers.php b/src/helpers.php
diff --git a/src/middleware.php b/src/middleware.php
diff --git a/tests/Domain/Service/Catalog/OrderServiceTest.php b/tests/Domain/Service/Catalog/OrderServiceTest.php

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ class SearchAction extends ActionApi`
`14`	`14`	`protected function action(): \Slim\Psr7\Response`
`15`	`15`	`{`
`16`	`16`	`try {`
`17`		`- $query = trim(str_escape($this->getParam('query', $this->getParam('q', ''))));`
	`17`	`+ $query = mb_trim(str_escape($this->getParam('query', $this->getParam('q', ''))));`
`18`	`18`	`$index_type = $this->getParam('type', $this->getParam('t', ''));`
`19`	`19`	`$limit = (int) $this->getParam('limit', $this->parameter('search_limit', 10));`
`20`	`20`	`$result = collect();`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ class SearchAction extends AbstractAction`
`12`	`12`	`{`
`13`	`13`	`protected function action(): \Slim\Psr7\Response`
`14`	`14`	`{`
`15`		`- $query = trim(str_escape(strip_tags($this->getParam('query', $this->getParam('q', '')))));`
	`15`	`+ $query = mb_trim(str_escape(strip_tags($this->getParam('query', $this->getParam('q', '')))));`
`16`	`16`	`$index_type = $this->getParam('type', $this->getParam('t', ''));`
`17`	`17`	`$limit = (int) $this->getParam('limit', $this->parameter('search_limit', 10));`
`18`	`18`	`$result = collect();`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ protected function revokeState(): void`
`49`	`49`
`50`	`50`	`protected function getRedirectUrl($path): string`
`51`	`51`	`{`
`52`		`- return rtrim($this->parameter('common_homepage', ''), '/') . $path;`
	`52`	`+ return mb_rtrim($this->parameter('common_homepage', ''), '/') . $path;`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`/**`