phpstan

davidecesarano · Oct 24, 2020 · 26736c2 · 26736c2
1 parent 03491e1
commit 26736c2
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 25 deletions.
diff --git a/Embryo/PDO/Connection.php b/Embryo/PDO/Connection.php
@@ -17,7 +17,7 @@
     class Connection 
     {
         /**
-         * @var PDO $pdo
+         * @var \PDO $pdo
          */
         private $pdo;
 
@@ -56,9 +56,9 @@ public function query(string $query): Query
         /**
          * Transaction
          * 
-         * @param Closure $callback
+         * @param \Closure $callback
          * @return mixed
-         * @throws PDOException
+         * @throws \PDOException
          */
         public function transaction(\Closure $callback)
         {

diff --git a/Embryo/PDO/Database.php b/Embryo/PDO/Database.php
@@ -40,8 +40,8 @@ public function __construct(array $database)
          *
          * @param string $connectionName
          * @return Connection
-         * @throws InvalidArgumentException
-         * @throws PDOException
+         * @throws \InvalidArgumentException
+         * @throws \PDOException
          */
         public function connection(string $connectionName = 'local'): Connection
         {

diff --git a/Embryo/PDO/QueryBuilder/Query.php b/Embryo/PDO/QueryBuilder/Query.php
@@ -24,7 +24,7 @@ class Query
         private $query;
 
         /**
-         * @var \PDOStatement|bool $stmt
+         * @var \PDOStatement $stmt
          */
         private $stmt;
 
@@ -41,7 +41,7 @@ class Query
         /**
          * @var int $lastInsertId
          */
-        private $lastInsertId = [];
+        private $lastInsertId;
 
         /**
          * Set PDO.
@@ -71,6 +71,7 @@ public function query(string $query): self
          *
          * @param array $values
          * @return self
+         * @throws \PDOException
          */
         public function values(array $values): self
         {
@@ -94,13 +95,13 @@ public function values(array $values): self
          * or emit PDO exception.
          *
          * @return void
-         * @throws PDOException
+         * @throws \PDOException
          */
         public function execute()
         {
             try {
                 $this->execute = $this->stmt->execute();
-                $this->lastInsertId = $this->pdo->lastInsertId();
+                $this->lastInsertId = (int) $this->pdo->lastInsertId();
             } catch (\PDOException $e) {
                 throw new \PDOException($e->getMessage());
             }
@@ -138,15 +139,15 @@ public function lastId(): int
         public function count(): int
         {
             $this->execute();
-            return $this->stmt->rowCount();
+            return (int) $this->stmt->rowCount();
         }
 
         /**
          * Execute and return an 
          * object row or an array of
          * objects.
          *
-         * @return object|array
+         * @return object|array|bool
          */
         public function get()
         {
@@ -166,7 +167,8 @@ public function get()
         public function all(): array
         {
             $this->execute();
-            return $this->stmt->fetchAll(\PDO::FETCH_OBJ);
+            $data = $this->stmt->fetchAll(\PDO::FETCH_OBJ);
+            return $data ?: [];
         }
 
         /**
@@ -178,7 +180,7 @@ public function debug(): string
         {
             ob_start();
             $this->stmt->debugDumpParams();
-            $output = ob_get_contents();
+            $output = ob_get_contents() ?: '';
             ob_end_clean();
             return '<pre>'.htmlspecialchars($output).'</pre>';
         }

diff --git a/Embryo/PDO/QueryBuilder/QueryBuilder.php b/Embryo/PDO/QueryBuilder/QueryBuilder.php
@@ -21,7 +21,7 @@ class QueryBuilder
         use ComposeQueryTrait;
 
         /**
-         * @var PDO $pdo
+         * @var \PDO $pdo
          */
         private $pdo;
 
@@ -51,7 +51,7 @@ class QueryBuilder
         private $delete = false;
 
         /**
-         * @var array $leftJoin
+         * @var array $join
          */
         private $join = [];
 
@@ -184,7 +184,7 @@ public function select(...$field): Query
         /**
          * SELECT statement shortened.
          * 
-         * @return object|array
+         * @return object|array|bool
          */
         public function get()
         {
@@ -371,7 +371,7 @@ public function rawJoin(string $join): self
         /**
          * "WHERE" and "AND" condition.
          *
-         * @param string|callback $field
+         * @param string|callable $field
          * @param mixed $operatorValue
          * @param mixed|null $value
          * @return self
@@ -384,7 +384,7 @@ public function where($field, $operatorValue = null, $value = null): self
         /**
          * "OR" condition.
          *
-         * @param string|callback $field
+         * @param string|callable $field
          * @param mixed $operatorValue
          * @param mixed|null $value
          * @return self
@@ -492,7 +492,7 @@ public function orWhereNotIn(string $field, array $values): self
          * @param string $field 
          * @param array $values 
          * @return self
-         * @throws InvalidArgumentException
+         * @throws \InvalidArgumentException
          */
         public function whereBetween(string $field, array $values): self 
         {
@@ -508,7 +508,7 @@ public function whereBetween(string $field, array $values): self
          * @param string $field 
          * @param array $values 
          * @return self
-         * @throws InvalidArgumentException
+         * @throws \InvalidArgumentException
          */
         public function orWhereBetween(string $field, array $values): self 
         {
@@ -524,7 +524,7 @@ public function orWhereBetween(string $field, array $values): self
          * @param string $field 
          * @param array $values 
          * @return self
-         * @throws InvalidArgumentException
+         * @throws \InvalidArgumentException
          */
         public function whereNotBetween(string $field, array $values): self 
         {
@@ -540,7 +540,7 @@ public function whereNotBetween(string $field, array $values): self
          * @param string $field 
          * @param array $values 
          * @return self
-         * @throws InvalidArgumentException
+         * @throws \InvalidArgumentException
          */
         public function orWhereNotBetween(string $field, array $values): self 
         {
@@ -566,11 +566,11 @@ public function rawWhere(string $where, array $values = []): self
          * Add WHERE condition.
          * 
          * @param string $clause 
-         * @param string|callback $field 
+         * @param string|callable $field 
          * @param mixed $operatorValue 
          * @param mixed $value 
          * @return self
-         * @throws InvalidArgumentException
+         * @throws \InvalidArgumentException
          */
         private function addWhere($clause, $field, $operatorValue = null, $value = null): self
         {

diff --git a/composer.json b/composer.json
@@ -22,5 +22,8 @@
         "psr-4": {
             "Embryo\\": "Embryo/"
         }
+    },
+    "require-dev": {
+        "phpstan/phpstan": "^0.12.40"
     }
-}
+}
diff --git a/phpstan.neon b/phpstan.neon
@@ -0,0 +1,6 @@
+parameters:
+	checkMissingIterableValueType: false
+	treatPhpDocTypesAsCertain: false
+	level: max
+	paths:
+		- Embryo