Require PHP 8

Author: odan

composer.json

@@ -13,10 +13,9 @@
     "license": "MIT",
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3",
-        "overtrue/phplint": "^2.3",
-        "phpstan/phpstan": "0.*",
+        "phpstan/phpstan": "^1",
         "phpunit/phpunit": "^9 || ^10",
-        "squizlabs/php_codesniffer": "^3.5"
+        "squizlabs/php_codesniffer": "^3"
     },
     "require": {
         "php": "^8.0",
@@ -39,15 +38,11 @@
     "scripts": {
         "cs:check": "php-cs-fixer fix --dry-run --format=txt --verbose --diff --config=.cs.php --ansi",
         "cs:fix": "php-cs-fixer fix --config=.cs.php --ansi",
-        "lint": "phplint ./ --exclude=vendor --no-interaction --no-cache --ansi",
-        "phoenix": "phoenix --ansi",
-        "stan": "phpstan analyse -c phpstan.neon --no-progress --ansi --xdebug",
-        "schema:dump": "php bin/console.php schema-dump --ansi",
         "sniffer:check": "phpcs --standard=phpcs.xml",
         "sniffer:fix": "phpcbf --standard=phpcs.xml",
+        "stan": "phpstan analyse -c phpstan.neon --no-progress --ansi --xdebug",
         "test": "phpunit --configuration phpunit.xml --do-not-cache-result --colors=always",
         "test:all": [
-            "@lint",
             "@cs:check",
             "@sniffer:check",
             "@stan",

phpstan.neon

@@ -2,6 +2,7 @@ parameters:
 	level: max
 	checkGenericClassInNonGenericObjectType: false
 	checkMissingIterableValueType: false
+	treatPhpDocTypesAsCertain: false
 	paths:
 		- src
 		- tests

src/Condition.php

@@ -107,8 +107,8 @@ public function getConditionSql(array $sql, array $where, string $conditionType)
      *
      * https://dev.mysql.com/doc/refman/5.7/en/comparison-operators.html
      *
-     * @param mixed $rightField The right field
-     * @param mixed $comparison The comparison
+     * @param string|array $rightField The right field
+     * @param string|mixed $comparison The comparison
      *
      * @return array The value
      */
@@ -132,6 +132,7 @@ private function getRightFieldValue($rightField, $comparison): array
             $comparison = 'IS NOT';
             $rightField = $this->quoter->quoteValue($rightField);
         } elseif ($comparison === 'between' || $comparison === 'not between') {
+            /** @var array $rightField */
             $between1 = $this->quoter->quoteValue($rightField[0]);
             $between2 = $this->quoter->quoteValue($rightField[1]);
             $rightField = sprintf('%s AND %s', $between1, $between2);
@@ -141,6 +142,7 @@ private function getRightFieldValue($rightField, $comparison): array
             $rightField = $this->quoter->quoteValue($rightField);
         }
 
+        // @phpstan-ignore-next-line
         return [$rightField, strtoupper($comparison)];
     }
 

src/InsertQuery.php

@@ -212,10 +212,10 @@ public function build(): string
     public function lastInsertId(string $name = null): string
     {
         if ($name === null) {
-            return $this->pdo->lastInsertId();
+            return $this->pdo->lastInsertId() ?: '0';
         }
 
-        return $this->pdo->lastInsertId($name);
+        return $this->pdo->lastInsertId($name) ?: '0';
     }
 
     /**
@@ -230,7 +230,7 @@ public function insertGetId(array $values): string
         $stmt = $this->set($values)->prepare();
         $stmt->execute();
 
-        return $this->pdo->lastInsertId();
+        return $this->lastInsertId();
     }
 
     /**

src/Operator.php

@@ -18,7 +18,6 @@ final class Operator
     public const LTE = '<=';
     public const IS = 'is';
     public const IS_NOT = 'is not';
-    //public const IS_NOT_NULL = 'is not null';
     public const LIKE = 'like';
     public const NOT_LIKE = 'not like';
     public const SOUNDS_LIKE = 'sounds like';

src/Quoter.php

@@ -4,6 +4,8 @@
 
 use PDO;
 use RuntimeException;
+use UnexpectedValueException;
+
 use function array_key_first;
 
 /**
@@ -65,10 +67,11 @@ public function quoteValue($value): string
             return 'NULL';
         }
 
-        $result = $this->pdo->quote($value);
+        // @phpstan-ignore-next-line
+        $result = $this->pdo->quote((string)$value);
 
         if (!is_string($result)) {
-            throw new RuntimeException('The database driver does not support quoting in this way.');
+            throw new UnexpectedValueException('The database driver does not support quoting in this way.');
         }
 
         return $result;

src/UpdateQuery.php

@@ -56,9 +56,9 @@ final class UpdateQuery implements QueryInterface
     private $orderBy = [];
 
     /**
-     * @var int Limit
+     * @var int|null Limit
      */
-    private $limit;
+    private $limit = null;
 
     /**
      * Constructor.

tests/ConnectionTest.php

@@ -36,6 +36,8 @@ public function testPrepareQuery(): void
         $statement = $select->prepare();
 
         $statement->execute();
+
+        /** @var array $row */
         $row = $statement->fetch(PDO::FETCH_ASSOC);
 
         $this->assertNotEmpty($row['TABLE_NAME']);