increase psalm level

apioo · Nov 7, 2022 · afe91ad · afe91ad
1 parent 0157d86
commit afe91ad
Show file tree

Hide file tree

Showing 9 changed files with 101 additions and 72 deletions.
diff --git a/psalm.xml b/psalm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <psalm
-    errorLevel="4"
+    errorLevel="3"
     resolveFromConfigFile="true"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"

diff --git a/src/Authorization/TokenGenerator.php b/src/Authorization/TokenGenerator.php
@@ -78,6 +78,10 @@ public static function generateUserPassword(): string
 
     private static function generateString(int $length): string
     {
+        if ($length <= 0) {
+            throw new \RuntimeException('Length must be positive');
+        }
+
         return substr(bin2hex(random_bytes($length)), 0, $length);
     }
 }
diff --git a/src/Backend/View/App/Token/QueryFilter.php b/src/Backend/View/App/Token/QueryFilter.php
@@ -40,6 +40,17 @@ class QueryFilter extends QueryFilterAbstract
     protected ?string $scope = null;
     protected ?string $ip = null;
 
+    public function __construct(\DateTimeImmutable $from, \DateTimeImmutable $to, ?int $appId = null, ?int $userId = null, ?int $status = null, ?string $scope = null, ?string $ip = null)
+    {
+        parent::__construct($from, $to);
+
+        $this->appId = $appId;
+        $this->userId = $userId;
+        $this->status = $status;
+        $this->scope = $scope;
+        $this->ip = $ip;
+    }
+
     public function getAppId(): ?int
     {
         return $this->appId;
@@ -93,12 +104,13 @@ public function getCondition(?string $alias = null): Condition
         return $condition;
     }
 
-    public static function create(RequestInterface $request): static
+    public static function create(RequestInterface $request): self
     {
-        $filter = parent::create($request);
-        $appId  = $request->get('appId');
-        $userId = $request->get('userId');
-        $status = $request->get('status');
+        [$from, $to] = self::getFromAndTo($request);
+
+        $appId  = self::toInt($request->get('appId'));
+        $userId = self::toInt($request->get('userId'));
+        $status = self::toInt($request->get('status'));
         $scope  = $request->get('scope');
         $ip     = $request->get('ip');
         $search = $request->get('search');
@@ -116,14 +128,6 @@ public static function create(RequestInterface $request): static
             }
         }
 
-        if ($filter instanceof self) {
-            $filter->appId  = $appId;
-            $filter->userId = $userId;
-            $filter->status = $status;
-            $filter->scope  = $scope;
-            $filter->ip     = $ip;
-        }
-
-        return $filter;
+        return new self($from, $to, $appId, $userId, $status, $scope, $ip);
     }
 }
diff --git a/src/Backend/View/Audit/QueryFilter.php b/src/Backend/View/Audit/QueryFilter.php
@@ -40,6 +40,17 @@ class QueryFilter extends QueryFilterAbstract
     protected ?string $ip = null;
     protected ?string $message = null;
 
+    public function __construct(\DateTimeImmutable $from, \DateTimeImmutable $to, ?int $appId = null, ?int $userId = null, ?string $event = null, ?string $ip = null, ?string $message = null)
+    {
+        parent::__construct($from, $to);
+
+        $this->appId = $appId;
+        $this->userId = $userId;
+        $this->event = $event;
+        $this->ip = $ip;
+        $this->message = $message;
+    }
+
     public function getAppId(): ?int
     {
         return $this->appId;
@@ -93,11 +104,12 @@ public function getCondition(?string $alias = null): Condition
         return $condition;
     }
 
-    public static function create(RequestInterface $request): static
+    public static function create(RequestInterface $request): self
     {
-        $filter  = parent::create($request);
-        $appId   = $request->get('appId');
-        $userId  = $request->get('userId');
+        [$from, $to] = self::getFromAndTo($request);
+
+        $appId   = self::toInt($request->get('appId'));
+        $userId  = self::toInt($request->get('userId'));
         $event   = $request->get('event');
         $ip      = $request->get('ip');
         $message = $request->get('message');
@@ -116,14 +128,6 @@ public static function create(RequestInterface $request): static
             }
         }
 
-        if ($filter instanceof self) {
-            $filter->appId   = $appId;
-            $filter->userId  = $userId;
-            $filter->event   = $event;
-            $filter->ip      = $ip;
-            $filter->message = $message;
-        }
-
-        return $filter;
+        return new self($from, $to, $appId, $userId, $event, $ip, $message);
     }
 }
diff --git a/src/Backend/View/Log/QueryFilter.php b/src/Backend/View/Log/QueryFilter.php
@@ -44,6 +44,21 @@ class QueryFilter extends QueryFilterAbstract
     protected ?string $header = null;
     protected ?string $body = null;
 
+    public function __construct(\DateTimeImmutable $from, \DateTimeImmutable $to, ?int $routeId = null, ?int $appId = null, ?int $userId = null, ?string $ip = null, ?string $userAgent = null, ?string $method = null, ?string $path = null, ?string $header = null, ?string $body = null)
+    {
+        parent::__construct($from, $to);
+
+        $this->routeId = $routeId;
+        $this->appId = $appId;
+        $this->userId = $userId;
+        $this->ip = $ip;
+        $this->userAgent = $userAgent;
+        $this->method = $method;
+        $this->path = $path;
+        $this->header = $header;
+        $this->body = $body;
+    }
+
     public function getRouteId(): ?int
     {
         return $this->routeId;
@@ -133,12 +148,13 @@ public function getCondition(?string $alias = null): Condition
         return $condition;
     }
 
-    public static function create(RequestInterface $request): static
+    public static function create(RequestInterface $request): self
     {
-        $filter    = parent::create($request);
-        $routeId   = $request->get('routeId');
-        $appId     = $request->get('appId');
-        $userId    = $request->get('userId');
+        [$from, $to] = self::getFromAndTo($request);
+
+        $routeId   = self::toInt($request->get('routeId'));
+        $appId     = self::toInt($request->get('appId'));
+        $userId    = self::toInt($request->get('userId'));
         $ip        = $request->get('ip');
         $userAgent = $request->get('userAgent');
         $method    = $request->get('method');
@@ -166,18 +182,6 @@ public static function create(RequestInterface $request): static
             }
         }
 
-        if ($filter instanceof self) {
-            $filter->routeId   = $routeId;
-            $filter->appId     = $appId;
-            $filter->userId    = $userId;
-            $filter->ip        = $ip;
-            $filter->userAgent = $userAgent;
-            $filter->method    = $method;
-            $filter->path      = $path;
-            $filter->header    = $header;
-            $filter->body      = $body;
-        }
-
-        return $filter;
+        return new self($from, $to, $routeId, $appId, $userId, $ip, $userAgent, $method, $path, $header, $body);
     }
 }
diff --git a/src/Backend/View/Plan/Usage/QueryFilter.php b/src/Backend/View/Plan/Usage/QueryFilter.php
@@ -38,6 +38,15 @@ class QueryFilter extends QueryFilterAbstract
     protected ?int $userId = null;
     protected ?int $appId = null;
 
+    public function __construct(\DateTimeImmutable $from, \DateTimeImmutable $to, ?int $routeId = null, ?int $userId = null, ?int $appId = null)
+    {
+        parent::__construct($from, $to);
+
+        $this->routeId = $routeId;
+        $this->userId = $userId;
+        $this->appId = $appId;
+    }
+
     public function getRouteId(): ?int
     {
         return $this->routeId;
@@ -78,19 +87,14 @@ protected function getDateColumn(): string
         return 'insert_date';
     }
 
-    public static function create(RequestInterface $request): static
+    public static function create(RequestInterface $request): self
     {
-        $filter  = parent::create($request);
-        $routeId = $request->get('routeId');
-        $userId  = $request->get('userId');
-        $appId   = $request->get('appId');
-
-        if ($filter instanceof self) {
-            $filter->routeId = $routeId;
-            $filter->userId  = $userId;
-            $filter->appId   = $appId;
-        }
+        [$from, $to] = self::getFromAndTo($request);
+
+        $routeId = self::toInt($request->get('routeId'));
+        $userId  = self::toInt($request->get('userId'));
+        $appId   = self::toInt($request->get('appId'));
 
-        return $filter;
+        return new self($from, $to, $routeId, $userId, $appId);
     }
 }
diff --git a/src/Backend/View/QueryFilterAbstract.php b/src/Backend/View/QueryFilterAbstract.php
@@ -67,7 +67,7 @@ protected function getDateColumn(): string
         return 'date';
     }
 
-    public static function create(RequestInterface $request): static
+    protected static function getFromAndTo(RequestInterface $request): array
     {
         $from = new \DateTimeImmutable($request->get('from') ?? '-1 month');
         $to   = new \DateTimeImmutable($request->get('to') ?? 'now');
@@ -84,6 +84,11 @@ public static function create(RequestInterface $request): static
             $to = $from->add(new \DateInterval('P2M'));
         }
 
-        return new static($from, $to);
+        return [$from, $to];
+    }
+
+    protected static function toInt(mixed $value): ?int
+    {
+        return !empty($value) ? (int) $value : null;
     }
 }
diff --git a/src/Backend/View/Transaction/QueryFilter.php b/src/Backend/View/Transaction/QueryFilter.php
@@ -38,6 +38,15 @@ class QueryFilter extends QueryFilterAbstract
     protected ?int $status = null;
     protected ?string $provider = null;
 
+    public function __construct(\DateTimeImmutable $from, \DateTimeImmutable $to, ?int $invoiceId = null, ?int $status = null, ?string $provider = null)
+    {
+        parent::__construct($from, $to);
+
+        $this->invoiceId = $invoiceId;
+        $this->status = $status;
+        $this->provider = $provider;
+    }
+
     public function getInvoiceId(): ?int
     {
         return $this->invoiceId;
@@ -78,11 +87,12 @@ protected function getDateColumn(): string
         return 'insert_date';
     }
 
-    public static function create(RequestInterface $request): static
+    public static function create(RequestInterface $request): self
     {
-        $filter    = parent::create($request);
-        $invoiceId = $request->get('invoiceId');
-        $status    = $request->get('status');
+        [$from, $to] = self::getFromAndTo($request);
+
+        $invoiceId = self::toInt($request->get('invoiceId'));
+        $status    = self::toInt($request->get('status'));
         $provider  = $request->get('provider');
         $search    = $request->get('search');
 
@@ -99,12 +109,6 @@ public static function create(RequestInterface $request): static
             }
         }
 
-        if ($filter instanceof self) {
-            $filter->invoiceId = $invoiceId;
-            $filter->status    = $status;
-            $filter->provider  = $provider;
-        }
-
-        return $filter;
+        return new self($from, $to, $invoiceId, $status, $provider);
     }
 }
diff --git a/src/Service/Connection/Token.php b/src/Service/Connection/Token.php
@@ -185,7 +185,7 @@ private function updateConnectionConfig(Model\ConnectionInterface $connection, A
         }
 
         $update = new ConnectionUpdate();
-        $update->setConfig(new ConnectionConfig($config));
+        $update->setConfig(ConnectionConfig::fromArray($config));
         $this->connectionService->update($connection->getId(), $update, UserContext::newAnonymousContext());
     }