upgrades: upgrade project

Author: mikaelcom

.docker/Dockerfile

@@ -1,8 +1,44 @@
-FROM splitbrain/phpfarm:jessie
+FROM debian:trixie-slim
 
-RUN apt-get update && apt-get install -y git zip
+# Prevent interactive prompts
+ENV DEBIAN_FRONTEND=noninteractive
 
+# Install dependencies
+RUN apt-get update && apt-get install -y \
+    apt-transport-https \
+    ca-certificates \
+    curl \
+    git \
+    lsb-release \
+    unzip \
+    zip \
+    && curl -sSLo /usr/share/keyrings/deb.sury.org-php.gpg https://packages.sury.org/php/apt.gpg \
+    && echo "deb [signed-by=/usr/share/keyrings/deb.sury.org-php.gpg] https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list \
+    && apt-get update
+
+# Supported PHP Versions
+ENV PHP_VERSIONS="7.4 8.0 8.1 8.2 8.3 8.4 8.5"
+
+# Install all PHP versions using a loop
+RUN for ver in $PHP_VERSIONS; do \
+        apt-get install -y \
+        php${ver}-cli php${ver}-xml php${ver}-mbstring php${ver}-soap; \
+    done \
+    && apt-get clean && rm -rf /var/lib/apt/lists/*
+
+# Create symlinks (php-X.Y) using the same list
+RUN for ver in $PHP_VERSIONS; do \
+        ln -s /usr/bin/php${ver} /usr/bin/php-${ver}; \
+    done
+
+# Install Composer
 COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
+
+# Set working directory
+WORKDIR /var/www
+
+# Copy project files
 COPY . /var/www/
 
-WORKDIR /var/www/
+# Default command
+CMD ["bash"]

.github/workflows/sonarcloud.yml .github/workflows/sonars.yml.github/workflows/sonarcloud.yml renamed to .github/workflows/sonars.yml

@@ -1,37 +1,53 @@
-name: SonarCloud
+name: Sonars
 on:
     push:
         branches:
             - develop
             - feature/*
             - feat/*
+            - release/*
     pull_request:
         types: [ opened, synchronize, reopened ]
+concurrency: sonars
 jobs:
     sonarcloud:
-        name: SonarCloud
+        name: Sonars
         runs-on: ubuntu-latest
+        permissions:
+            contents: read
+            pull-requests: write
+            statuses: write
         steps:
-            -   uses: actions/checkout@v2
+            -   name: Checkout code
+                uses: actions/checkout@v3
                 with:
                     fetch-depth: 0
 
             -   name: Setup PHP with Xdebug
-                uses: shivammathur/setup-php@v2
+                uses: shivammathur/setup-php@v2.37.2
                 with:
                     php-version: 7.4
                     coverage: xdebug
 
             -   name: Install dependencies with composer
                 run: composer update --no-ansi --no-interaction --no-progress
 
-            -   name: Generate coverage report with phpunit/phpunit
+            -   name: Generate coverage report with phpunit
                 run: vendor/bin/phpunit --coverage-clover coverage.xml --log-junit report.xml
 
+            -   name: Monitor coverage
+                uses: slavcodev/coverage-monitor-action@v1
+                with:
+                    github_token: ${{ secrets.GITHUB_TOKEN }}
+                    coverage_path: coverage.xml
+                    threshold_alert: 95
+                    threshold_warning: 90
+
             -   name: Fix phpunit files paths
                 run: sed -i 's@'$GITHUB_WORKSPACE/'@''@g' coverage.xml report.xml
 
             -   name: SonarCloud Scan
-                uses: SonarSource/sonarcloud-github-action@master
+                uses: SonarSource/sonarqube-scan-action@v7
                 env:
+                    GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
                     SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

.gitmodules

@@ -0,0 +1,3 @@
+[submodule ".docker"]
+	path = .docker
+	url = git@github.com:WsdlToPhp/DockerCommonImage.git

Makefile

@@ -0,0 +1,37 @@
+PHP_VERSION ?= php-7.4
+CONTAINER_NAME ?= package_generator
+COMPOSER ?= /usr/bin/composer
+DOCKER_COMPOSE ?= docker compose
+DOCKER_EXEC_CONTAINER ?= docker exec -t $(CONTAINER_NAME)
+
+.PHONY: bash build cs-fixer down install phpstan phpunit rector up update
+
+bash:
+	$(DOCKER_EXEC_CONTAINER) bash
+
+build:
+	$(DOCKER_COMPOSE) build
+
+cs-fixer:
+	$(DOCKER_EXEC_CONTAINER) $(PHP_VERSION) vendor/bin/php-cs-fixer fix --ansi --diff --verbose
+
+down:
+	$(DOCKER_COMPOSE) down
+
+install:
+	$(DOCKER_EXEC_CONTAINER) $(PHP_VERSION) $(COMPOSER) install
+
+phpstan:
+	$(DOCKER_EXEC_CONTAINER) $(PHP_VERSION) vendor/bin/phpstan analyze src --level=2
+
+phpunit:
+	$(DOCKER_EXEC_CONTAINER) $(PHP_VERSION) vendor/bin/phpunit --stop-on-failure --stop-on-error $(ARGS)
+
+rector:
+	$(DOCKER_EXEC_CONTAINER) $(PHP_VERSION) vendor/bin/rector process
+
+up:
+	$(DOCKER_COMPOSE) up -d
+
+update:
+	$(DOCKER_EXEC_CONTAINER) $(PHP_VERSION) $(COMPOSER) update

composer.json

@@ -20,6 +20,10 @@
         {
             "name": "phordijk",
             "role": "Contributor"
+        },
+        {
+            "name": "Andreas Allacher",
+            "role": "Contributor"
         }
     ],
     "require": {

docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3.4'
-
 services:
   php:
     build:
@@ -8,3 +6,4 @@ services:
     volumes:
       - .:/var/www:rw
     container_name: dom_handler
+    tty: true