Merge pull request #19 from codenamephp/dependabot/docker/docker/application/webdevops/php-dev-8.3

bastianschwarz · web-flow · commit 23532b6f0568 · 2024-01-07T15:22:33.000+01:00
Bump webdevops/php-dev from 8.2 to 8.3 in /docker/application
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,4 +19,4 @@ jobs:
   ci:
     uses: codenamephp/workflows.php/.github/workflows/ci.yml@1
     with:
-      php-versions: '["8.1", "8.2"]'
+      php-versions: '["8.1", "8.2", "8.3"]'
diff --git a/.idea/runConfigurations/ci_all.xml b/.idea/runConfigurations/ci_all.xml
diff --git a/docker/application/Dockerfile b/docker/application/Dockerfile
@@ -1,4 +1,4 @@
-FROM webdevops/php-dev:8.2
+FROM webdevops/php-dev:8.3
 
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer
 
diff --git a/phive.xml b/phive.xml
@@ -16,7 +16,7 @@
   -->
 <phive xmlns="https://phar.io/phive">
   <phar name="phpunit" version="^10.0" installed="10.2.0" location="./tools/phpunit.phar" copy="true"/>
-  <phar name="psalm" version="^5.0" installed="5.12.0" location="./tools/psalm" copy="true"/>
+  <phar name="psalm" version="^5.0" installed="5.18.0" location="./tools/psalm" copy="true"/>
   <phar name="composer-unused" version="^0.8" installed="0.8.9" location="./tools/composer-unused.phar" copy="true"/>
   <phar name="composer-require-checker" version="^4.0" installed="4.6.0" location="./tools/composer-require-checker" copy="true"/>
   <phar name="infection" version="^0.26" installed="0.26.21" location="./tools/infection" copy="true"/>
diff --git a/src/functions/All.php b/src/functions/All.php
@@ -146,7 +146,7 @@ public function parse(string $value) : string {
   public function parseOnHost(Host $host, string $value) : string {
     $finalValue = '';
     $this->on($host, function() use (&$finalValue, $value) { $finalValue = $this->parse($value); });
-    return (string) $finalValue;
+    return $finalValue;
   }
 
   public function run(string $command, ?array $options = [], ?int $timeout = null, ?int $idle_timeout = null, ?string $secret = null, ?array $env = null, ?bool $real_time_output = false, ?bool $no_throw = false) : string {
diff --git a/src/taskMatcher/ByRegexTaskName.php b/src/taskMatcher/ByRegexTaskName.php
@@ -27,6 +27,6 @@ final class ByRegexTaskName implements iTaskMatcher {
   public function __construct(public string $regex) {}
 
   public function matches(Task $task) : bool {
-    return preg_match($this->regex, $task->getName()) === 1;
+    return $this->regex !== '' && preg_match($this->regex, $task->getName()) === 1;
   }
-}
+}
diff --git a/test/taskMatcher/ByRegexTaskNameTest.php b/test/taskMatcher/ByRegexTaskNameTest.php
@@ -49,6 +49,15 @@ public function testMatches() : void {
     self::assertFalse($this->sut->matches($task4));
   }
 
+  public function testMatches_canReturnFalse_whenRegexIsEmpty() : void {
+    $this->sut->regex = '';
+
+    $task1 = $this->createMock(Task::class);
+    $task1->expects(self::never())->method('getName');
+
+    self::assertFalse($this->sut->matches($task1));
+  }
+
   public function test__construct() : void {
     $regex = 'some regex';
 
diff --git a/tools/psalm b/tools/psalm

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM webdevops/php-dev:8.2`
	`1`	`+FROM webdevops/php-dev:8.3`
`2`	`2`
`3`	`3`	`COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ public function parse(string $value) : string {`
`146`	`146`	`public function parseOnHost(Host $host, string $value) : string {`
`147`	`147`	`$finalValue = '';`
`148`	`148`	`$this->on($host, function() use (&$finalValue, $value) { $finalValue = $this->parse($value); });`
`149`		`- return (string) $finalValue;`
	`149`	`+ return $finalValue;`
`150`	`150`	`}`
`151`	`151`
`152`	`152`	`public function run(string $command, ?array $options = [], ?int $timeout = null, ?int $idle_timeout = null, ?string $secret = null, ?array $env = null, ?bool $real_time_output = false, ?bool $no_throw = false) : string {`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,6 @@ final class ByRegexTaskName implements iTaskMatcher {`
`27`	`27`	`public function __construct(public string $regex) {}`
`28`	`28`
`29`	`29`	`public function matches(Task $task) : bool {`
`30`		`- return preg_match($this->regex, $task->getName()) === 1;`
	`30`	`+ return $this->regex !== '' && preg_match($this->regex, $task->getName()) === 1;`
`31`	`31`	`}`
`32`		`-}`
	`32`	`+}`