[fix] Implicitly nullable parameter declarations for PHP8.4 #1130

catfan · Nov 28, 2024 · 6ef45a5 · 6ef45a5
1 parent 7775795
commit 6ef45a5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -5,7 +5,8 @@
     ->setRules([
         '@PSR2' => true,
         '@PSR12' => true,
-        'array_syntax' => ['syntax' => 'short']
+        'array_syntax' => ['syntax' => 'short'],
+        'nullable_type_declaration_for_default_null_value' => true
     ])
     ->setFinder(
         PhpCsFixer\Finder::create()

diff --git a/src/Medoo.php b/src/Medoo.php
@@ -184,21 +184,21 @@ class Medoo
 
     /**
      * Regular expression pattern for valid table names.
-     * 
+     *
      * @var string
      */
     protected const TABLE_PATTERN = "[\p{L}_][\p{L}\p{N}@$#\-_]*";
 
     /**
      * Regular expression pattern for valid column names.
-     * 
+     *
      * @var string
      */
     protected const COLUMN_PATTERN = "[\p{L}_][\p{L}\p{N}@$#\-_\.]*";
-    
+
     /**
      * Regular expression pattern for valid alias names.
-     * 
+     *
      * @var string
      */
     protected const ALIAS_PATTERN = "[\p{L}_][\p{L}\p{N}@$#\-_]*";
@@ -541,7 +541,7 @@ public function query(string $statement, array $map = []): ?PDOStatement
      * @codeCoverageIgnore
      * @return \PDOStatement|null
      */
-    public function exec(string $statement, array $map = [], callable $callback = null): ?PDOStatement
+    public function exec(string $statement, array $map = [], ?callable $callback = null): ?PDOStatement
     {
         $this->statement = null;
         $this->errorInfo = null;
@@ -1425,7 +1425,7 @@ protected function dataMap(
         array $columnMap,
         array &$stack,
         bool $root,
-        array &$result = null
+        ?array &$result = null
     ): void {
         if ($root) {
             $columnsKey = array_keys($columns);
@@ -1697,7 +1697,7 @@ public function select(string $table, $join, $columns = null, $where = null): ?a
      * @param string $primaryKey
      * @return \PDOStatement|null
      */
-    public function insert(string $table, array $values, string $primaryKey = null): ?PDOStatement
+    public function insert(string $table, array $values, ?string $primaryKey = null): ?PDOStatement
     {
         $stack = [];
         $columns = [];
@@ -2160,7 +2160,7 @@ public function action(callable $actions): void
      * @codeCoverageIgnore
      * @return string|null
      */
-    public function id(string $name = null): ?string
+    public function id(?string $name = null): ?string
     {
         $type = $this->type;