Update phpstan and fix findings

spejder · Sep 13, 2022 · a911ec3 · a911ec3
1 parent a8cbebf
commit a911ec3
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 17 deletions.
diff --git a/composer.json b/composer.json
@@ -29,7 +29,9 @@
         "jacobsteringa/odoo-client": "<=0.3.0"
     },
     "require-dev": {
-        "phpstan/phpstan": "^0.12.32 || ^1.0.0",
-        "squizlabs/php_codesniffer": "^3.5"
+        "phpstan/phpstan": "^1",
+        "squizlabs/php_codesniffer": "^3.5",
+        "phpstan/phpstan-deprecation-rules": "^1",
+        "phpstan/phpstan-symfony": "^1"
     }
 }
diff --git a/phpstan.neon b/phpstan.neon
@@ -2,5 +2,5 @@ parameters:
   level: max
   paths:
     - .
-  excludes_analyse:
+  excludePaths:
     - vendor
diff --git a/src/Odoo/Odoo.php b/src/Odoo/Odoo.php
@@ -34,9 +34,9 @@ class Odoo
     /**
      * Unique identifier for current user
      *
-     * @var integer
+     * @var integer|null
      */
-    protected $uid;
+    protected $uid = null;
 
     /**
      * Current users username
@@ -112,23 +112,25 @@ public function version(): array
     {
         $response = $this->getClient('common')->call('version');
 
-        return $response;
+        return is_array($response) ? $response : [];
     }
 
     /**
      * Get timezone
      *
      * @return string Current timezone
      */
-    public function timezone(): string
+    public function timezone(): ?string
     {
         $params = [
             $this->database,
             $this->user,
             $this->password
         ];
 
-        return $this->getClient('common')->call('timezone_get', $params);
+        $response = $this->getClient('common')->call('timezone_get', $params);
+
+        return is_string($response) ? $response : null;
     }
 
     /**
@@ -153,7 +155,7 @@ public function search(string $model, array $data, int $offset = 0, int $limit =
 
         $response = $this->getClient('object')->call('execute', $params);
 
-        return $response;
+        return is_array($response) ? $response : [];
     }
 
     /**
@@ -164,7 +166,7 @@ public function search(string $model, array $data, int $offset = 0, int $limit =
      *
      * @return integer Created model id
      */
-    public function create(string $model, array $data): int
+    public function create(string $model, array $data): ?int
     {
         $params = $this->buildParams([
             $model,
@@ -174,7 +176,7 @@ public function create(string $model, array $data): int
 
         $response = $this->getClient('object')->call('execute', $params);
 
-        return $response;
+        return is_int($response) ? $response : null;
     }
 
     /**
@@ -197,7 +199,7 @@ public function read(string $model, array $ids, array $fields = []): array
 
         $response = $this->getClient('object')->call('execute', $params);
 
-        return $response;
+        return is_array($response) ? $response : [];
     }
 
     /**
@@ -229,7 +231,7 @@ public function searchRead(
 
         $response = $this->getClient('object')->call('execute', $params);
 
-        return $response;
+        return is_array($response) ? $response : [];
     }
 
     /**
@@ -252,7 +254,7 @@ public function write(string $model, array $ids, array $fields): array
 
         $response = $this->getClient('object')->call('execute', $params);
 
-        return $response;
+        return is_array($response) ? $response : [];
     }
 
     /**
@@ -271,7 +273,9 @@ public function unlink(string $model, array $ids): bool
             $ids
         ]);
 
-        return $this->getClient('object')->call('execute', $params);
+        $response = $this->getClient('object')->call('execute', $params);
+
+        return is_bool($response) ? $response : false;
     }
 
     /**
@@ -302,6 +306,7 @@ public function getReport(string $model, array $ids, string $type = 'qweb-pdf'):
         $state = false;
 
         while (!$state) {
+            /** @var array<string> */
             $report = $client->call(
                 'report_get',
                 $this->buildParams([$reportId])
@@ -401,16 +406,18 @@ protected function getClient(?string $path = null): XmlRpcClient
      *
      * @return int $uid
      */
-    protected function uid(): int
+    protected function uid(): ?int
     {
         if ($this->uid === null) {
             $client = $this->getClient('common');
 
-            $this->uid = $client->call('login', [
+            $response = $client->call('login', [
                 $this->database,
                 $this->user,
                 $this->password
             ]);
+
+            $this->uid = is_int($response) ? $response : null;
         }
 
         return $this->uid;