Merge pull request Ashishkumbhar01#34 from CodeWithSushil/master

[update] Add type safety and php 8.4 supported

Author: Ashishkumbhar01

README.md

@@ -82,7 +82,8 @@ $data = [
   'version' => '8.3'
 ];
 
-$client->postData('table name', $data);
+$client->postData('table name', $data, 'id');
+// 3rd option on_conflict
 ```
 
 ### `updateData()`

composer.json

@@ -1,8 +1,8 @@
 {
-    "name": "supabase-php/supabase-client",
-    "description": "Supabase for PHP client.",
-    "keywords": ["supabase","supabase-php","supabase-client"],
-    "version": "1.0.7",
+  "$schema": "https://getcomposer.org/schem     a.json",
+  "name": "supabase-php/supabase-client",
+  "description": "Supabase for PHP client.",
+  "keywords": ["supabase","supabase-php","supabase-client"],
     "type": "library",
     "require": {
       "php": "^8.2",
@@ -43,5 +43,8 @@
         "allow-plugins": {
             "pestphp/pest-plugin": true
         }
-    }
+    },
+  "require-dev": {
+    "phpstan/phpstan": "^2.0"
+  }
 }

composer.lock

@@ -0,0 +1,10 @@
+<?php
+declare(strict_types=1);
+namespace Supabase;
+
+class Exception{
+  public static function Error()
+  {
+    throw new Exception('Error');
+  } 
+};

src/Exceptions.php

@@ -1,10 +1,12 @@
 <?php
+declare(strict_types=1);
+
 namespace Supabase;
 use Supabase\Supabase;
 
 class Functions extends Supabase
 {
-  public function getAllData($table=null)
+  public function getAllData(?string $table=null)
   {
     if (!isset($table)) {
       echo "Please provide your Supabase table name.";
@@ -16,7 +18,7 @@ public function getAllData($table=null)
     }
   }
 
-  public function getSingleData($table=null, $query=[])
+  public function getSingleData(?string $table=null, array $query=[])
   {
     if (!isset($table)) {
       echo "Please provide your Supabase table name.";
@@ -30,7 +32,7 @@ public function getSingleData($table=null, $query=[])
     }
   }
 
-  public function postData($table=null, $query=[], $on_conflict=null)
+  public function postData(?string $table=null, array $query=[], ?string $on_conflict=null)
   {
 	if (!isset($table)) {
 	  echo "Please provide your Supabase table name.";
@@ -45,11 +47,11 @@ public function postData($table=null, $query=[], $on_conflict=null)
 	  }
 
 	  $html = $this->grab($path, "POST", json_encode($query));
-	  return $html;
-	}
+    return $html;
+  }
   }
 
-  public function updateData($table=null, ?int $id=null, $query=[])
+  public function updateData(?string $table=null, ?int $id=null, array $query=[])
   {
     if (!isset($table)) {
       echo "Please provide your Supabase table name.";
@@ -64,7 +66,7 @@ public function updateData($table=null, ?int $id=null, $query=[])
     }
   }
 
-  public function deleteData($table=null, ?int $id=null)
+  public function deleteData(?string $table=null, ?int $id=null)
   {
     if (!isset($table)) {
       echo "Please provide your Supabase table name.";
@@ -77,23 +79,23 @@ public function deleteData($table=null, ?int $id=null)
     }
   }
 
-  public function pages($table=null)
+  public function pages(?string $table=null)
   {
     $path = "$this->url/$table?select=*";
     $html = $this->grab($path, "GET");
     $data = json_decode($html, true);
     return $data;
   }
 
-  public function filter($table=null, ?int $range=null)
+  public function filter(?string $table=null, ?int $range=null)
   {
     $path = "$this->url/$table?id=eq.$range&select=*";
     $html = $this->grab($path, "GET");
     $data = json_decode($html, true);
     return $data;
   }
 
-  public function matchs($table=null, $query=[])
+  public function matchs(?string $table=null, array $query=[])
   {
     $path = "$this->url/$table";
     $html = $this->grab($path, "POST", json_encode($query));

src/Functions.php

@@ -1,13 +1,15 @@
 <?php
+declare(strict_types=1);
+
 namespace Supabase;
 use Exception;
 
 class Supabase
 {
-  private string|null $apikey;
-  protected string|null $url;
+  private $apikey;
+  protected $url;
 
-  public function __construct($url=null, $apikey=null)
+  public function __construct(?string $url=null, ?string $apikey=null)
   {
     if (!isset($url)){
       throw new Exception("Supabase URL must be specified");
@@ -19,25 +21,30 @@ public function __construct($url=null, $apikey=null)
     }
   }
 
-  protected function grab($url, $method, $data=null)
+  protected function grab(string $url, string $method, ?string $data=null)
   {
     $headers = array(
       "apikey: $this->apikey",
       "Authorization: Bearer $this->apikey",
-      "Content-Type: application/json",
-      "Prefer: return=minimal",
-      "Range: 0-9",
-      "Prefer: resolution=merge-duplicates"
+      'Content-Type: application/json',
+      'Accept: application/json',
+      'Prefer: return=minimal',
+      'Range: 0-9',
+      'Prefer: resolution=merge-duplicates'
     );
 
     $options = array(
       CURLOPT_URL => $url,
       CURLOPT_RETURNTRANSFER => true,
+      CURLOPT_SSL_VERIFYPEER => true,
+      CURLOPT_SSL_VERIFYHOST => 2,
       CURLOPT_HTTPHEADER => $headers,
       CURLOPT_CUSTOMREQUEST => $method,
-      CURLOPT_TIMEOUT => 120,
-      CURLOPT_ENCODING => "UTF-8",
-      CURLOPT_CONNECTTIMEOUT => 120
+      CURLOPT_TIMEOUT => 30,
+      CURLOPT_ENCODING => "",
+      CURLOPT_CONNECTTIMEOUT => 10,
+      CURLOPT_FRESH_CONNECT => true,
+      CURLOPT_FORBID_REUSE => true
     );
 
     $ch = curl_init();
@@ -50,7 +57,16 @@ protected function grab($url, $method, $data=null)
 
     if(curl_errno($ch)){
       $error = curl_error($ch);
-      echo "Error :". $error;
+      echo json_encode($error, JSON_PRETTY_PRINT);
+    }
+    
+    // Validate HTTP status code 
+    $http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+    
+    if ($http_code !== 200) {
+    echo "Request failed with status code $http_code";
+    curl_close($ch);
+    exit;
     }
     curl_close($ch);
   }