Getting integration tests to run again.

composer.json

@@ -5,7 +5,7 @@
     "keywords": ["supabase","postgrest", "postgrest-php"],
     "homepage": "https://github.com/supabase-community/postgrest-php",
     "autoload": {
-        "psr-0": { "": "src/" },
+	 "psr-0": { "": "src/" },
         "psr-4": {
             "Supabase\\Postgrest\\": "src/"
         }

src/Postgrest.php

@@ -1,8 +1,8 @@
 <?php
 namespace Supabase\Postgrest;
 
-use Supabase\Util\PostgrestError;
-use Supabase\Util\Request;
+use Supabase\Postgrest\Util\PostgrestError;
+use Supabase\Postgrest\Util\Request;
 
 class Postgrest
 {

src/PostgrestClient.php

@@ -3,7 +3,7 @@
 namespace Supabase\Postgrest;
 
 use Spatie\Url\Url;
-use Supabase\Util\Constants;
+use Supabase\Postgrest\Util\Constants;
 
 class PostgrestClient
 {

src/PostgrestQuery.php

@@ -1,6 +1,8 @@
 <?php
 namespace Supabase\Postgrest;
 
+use Supabase\Postgrest\PostgrestFilter;
+
 class PostgrestQuery
 {
 	public $url;

src/Util/Constants.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Supabase\Util;
+namespace Supabase\Postgrest\Util;
 
 class Constants
 {

src/Util/EnvSetup.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Supabase\Util;
+namespace Supabase\Postgrest\Util;
 
 use Dotenv\Dotenv;
 

src/Util/PostgrestApiError.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Supabase\Util;
+namespace Supabase\Postgrest\Util;
 
 class PostgrestApiError extends PostgrestError
 {

src/Util/PostgrestError.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Supabase\Util;
+namespace Supabase\Postgrest\Util;
 
 class PostgrestError extends \Exception
 {

src/Util/PostgrestUnknownError.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Supabase\Util;
+namespace Supabase\Postgrest\Util;
 
 class PostgrestUnknownError extends PostgrestError
 {

src/Util/Request.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Supabase\Util;
+namespace Supabase\Postgrest\Util;
 
 use Psr\Http\Message\ResponseInterface;
 

tests/integration/PostgrestClientTest.php

@@ -1,8 +1,10 @@
 <?php
 
 declare(strict_types=1);
-require 'vendor/autoload.php';
+
 use PHPUnit\Framework\TestCase;
+use Supabase\Postgrest\PostgrestClient;
+use Supabase\Postgrest\Util\EnvSetup;
 
 final class PostgrestClientTest extends TestCase
 {
@@ -11,16 +13,12 @@ final class PostgrestClientTest extends TestCase
 	public function setup(): void
 	{
 		parent::setUp();
-		\Dotenv\Dotenv::createImmutable(__DIR__);
-		$dotenv = \Dotenv\Dotenv::createUnsafeImmutable(__DIR__, '/../../.env.test');
-		$dotenv->load();
-		$api_key = getenv('API_KEY');
-		$reference_id = getenv('REFERENCE_ID');
-		$scheme = 'https://';
-		$domain = '.supabase.co/';
-		$path = 'rest/v1/';
-		$opts = [];
-		$this->client = new PostgrestClient($reference_id, $api_key, $opts, $domain, $scheme, $path);
+
+		$keys = EnvSetup::env(__DIR__.'/../');
+		$api_key = $keys['API_KEY'];
+		$reference_id = $keys['REFERENCE_ID'];
+
+		$this->client = new PostgrestClient($reference_id, $api_key);
 	}
 
 	public function testBulkProcessing(): void

tests/integration/PostgrestTest.php

@@ -1,8 +1,10 @@
 <?php
 
 declare(strict_types=1);
-require 'vendor/autoload.php';
+
 use PHPUnit\Framework\TestCase;
+use Supabase\Postgrest\PostgrestClient;
+use Supabase\Postgrest\Util\EnvSetup;
 
 final class PostgrestTest extends TestCase
 {
@@ -11,16 +13,12 @@ final class PostgrestTest extends TestCase
 	public function setup(): void
 	{
 		parent::setUp();
-		\Dotenv\Dotenv::createImmutable(__DIR__);
-		$dotenv = \Dotenv\Dotenv::createUnsafeImmutable(__DIR__, '/../../.env.test');
-		$dotenv->load();
-		$api_key = getenv('API_KEY');
-		$reference_id = getenv('REFERENCE_ID');
-		$scheme = 'https://';
-		$domain = '.supabase.co/';
-		$path = 'rest/v1/';
-		$opts = [];
-		$this->client = new PostgrestClient($reference_id, $api_key, $opts, $domain, $scheme, $path);
+
+		$keys = EnvSetup::env(__DIR__.'/../');
+		$api_key = $keys['API_KEY'];
+		$reference_id = $keys['REFERENCE_ID'];
+
+		$this->client = new PostgrestClient($reference_id, $api_key);
 	}
 
 	/**