Merge remote-tracking branch 'upstream/main' into chore/deps

.github/workflows/composer-root-version.yaml

@@ -3,7 +3,15 @@ name: RootVersionChecker
 on:
     push:
         branches: [ main ]
-    pull_request:
+    pull_request: ~
+    schedule:
+        # Do not make it the first of the month and/or midnight since it is a very busy time
+        - cron: "* 10 5 * *"
+
+# See https://stackoverflow.com/a/72408109
+concurrency:
+    group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+    cancel-in-progress: true
 
 jobs:
     cs-lint:

.github/workflows/e2e-tests.yaml

@@ -3,9 +3,17 @@ name: End-to-End Tests
 on:
     push:
         branches: [ main ]
-    pull_request:
+    pull_request: ~
     release:
         types: [ created ]
+    schedule:
+        # Do not make it the first of the month and/or midnight since it is a very busy time
+        - cron: "* 10 5 * *"
+
+# See https://stackoverflow.com/a/72408109
+concurrency:
+    group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+    cancel-in-progress: true
 
 jobs:
     build-test-phar:

.github/workflows/lint.yaml

@@ -3,7 +3,15 @@ name: Lint
 on:
     push:
         branches: [ main ]
-    pull_request:
+    pull_request: ~
+    schedule:
+        # Do not make it the first of the month and/or midnight since it is a very busy time
+        - cron: "* 10 5 * *"
+
+# See https://stackoverflow.com/a/72408109
+concurrency:
+    group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+    cancel-in-progress: true
 
 jobs:
     cs:

.github/workflows/release.yaml

@@ -3,9 +3,17 @@ name: Release
 on:
     push:
         branches: [ main ]
-    pull_request:
+    pull_request: ~
     release:
         types: [ created ]
+    schedule:
+        # Do not make it the first of the month and/or midnight since it is a very busy time
+        - cron: "* 10 5 * *"
+
+# See https://stackoverflow.com/a/72408109
+concurrency:
+    group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+    cancel-in-progress: true
 
 jobs:
     build-phar:

.github/workflows/security.yaml

@@ -3,9 +3,17 @@ name: Security
 on:
     push:
         branches: [ main ]
-    pull_request:
+    pull_request: ~
     release:
         types: [ created ]
+    schedule:
+      # Do not make it the first of the month and/or midnight since it is a very busy time
+          - cron: "* 10 5 * *"
+
+# See https://stackoverflow.com/a/72408109
+concurrency:
+    group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+    cancel-in-progress: true
 
 jobs:
     security:

.github/workflows/tests.yaml

@@ -3,9 +3,17 @@ name: Tests
 on:
     push:
         branches: [ main ]
-    pull_request:
+    pull_request: ~
     release:
-        types: [ created ]
+        types: [ created ] ~
+    schedule:
+      # Do not make it the first of the month and/or midnight since it is a very busy time
+          - cron: "* 10 5 * *"
+
+# See https://stackoverflow.com/a/72408109
+concurrency:
+    group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+    cancel-in-progress: true
 
 jobs:
     root-version:

composer-root-version-checker/src/CouldNotParseTag.php

@@ -44,7 +44,7 @@ public static function noNameTagFound(
     }
 
     public static function withReason(
-        null|bool|int|float|string $tag,
+        null|bool|float|int|string $tag,
         string $reason
     ): self {
         return new self(

composer-root-version-checker/src/Logger.php

@@ -31,7 +31,7 @@ public function __destruct()
         $this->writeRecords();
     }
 
-    public function log($level, Stringable|string $message, array $context = []): void
+    public function log($level, string|Stringable $message, array $context = []): void
     {
         $record = sprintf('[%s] %s', $level, $message).PHP_EOL;
 

composer.json

@@ -18,13 +18,14 @@
     ],
     "require": {
         "php": "^8.1",
-        "fidry/console": "^0.5.0",
+        "fidry/console": "^0.5.0 || ^0.6.0",
+        "fidry/filesystem": "^1.1",
         "jetbrains/phpstorm-stubs": "^v2022.2",
         "nikic/php-parser": "^4.12",
         "symfony/console": "^5.2 || ^6.0",
         "symfony/filesystem": "^5.2 || ^6.0",
         "symfony/finder": "^5.2 || ^6.0",
-        "thecodingmachine/safe": "^1.3 || ^2.0"
+        "thecodingmachine/safe": "^2.0"
     },
     "require-dev": {
         "bamarni/composer-bin-plugin": "^1.1",

src/Autoload/ScoperAutoloadGenerator.php

@@ -217,7 +217,7 @@ private static function createClassAliasStatement(
      *
      * @return list<string>
      */
-    private static function wrapStatementsInNamespaceBlock(string $namespace, string|array $statements): array
+    private static function wrapStatementsInNamespaceBlock(string $namespace, array|string $statements): array
     {
         if (is_string($statements)) {
             $statements = explode(self::$eol, $statements);