Refactor docker container to be able to run any PHP version from 7.4

Thanks AI for 😄:
 - update Dockerfile
 - update docker-compose
 - create Makefile

Update code with:
 - CS Fixer
 - Rector

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

@@ -8,6 +8,7 @@ on:
             - release/*
     pull_request:
         types: [ opened, synchronize, reopened ]
+concurrency: sonars
 jobs:
     sonarcloud:
         name: Sonars
@@ -46,7 +47,7 @@ jobs:
                 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

.php-cs-fixer.php

@@ -10,5 +10,6 @@
     ->setRules(array(
         '@PhpCsFixer' => true,
         'phpdoc_separation' => false,
+        'single_line_empty_body' => false,
     ))
     ->setFinder($finder);

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
+
+rector:
+	$(DOCKER_EXEC_CONTAINER) $(PHP_VERSION) vendor/bin/rector process
+
+up:
+	$(DOCKER_COMPOSE) up -d
+
+update:
+	$(DOCKER_EXEC_CONTAINER) $(PHP_VERSION) $(COMPOSER) update

README.md

@@ -128,15 +128,15 @@ Thanks to the [Docker image](https://hub.docker.com/r/splitbrain/phpfarm) of [ph
 
 First of all, you need to create your container which you can do using [docker-compose](https://docs.docker.com/compose/) by running the below command line from the root directory of the project:
 ```bash
-$ docker-compose up -d --build
+$ make build up
 ```
 
 You then have a container named `package_generator` in which you can run `composer` commands and `php cli` commands such as:
 ```bash
 # install deps in container (using update ensure it does use the composer.lock file if there is any)
-$ docker exec -it package_generator php-7.4 /usr/bin/composer update
+$ make update
 # run tests in container
-$ docker exec -it package_generator php-7.4 -dmemory_limit=-1 vendor/bin/phpunit
+$ make phpunit
 ```
 
 ## Contributing

composer.json

@@ -129,9 +129,9 @@
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.0",
-        "phpstan/phpstan": "^1.3",
+        "phpstan/phpstan": "^2",
         "phpunit/phpunit": "^9",
-        "rector/rector": "^0.15.17"
+        "rector/rector": "^2"
     },
     "autoload": {
         "psr-4": {

docker-compose.yml

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

rector.php

@@ -3,8 +3,8 @@
 declare(strict_types=1);
 
 use Rector\CodeQuality\Rector\Class_\InlineConstructorDefaultToPropertyRector;
-use Rector\CodeQuality\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector;
 use Rector\Config\RectorConfig;
+use Rector\Php84\Rector\Param\ExplicitNullableParamTypeRector;
 use Rector\Set\ValueObject\LevelSetList;
 use Rector\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictNativeCallRector;
 use Rector\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictTypedPropertyRector;
@@ -30,6 +30,6 @@
     // register a single rule
     $rectorConfig->rule(InlineConstructorDefaultToPropertyRector::class);
     $rectorConfig->rule(ReturnTypeFromStrictNativeCallRector::class);
-    $rectorConfig->rule(ReturnTypeFromStrictScalarReturnExprRector::class);
     $rectorConfig->rule(ReturnTypeFromStrictTypedPropertyRector::class);
+    $rectorConfig->rule(ExplicitNullableParamTypeRector::class);
 };

src/ConfigurationReader/AbstractYamlReader.php

@@ -16,6 +16,9 @@ abstract protected function __construct(string $filename);
 
     abstract public static function getDefaultConfigurationPath(): string;
 
+    /**
+     * @throws \InvalidArgumentException
+     */
     public static function instance(?string $filename = null): self
     {
         $loadFilename = empty($filename) ? static::getDefaultConfigurationPath() : $filename;
@@ -46,6 +49,9 @@ protected function loadYaml(string $filename)
         return $ymlParser->parse(file_get_contents($filename));
     }
 
+    /**
+     * @throws \InvalidArgumentException
+     */
     protected function parseSimpleArray(string $filename, string $mainKey): array
     {
         $values = $this->loadYaml($filename);