Merge remote-tracking branch 'origin/master'

# Conflicts:
#	composer.lock

.github/ISSUE_TEMPLATE/workflows/codeql-analysis.yml

@@ -0,0 +1,20 @@
+name: "CodeQL"
+
+on: [pull_request]
+jobs:
+  lint:
+    name: CodeQL
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+      with:
+        fetch-depth: 2
+
+    - run: git checkout HEAD^2
+
+    - name: Run CodeQL
+      run: |
+        docker run --rm -v $PWD:/app composer sh -c \
+        "composer install --profile --ignore-platform-reqs && composer check"

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,20 @@
+name: "CodeQL"
+
+on: [ pull_request ]
+jobs:
+  lint:
+    name: CodeQL
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 2
+
+      - run: git checkout HEAD^2
+
+      - name: Run CodeQL
+        run: |
+          docker run --rm -v $PWD:/app composer sh -c \
+          "composer install --profile --ignore-platform-reqs && composer check"

.github/workflows/linter.yml

@@ -1,20 +1,20 @@
 name: "Linter"
 
-on: [pull_request]
+on: [ pull_request ]
 jobs:
   lint:
     name: Linter
     runs-on: ubuntu-latest
 
     steps:
-    - name: Checkout repository
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 2
+      - name: Checkout repository
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 2
 
-    - run: git checkout HEAD^2
+      - run: git checkout HEAD^2
 
-    - name: Run Linter
-      run: |
-        docker run --rm -v $PWD:/app composer sh -c \
-        "composer install --profile --ignore-platform-reqs && composer lint"
+      - name: Run Linter
+        run: |
+          docker run --rm -v $PWD:/app composer sh -c \
+          "composer install --profile --ignore-platform-reqs && composer lint"

.github/workflows/tests.yml

@@ -0,0 +1,24 @@
+name: "Tests"
+
+on: [ pull_request ]
+jobs:
+  lint:
+    name: Tests
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 2
+
+      - run: git checkout HEAD^2
+
+      - name: Build
+        run: |
+          docker compose build
+          docker compose up -d
+          sleep 10
+
+      - name: Run Tests
+        run: docker compose exec tests vendor/bin/phpunit --configuration phpunit.xml tests

Dockerfile

@@ -5,7 +5,7 @@ WORKDIR /src/
 COPY composer.lock /src/
 COPY composer.json /src/
 
-RUN composer update --ignore-platform-reqs --optimize-autoloader \
+RUN composer install --ignore-platform-reqs --optimize-autoloader \
     --no-plugins --no-scripts --prefer-dist
 
 FROM php:8.0-cli-alpine as final
@@ -22,6 +22,5 @@ COPY --from=step0 /src/vendor /code/vendor
 COPY ./tests /code/tests
 COPY ./src /code/src
 COPY ./phpunit.xml /code/phpunit.xml
-COPY ./psalm.xml /code/psalm.xml
 
 CMD [ "tail", "-f", "/dev/null" ]

composer.json

@@ -5,21 +5,24 @@
     "keywords": ["php","framework", "upf", "utopia", "audit"],
     "license": "MIT",
     "minimum-stability": "stable",
+    "scripts": {
+        "lint": "./vendor/bin/pint --test",
+        "format": "./vendor/bin/pint",
+        "check": "./vendor/bin/phpstan analyse --level max src tests"
+    },
     "autoload": {
         "psr-4": {"Utopia\\Audit\\": "src/Audit"}
     },
-    "scripts": {
-        "lint": "./vendor/bin/pint --test",
-        "format": "./vendor/bin/pint"
+    "autoload-dev": {
+        "psr-4": {"Utopia\\Tests\\": "tests/Audit"}
     },
     "require": {
         "php": ">=8.0",
-        "ext-pdo": "*",
-        "utopia-php/database": "0.28.*"
+        "utopia-php/database": "0.36.*"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.3",
-        "vimeo/psalm": "4.0.1",
-        "laravel/pint": "1.2.*"
+        "phpstan/phpstan": "^1.8",
+        "laravel/pint": "1.5.*"
     }
 }