composer update

#8 - fix header json

composer.json

@@ -12,16 +12,11 @@
       "src/Client.php",
       "src/Settings.php",
       "src/Collection.php"
-    ],
+    ]
-    "psr-4": {
-      "Pb\\": "src/",
-      "Pb\\Exception\\": "src/exception"
-    }
   },
   "require": {
     "php": "^8.1|^8.2",
-    "ext-curl": "*",
+    "ext-curl": "*"
-    "guzzlehttp/guzzle": "^7.9"
   },
   "require-dev": {
     "phpunit/phpunit": "^11.5",

src/AuthTest.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace Pb;
+
+use PHPUnit\Framework\TestCase;
+
+final class AuthTest extends TestCase
+{
+
+    private Collection $collection;
+    private ?string $url;
+
+    protected function setUp(): void
+    {
+        $this->url = getenv('POCKETBASE_URL') ?: 'https://admin.pocketbase.dev';
+        $this->collection = new Collection($this->url, 'users');
+    }
+    public function testAuthUser(): void
+    {
+        $actual = $this->collection->authAsUser('support@jonathan-martz.de', 'rockt');
+        $expected = '{"data":{},"message":"Failed to authenticate.","status":400}';
+
+        $this->assertEquals($expected, trim($actual, PHP_EOL));
+    }
+
+    public function testAuthSuperUser(): void
+    {
+        $this->collection = new Collection($this->url, '_superusers');
+        $actual = $this->collection->authAsAdmin('admin@jonathan-martz.de', 'rockt');
+        $expected = '{"data":{},"message":"Failed to authenticate.","status":400}';
+
+        $this->assertEquals($expected, trim($actual, PHP_EOL));
+    }
+
+    public function testAuthSuperUser2(): void
+    {
+        $this->collection = new Collection($this->url, '_superusers');
+
+        $actual = $this->collection->authAsAdmin('admin@jonathan-martz.de', 'rockt');
+
+        $data = json_decode($actual,true);
+        $this->assertArrayHasKey('record',$data);
+        $this->assertArrayHasKey('token',$data);
+        $this->assertCount(8,$data['record']);
+    }
+}

src/Collection.php

@@ -2,8 +2,6 @@
 
 namespace Pb;
 
-use GuzzleHttp\Exception\GuzzleException;
-
 /**
  *
  */
@@ -29,10 +27,7 @@ class Collection
      * @param string $collection
      * @param string $token
      */
-    public function __construct(string $url,
+    public function __construct(string $url, string $collection, string $token = '')
-                                string $collection,
-                                string $token = ''
-    )
     {
         $this->url = $url;
         $this->collection = $collection;
@@ -41,6 +36,12 @@ class Collection
         }
     }
 
+    /**
+     * @param int $start
+     * @param int $end
+     * @param array $queryParams
+     * @return array
+     */
     public function getList(int $start = 1, int $end = 50, array $queryParams = []): array
     {
         $queryParams['perPage'] = $end;
@@ -50,6 +51,12 @@ class Collection
         return json_decode($response, JSON_FORCE_OBJECT);
     }
 
+    /**
+     * @param string $recordId
+     * @param string $field
+     * @param string $filepath
+     * @return void
+     */
     public function upload(string $recordId, string $field, string $filepath): void
     {
         $ch = curl_init($this->url . "/api/collections/" . $this->collection . "/records/" . $recordId);
@@ -69,16 +76,25 @@ class Collection
         $response = curl_exec($ch);
     }
 
-    public function authAsUser(string $email, string $password): array
+    /**
+     * @param string $email
+     * @param string $password
+     * @return void
+     */
+    public function authAsUser(string $email, string $password): string
     {
         $result = $this->doRequest($this->url . "/api/collections/users/auth-with-password", 'POST', ['identity' => $email, 'password' => $password]);
-        $result = json_decode($result, JSON_FORCE_OBJECT);
         if (!empty($result['token'])) {
             self::$token = $result['token'];
         }
         return $result;
     }
 
+    /**
+     * @param int $batch
+     * @param array $queryParams
+     * @return array
+     */
     public function getFullList(array $queryParams, int $batch = 200): array
     {
         $queryParams = [... $queryParams, 'perPage' => $batch];
@@ -88,72 +104,104 @@ class Collection
         return json_decode($response, JSON_FORCE_OBJECT);
     }
 
+    /**
+     * @param string $filter
+     * @param array $queryParams
+     * @return array
+     */
     public function getFirstListItem(string $filter, array $queryParams = []): array
     {
-        // TODO filter
         $queryParams['perPage'] = 1;
-        $queryParams['filter'] = $filter;
         $getParams = !empty($queryParams) ? http_build_query($queryParams) : "";
         $response = $this->doRequest($this->url . "/api/collections/" . $this->collection . "/records?" . $getParams, 'GET');
-
+        return json_decode($response, JSON_FORCE_OBJECT)['items'][0];
-        $data = json_decode($response, JSON_FORCE_OBJECT);
-        if (empty($data['items']) || count($data['items']) < 1) {
-            throw new exception\FirstListItemNotFoundException('First doesnt exists');
-        }
-
-        return $data['items'][0] ?? [];
     }
 
+    /**
+     * @param array $bodyParams
+     * @param array $queryParams
+     * @return void
+     */
     public function create(array $bodyParams = [], array $queryParams = []): string
     {
-        // TODO query params ?
         return $this->doRequest($this->url . "/api/collections/" . $this->collection . "/records", 'POST', $bodyParams);
     }
 
+    /**
+     * @param string $recordId
+     * @param array $bodyParams
+     * @param array $queryParams
+     * @return void
+     */
     public function update(string $recordId, array $bodyParams = [], array $queryParams = []): void
     {
         // Todo bodyParams equals json, currently workaround
         $this->doRequest($this->url . "/api/collections/" . $this->collection . "/records/" . $recordId, 'PATCH', $bodyParams);
     }
 
+    /**
+     * @param string $recordId
+     * @param array $queryParams
+     * @return void
+     */
     public function delete(string $recordId, array $queryParams = []): void
     {
-        // TODO params ?
         $this->doRequest($this->url . "/api/collections/" . $this->collection . "/records/" . $recordId, 'DELETE');
     }
 
     /**
-     * @throws GuzzleException
+     * @param string $recordId
+     * @param string $url
+     * @param string $method
+     * @return bool|string
      */
     public function doRequest(string $url, string $method, $bodyParams = []): string
     {
-        $tmp = $bodyParams;
+        // TODO move doRequestIntoService ?
-        $bodyParams = [];
+        // TODO replace curl with HttpClient
-        $bodyParams['json'] = $tmp;
+        $ch = curl_init();
-        $bodyParams['headers']['Content-Type'] = 'application/json';
 
         if (self::$token != '') {
-            $bodyParams['headers']['Authorization'] = 'Bearer ' . self::$token;
+            $headers = array(
+                'Authorization: ' . self::$token
+            );
+            curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
         }
 
-        $client = new \GuzzleHttp\Client();
+        if ($bodyParams) {
-        $response = $client->request($method, $url, $bodyParams);
+            curl_setopt($ch, CURLOPT_POSTFIELDS, $bodyParams);
-        return $response->getBody()->getContents() ?? '';
+        }
+
+        curl_setopt($ch, CURLOPT_URL, $url);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+        curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $method);
+        $output = curl_exec($ch);
+        curl_close($ch);
+
+        return $output;
     }
 
+    /**
+     * @param string $recordId
+     * @param array $queryParams
+     * @return mixed
+     */
     public function getOne(string $recordId, array $queryParams = []): array
     {
-        // TODO params ?
         $output = $this->doRequest($this->url . "/api/collections/" . $this->collection . "/records/" . $recordId, 'GET');
         return json_decode($output, JSON_FORCE_OBJECT);
     }
 
+    /**
+     * @param string $email
+     * @param string $password
+     * @return void
+     */
     public function authAsAdmin(string $email, string $password): string
     {
         $bodyParams['identity'] = $email;
         $bodyParams['password'] = $password;
         $output = $this->doRequest($this->url . "/api/collections/_superusers/auth-with-password", 'POST', $bodyParams);
-
         $token = json_decode($output, true)['token'];
         if ($token) {
             self::$token = $token;
@@ -161,36 +209,4 @@ class Collection
 
         return $output;
     }
-
-    public static function getAuthToken(): string
-    {
-        return self::$token;
-    }
-
-    public static function setAuthToken(string $token): void
-    {
-        self::$token = $token;
-    }
-
-    public function getUrl(): string
-    {
-        return $this->url;
-    }
-
-    public function setUrl(string $url): Collection
-    {
-        $this->url = $url;
-        return $this;
-    }
-
-    public function getCollection(): string
-    {
-        return $this->collection;
-    }
-
-    public function setCollection(string $collection): Collection
-    {
-        $this->collection = $collection;
-        return $this;
-    }
 }

src/Settings.php

@@ -41,7 +41,6 @@ class Settings
 
         if (self::$token != '') {
             $headers = array(
-                'Content-Type:application/json',
                 'Authorization: ' . self::$token
             );
             curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);

src/exception/FirstListItemNotFoundException.php

@@ -1,14 +0,0 @@
-<?php
-
-namespace Pb\Exception;
-
-class FirstListItemNotFoundException extends \Exception
-{
-
-    /**
-     * @param string $string
-     */
-    public function __construct(string $string)
-    {
-    }
-}

tests/AuthTest.php

@@ -1,38 +0,0 @@
-<?php
-
-use GuzzleHttp\Exception\ClientException;
-use Pb\Collection;
-use PHPUnit\Framework\TestCase;
-
-final class AuthTest extends TestCase
-{
-
-    private Collection $collection;
-    private ?string $url;
-
-    protected function setUp(): void
-    {
-        $this->url = getenv('POCKETBASE_URL') ?: 'https://admin.pocketbase.dev';
-        $this->collection = new Collection($this->url, 'users');
-    }
-    public function testAuthUser(): void
-    {
-        $this->expectException(ClientException::class);
-        $this->collection->authAsUser('support@jonathan-martz.de', 'rockt');
-    }
-
-    public function testAuthSuperUser(): void
-    {
-        $this->collection = new Collection($this->url, '_superusers');
-        $this->expectException(ClientException::class);
-        $this->collection->authAsAdmin('admin@jonathan-martz.de', 'rockt');
-    }
-
-    public function testAuthSuperUser2(): void
-    {
-        $this->collection = new Collection($this->url, '_superusers');
-
-        $this->expectException(ClientException::class);
-        $this->collection->authAsAdmin('admin@jmartz.de', 'rockt123?!');
-    }
-}

tests/CollectionCreateTest.php

@@ -1,35 +0,0 @@
-<?php
-
-use GuzzleHttp\Exception\ClientException;
-use Pb\Collection;
-use PHPUnit\Framework\TestCase;
-
-class CollectionCreateTest extends TestCase
-{
-    private string $url;
-    private Collection $collection;
-
-    protected function setUp(): void
-    {
-        $this->url = getenv('POCKETBASE_URL') ?: 'https://admin.pocketbase.dev';
-        $this->collection = new Collection($this->url, 'users');
-    }
-
-    public function testCreateCollectionItem(){
-        $this->expectException(ClientException::class);
-        $this->expectExceptionCode(403);
-        $this->collection->create(['name' => 'Hallo Welt']);
-    }
-
-    public function testCreateCollectionItemAuthed(){
-        $this->collection->authAsUser('admin@jmartz.de', 'rockt123?!');#
-        self::assertNotEmpty($this->collection->getAuthToken());
-    }
-
-    public function testCreateCollectionItemAuthedAdmin(){
-        $this->collection->authAsAdmin('admin@jonathan-martz.de', 'rockt123?!');
-        $response = $this->collection->create(['email' => 'test@jonathan-martz.de','password' => 'rockt123?!','passwordConfirm' => 'rockt123?!']);
-        var_dump($response);
-        self::assertNotEmpty($this->collection->getAuthToken());
-    }
-}

tests/CollectionGetFirstListItemTest.php

@@ -1,7 +1,6 @@
 <?php
 
 use Pb\Collection;
-use Pb\Exception\FirstListItemNotFoundException;
 use PHPUnit\Framework\TestCase;
 
 final class CollectionGetFirstListItemTest extends TestCase
@@ -14,22 +13,43 @@ final class CollectionGetFirstListItemTest extends TestCase
         $this->collection = new Collection($url, 'users');
     }
 
-    /**
-     * @throws FirstListItemNotFoundException
-     */
     public function test_getOne(): void
     {
         $id = '6588yk36406qqv1';
         $actual = $this->collection->getFirstListItem('id="'.$id.'"');
+        $expected = [
+            'avatar' => '',
+            'collectionId' => '_pb_users_auth_',
+            'collectionName' => 'users',
+            'created' => '2025-01-21 21:22:47.002Z',
+            'emailVisibility' => false,
+            'id' => '6588yk36406qqv1',
+            'name' => 'Jonathan Martz',
+            'updated' => '2025-01-21 21:22:47.002Z',
+            'verified' => true
+        ];
 
-        $this->assertEquals($id, $actual['id']);
+        $this->assertEquals($expected, $actual);
         $this->assertCount(9, $actual);
     }
 
     public function test_getOneWrongId(): void
     {
-        $id = '6588yk36406qqvb';
+        $id = '6588yk36406qqva';
-        $this->expectException(FirstListItemNotFoundException::class);
+        $actual = $this->collection->getFirstListItem('id="'.$id.'"');
-        $this->collection->getFirstListItem('id="'.$id.'"');
+        $expected = [
+            'avatar' => '',
+            'collectionId' => '_pb_users_auth_',
+            'collectionName' => 'users',
+            'created' => '2025-01-21 21:22:47.002Z',
+            'emailVisibility' => false,
+            'id' => '6588yk36406qqv1',
+            'name' => 'Jonathan Martz',
+            'updated' => '2025-01-21 21:22:47.002Z',
+            'verified' => true
+        ];
+
+        $this->assertEquals($expected, $actual);
+        $this->assertCount(9,$actual);
     }
 }

tests/CollectionGetOneTest.php

@@ -1,6 +1,5 @@
 <?php
 
-use GuzzleHttp\Exception\ClientException;
 use Pb\Collection;
 use PHPUnit\Framework\TestCase;
 
@@ -19,15 +18,33 @@ final class CollectionGetOneTest extends TestCase
     {
         $id = '6588yk36406qqv1';
         $actual = $this->collection->getOne($id);
+        $expected = [
+            'avatar' => '',
+            'collectionId' => '_pb_users_auth_',
+            'collectionName' => 'users',
+            'created' => '2025-01-21 21:22:47.002Z',
+            'emailVisibility' => false,
+            'id' => '6588yk36406qqv1',
+            'name' => 'Jonathan Martz',
+            'updated' => '2025-01-21 21:22:47.002Z',
+            'verified' => true
+        ];
 
-        $this->assertEquals($id, $actual['id']);
+        $this->assertEquals($expected, $actual);
         $this->assertCount(9, $actual);
     }
 
     public function test_getOneWrongId(): void
     {
         $id = '6588yk36406qqva';
-        $this->expectException(ClientException::class);
+        $actual = $this->collection->getOne($id);
-        $this->collection->getOne($id);
+        $expected = [
+            'data' => [],
+            'message' => "The requested resource wasn't found.",
+            'status' => 404,
+        ];
+
+        $this->assertEquals($expected, $actual);
+        $this->assertCount(3,$actual);
     }
 }