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

.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/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>