fix: improve compatibility with PHP 8.4 (#214)

src/Database.php

@@ -132,21 +132,21 @@ public function query(string $query, array $parameters = []): StatementInterface
             ->query($query, $parameters);
     }
 
-    public function insert(string $table = null): InsertQuery
+    public function insert(?string $table = null): InsertQuery
     {
         return $this->getDriver(self::WRITE)
             ->getQueryBuilder()
             ->insertQuery($this->prefix, $table);
     }
 
-    public function update(string $table = null, array $values = [], array $where = []): UpdateQuery
+    public function update(?string $table = null, array $values = [], array $where = []): UpdateQuery
     {
         return $this->getDriver(self::WRITE)
             ->getQueryBuilder()
             ->updateQuery($this->prefix, $table, $where, $values);
     }
 
-    public function delete(string $table = null, array $where = []): DeleteQuery
+    public function delete(?string $table = null, array $where = []): DeleteQuery
     {
         return $this->getDriver(self::WRITE)
             ->getQueryBuilder()
@@ -168,7 +168,7 @@ public function select(mixed $columns = '*'): SelectQuery
 
     public function transaction(
         callable $callback,
-        string $isolationLevel = null,
+        ?string $isolationLevel = null,
     ): mixed {
         $this->begin($isolationLevel);
 
@@ -183,7 +183,7 @@ public function transaction(
         }
     }
 
-    public function begin(string $isolationLevel = null): bool
+    public function begin(?string $isolationLevel = null): bool
     {
         return $this->getDriver(self::WRITE)->beginTransaction($isolationLevel);
     }

src/DatabaseInterface.php

@@ -142,14 +142,14 @@ public function select(mixed $columns = '*'): SelectQuery;
      * @throws \Throwable
      *
      */
-    public function transaction(callable $callback, string $isolationLevel = null): mixed;
+    public function transaction(callable $callback, ?string $isolationLevel = null): mixed;
 
     /**
      * Start database transaction.
      *
      * @link http://en.wikipedia.org/wiki/Database_transaction
      */
-    public function begin(string $isolationLevel = null): bool;
+    public function begin(?string $isolationLevel = null): bool;
 
     /**
      * Commit the active database transaction.

src/DatabaseManager.php

@@ -87,7 +87,7 @@ public function getDatabases(): array
      *
      * @throws DBALException
      */
-    public function database(string $database = null): DatabaseInterface
+    public function database(?string $database = null): DatabaseInterface
     {
         if ($database === null) {
             $database = $this->config->getDefaultDatabase();

src/DatabaseProviderInterface.php

@@ -21,5 +21,5 @@ interface DatabaseProviderInterface
      * @throws DBALException
      *
      */
-    public function database(string $database = null): DatabaseInterface;
+    public function database(?string $database = null): DatabaseInterface;
 }

src/Driver/Compiler.php

@@ -329,8 +329,8 @@ protected function groupBy(QueryParameters $params, Quoter $q, array $groupBy):
     abstract protected function limit(
         QueryParameters $params,
         Quoter $q,
-        int $limit = null,
-        int $offset = null,
+        ?int $limit = null,
+        ?int $offset = null,
     ): string;
 
     protected function updateQuery(

src/Driver/Driver.php

@@ -235,7 +235,7 @@ public function execute(string $query, array $parameters = []): int
      *
      * @return mixed
      */
-    public function lastInsertID(string $sequence = null)
+    public function lastInsertID(?string $sequence = null)
     {
         $result = $this->getPDO()->lastInsertId();
         $this->logger?->debug("Insert ID: {$result}");
@@ -256,7 +256,7 @@ public function getTransactionLevel(): int
      * @link http://en.wikipedia.org/wiki/Isolation_(database_systems)
      *
      */
-    public function beginTransaction(string $isolationLevel = null): bool
+    public function beginTransaction(?string $isolationLevel = null): bool
     {
         ++$this->transactionLevel;
 

src/Driver/DriverInterface.php

@@ -176,7 +176,7 @@ public function execute(string $query, array $parameters = []): int;
      *
      * @return mixed
      */
-    public function lastInsertID(string $sequence = null);
+    public function lastInsertID(?string $sequence = null);
 
     /**
      * Start SQL transaction with specified isolation level (not all DBMS support it). Nested
@@ -187,7 +187,7 @@ public function lastInsertID(string $sequence = null);
      *
      * @return bool True of success.
      */
-    public function beginTransaction(string $isolationLevel = null): bool;
+    public function beginTransaction(?string $isolationLevel = null): bool;
 
     /**
      * Commit the active database transaction.

src/Driver/HandlerInterface.php

@@ -78,7 +78,7 @@ public function hasTable(string $table): bool;
      * @throws HandlerException
      *
      */
-    public function getSchema(string $table, string $prefix = null): AbstractTable;
+    public function getSchema(string $table, ?string $prefix = null): AbstractTable;
 
     /**
      * Create table based on a given schema.

src/Driver/MySQL/MySQLCompiler.php

@@ -41,7 +41,7 @@ protected function insertQuery(QueryParameters $params, Quoter $q, array $tokens
      *
      * @link http://dev.mysql.com/doc/refman/5.0/en/select.html#id4651990
      */
-    protected function limit(QueryParameters $params, Quoter $q, int $limit = null, int $offset = null): string
+    protected function limit(QueryParameters $params, Quoter $q, ?int $limit = null, ?int $offset = null): string
     {
         if ($limit === null && $offset === null) {
             return '';

src/Driver/MySQL/MySQLHandler.php

@@ -25,7 +25,7 @@ class MySQLHandler extends Handler
     /**
      * @psalm-param non-empty-string $table
      */
-    public function getSchema(string $table, string $prefix = null): AbstractTable
+    public function getSchema(string $table, ?string $prefix = null): AbstractTable
     {
         return new MySQLTable($this->driver, $table, $prefix ?? '');
     }

src/Driver/MySQL/Schema/MySQLColumn.php

@@ -180,7 +180,7 @@ class MySQLColumn extends AbstractColumn
     /**
      * @psalm-param non-empty-string $table
      */
-    public static function createInstance(string $table, array $schema, \DateTimeZone $timezone = null): self
+    public static function createInstance(string $table, array $schema, ?\DateTimeZone $timezone = null): self
     {
         $column = new self($table, $schema['Field'], $timezone);
 

src/Driver/PDOStatementInterface.php

@@ -34,15 +34,15 @@ public function bindParam(
         int|string $param,
         mixed &$var,
         int $type = \PDO::PARAM_STR,
-        int $maxLength = null,
+        ?int $maxLength = null,
         mixed $driverOptions = null,
     ): bool;
 
     public function bindColumn(
         int|string $column,
         mixed &$var,
         int $type = \PDO::PARAM_STR,
-        int $maxLength = null,
+        ?int $maxLength = null,
         mixed $driverOptions = null,
     ): bool;
 

src/Driver/Postgres/PostgresCompiler.php

@@ -69,7 +69,7 @@ protected function distinct(QueryParameters $params, Quoter $q, string|bool|arra
         return 'DISTINCT';
     }
 
-    protected function limit(QueryParameters $params, Quoter $q, int $limit = null, int $offset = null): string
+    protected function limit(QueryParameters $params, Quoter $q, ?int $limit = null, ?int $offset = null): string
     {
         if ($limit === null && $offset === null) {
             return '';

src/Driver/Postgres/PostgresDriver.php

@@ -154,7 +154,7 @@ public function resetPrimaryKeys(): void
      *
      *
      */
-    public function beginTransaction(string $isolationLevel = null): bool
+    public function beginTransaction(?string $isolationLevel = null): bool
     {
         ++$this->transactionLevel;
 

src/Driver/Postgres/PostgresHandler.php

@@ -27,7 +27,7 @@ class PostgresHandler extends Handler
     /**
      * @psalm-param non-empty-string $table
      */
-    public function getSchema(string $table, string $prefix = null): AbstractTable
+    public function getSchema(string $table, ?string $prefix = null): AbstractTable
     {
         return new PostgresTable($this->driver, $table, $prefix ?? '');
     }

src/Driver/Postgres/Query/PostgresInsertQuery.php

@@ -36,7 +36,7 @@ class PostgresInsertQuery extends InsertQuery implements ReturningInterface
     /** @var list<FragmentInterface|non-empty-string> */
     protected array $returningColumns = [];
 
-    public function withDriver(DriverInterface $driver, string $prefix = null): QueryInterface
+    public function withDriver(DriverInterface $driver, ?string $prefix = null): QueryInterface
     {
         $driver instanceof PostgresDriver or throw new BuilderException(
             'Postgres InsertQuery can be used only with Postgres driver',

src/Driver/ReadonlyHandler.php

@@ -46,7 +46,7 @@ public function hasTable(string $table): bool
     /**
      * @psalm-param non-empty-string $table
      */
-    public function getSchema(string $table, string $prefix = null): AbstractTable
+    public function getSchema(string $table, ?string $prefix = null): AbstractTable
     {
         return $this->parent->getSchema($table, $prefix);
     }

src/Driver/SQLServer/Query/SQLServerInsertQuery.php

@@ -34,7 +34,7 @@ class SQLServerInsertQuery extends InsertQuery implements ReturningInterface
      */
     protected array $returningColumns = [];
 
-    public function withDriver(DriverInterface $driver, string $prefix = null): QueryInterface
+    public function withDriver(DriverInterface $driver, ?string $prefix = null): QueryInterface
     {
         $driver instanceof SQLServerDriver or throw new BuilderException(
             'SQLServer InsertQuery can be used only with SQLServer driver',

src/Driver/SQLServer/SQLServerCompiler.php

@@ -121,9 +121,9 @@ protected function selectQuery(QueryParameters $params, Quoter $q, array $tokens
     protected function limit(
         QueryParameters $params,
         Quoter $q,
-        int $limit = null,
-        int $offset = null,
-        string $rowNumber = null,
+        ?int $limit = null,
+        ?int $offset = null,
+        ?string $rowNumber = null,
     ): string {
         if ($limit === null && $offset === null) {
             return '';

src/Driver/SQLServer/SQLServerHandler.php

@@ -24,7 +24,7 @@ class SQLServerHandler extends Handler
     /**
      * @psalm-param non-empty-string $table
      */
-    public function getSchema(string $table, string $prefix = null): AbstractTable
+    public function getSchema(string $table, ?string $prefix = null): AbstractTable
     {
         return new SQLServerTable($this->driver, $table, $prefix ?? '');
     }

src/Driver/SQLite/SQLiteCompiler.php

@@ -28,7 +28,7 @@ class SQLiteCompiler extends Compiler implements CachingCompilerInterface
      *
      * @link http://stackoverflow.com/questions/10491492/sqllite-with-skip-offset-only-not-limit
      */
-    protected function limit(QueryParameters $params, Quoter $q, int $limit = null, int $offset = null): string
+    protected function limit(QueryParameters $params, Quoter $q, ?int $limit = null, ?int $offset = null): string
     {
         if ($limit === null && $offset === null) {
             return '';

src/Driver/SQLite/SQLiteHandler.php

@@ -56,7 +56,7 @@ public function hasTable(string $table): bool
         return (bool) $this->driver->query($query, [$table])->fetchColumn();
     }
 
-    public function getSchema(string $table, string $prefix = null): AbstractTable
+    public function getSchema(string $table, ?string $prefix = null): AbstractTable
     {
         return new SQLiteTable($this->driver, $table, $prefix ?? '');
     }

src/Driver/SQLite/Schema/SQLiteColumn.php

@@ -126,7 +126,7 @@ class SQLiteColumn extends AbstractColumn
     public static function createInstance(
         string $table,
         array $schema,
-        \DateTimeZone $timezone = null,
+        ?\DateTimeZone $timezone = null,
     ): self {
         $column = new self($table, $schema['name'], $timezone);
 

src/Driver/Statement.php

@@ -43,7 +43,7 @@ public function fetch(int $mode = self::FETCH_ASSOC): mixed
         return $this->pdoStatement->fetch($mode);
     }
 
-    public function fetchColumn(int $columnNumber = null): mixed
+    public function fetchColumn(?int $columnNumber = null): mixed
     {
         return $columnNumber === null
             ? $this->pdoStatement->fetchColumn()

src/Exception/ReadonlyConnectionException.php

@@ -19,7 +19,7 @@ class ReadonlyConnectionException extends DBALException
      *
      * @return static
      */
-    public static function onWriteStatementExecution(int $code = 0, \Throwable $prev = null): self
+    public static function onWriteStatementExecution(int $code = 0, ?\Throwable $prev = null): self
     {
         return new self(self::WRITE_STMT_MESSAGE, $code, $prev);
     }

src/LoggerFactoryInterface.php

@@ -9,5 +9,5 @@
 
 interface LoggerFactoryInterface
 {
-    public function getLogger(DriverInterface $driver = null): LoggerInterface;
+    public function getLogger(?DriverInterface $driver = null): LoggerInterface;
 }

src/Query/ActiveQuery.php

@@ -26,7 +26,7 @@ abstract class ActiveQuery implements QueryInterface, \Stringable
     protected ?DriverInterface $driver = null;
     protected ?string $prefix = null;
 
-    public function withDriver(DriverInterface $driver, string $prefix = null): QueryInterface
+    public function withDriver(DriverInterface $driver, ?string $prefix = null): QueryInterface
     {
         $query = clone $this;
         $query->driver = $driver;
@@ -50,7 +50,7 @@ public function getPrefix(): ?string
      *
      * @psalm-return non-empty-string
      */
-    public function sqlStatement(QueryParameters $parameters = null): string
+    public function sqlStatement(?QueryParameters $parameters = null): string
     {
         $this->driver === null and throw new BuilderException('Unable to build query without associated driver');
 

src/Query/BuilderInterface.php

@@ -30,7 +30,7 @@ public function withDriver(DriverInterface $driver): self;
      */
     public function insertQuery(
         string $prefix,
-        string $table = null,
+        ?string $table = null,
     ): InsertQuery;
 
     /**
@@ -45,7 +45,7 @@ public function selectQuery(
 
     public function deleteQuery(
         string $prefix,
-        string $from = null,
+        ?string $from = null,
         array $where = [],
     ): DeleteQuery;
 
@@ -55,7 +55,7 @@ public function deleteQuery(
      */
     public function updateQuery(
         string $prefix,
-        string $table = null,
+        ?string $table = null,
         array $where = [],
         array $values = [],
     ): UpdateQuery;

src/Query/InsertQuery.php

@@ -23,7 +23,7 @@ class InsertQuery extends ActiveQuery
     protected array $columns = [];
     protected array $values = [];
 
-    public function __construct(string $table = null)
+    public function __construct(?string $table = null)
     {
         $this->table = $table ?? '';
     }

src/Query/QueryBuilder.php

@@ -50,7 +50,7 @@ public function withDriver(DriverInterface $driver): BuilderInterface
      */
     public function insertQuery(
         string $prefix,
-        string $table = null,
+        ?string $table = null,
     ): InsertQuery {
         $insert = $this->insertQuery->withDriver($this->driver, $prefix);
 
@@ -80,7 +80,7 @@ public function selectQuery(
 
     public function deleteQuery(
         string $prefix,
-        string $from = null,
+        ?string $from = null,
         array $where = [],
     ): DeleteQuery {
         $delete = $this->deleteQuery->withDriver($this->driver, $prefix);
@@ -97,7 +97,7 @@ public function deleteQuery(
      */
     public function updateQuery(
         string $prefix,
-        string $table = null,
+        ?string $table = null,
         array $where = [],
         array $values = [],
     ): UpdateQuery {

src/Query/QueryInterface.php

@@ -21,7 +21,7 @@ interface QueryInterface extends FragmentInterface
      *
      * @return $this
      */
-    public function withDriver(DriverInterface $driver, string $prefix = null): self;
+    public function withDriver(DriverInterface $driver, ?string $prefix = null): self;
 
     public function getDriver(): ?DriverInterface;