Update the dependencies

contao · Jun 18, 2024 · e428cfc · e428cfc
1 parent f811f45
commit e428cfc
Show file tree

Hide file tree

Showing 20 changed files with 29 additions and 23 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -25,10 +25,12 @@ jobs:
                   coverage: none
 
             - name: Checkout
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
+              with:
+                  show-progress: false
 
             - name: Install the dependencies
-              run: composer install --no-interaction --no-progress
+              uses: ramsey/composer-install@v3
 
             - name: Run the unit tests
               run: vendor/bin/phpunit
@@ -46,10 +48,14 @@ jobs:
                   coverage: none
 
             - name: Checkout
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
+              with:
+                  show-progress: false
 
             - name: Install the dependencies
-              run: composer install --ignore-platform-req=php --no-interaction --no-progress
+              uses: ramsey/composer-install@v3
+              with:
+                  composer-options: --ignore-platform-req=php+
 
             - name: Run the unit tests
               run: vendor/bin/phpunit
diff --git a/ecs.php b/ecs.php
@@ -41,5 +41,5 @@
         'header' => "This file is part of Contao.\n\n(c) Leo Feyer\n\n@license LGPL-3.0-or-later",
     ])
     ->withParallel()
-    ->withCache(sys_get_temp_dir().'/ecs_ecs_cache')
+    ->withCache(sys_get_temp_dir().'/ecs/ecs')
 ;
diff --git a/rector.php b/rector.php
@@ -23,5 +23,5 @@
         __DIR__.'/rector.php',
     ])
     ->withParallel()
-    ->withCache(sys_get_temp_dir().'/ecs_rector_cache')
+    ->withCache(sys_get_temp_dir().'/ecs/rector')
 ;
diff --git a/tests/Fixer/AssertEqualsFixerTest.php b/tests/Fixer/AssertEqualsFixerTest.php
@@ -31,7 +31,7 @@ public function testFixesTheCode(string $code, string $expected): void
         $this->assertSame($expected, $tokens->generateCode());
     }
 
-    public function getCodeSamples(): \Generator
+    public static function getCodeSamples(): iterable
     {
         yield [
             <<<'EOT'

diff --git a/tests/Fixer/CaseCommentIndentationFixerTest.php b/tests/Fixer/CaseCommentIndentationFixerTest.php
@@ -31,7 +31,7 @@ public function testFixesTheCode(string $code, string $expected): void
         $this->assertSame($expected, $tokens->generateCode());
     }
 
-    public function getCodeSamples(): \Generator
+    public static function getCodeSamples(): iterable
     {
         yield [
             <<<'EOT'

diff --git a/tests/Fixer/ChainedMethodBlockFixerTest.php b/tests/Fixer/ChainedMethodBlockFixerTest.php
@@ -31,7 +31,7 @@ public function testFixesTheCode(string $code, string $expected): void
         $this->assertSame($expected, $tokens->generateCode());
     }
 
-    public function getCodeSamples(): \Generator
+    public static function getCodeSamples(): iterable
     {
         yield [
             <<<'EOT'

diff --git a/tests/Fixer/CommentLengthFixerTest.php b/tests/Fixer/CommentLengthFixerTest.php
@@ -31,7 +31,7 @@ public function testFixesTheCode(string $code, string $expected): void
         $this->assertSame($expected, $tokens->generateCode());
     }
 
-    public function getCodeSamples(): \Generator
+    public static function getCodeSamples(): iterable
     {
         yield [
             <<<'EOT'

diff --git a/tests/Fixer/ExpectsWithCallbackFixerTest.php b/tests/Fixer/ExpectsWithCallbackFixerTest.php
@@ -31,7 +31,7 @@ public function testFixesTheCode(string $code, string $expected): void
         $this->assertSame($expected, $tokens->generateCode());
     }
 
-    public function getCodeSamples(): \Generator
+    public static function getCodeSamples(): iterable
     {
         yield [
             <<<'EOT'

diff --git a/tests/Fixer/FindByPkFixerTest.php b/tests/Fixer/FindByPkFixerTest.php
@@ -31,7 +31,7 @@ public function testFixesTheCode(string $code, string $expected): void
         $this->assertSame($expected, $tokens->generateCode());
     }
 
-    public function getCodeSamples(): \Generator
+    public static function getCodeSamples(): iterable
     {
         yield [
             <<<'EOT'

diff --git a/tests/Fixer/FunctionCallWithMultilineArrayFixerTest.php b/tests/Fixer/FunctionCallWithMultilineArrayFixerTest.php
@@ -31,7 +31,7 @@ public function testFixesTheCode(string $code, string $expected): void
         $this->assertSame($expected, $tokens->generateCode());
     }
 
-    public function getCodeSamples(): \Generator
+    public static function getCodeSamples(): iterable
     {
         yield [
             <<<'EOT'

diff --git a/tests/Fixer/InlinePhpdocCommentFixerTest.php b/tests/Fixer/InlinePhpdocCommentFixerTest.php
@@ -31,7 +31,7 @@ public function testFixesTheCode(string $code, string $expected): void
         $this->assertSame($expected, $tokens->generateCode());
     }
 
-    public function getCodeSamples(): \Generator
+    public static function getCodeSamples(): iterable
     {
         yield [
             <<<'EOT'

diff --git a/tests/Fixer/IsArrayNotEmptyFixerTest.php b/tests/Fixer/IsArrayNotEmptyFixerTest.php
@@ -31,7 +31,7 @@ public function testFixesTheCode(string $code, string $expected): void
         $this->assertSame($expected, $tokens->generateCode());
     }
 
-    public function getCodeSamples(): \Generator
+    public static function getCodeSamples(): iterable
     {
         yield [
             <<<'EOT'

diff --git a/tests/Fixer/MockMethodChainingIndentationFixerTest.php b/tests/Fixer/MockMethodChainingIndentationFixerTest.php
@@ -31,7 +31,7 @@ public function testFixesTheCode(string $code, string $expected): void
         $this->assertSame($expected, $tokens->generateCode());
     }
 
-    public function getCodeSamples(): \Generator
+    public static function getCodeSamples(): iterable
     {
         yield [
             <<<'EOT'

diff --git a/tests/Fixer/MultiLineLambdaFunctionArgumentsFixerTest.php b/tests/Fixer/MultiLineLambdaFunctionArgumentsFixerTest.php
@@ -31,7 +31,7 @@ public function testFixesTheCode(string $code, string $expected): void
         $this->assertSame($expected, $tokens->generateCode());
     }
 
-    public function getCodeSamples(): \Generator
+    public static function getCodeSamples(): iterable
     {
         yield [
             <<<'EOT'

diff --git a/tests/Fixer/MultilineIfIndentationFixerTest.php b/tests/Fixer/MultilineIfIndentationFixerTest.php
@@ -31,7 +31,7 @@ public function testFixesTheCode(string $code, string $expected): void
         $this->assertSame($expected, $tokens->generateCode());
     }
 
-    public function getCodeSamples(): \Generator
+    public static function getCodeSamples(): iterable
     {
         yield [
             <<<'EOT'

diff --git a/tests/Fixer/NoExpectsThisAnyFixerTest.php b/tests/Fixer/NoExpectsThisAnyFixerTest.php
@@ -31,7 +31,7 @@ public function testFixesTheCode(string $code, string $expected): void
         $this->assertSame($expected, $tokens->generateCode());
     }
 
-    public function getCodeSamples(): \Generator
+    public static function getCodeSamples(): iterable
     {
         yield [
             <<<'EOT'

diff --git a/tests/Fixer/NoLineBreaksBetweenMethodArgumentsFixerTest.php b/tests/Fixer/NoLineBreaksBetweenMethodArgumentsFixerTest.php
@@ -31,7 +31,7 @@ public function testFixesTheCode(string $code, string $expected): void
         $this->assertSame($expected, $tokens->generateCode());
     }
 
-    public function getCodeSamples(): \Generator
+    public static function getCodeSamples(): iterable
     {
         yield [
             <<<'EOT'

diff --git a/tests/Fixer/NoSemicolonAfterShortEchoTagFixerTest.php b/tests/Fixer/NoSemicolonAfterShortEchoTagFixerTest.php
@@ -31,7 +31,7 @@ public function testFixesTheCode(string $code, string $expected): void
         $this->assertSame($expected, $tokens->generateCode());
     }
 
-    public function getCodeSamples(): \Generator
+    public static function getCodeSamples(): iterable
     {
         yield [
             <<<'EOT'

diff --git a/tests/Fixer/SingleLineConfigureCommandFixerTest.php b/tests/Fixer/SingleLineConfigureCommandFixerTest.php
@@ -31,7 +31,7 @@ public function testFixesTheCode(string $code, string $expected): void
         $this->assertSame($expected, $tokens->generateCode());
     }
 
-    public function getCodeSamples(): \Generator
+    public static function getCodeSamples(): iterable
     {
         yield [
             <<<'EOT'

diff --git a/tests/Fixer/TypeHintOrderFixerTest.php b/tests/Fixer/TypeHintOrderFixerTest.php
@@ -31,7 +31,7 @@ public function testFixesTheCode(string $code, string $expected): void
         $this->assertSame($expected, $tokens->generateCode());
     }
 
-    public function getCodeSamples(): \Generator
+    public static function getCodeSamples(): iterable
     {
         yield [
             <<<'EOT'