Merge pull request #332 from jolicode/up

Update composer and leverage bump-after-update option
jolicode · Nov 4, 2024 · 31004dd · 31004dd
2 parents c612618 + aac8856
commit 31004dd
Show file tree

Hide file tree

Showing 6 changed files with 190 additions and 167 deletions.
diff --git a/.castor/qa.php b/.castor/qa.php
@@ -29,6 +29,15 @@ function install(): void
     docker_compose_run('composer install -o', workDir: '/var/www/tools/phpstan');
 }
 
+#[AsTask(description: 'Update tooling')]
+function update(): void
+{
+    io()->title('Update QA tooling');
+
+    docker_compose_run('composer update -o', workDir: '/var/www/tools/php-cs-fixer');
+    docker_compose_run('composer update -o', workDir: '/var/www/tools/phpstan');
+}
+
 // #[AsTask(description: 'Runs PHPUnit', aliases: ['phpunit'])]
 // function phpunit(): int
 // {

diff --git a/infrastructure/docker/services/php/Dockerfile b/infrastructure/docker/services/php/Dockerfile
@@ -115,7 +115,7 @@ RUN adduser app sudo \
     && phpenmod app-builder
 
 # Composer
-COPY --from=composer/composer:2.7.7 /usr/bin/composer /usr/bin/composer
+COPY --from=composer/composer:2.8.2 /usr/bin/composer /usr/bin/composer
 RUN mkdir -p "/home/app/.composer/cache" \
     && chown app: /home/app/.composer -R
 

diff --git a/tools/php-cs-fixer/composer.json b/tools/php-cs-fixer/composer.json
@@ -1,12 +1,13 @@
 {
     "type": "project",
     "require": {
-        "friendsofphp/php-cs-fixer": "^3.59.3"
+        "friendsofphp/php-cs-fixer": "^3.64.0"
     },
     "config": {
         "platform": {
             "php": "8.1"
         },
+        "bump-after-update": true,
         "sort-packages": true
     }
 }