Add support php 8.4

Author: isublimity

composer.json

@@ -13,7 +13,7 @@
     }
   ],
   "require": {
-    "php": "^7.3|^8.0",
+    "php": "^8.0",
     "ext-curl": "*",
     "ext-json": "*"
   },

src/Client.php

@@ -292,13 +292,13 @@ public function settings()
      * @param string|null $useSessionId
      * @return $this
      */
-    public function useSession(string $useSessionId = null)
+    public function useSession(string $useSessionId = '')
     {
         if (!$this->settings()->getSessionId()) {
             if (!$useSessionId) {
                 $this->settings()->makeSessionId();
             } else {
-                $this->settings()->session_id($useSessionId);
+                $this->settings()->swhereInFileession_id($useSessionId);
             }
         }
         return $this;
@@ -383,14 +383,15 @@ public function enableExtremes(bool $flag = true)
     }
 
     /**
-     * @param mixed[] $bindings
+     * @param string $sql
+     * @param array $bindings
      * @return Statement
      */
     public function select(
         string $sql,
         array $bindings = [],
-        WhereInFile $whereInFile = null,
-        WriteToFile $writeToFile = null
+        ?WhereInFile $whereInFile = null,
+        ?WriteToFile $writeToFile = null
     )
     {
         return $this->transport()->select($sql, $bindings, $whereInFile, $writeToFile);
@@ -437,8 +438,8 @@ public function progressFunction(callable $callback)
     public function selectAsync(
         string $sql,
         array $bindings = [],
-        WhereInFile $whereInFile = null,
-        WriteToFile $writeToFile = null
+        ?WhereInFile $whereInFile = null,
+        ?WriteToFile $writeToFile = null
     )
     {
         return $this->transport()->selectAsync($sql, $bindings, $whereInFile, $writeToFile);
@@ -805,14 +806,14 @@ public function isExists(string $database, string $table)
     /**
      * List of partitions
      *
-     * @return mixed[][]
+     * @return array
      * @throws \Exception
      */
-    public function partitions(string $table, int $limit = null, bool $active = null)
+    public function partitions(string $table, int $limit = 0, ?bool $active = null)
     {
         $database = $this->settings()->getDatabase();
         $whereActiveClause = $active === null ? '' : sprintf(' AND active = %s', (int)$active);
-        $limitClause = $limit !== null ? ' LIMIT ' . $limit : '';
+        $limitClause = $limit > 0 ? ' LIMIT ' . $limit : '';
 
         return $this->select(<<<CLICKHOUSE
 SELECT *

src/Transport/CurlerRequest.php

@@ -124,7 +124,6 @@ public function __construct($id = false)
             CURLOPT_HEADER => TRUE,
             CURLOPT_FOLLOWLOCATION => TRUE,
             CURLOPT_AUTOREFERER => 1, // при редиректе подставлять в «Referer:» значение из «Location:»
-            CURLOPT_BINARYTRANSFER => 1, // передавать в binary-safe
             CURLOPT_RETURNTRANSFER => TRUE,
             CURLOPT_USERAGENT => 'smi2/PHPClickHouse/client',
         );

tests/ClientTest.php

@@ -118,7 +118,7 @@ private function create_fake_file($file_name, $size = 1, $file_type = 'CSV')
                             fwrite($handle, json_encode($j) . PHP_EOL);
                             break;
                         default:
-                            fputcsv($handle, $j);
+                            fputcsv($handle, $j,",",'"',"\\");
                     }
                     $rows++;
                 }
@@ -556,7 +556,7 @@ private function make_csv_SelectWhereIn($file_name, $array)
 
         $handle = fopen($file_name, 'w');
         foreach ($array as $row) {
-            fputcsv($handle, $row);
+            fputcsv($handle, $row,",",'"',"\\");
         }
 
         fclose($handle);