Update OpenVK codebase at December 7, 2024

.dockerignore

@@ -0,0 +1,22 @@
+vendor
+openvk.yml
+chandler.yml
+update.pid
+update.pid.old
+Web/static/js/node_modules
+
+tmp/*
+!tmp/api-storage/.gitkeep
+!tmp/themepack_artifacts/.gitkeep
+themepacks/*
+!themepacks/.gitkeep
+!themepacks/openvk_modern
+!themepacks/midnight
+storage/*
+!storage/.gitkeep
+
+.idea
+.php-cs-fixer.cache
+
+tests/
+.github/

.github/FUNDING.yml

@@ -1 +1 @@
-custom: "https://openvk.su/donate"
+custom: "https://openvk.org/donate"

.github/workflows/analyse.yaml

@@ -0,0 +1,36 @@
+name: Static analysis
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  phpstan:
+    name: PHPStan
+    runs-on: ubuntu-latest
+
+    # 'push' runs on inner branches, 'pull_request' will run only on outer PRs
+    if: >
+      github.event_name == 'push'
+      || (github.event_name == 'pull_request'
+          && github.event.pull_request.head.repo.full_name != github.repository)
+
+    steps:
+      - name: Code Checkout
+        uses: actions/checkout@v7
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v4
+
+      - name: Build and start Docker container
+        working-directory: install/automated/docker
+        run: |
+          docker build -t openvk ../../.. -f openvk.Dockerfile
+
+      - name: Run Docker container with PHPStan
+        working-directory: install/automated/docker
+        run: |
+          docker container run --rm \
+            -v ./chandler.example.yml:/opt/chandler/chandler.yml \
+            -v ./openvk.example.yml:/opt/chandler/extensions/available/openvk/openvk.yml \
+            openvk vendor/bin/phpstan analyse --memory-limit 1G

.github/workflows/build-base.yaml

@@ -2,57 +2,70 @@ name: Build base images
 
 on:
   schedule:
-    - cron: '0 0 * * *'
+    - cron: "0 0 * * *"
+  workflow_dispatch:
 
 env:
   BASE_IMAGE_NAME: php
-  BASE_IMAGE_VERSION: "8.1"
+  BASE_IMAGE_VERSION: "8.2"
 
 jobs:
   build-cli:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v7
         with:
           lfs: false
-      
+
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      
+        uses: docker/setup-qemu-action@v4
+
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v4
+
+      - name: Change repository string to lowercase
+        id: repositorystring
+        uses: Entepotenz/change-string-case-action-min-dependencies@v1.2.0
+        with:
+          string: ${{ github.repository }}
 
       - name: Log into registry
         run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
 
       - name: Build cli image
         run: |
-          IMAGE_NAME=ghcr.io/${{ github.repository }}/$BASE_IMAGE_NAME:$BASE_IMAGE_VERSION-cli
+          IMAGE_NAME=ghcr.io/${{ steps.repositorystring.outputs.lowercase }}/$BASE_IMAGE_NAME:$BASE_IMAGE_VERSION-cli
 
           docker buildx build --platform linux/amd64,linux/arm64 -t $IMAGE_NAME . --push -f install/automated/docker/base-php-cli.Dockerfile --build-arg VERSION=$BASE_IMAGE_VERSION
-  
+
   build-apache:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v7
         with:
           lfs: false
-      
+
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      
+        uses: docker/setup-qemu-action@v4
+
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v4
+
+      - name: Change repository string to lowercase
+        id: repositorystring
+        uses: Entepotenz/change-string-case-action-min-dependencies@v1.2.0
+        with:
+          string: ${{ github.repository }}
 
       - name: Log into registry
         run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
-     
+
       - name: Build apache image
         run: |
-          IMAGE_NAME=ghcr.io/${{ github.repository }}/$BASE_IMAGE_NAME:$BASE_IMAGE_VERSION-apache
+          IMAGE_NAME=ghcr.io/${{ steps.repositorystring.outputs.lowercase }}/$BASE_IMAGE_NAME:$BASE_IMAGE_VERSION-apache
 
           docker buildx build --platform linux/amd64,linux/arm64 -t $IMAGE_NAME . --push -f install/automated/docker/base-php-apache.Dockerfile --build-arg VERSION=$BASE_IMAGE_VERSION

.github/workflows/build.yaml

@@ -1,64 +1,65 @@
 name: Build images
 
-on:
-  push:
-    # Publish `master` as Docker `latest` image.
-    branches:
-      - master
-
-    # Publish `v1.2.3` tags as releases.
-    tags:
-      - v*
+on: [push, pull_request]
 
 env:
-  BASE_IMAGE_NAME: openvk
-  DB_IMAGE_NAME: mariadb
-  EVENT_IMAGE_NAME: mariadb
-  DB_VERSION: "10.9"
+    BASE_IMAGE_NAME: openvk
 
 jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        arch: ['x86_64']
+    buildbase:
+        name: Build base images
+
+        runs-on: ubuntu-latest
+
+        # 'push' runs on inner branches, 'pull_request' will run only on outer PRs
+        if: >
+          github.repository_owner == 'OpenVK'
+          && (github.event_name == 'push'
+          || (github.event_name == 'pull_request'
+              && github.event.pull_request.head.repo.full_name != github.repository))
 
-    if: github.event_name == 'push'
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          lfs: false
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v2
+        steps:
+            - name: Set up QEMU
+              uses: docker/setup-qemu-action@v4
 
-      - name: Log into registry
-        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
+            - name: Set up Docker Buildx
+              id: buildx
+              uses: docker/setup-buildx-action@v4
+              with:
+                  platforms: linux/amd64,linux/arm64
 
-      - name: Build base image
-        run: |
-          IMAGE_ID=ghcr.io/${{ github.repository }}/$BASE_IMAGE_NAME
-          IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
-          VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
-          [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
-          [ "$VERSION" == "master" ] && VERSION=latest
-          echo IMAGE_ID=$IMAGE_ID
-          echo VERSION=$VERSION
+            - name: Change repository string to lowercase
+              id: repositorystring
+              uses: Entepotenz/change-string-case-action-min-dependencies@v1.2.0
+              with:
+                  string: ${{ github.repository }}
 
-          docker buildx build --platform linux/amd64,linux/arm64 -t $IMAGE_ID:$VERSION . --push -f install/automated/docker/openvk.Dockerfile --build-arg GITREPO=${{ github.repository }}
-
-      - name: Build MariaDB primary image
-        run: |
-          IMAGE_NAME=ghcr.io/${{ github.repository }}/$DB_IMAGE_NAME:$DB_VERSION-primary
+            - name: Base image meta
+              id: basemeta
+              uses: docker/metadata-action@v6
+              with:
+                  images: |
+                      ghcr.io/${{ steps.repositorystring.outputs.lowercase }}/${{env.BASE_IMAGE_NAME}}
+                  labels: |
+                      org.opencontainers.image.documentation=https://github.com/OpenVK/openvk/blob/master/install/automated/docker/Readme.md
+                  tags: |
+                      type=sha
+                      type=ref,event=branch
+                      type=ref,event=pr
+                      type=ref,event=tag
+                      type=raw,value=latest,enable={{is_default_branch}}
 
-          docker buildx build --platform linux/amd64,linux/arm64 -t $IMAGE_NAME . --push -f install/automated/docker/mariadb-primary.Dockerfile --build-arg VERSION=$DB_VERSION
-
-      - name: Build MariaDB event image
-        run: |
-          IMAGE_NAME=ghcr.io/${{ github.repository }}/$EVENT_IMAGE_NAME:$DB_VERSION-eventdb
+            - name: Log into registry
+              if: github.event_name != 'pull_request'
+              run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
 
-          docker buildx build --platform linux/amd64,linux/arm64 -t $IMAGE_NAME . --push -f install/automated/docker/mariadb-eventdb.Dockerfile --build-arg VERSION=$DB_VERSION
+            - name: Build base image
+              uses: docker/build-push-action@v7
+              with:
+                  platforms: linux/amd64,linux/arm64
+                  file: install/automated/docker/openvk.Dockerfile
+                  tags: ${{ steps.basemeta.outputs.tags }}
+                  labels: ${{ steps.basemeta.outputs.labels }}
+                  push: ${{ github.event_name != 'pull_request' }}
+                  build-args: |
+                      GITREPO=${{ steps.repositorystring.outputs.lowercase }}

.github/workflows/codeberg-mirror.yml

@@ -5,8 +5,9 @@ on: push
 jobs:
   to_codeberg:
     runs-on: ubuntu-latest
+    if: github.repository_owner == 'OpenVK'
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v7
         with:
           fetch-depth: 0
       - uses: pixta-dev/repository-mirroring-action@v1

.github/workflows/lint.yaml

@@ -0,0 +1,35 @@
+name: Lint
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+
+    # 'push' runs on inner branches, 'pull_request' will run only on outer PRs
+    if: >
+      github.event_name == 'push'
+      || (github.event_name == 'pull_request'
+          && github.event.pull_request.head.repo.full_name != github.repository)
+
+    permissions:
+      contents: read
+    steps:
+      - name: Code Checkout
+        uses: actions/checkout@v7
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: "8.2"
+          extensions: gd, zip, intl, yaml, pdo_mysql, imagick
+          tools: composer:v2
+          coverage: none
+
+      - name: Install dependencies
+        run: composer install --no-interaction --no-progress --no-suggest --prefer-dist
+
+      - name: PHP CS Fixer
+        run: vendor/bin/php-cs-fixer fix --dry-run --diff

.github/workflows/test-screenshots.yaml

@@ -0,0 +1,36 @@
+name: Screenshot Tests
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    # 'push' runs on inner branches, 'pull_request' will run only on outer PRs
+    if: >
+      github.event_name == 'push'
+      || (github.event_name == 'pull_request'
+          && github.event.pull_request.head.repo.full_name != github.repository)
+
+    steps:
+      - uses: actions/checkout@v7
+
+      - name: Build test images
+        run: docker compose -f tests/docker-compose.test.yml build
+
+      - name: Run full test stack
+        run: >
+          docker compose -f tests/docker-compose.test.yml up
+          --abort-on-container-exit
+          --exit-code-from playwright
+          --no-build
+
+      - name: Upload test results on failure
+        if: failure()
+        uses: actions/upload-artifact@v7
+        with:
+          name: playwright-results
+          path: tests/e2e/test-results/
+          retention-days: 30

.gitignore

@@ -6,7 +6,7 @@ update.pid.old
 Web/static/js/node_modules
 
 tmp/*
-!tmp/api-storage
+!tmp/api-storage/.gitkeep
 !tmp/themepack_artifacts/.gitkeep
 themepacks/*
 !themepacks/.gitkeep
@@ -15,4 +15,7 @@ themepacks/*
 storage/*
 !storage/.gitkeep
 
-.idea
+data/knowledgebase/*
+
+.idea
+.php-cs-fixer.cache

.php-cs-fixer.dist.php

@@ -0,0 +1,15 @@
+<?php
+
+$finder = (new PhpCsFixer\Finder())
+    ->in(__DIR__)
+    ->name('openvkctl')
+;
+
+return (new PhpCsFixer\Config())
+    ->setRules([
+        '@PER-CS2.0' => true,
+        '@PHP82Migration' => true,
+    ])
+    ->setFinder($finder)
+    ->setParallelConfig(PhpCsFixer\Runner\Parallel\ParallelConfigFactory::detect())
+;