fix(deps): update dependency guzzlehttp/psr7 to v3

Reviewed-on: #63

.github/workflows/php-integration-tests.yml

@@ -0,0 +1,59 @@
+name: PHP Integration Tests
+
+on:
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  test:
+    name: Integration Tests
+    runs-on: ubuntu-latest
+    services:
+      mongo:
+        image: mongo:8
+        options: >-
+          --health-cmd "mongosh --quiet --eval \"db.adminCommand('ping')\""
+          --health-interval 5s
+          --health-timeout 5s
+          --health-retries 12
+
+    steps:
+      - name: Retrieve Server Install Action
+        uses: actions/checkout@v6.0.2
+        with:
+          repository: Nodarx/action-server-install
+          ref: main
+          path: action-server-install
+          github-server-url: https://git.ktrix.dev
+
+      - name: Install server
+        uses: ./action-server-install
+        with:
+          install-php: 'true'
+          php-version: '8.5'
+          server-path: './server'
+          database-uri: 'mongodb://mongo:27017/?tls=false'
+          database-name: 'ktrix_ci'
+          app-environment: 'test'
+
+      - name: Checkout module under test
+        uses: actions/checkout@v6.0.2
+        with:
+          repository: ${{ github.repository }}
+          ref: ${{ github.event.pull_request.head.sha || github.sha }}
+          path: server/modules/provider_jmapc
+          github-server-url: https://git.ktrix.dev
+
+      - name: Install module dependencies
+        run: composer install --prefer-dist --no-progress
+        working-directory: server/modules/provider_jmapc
+
+      - name: Install and enable module
+        working-directory: server
+        run: |
+          php bin/console module:install provider_jmapc
+          php bin/console module:enable provider_jmapc
+
+      - name: Run integration tests
+        working-directory: server/modules/provider_jmapc
+        run: composer test:integration

.github/workflows/renovate.yml

@@ -25,11 +25,17 @@ jobs:
           tools: composer:v2
 
       - name: Install Renovate
-        run: npm install -g renovate
+        run: |
+          npm install --global --no-audit --fund=false \
+            --prefix "${{ runner.temp }}/renovate-npm" \
+            --cache "${{ runner.temp }}/renovate-npm-cache" \
+            renovate
+          "${{ runner.temp }}/renovate-npm/bin/renovate" --version
 
       - name: Run Renovate
         env:
           RENOVATE_TOKEN: ${{ secrets.RENOVATE_TOKEN }}
           RENOVATE_PLATFORM: gitea
           RENOVATE_ENDPOINT: https://git.ktrix.dev/api/v1
-        run: renovate ${{ gitea.repository }}
+        run: |
+          "${{ runner.temp }}/renovate-npm/bin/renovate" ${{ gitea.repository }}

.gitignore

@@ -14,11 +14,7 @@ node_modules/
 # Backend development
 /lib/vendor/
 coverage/
-phpunit.xml.cache
-.phpunit.cache
-.phpunit.result.cache
-.php-cs-fixer.cache
-.phpstan.cache
+*.cache
 .phpactor/
 
 # Editors

composer.json

@@ -10,7 +10,7 @@
   "config": {
     "optimize-autoloader": true,
     "platform": {
-      "php": "8.2"
+      "php": "8.3"
     },
     "autoloader-suffix": "ProviderJmapc",
     "vendor-dir": "lib/vendor",
@@ -26,12 +26,12 @@
   ],
   "require": {
     "guzzlehttp/guzzle": "^7.0",
-    "guzzlehttp/psr7": "^2.0",
-    "php": ">=8.2 <=8.5",
+    "guzzlehttp/psr7": "^3.0",
+    "php": ">=8.3 <=8.5",
     "sebastiankrupinski/jmap-client-php": "dev-main"
   },
   "require-dev": {
-    "phpunit/phpunit": "^11.0"
+    "phpunit/phpunit": "^12.0"
   },
   "autoload": {
     "psr-4": {
@@ -48,7 +48,8 @@
       ],
       "post-update-cmd": [
       ],
-      "test:unit": "phpunit --configuration tests/php/phpunit.unit.xml --colors=always --testdox",
-      "test:coverage": "XDEBUG_MODE=coverage phpunit --configuration tests/php/phpunit.unit.xml --coverage-html .phpunit.coverage --coverage-text"
+      "test:unit": "phpunit --configuration tests/php/phpunit.xml --testsuite \"Unit Tests\" --colors=always --testdox",
+      "test:integration": "phpunit --configuration tests/php/phpunit.xml --testsuite \"Integration Tests\" --colors=always --testdox",
+      "test:coverage": "XDEBUG_MODE=coverage phpunit --configuration tests/php/phpunit.xml --testsuite \"Unit Tests\" --coverage-html .phpunit.coverage --coverage-text"
   }
 }

lib/Providers/Document/CollectionProperties.php

@@ -9,7 +9,7 @@ declare(strict_types=1);
 
 namespace KTXM\ProviderJmapc\Providers\Document;
 
-use KTXF\Resource\Documents\Collection\CollectionPropertiesMutableAbstract;
+use KTXF\Documents\Collection\CollectionPropertiesMutableAbstract;
 
 /**
  * Document Collection Properties Implementation

lib/Providers/Document/CollectionResource.php

@@ -9,7 +9,7 @@ declare(strict_types=1);
 
 namespace KTXM\ProviderJmapc\Providers\Document;
 
-use KTXF\Resource\Documents\Collection\CollectionMutableAbstract;
+use KTXF\Documents\Collection\CollectionMutableAbstract;
 
 /**
  * Document Collection Resource Implementation

lib/Providers/Document/EntityProperties.php

@@ -9,7 +9,7 @@ declare(strict_types=1);
 
 namespace KTXM\ProviderJmapc\Providers\Document;
 
-use KTXF\Resource\Documents\Entity\EntityPropertiesMutableAbstract;
+use KTXF\Documents\Entity\EntityPropertiesMutableAbstract;
 
 /**
  * Document Collection Properties Implementation

lib/Providers/Document/EntityResource.php

@@ -9,7 +9,7 @@ declare(strict_types=1);
 
 namespace KTXM\ProviderJmapc\Providers\Document;
 
-use KTXF\Resource\Documents\Entity\EntityMutableAbstract;
+use KTXF\Documents\Entity\EntityMutableAbstract;
 
 /**
  * Mail Entity Resource Implementation

lib/Providers/Document/Provider.php

@@ -9,11 +9,11 @@ declare(strict_types=1);
 
 namespace KTXM\ProviderJmapc\Providers\Document;
 
-use KTXF\Resource\Documents\Provider\ProviderBaseInterface;
-use KTXF\Resource\Documents\Provider\ProviderServiceMutateInterface;
-use KTXF\Resource\Documents\Provider\ProviderServiceTestInterface;
-use KTXF\Resource\Documents\Service\ServiceBaseInterface;
-use KTXF\Resource\Documents\Service\ServiceMutableInterface;
+use KTXF\Documents\Provider\ProviderBaseInterface;
+use KTXF\Documents\Provider\ProviderServiceMutateInterface;
+use KTXF\Documents\Provider\ProviderServiceTestInterface;
+use KTXF\Documents\Service\ServiceBaseInterface;
+use KTXF\Documents\Service\ServiceMutableInterface;
 use KTXF\Resource\Provider\ResourceServiceLocationInterface;
 use KTXF\Resource\Provider\ResourceServiceMutateInterface;
 use KTXM\ProviderJmapc\Service\Discovery;
@@ -21,9 +21,9 @@ use KTXM\ProviderJmapc\Service\Remote\RemoteService;
 use KTXM\ProviderJmapc\Stores\ServiceStore;
 
 /**
- * JMAP Mail Provider
+ * JMAP Documents Provider
  */
-class Provider implements ProviderServiceMutateInterface, ProviderServiceTestInterface
+class Provider implements ProviderBaseInterface, ProviderServiceMutateInterface, ProviderServiceTestInterface
 {
 
     public const JSON_TYPE = ProviderBaseInterface::JSON_TYPE;
@@ -63,7 +63,7 @@ class Provider implements ProviderServiceMutateInterface, ProviderServiceTestInt
 
     public function type(): string
     {
-        return self::TYPE_MAIL;
+        return self::TYPE_DOCUMENT;
     }
 
     public function identifier(): string
@@ -170,7 +170,7 @@ class Provider implements ProviderServiceMutateInterface, ProviderServiceTestInt
         return $discovery->discover($identity, $location, $secret, $verifySSL);
     }
 
-    public function serviceTest(ServiceBaseInterface $service, array $options = []): array {
+    public function serviceTest(ServiceBaseInterface|ServiceMutableInterface $service, array $options = []): array {
         $startTime = microtime(true);
 
         try {

lib/Providers/Document/Service.php

@@ -10,17 +10,20 @@ declare(strict_types=1);
 namespace KTXM\ProviderJmapc\Providers\Document;
 
 use Generator;
-use KTXF\Resource\Provider\ResourceServiceIdentityInterface;
-use KTXF\Resource\Provider\ResourceServiceLocationInterface;
+use KTXF\Documents\Collection\CollectionBaseInterface;
+use KTXF\Documents\Collection\CollectionMutableInterface;
+use KTXF\Documents\Collection\CollectionPropertiesBaseInterface;
+use KTXF\Documents\Service\ServiceBaseInterface;
+use KTXF\Documents\Service\ServiceCollectionMutableInterface;
+use KTXF\Documents\Service\ServiceConfigurableInterface;
+use KTXF\Documents\Service\ServiceMutableInterface;
 use KTXF\Resource\Delta\Delta;
-use KTXF\Resource\Documents\Collection\CollectionBaseInterface;
-use KTXF\Resource\Documents\Collection\CollectionMutableInterface;
-use KTXF\Resource\Documents\Service\ServiceBaseInterface;
-use KTXF\Resource\Documents\Service\ServiceCollectionMutableInterface;
-use KTXF\Resource\Documents\Service\ServiceConfigurableInterface;
-use KTXF\Resource\Documents\Service\ServiceMutableInterface;
 use KTXF\Resource\Filter\Filter;
 use KTXF\Resource\Filter\IFilter;
+use KTXF\Resource\Identifier\CollectionIdentifierInterface;
+use KTXF\Resource\Identifier\EntityIdentifierInterface;
+use KTXF\Resource\Provider\ResourceServiceIdentityInterface;
+use KTXF\Resource\Provider\ResourceServiceLocationInterface;
 use KTXF\Resource\Range\IRange;
 use KTXF\Resource\Range\Range;
 use KTXF\Resource\Range\RangeType;
@@ -316,18 +319,30 @@ class Service implements ServiceBaseInterface, ServiceMutableInterface, ServiceC
         return new CollectionResource(provider: $this->provider(), service: $this->identifier());
     }
 
-    public function collectionCreate(string|int|null $location, CollectionMutableInterface $collection, array $options = []): CollectionBaseInterface
+    /**
+     * Convert incoming collection properties into a native CollectionResource
+     */
+    private function collectionNative(CollectionPropertiesBaseInterface $properties, string|int|null $identifier = null): CollectionResource
+    {
+        if ($properties instanceof CollectionResource) {
+            return clone $properties;
+        }
+        $object = new CollectionResource(provider: $this->provider(), service: $this->identifier());
+        $object->jsonDeserialize(array_filter([
+            CollectionResource::PROPERTY_IDENTIFIER => $identifier,
+            CollectionResource::PROPERTY_PROPERTIES => $properties->jsonSerialize(),
+        ], fn($v) => $v !== null));
+        return $object;
+    }
+
+    public function collectionCreate(CollectionIdentifierInterface|null $target, CollectionPropertiesBaseInterface $properties, array $options = []): CollectionBaseInterface
     {
         $this->initialize();
 
-        if ($collection instanceof CollectionResource === false) {
-            $object = new CollectionResource(provider: $this->provider(), service: $this->identifier());
-            $object->jsonDeserialize($collection->jsonSerialize());
-            $collection = $object;
-        }
+        $collection = $this->collectionNative($properties);
 
         $collection = $collection->toJmap();
-        $collection = $this->remoteService->collectionCreate($location, $collection, $options);
+        $collection = $this->remoteService->collectionCreate($target?->collection(), $collection, $options);
 
         $object = new CollectionResource(provider: $this->provider(), service: $this->identifier());
         $object->fromJmap($collection);
@@ -335,15 +350,12 @@ class Service implements ServiceBaseInterface, ServiceMutableInterface, ServiceC
         return $object;
     }
 
-    public function collectionUpdate(string|int $identifier, CollectionMutableInterface $collection): CollectionBaseInterface
+    public function collectionUpdate(CollectionIdentifierInterface $target, CollectionPropertiesBaseInterface $properties): CollectionBaseInterface
     {
         $this->initialize();
 
-        if ($collection instanceof CollectionResource === false) {
-            $object = new CollectionResource(provider: $this->provider(), service: $this->identifier());
-            $object->jsonDeserialize($collection->jsonSerialize());
-            $collection = $object;
-        }
+        $identifier = $target->collection();
+        $collection = $this->collectionNative($properties, $identifier);
 
         $collection = $collection->toJmap();
         $collection = $this->remoteService->collectionModify($identifier, $collection);
@@ -354,14 +366,17 @@ class Service implements ServiceBaseInterface, ServiceMutableInterface, ServiceC
         return $object;
     }
 
-    public function collectionDelete(string|int $identifier, bool $force = false, bool $recursive = false): bool
+    public function collectionDelete(CollectionIdentifierInterface $target, bool $force = false): CollectionBaseInterface | true
     {
         $this->initialize();
 
-        return $this->remoteService->collectionDestroy($identifier, $force, $recursive) !== null;
+        if ($this->remoteService->collectionDestroy($target->collection(), $force, $force) === null) {
+            throw new \RuntimeException("Failed to delete collection: {$target->collection()}");
+        }
+        return true;
     }
 
-    public function collectionMove(string|int $identifier, string|int|null $targetLocation): CollectionBaseInterface
+    public function collectionMove(CollectionIdentifierInterface|null $target, CollectionIdentifierInterface $source): CollectionBaseInterface
     {
         // TODO: Implement collection move
         $this->initialize();
@@ -369,12 +384,20 @@ class Service implements ServiceBaseInterface, ServiceMutableInterface, ServiceC
         return $collection;
     }
 
+    public function collectionCopy(CollectionIdentifierInterface|null $target, CollectionIdentifierInterface $source): CollectionBaseInterface
+    {
+        // TODO: Implement collection copy
+        $this->initialize();
+        $collection = new CollectionResource(provider: $this->provider(), service: $this->identifier());
+        return $collection;
+    }
+
     // Entity operations
 
-    public function entityList(string|int|null $collection, ?IFilter $filter = null, ?ISort $sort = null, ?IRange $range = null, ?array $properties = null): array
+    public function entityListBulk(string|int|null $collection, ?IFilter $filter = null, ?ISort $sort = null, ?IRange $range = null, ?array $properties = null): array
     {
         $this->initialize();
-        
+
         $result = $this->remoteService->entityList($collection, $filter, $sort, $range, $properties);
 
         $list = [];
@@ -390,7 +413,7 @@ class Service implements ServiceBaseInterface, ServiceMutableInterface, ServiceC
         return $list;
     }
 
-    public function entityListStream(string|int $collection, ?IFilter $filter = null, ?ISort $sort = null, ?IRange $range = null, ?array $properties = null): Generator
+    public function entityListStream(string|int|null $collection, ?IFilter $filter = null, ?ISort $sort = null, ?IRange $range = null, ?array $properties = null): Generator
     {
         $this->initialize();
         
@@ -421,11 +444,11 @@ class Service implements ServiceBaseInterface, ServiceMutableInterface, ServiceC
         return new Range();
     }
 
-    public function entityDelta(string|int|null $collection, string $signature, string $detail = 'ids'): Delta
+    public function entityDelta(string|int|null $collection, string $signature): Delta
     {
         $this->initialize();
 
-        return $this->remoteService->entityDelta($collection, $signature, $detail);
+        return $this->remoteService->entityDelta($collection, $signature, 'ids');
     }
 
     public function entityExtant(string|int|null $collection, string|int ...$identifiers): array
@@ -435,48 +458,45 @@ class Service implements ServiceBaseInterface, ServiceMutableInterface, ServiceC
         return $this->remoteService->entityExtant(...$identifiers);
     }
 
-    public function entityFetch(string|int|null $collection, string|int ...$identifiers): array
+    public function entityFetchBulk(EntityIdentifierInterface ...$identifiers): array
     {
         $this->initialize();
 
-        $entities = $this->remoteService->entityFetch(...$identifiers);
-        
-        foreach ($entities as &$entity) {
+        $entityIds = array_map(fn($identifier) => $identifier->entity(), $identifiers);
+        $entities = $this->remoteService->entityFetch(...$entityIds);
+
+        $list = [];
+        foreach ($entities as $key => $entity) {
             if (is_array($entity) && isset($entity['id'])) {
                 $object = new EntityResource(provider: $this->provider(), service: $this->identifier());
                 $object->fromJmap($entity);
-                $entity = $object;
+                $list[$object->identifier()] = $object;
+            } else {
+                $list[$key] = $entity;
             }
         }
 
-        return $entities;
+        return $list;
     }
 
-    public function entityRead(string|int|null $collection, string|int $identifier): ?string
+    public function entityFetchStream(EntityIdentifierInterface ...$identifiers): Generator
+    {
+        yield from $this->entityFetchBulk(...$identifiers);
+    }
+
+    public function entityRead(EntityIdentifierInterface $target): ?string
     {
         return null;
     }
 
-    // Node operations
-
-    public function nodeList(string|int|null $collection, bool $recursive = false, ?IFilter $filter = null, ?ISort $sort = null, ?IRange $range = null, ?array $properties = null): array
+    public function entityReadStream(EntityIdentifierInterface $target)
     {
-        return [];
+        return null;
     }
 
-    public function nodeListFilter(): IFilter
+    public function entityReadChunk(EntityIdentifierInterface $target, int $offset, int $length): ?string
     {
-        return new Filter(['']);
-    }
-
-    public function nodeListSort(): ISort
-    {
-        return new Sort(['']);
-    }
-
-    public function nodeDelta(string|int|null $collection, string $signature, string $detail = 'ids'): Delta
-    {
-        return new Delta();
+        return null;
     }
 
 }

lib/Providers/Mail/Provider.php

@@ -142,7 +142,7 @@ class Provider implements ProviderBaseInterface, ProviderServiceMutateInterface,
         }
 
         $created = $this->serviceStore->create($tenantId, $userId, $service);
-        return (string) $created['id'];
+        return (string) $created['sid'];
     }
 
     public function serviceModify(string $tenantId, string $userId, ResourceServiceMutateInterface $service): string
@@ -151,8 +151,8 @@ class Provider implements ProviderBaseInterface, ProviderServiceMutateInterface,
             throw new \InvalidArgumentException('Service must be instance of JMAP Service');
         }
 
-        $updated = $this->serviceStore->modify($tenantId, $userId, $service);
-        return (string) $updated['sid'];
+        $this->serviceStore->modify($tenantId, $userId, $service);
+        return (string) $service->identifier();
     }
 
     public function serviceDestroy(string $tenantId, string $userId, ResourceServiceMutateInterface $service): bool

package.json

@@ -27,9 +27,12 @@
     "@vitejs/plugin-vue": "^6.0.1",
     "@vitest/coverage-v8": "^4.0.18",
     "@vitest/ui": "^4.0.18",
+    "@vue/test-utils": "^2.4.10",
     "@vue/tsconfig": "^0.9.0",
+    "jsdom": "^29.1.1",
     "typescript": "~6.0.0",
     "vite": "^8.0.0",
+    "vitest": "^4.0.18",
     "vue-tsc": "^3.0.5"
   }
 }

tests/js/vitest.config.ts

@@ -1,17 +1,17 @@
 import { fileURLToPath } from 'node:url'
 import { defineConfig, configDefaults } from 'vitest/config'
 import vue from '@vitejs/plugin-vue'
-import vuetify from 'vite-plugin-vuetify'
 import path from 'path'
 
 const __filename = fileURLToPath(import.meta.url)
 const __dirname = path.dirname(__filename)
 
 export default defineConfig({
-  plugins: [vue(), vuetify()],
+  plugins: [vue()],
   resolve: {
     alias: {
-      '@KTXC': path.resolve(__dirname, '../../../core/src'),
+      '@': path.resolve(__dirname, '../../src'),
+      '@KTXC': path.resolve(__dirname, '../../../../core/src'),
     },
   },
   test: {

tests/php/Integration/BaseTest.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace KTXT\ProviderJmapc\Integration;
+
+use PHPUnit\Framework\TestCase;
+
+class BaseTest extends TestCase
+{
+    public function testBasicAssertion(): void
+    {
+        $this->assertTrue(true);
+    }
+
+    public function testArrayOperations(): void
+    {
+        $array = ['foo' => 'bar'];
+
+        $this->assertArrayHasKey('foo', $array);
+        $this->assertEquals('bar', $array['foo']);
+    }
+
+    public function testStringOperations(): void
+    {
+        $string = 'Hello, World!';
+
+        $this->assertStringContainsString('World', $string);
+        $this->assertEquals(13, strlen($string));
+    }
+}

tests/php/bootstrap.php

@@ -2,6 +2,16 @@
 
 require dirname(__DIR__, 2).'/lib/vendor/autoload.php';
 
+// When this module is checked out inside a full server (server/modules/<handle>,
+// as it is in CI and in this monorepo checkout), also load the server's own
+// core/shared autoloader so tests can reference framework (KTXC/KTXF) types.
+// Standalone module checkouts without a server alongside them skip this.
+define('SERVER_ROOT', dirname(__DIR__, 4));
+$serverAutoload = SERVER_ROOT . '/vendor/autoload.php';
+if (is_file($serverAutoload)) {
+    require $serverAutoload;
+}
+
 if (isset($_SERVER['APP_DEBUG']) && $_SERVER['APP_DEBUG']) {
     umask(0000);
 }

tests/php/phpunit.xml

@@ -21,6 +21,9 @@
         <testsuite name="Unit Tests">
             <directory>unit</directory>
         </testsuite>
+        <testsuite name="Integration Tests">
+            <directory>Integration</directory>
+        </testsuite>
     </testsuites>
 
     <source ignoreSuppressionOfDeprecations="true"
@@ -29,8 +32,7 @@
             restrictWarnings="true"
     >
         <include>
-            <directory>../../core/lib</directory>
-            <directory>../../shared/lib</directory>
+            <directory>../../lib</directory>
         </include>
 
         <deprecationTrigger>