Merge from Upstream master

.devcontainer/Dockerfile

@@ -0,0 +1,14 @@
+FROM mcr.microsoft.com/devcontainers/php:8.2
+
+# Create Laravel test project directory in vscode user home
+USER vscode
+RUN mkdir -p /home/vscode/laravel-test
+
+# Expose port 8000 for Laravel
+EXPOSE 8000
+
+# Create setup script for Laravel test environment
+COPY ./setup-laravel-test.sh /usr/local/bin/setup-laravel-test.sh
+USER root
+RUN chmod +x /usr/local/bin/setup-laravel-test.sh
+USER vscode

.devcontainer/devcontainer.json

@@ -0,0 +1,37 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/php
+{
+	"name": "Laravel SCIM Server Dev",
+	// Use the Dockerfile in the .devcontainer folder
+	"build": {
+		"dockerfile": "Dockerfile",
+		"context": "."
+	},
+
+	// Configure tool-specific properties
+	"customizations": {
+		"vscode": {
+			"extensions": [
+				"bmewburn.vscode-intelephense-client",
+				"xdebug.php-debug",
+				"mikestead.dotenv",
+				"mehedidracula.php-namespace-resolver",
+				"recca0120.vscode-phpunit",
+				"formulahendry.terminal",
+				"junstyle.php-cs-fixer"
+			],
+			"settings": {
+				"php.validate.executablePath": "/usr/local/bin/php"
+			}
+		}
+	},
+
+	// Use 'forwardPorts' to make a list of ports inside the container available locally
+	"forwardPorts": [8000],
+
+	// Use 'postCreateCommand' to run commands after the container is created
+	"postCreateCommand": "composer install",
+
+	// Add a non-root user to run the server
+	"remoteUser": "vscode"
+}

.devcontainer/setup-laravel-test.sh

@@ -0,0 +1,33 @@
+#!/bin/bash
+set -e
+
+# Create Laravel project if it doesn't exist
+if [ ! -d "/home/vscode/laravel-test/vendor" ]; then
+    echo "Creating new Laravel project..."
+    cd /home/vscode
+    composer create-project --prefer-dist laravel/laravel laravel-test
+
+    cd laravel-test
+
+    # Add the local package as a repository
+    jq '.repositories=[{"type": "path","url": "/workspaces/laravel-scim-server"}]' ./composer.json > composer.json.tmp && mv composer.json.tmp composer.json
+
+    # Require the package and laravel/tinker
+    composer require arietimmerman/laravel-scim-server @dev
+    composer require laravel/tinker
+
+    # Set up SQLite database
+    touch ./.database.sqlite
+    echo "DB_CONNECTION=sqlite" >> ./.env
+    echo "DB_DATABASE=/home/vscode/laravel-test/.database.sqlite" >> ./.env
+
+    # Run migrations
+    php artisan migrate
+
+    # Create test users
+    echo "User::factory()->count(100)->create();" | php artisan tinker
+
+    echo "Laravel test environment setup complete!"
+else
+    echo "Laravel test environment already exists!"
+fi

.github/workflows/ci.yml

@@ -1,16 +1,72 @@
 name: CI
 
-on: [push]
+on: ['push', 'pull_request']
+
+permissions:
+  contents: read
+  packages: write
 
 jobs:
-  build-test:
+  tests:
     runs-on: ubuntu-latest
+    continue-on-error: true
+    strategy:
+      matrix:
+        php: [8.0, 8.1, 8.2]
+        laravel: [10.*, 11.*, 12.*]
+        exclude:
+          - laravel: 10.*
+            php: 8.0
+          - laravel: 11.*
+            php: 7.3
+          - laravel: 11.*
+            php: 7.4
+          - laravel: 11.*
+            php: 8.0
+          - laravel: 11.*
+            php: 8.1
+          - laravel: 12.*
+            php: 7.3
+          - laravel: 12.*
+            php: 7.4
+          - laravel: 12.*
+            php: 8.0
+          - laravel: 12.*
+            php: 8.1
+
+    name: PHP ${{ matrix.php }} on Laravel ${{ matrix.laravel }}
 
     steps:
-    - uses: actions/checkout@v2
-    - uses: php-actions/composer@v6
-      with:
-        php_version: 8
-    - uses: php-actions/phpunit@v3
+    - name: Checkout code
+      uses: actions/checkout@v2
+    - name: Setup PHP
+      uses: shivammathur/setup-php@v2
       with:
-        php_version: 8
+        php-version: ${{ matrix.php }}
+    - name: Install dependencies
+      run: |
+        composer require "illuminate/console:${{ matrix.laravel }}" "illuminate/database:${{ matrix.laravel }}" "illuminate/support:${{ matrix.laravel }}" --no-interaction --no-update
+        composer update
+    - name: Run tests
+      run: vendor/bin/phpunit
+
+  docker:
+    # Only push Docker image for direct pushes to master branch
+    if: github.event_name == 'push' && github.ref == 'refs/heads/master'
+    runs-on: ubuntu-latest
+    needs: tests
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+      - name: Log in to the Container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: true
+          tags: ghcr.io/${{ github.repository }}:latest

.gitignore

@@ -1 +1,2 @@
 vendor
+.phpunit.result.cache

.vscode/launch.json

@@ -0,0 +1,49 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+
+        {
+            "name": "Listen for Xdebug",
+            "type": "php",
+            "request": "launch",
+            "port": 9000
+        },
+        {
+            "name": "Launch currently open script",
+            "type": "php",
+            "request": "launch",
+            "program": "${file}",
+            "cwd": "${fileDirname}",
+            "port": 0,
+            "runtimeArgs": [
+                "-dxdebug.start_with_request=yes"
+            ],
+            "env": {
+                "XDEBUG_MODE": "debug,develop",
+                "XDEBUG_CONFIG": "client_port=${port}"
+            }
+        },
+        {
+            "name": "Launch Built-in web server",
+            "type": "php",
+            "request": "launch",
+            "runtimeArgs": [
+                "-dxdebug.mode=debug",
+                "-dxdebug.start_with_request=yes",
+                "-S",
+                "localhost:0"
+            ],
+            "program": "",
+            "cwd": "${workspaceRoot}",
+            "port": 9003,
+            "serverReadyAction": {
+                "pattern": "Development Server \\(http://localhost:([0-9]+)\\) started",
+                "uriFormat": "http://localhost:%s",
+                "action": "openExternally"
+            }
+        }
+    ]
+}

.vscode/settings.json

@@ -0,0 +1,12 @@
+{
+    "php.validate.enable": true,
+    "php.validate.run": "onType",
+    "php.validate.executablePath": "/usr/local/bin/php",
+    "php-cs-fixer.executablePath": "/workspaces/laravel-scim-server/vendor/bin/php-cs-fixer",
+    "files.associations": {
+        "*.php": "php"
+    },
+    "[php]": {
+        "editor.formatOnSave": true
+    }
+}

.vscode/tasks.json

@@ -0,0 +1,35 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "Setup Laravel SCIM Test Server",
+            "type": "shell",
+            "command": "setup-laravel-test.sh",
+            "problemMatcher": [],
+            "presentation": {
+                "reveal": "always",
+                "panel": "new"
+            },
+            "group": "test"
+        },
+        {
+            "label": "Start Laravel SCIM Test Server",
+            "type": "shell",
+            "command": "export XDEBUG_MODE=debug,develop && cd /home/vscode/laravel-test && COMPOSER_AUTOLOAD_DEV=1 composer dump-autoload && php artisan serve --host=0.0.0.0 --port=8000",
+            "dependsOn": "Setup Laravel SCIM Test Server",
+            "problemMatcher": [],
+            "presentation": {
+                "reveal": "always",
+                "panel": "dedicated"
+            },
+            "group": "test"
+        },
+        {
+            "label": "Open SCIM Server in Browser",
+            "type": "shell",
+            "command": "$BROWSER http://localhost:8000/scim/v2/Users",
+            "problemMatcher": [],
+            "group": "test"
+        }
+    ]
+}