Code with sushil patch 1 (Ashishkumbhar01#61)

* update

* .env file load setup

* .env file load setup update

* .env file load setup update

* Rename .env.example to .env

* Update .env

* .env.example

* composer psr-4 update

* update

* update

* Delete .env

Author: CodeWithSushil

.env.example

@@ -1,7 +1,2 @@
-# Supabase Config
-
-# Supabase database URL
-SB_URL=https://[your].supabase.co
-
-# Supabase Anon or `service_role` API key.
-SB_APIKEY= your anon api key
+URL=
+API_KEY=

composer.json

@@ -21,7 +21,7 @@
     "license": "MIT",
     "autoload": {
         "psr-4": {
-            "Supabase\\Client\\": "src/"
+            "Supabase\\": "src/"
         }
     },
     "autoload-dev": {
@@ -55,10 +55,11 @@
         "post-root-package-install": [
             "@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
         ],
-        "unit": "phpunit",
-        "types": "phpstan analyse --ansi",
+        "test:unit": "phpunit",
+        "test:type": "phpstan analyse --ansi",
         "test": [
-            "@unit"
+            "@test:unit",
+            "@test:type"
         ]
     },
     "minimum-stability": "dev",

phpstan.neon.dist

@@ -2,6 +2,5 @@ parameters:
   level: max
   paths:
     - src
-    - tests
 
   reportUnmatchedIgnoredErrors: true

src/Exceptions.php

@@ -1,6 +1,6 @@
-<?php
-declare(strict_types=1);
-namespace Supabase\Client;
+<?php declare(strict_types=1);
+
+namespace Supabase;
 
 class Exceptions extends Exception {
   public static function Error()

src/Functions.php

@@ -1,8 +1,8 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
-namespace Supabase\Client;
-use Supabase\Client\Supabase;
+namespace Supabase;
+
+use Supabase\Supabase;
 
 class Functions extends Supabase
 {

src/Supabase.php

@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Supabase\Client;
+namespace Supabase;
 use Exception;
 
 class Supabase

src/Util/EnvSetup.php

@@ -0,0 +1,40 @@
+<?php
+namespace Supabase\Util;
+
+use Dotenv\Dotenv;
+
+class EnvSetup
+{
+    public static function env($path): array
+    {
+        // If the env vars are set and not empty use them
+        $key = getenv('API_KEY');
+        $url = getenv('URL');
+
+        // else check try to load the .env file in the $path
+        if (empty($key) || empty($url)) {
+            $loaded = Dotenv::createArrayBacked($path)->safeLoad();
+
+            if (key_exists('API_KEY', $loaded)) {
+                $key = $loaded['API_KEY'];
+            }
+
+            if (key_exists('URL', $loaded)) {
+                $url = $loaded['URL'];
+            }
+        }
+
+        if (empty($key)) {
+            throw new \Exception('Could not load API_KEY');
+        }
+
+        if (empty($url)) {
+            throw new \Exception('Could not load URL');
+        }
+
+        return [
+            'API_KEY' => $key,
+            'URL' => $url,
+        ];
+    }
+}

tests/SupabaseTest.php

@@ -5,25 +5,21 @@
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
-use Supabase\Client\Functions as Supabase;
-use Dotenv\Dotenv;
+use Supabase\Functions as Supabase;
+use Supabase\Util\EnvSetup;
 
-#[CoversClass(Functions::class)]
+#[CoversClass(Supabase::class)]
 class SupabaseTest extends TestCase
 {
     #[Test]
-    public function connected()
+    public function setUp() :void
     {
-        $dotenv = Dotenv::createImmutable(__DIR__);
-        $dotenv->safeLoad();
+        parent::setUp();
+        $keys = EnvSetup::env(__DIR__.'/../');
+        $key = $keys['API_KEY'];
+        $url = $keys['URL'];
 
-        $config = [
-            'url' => $_ENV['URL'],
-            'apikey' => $_ENV['APIKEY']
-        ];
-
-        $client = new Supabase($config['url'], $config['apikey']);
+        $client = new Supabase($url, $key);
         $this->assertInstanceOf(Supabase::class, $client);
-       // $this->assertTrue($client->getAllData('Users'));
     }
 }