bump: all (#156)

* bump: all the things * fix: disable array key check in Psalm (for now) * fix: remove redundant array_values() * fix: specific keys in paths() * fix: enable array key check in Psalm * fix: add permissions return type * fix: dry run return type * fix: dry run, execute args type * fix: Psalm more/less specific return types * fix: Psalm remove baseline * fix1: streamline * bump: all * fix: Psalm MoreSpecificType
sigwinhq · Jan 19, 2024 · 2f10846 · 2f10846
1 parent 69e1c05
commit 2f10846
Show file tree

Hide file tree

Showing 14 changed files with 93 additions and 194 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -5,4 +5,3 @@
 /*baseline* export-ignore
 /composer.lock export-ignore
 /Makefile export-ignore
-/package.json export-ignore
diff --git a/infection.json.dist b/infection.json.dist
@@ -0,0 +1,17 @@
+{
+    "source": {
+        "directories": [
+            "src"
+        ]
+    },
+    "logs": {
+        "text": "var/phpqa/infection.log"
+    },
+    "minCoveredMsi": 100,
+    "mutators": {
+        "@default": true,
+        "IdenticalEqual": false,
+        "NotIdenticalNotEqual": false,
+        "MBString": false
+    }
+}
diff --git a/phpstan.baseline.neon b/phpstan.baseline.neon
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -3,7 +3,6 @@ includes:
     - /tools/.composer/vendor-bin/phpstan/vendor/phpstan/phpstan-strict-rules/rules.neon
     - /tools/.composer/vendor-bin/phpstan/vendor/phpstan/phpstan-phpunit/extension.neon
     - /tools/.composer/vendor-bin/phpstan/vendor/phpstan/phpstan-symfony/extension.neon
-    - phpstan.baseline.neon
 parameters:
     tmpDir: %currentWorkingDirectory%/var/phpqa/phpstan
     level: max

diff --git a/psalm.baseline.xml b/psalm.baseline.xml
diff --git a/psalm.xml.dist b/psalm.xml.dist
@@ -4,7 +4,6 @@
        checkForThrowsInGlobalScope="true"
        ensureArrayIntOffsetsExist="true"
        ensureArrayStringOffsetsExist="true"
-       errorBaseline="psalm.baseline.xml"
        errorLevel="1"
        findUnusedBaselineEntry="true"
        findUnusedCode="true"

diff --git a/resources/Lighthouse/common.mk b/resources/Lighthouse/common.mk
@@ -1,4 +1,4 @@
-LIGHTHOUSE_DOCKER_IMAGE ?= cypress/browsers:node-20.9.0-chrome-118.0.5993.88-1-ff-118.0.2-edge-118.0.2088.46-1
+LIGHTHOUSE_DOCKER_IMAGE ?= cypress/browsers:node-20.10.0-chrome-118.0.5993.88-1-ff-118.0.2-edge-118.0.2088.46-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

diff --git a/resources/PHP/common.mk b/resources/PHP/common.mk
@@ -8,7 +8,7 @@ PHP_VERSION=8.3
 endif
 
 ifndef PHPQA_DOCKER_IMAGE
-PHPQA_DOCKER_IMAGE=jakzal/phpqa:1.93.0-php${PHP_VERSION}-alpine
+PHPQA_DOCKER_IMAGE=jakzal/phpqa:1.95.1-php${PHP_VERSION}-alpine
 endif
 
 ifndef PHPQA_DOCKER_COMMAND

diff --git a/resources/Visual/common.mk b/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.2
+BACKSTOP_DOCKER_IMAGE ?= backstopjs/backstopjs:6.3.3
 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

diff --git a/tests/functional/MakefileTestCase.php b/tests/functional/MakefileTestCase.php
@@ -100,7 +100,7 @@ public function testHelpIsTheDefaultCommand(): void
     public function testMakefileHasInit(): void
     {
         $expected = array_map(static fn (string $path): string => sprintf('if [ -d "$ROOT/resources/%1$s" ]; then cp -a $ROOT/resources/%1$s/. .; fi', $path), $this->getExpectedInitPaths());
-        $expected = array_merge(...array_values(array_map(static fn ($value) => [$value, 'if [ -f .gitattributes.dist ]; then mv .gitattributes.dist .gitattributes; fi'], $expected)));
+        $expected = array_merge(...array_map(static fn ($value) => [$value, 'if [ -f .gitattributes.dist ]; then mv .gitattributes.dist .gitattributes; fi'], $expected));
         $actual = self::dryRun('init');
 
         self::assertSame($expected, $actual);
@@ -109,6 +109,7 @@ public function testMakefileHasInit(): void
     /**
      * @dataProvider provideMakefileCommandsWorkCases
      *
+     * @param list<string>          $expected
      * @param array<string, string> $env
      */
     public function testMakefileCommandsWork(string $command, array $expected, array $env): void
@@ -131,17 +132,24 @@ protected function getExpectedHelp(): string
         return $this->generateHelpList(array_keys(static::getExpectedHelpCommandsExecutionPath([])));
     }
 
+    /**
+     * @param list<string> $commands
+     */
     protected function generateHelpList(array $commands): string
     {
         $help = [];
         sort($commands);
         foreach ($commands as $command) {
-            $help[] = sprintf('%1$s[45m%2$s%1$s[0m %3$s', "\e", str_pad($command, 20), $this->helpOverride[$command] ?? $this->help[$command] ?? '');
+            $help[] = sprintf('%1$s[45m%2$s%1$s[0m %3$s', "\e", mb_str_pad($command, 20), $this->helpOverride[$command] ?? $this->help[$command] ?? '');
         }
 
         return implode("\n", $help)."\n";
     }
 
+    /**
+     * @param list<string> $files
+     * @param list<string> $additionalFiles
+     */
     protected static function generateHelpExecutionPath(array $files = [], array $additionalFiles = []): string
     {
         $files = array_merge($files, [
@@ -154,7 +162,10 @@ protected static function generateHelpExecutionPath(array $files = [], array $ad
         $command = match (\PHP_OS_FAMILY) {
             'Darwin' => 'grep --no-filename --extended-regexp \'^ *[-a-zA-Z0-9_/]+ *:.*## \'  '.implode(' ', $files).' | awk \'BEGIN {FS = ":.*?## "}; {printf "\033[45m%-20s\033[0m %s\n", $1, $2}\' | sort',
             'Linux' => 'grep -h -E \'^ *[-a-zA-Z0-9_/]+ *:.*## \' '.implode(' ', $files).' | awk \'BEGIN {FS = ":.*?## "}; {printf "\033[45m%-20s\033[0m %s\n", $1, $2}\' | sort',
-            'Windows' => 'Select-String -Pattern \'^ *(?<name>[-a-zA-Z0-9_/]+) *:.*## *(?<help>.+)\' '.implode(',', array_map(static function (string $item, int $index): string {
+            'Windows' => 'Select-String -Pattern \'^ *(?<name>[-a-zA-Z0-9_/]+) *:.*## *(?<help>.+)\' '.implode(',', array_map(static function (false|string $item, int $index): string {
+                if ($item === false) {
+                    throw new \LogicException('Invalid item');
+                }
                 if ($index === 0) {
                     return $item;
                 }
@@ -167,6 +178,11 @@ protected static function generateHelpExecutionPath(array $files = [], array $ad
         return self::normalize($command);
     }
 
+    /**
+     * @param list<string> $dirs
+     *
+     * @return list<string>
+     */
     protected static function generatePermissionsExecutionPath(array $dirs): array
     {
         $commands = [];
@@ -221,7 +237,13 @@ protected static function getMakefilePath(): string
     }
 
     /**
+     * @param list<string>                   $args
      * @param null|array<string, int|string> $env
+     *
+     * @return list<string>
+     *
+     * @psalm-suppress MoreSpecificReturnType
+     * @psalm-suppress LessSpecificReturnStatement
      */
     protected static function dryRun(
         ?string $makeCommand = null,
@@ -236,6 +258,7 @@ protected static function dryRun(
     }
 
     /**
+     * @param list<string>                   $args
      * @param null|array<string, int|string> $env
      */
     protected static function execute(

diff --git a/tests/functional/PHP/PharTest.php b/tests/functional/PHP/PharTest.php
@@ -26,6 +26,9 @@ final class PharTest extends MakefileTestCase
 {
     use PhpTrait;
 
+    /**
+     * @var array<string, string>
+     */
     protected array $helpOverride = [
         'phar/build' => 'Build PHAR file',
     ];