Merge branch '6.x'

Author: danog

.github/workflows/build-docker.yml

@@ -27,6 +27,7 @@ jobs:
         uses: fkirc/[email protected]
         with:
           cancel_others: true
+          skip_after_successful_duplicate: false
           do_not_skip: '["release"]'
           # list files that may affect or are included into the built phar
           paths: '[".github/**", "bin/**", "assets/**", "build/**", "dictionaries/**", "src/**", "stubs/**", "psalm", "psalm-language-server", "psalm-plugin", "psalm-refactor", "psalm-review", "psalter", "box.json.dist", "composer.json", "config.xsd", "keys.asc.gpg", "scoper.inc.php"]'

bin/docker/Dockerfile

@@ -65,7 +65,7 @@ ENV GPG_KEYS AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256
 
 ADD bin/docker/deepbind.patch /
 
-ENV PHP_VERSION 8.4.5
+ADD https://github.com/php/php-src/commits/master.atom /dev/null
 
 RUN set -eux; \
 	\
@@ -188,6 +188,7 @@ COPY bin/docker/docker-php-* /usr/local/bin/
 
 # This line invalidates cache when master branch changes
 ADD https://github.com/vimeo/psalm/commits/master.atom /dev/null
+ADD https://github.com/vimeo/psalm/commits/6.x.atom /dev/null
 
 RUN pecl install igbinary