bump: all the things (#144)

psalm.baseline.xml

@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.8.0@9cf4f60a333f779ad3bc704a555920e81d4fdcda">
+<files psalm-version="5.14.1@b9d355e0829c397b9b3b47d0c0ed042a8a70284d">
   <file src="tests/functional/MakefileTestCase.php">
-    <LessSpecificReturnType>
-      <code><![CDATA[list<string>]]></code>
-    </LessSpecificReturnType>
     <MixedArgument>
       <code>$command</code>
       <code>$dir</code>

psalm.xml.dist

@@ -11,7 +11,7 @@
        findUnusedPsalmSuppress="true"
        findUnusedVariablesAndParams="true"
        limitMethodComplexity="true"
-       restrictReturnTypes="true"
+       restrictReturnTypes="false"
        strictBinaryOperands="true">
     <projectFiles>
         <directory name="./"/>

resources/Lighthouse/common.mk

@@ -1,4 +1,4 @@
-LIGHTHOUSE_DOCKER_IMAGE ?= cypress/browsers:node-18.16.0-chrome-112.0.5615.121-1-ff-112.0.1-edge-112.0.1722.48-1
+LIGHTHOUSE_DOCKER_IMAGE ?= cypress/browsers:node-20.5.0-chrome-114.0.5735.133-1-ff-114.0.2-edge-114.0.1823.51-1
 LIGHTHOUSE_DOCKER_COMMAND ?= docker run --init --interactive ${DOCKER_TTY} --rm --env HOME=/tmp ${DOCKER_USER} --volume "${DOCKER_CWD}:/public" --workdir "/public" ${LIGHTHOUSE_DOCKER_IMAGE}
 
 analyze/lighthouse: ## Analyze built files using Lighthouse

resources/PHP/common.mk

@@ -8,7 +8,7 @@ PHP_VERSION=8.2
 endif
 
 ifndef PHPQA_DOCKER_IMAGE
-PHPQA_DOCKER_IMAGE=jakzal/phpqa:1.87.0-php${PHP_VERSION}-alpine
+PHPQA_DOCKER_IMAGE=jakzal/phpqa:1.91.0-php${PHP_VERSION}-alpine
 endif
 
 ifndef PHPQA_DOCKER_COMMAND

resources/PHP/php-cs-fixer.php

@@ -46,6 +46,7 @@
                 'method_chaining_indentation' => false,
                 'multiline_whitespace_before_semicolons' => ['strategy' => 'new_line_for_chained_calls'],
                 'not_operator_with_successor_space' => true,
+                'nullable_type_declaration_for_default_null_value' => true,
                 'ordered_interfaces' => true,
                 'php_unit_internal_class' => true,
                 'php_unit_size_class' => true,

resources/Visual/common.mk

@@ -3,7 +3,7 @@ $(error BASE_URL must be defined before loading Visual/common.mk)
 endif
 
 PROJECT_ROOT = ${DOCKER_CWD}
-BACKSTOP_DOCKER_IMAGE ?= backstopjs/backstopjs:6.2.1
+BACKSTOP_DOCKER_IMAGE ?= backstopjs/backstopjs:6.2.2
 BACKSTOP_DOCKER_COMMAND ?= docker run --init --interactive ${TTY} --shm-size 256MB --cap-add=SYS_ADMIN --rm --env PROJECT_ROOT=${PROJECT_ROOT} --env BASE_URL=${BASE_URL} ${DOCKER_USER} --tmpfs /tmp --volume "${PROJECT_ROOT}:${PROJECT_ROOT}" --workdir "${PROJECT_ROOT}" ${BACKSTOP_DOCKER_IMAGE} --config backstop.config.js
 visual/test:
 	${BACKSTOP_DOCKER_COMMAND} test

tests/functional/MakefileTestCase.php

@@ -72,7 +72,7 @@ abstract protected function getExpectedInitPaths(): array;
 
     public function testMakefileExists(): void
     {
-        static::assertFileExists(
+        self::assertFileExists(
             $this->getRoot().\DIRECTORY_SEPARATOR.$this->getMakefilePath()
         );
     }
@@ -86,15 +86,15 @@ public function testMakefileHasHelp(): void
             $expected = preg_replace('/\r\n|\r|\n/', "\n", $this->stripColoring($expected));
         }
 
-        static::assertSame($expected, $actual);
+        self::assertSame($expected, $actual);
     }
 
     public function testHelpIsTheDefaultCommand(): void
     {
         $expected = $this->dryRun('help');
         $actual = $this->dryRun();
 
-        static::assertSame($expected, $actual);
+        self::assertSame($expected, $actual);
     }
 
     public function testMakefileHasInit(): void
@@ -103,19 +103,19 @@ public function testMakefileHasInit(): void
         $expected = array_merge(...array_values(array_map(static fn ($value) => [$value, 'if [ -f .gitattributes.dist ]; then mv .gitattributes.dist .gitattributes; fi'], $expected)));
         $actual = $this->dryRun('init');
 
-        static::assertSame($expected, $actual);
+        self::assertSame($expected, $actual);
     }
 
     /**
-     * @dataProvider provideHelpCommandsExecutionPathFixtures
+     * @dataProvider provideMakefileCommandsWorkCases
      *
      * @param array<string, string> $env
      */
     public function testMakefileCommandsWork(string $command, array $expected, array $env): void
     {
         $actual = $this->dryRun($command, env: $env);
 
-        static::assertSame($expected, $actual);
+        self::assertSame($expected, $actual);
     }
 
     /**
@@ -188,15 +188,15 @@ protected function generatePermissionsExecutionPath(array $dirs): array
     /**
      * @return iterable<array-key, array{string, list<string>, array<string, string>}>
      */
-    public function provideHelpCommandsExecutionPathFixtures(): iterable
+    public function provideMakefileCommandsWorkCases(): iterable
     {
         $commands = $this->getMakefileHelpCommands();
 
         $envs = $this->getEnvs();
         foreach ($envs as $env) {
             $expected = $this->getExpectedHelpCommandsExecutionPath($env);
             foreach ($commands as $command) {
-                static::assertArrayHasKey($command, $expected, sprintf('No expected execution path defined for command "%1$s"', $command));
+                self::assertArrayHasKey($command, $expected, sprintf('No expected execution path defined for command "%1$s"', $command));
             }
 
             foreach ($expected as $command => $path) {

tests/functional/PHP/LibraryTest.php

@@ -35,7 +35,7 @@ public function testCanRunComposerInstallLowest(): void
         $expected = array_merge($mkdir, $composer);
         $actual = $this->dryRun('composer/install-lowest');
 
-        static::assertSame($expected, $actual);
+        self::assertSame($expected, $actual);
     }
 
     public function testCanRunComposerInstallHighest(): void
@@ -47,7 +47,7 @@ public function testCanRunComposerInstallHighest(): void
         $expected = array_merge($mkdir, $composer);
         $actual = $this->dryRun('composer/install-highest');
 
-        static::assertSame($expected, $actual);
+        self::assertSame($expected, $actual);
     }
 
     protected function getExpectedInitPaths(): array

tests/functional/PHP/PharTest.php

@@ -39,7 +39,7 @@ public function testCanRunComposerInstallLowest(): void
         $expected = array_merge($mkdir, $composer);
         $actual = $this->dryRun('composer/install-lowest');
 
-        static::assertSame($expected, $actual);
+        self::assertSame($expected, $actual);
     }
 
     public function testCanRunComposerInstallHighest(): void
@@ -51,7 +51,7 @@ public function testCanRunComposerInstallHighest(): void
         $expected = array_merge($mkdir, $composer);
         $actual = $this->dryRun('composer/install-highest');
 
-        static::assertSame($expected, $actual);
+        self::assertSame($expected, $actual);
     }
 
     protected function getExpectedInitPaths(): array

tests/functional/PHP/PhpTrait.php

@@ -34,7 +34,7 @@ private function paths(?array $env): array
     {
         // defaults which are also defined in the Makefile
         $phpVersion = $env['PHP_VERSION'] ?? '8.2';
-        $phpqaDockerImage = $env['PHPQA_DOCKER_IMAGE'] ?? 'jakzal/phpqa:1.87.0-php%1$s-alpine';
+        $phpqaDockerImage = $env['PHPQA_DOCKER_IMAGE'] ?? 'jakzal/phpqa:1.91.0-php%1$s-alpine';
 
         return [
             'analyze' => [

tests/functional/Pimcore/ApplicationTest.php

@@ -44,7 +44,7 @@ public function testCanRunComposerInstall(): void
 
         $filesystem->rename('composer.lock.old', 'composer.lock');
 
-        static::assertSame($expected, $actual);
+        self::assertSame($expected, $actual);
     }
 
     protected function setUp(): void

tests/functional/YASSG/CompatTest.php

@@ -111,7 +111,7 @@ public function testDevServerWorks(): void
     private function generateDockerBackstopExecutionPath(string $command): string
     {
         return sprintf(
-            'docker run --init --interactive  --shm-size 256MB --cap-add=SYS_ADMIN --rm --env PROJECT_ROOT=$ROOT --env BASE_URL=file://localhost$ROOT/public %2$s --tmpfs /tmp --volume "$ROOT:$ROOT" --workdir "$ROOT" backstopjs/backstopjs:6.2.1 --config backstop.config.js %1$s',
+            'docker run --init --interactive  --shm-size 256MB --cap-add=SYS_ADMIN --rm --env PROJECT_ROOT=$ROOT --env BASE_URL=file://localhost$ROOT/public %2$s --tmpfs /tmp --volume "$ROOT:$ROOT" --workdir "$ROOT" backstopjs/backstopjs:6.2.2 --config backstop.config.js %1$s',
             $command,
             $this->generateDockerComposeExecutionUser()
         );
@@ -120,7 +120,7 @@ private function generateDockerBackstopExecutionPath(string $command): string
     private function generateDockerLighthouseExecutionPath(string $command): string
     {
         return sprintf(
-            'docker run --init --interactive  --rm --env HOME=/tmp %2$s --volume "$ROOT:/public" --workdir "/public" cypress/browsers:node-18.16.0-chrome-112.0.5615.121-1-ff-112.0.1-edge-112.0.1722.48-1 %1$s',
+            'docker run --init --interactive  --rm --env HOME=/tmp %2$s --volume "$ROOT:/public" --workdir "/public" cypress/browsers:node-20.5.0-chrome-114.0.5735.133-1-ff-114.0.2-edge-114.0.1823.51-1 %1$s',
             $command,
             $this->generateDockerComposeExecutionUser()
         );