Update GHA workflows to use current Ubuntu and tools versions (#106)

mpdude · web-flow · commit dcae8afe2106 · 2024-01-18T14:05:28.000+01:00
diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml
@@ -7,12 +7,12 @@ on:
     pull_request:
 
 env:
-    PHP_VERSION: 7.4
+    PHP_VERSION: 8.1
 
 jobs:
     composer-require-checker:
         name: Check missing composer requirements
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-22.04
         steps:
             -   name: Configure PHP version
                 uses: shivammathur/setup-php@v2
@@ -32,4 +32,4 @@ jobs:
                     composer update --no-interaction --no-scripts --no-progress
                     composer show
             -   name: ComposerRequireChecker
-                uses: docker://webfactory/composer-require-checker:3.2.0
+                uses: docker://ghcr.io/webfactory/composer-require-checker:4.8.0
diff --git a/.github/workflows/fix-cs-php.yml b/.github/workflows/fix-cs-php.yml
@@ -9,7 +9,7 @@ name: Coding Standards
 jobs:
     open-pr-for-cs-violations:
         name: PHP-CS-Fixer
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-22.04
         if: github.actor != 'dependabot[bot]'
         steps:
             -   name: Checkout code
@@ -18,7 +18,7 @@ jobs:
                     ref: ${{ github.head_ref }}
 
             -   name: Run PHP-CS-Fixer
-                uses: docker://oskarstark/php-cs-fixer-ga:3.11.0
+                uses: docker://oskarstark/php-cs-fixer-ga:3.26.0
 
             -   name: Commit and push back changes
                 uses: stefanzweifel/git-auto-commit-action@v4
diff --git a/.github/workflows/php-version-compatibility.yml b/.github/workflows/php-version-compatibility.yml
@@ -9,7 +9,7 @@ on:
 jobs:
     compat-check:
         name: Check dependency compatibility
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-22.04
         strategy:
             fail-fast: false
             matrix:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -6,7 +6,7 @@ name: Build .phar on release
 
 jobs:
     build_phar:
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-22.04
         steps:
             -   name: Configure PHP version
                 uses: shivammathur/setup-php@v2
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
     PHPUnit:
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-22.04
         strategy:
             fail-fast: false
             matrix:
diff --git a/src/Webfactory/Slimdump/Config/Column.php b/src/Webfactory/Slimdump/Config/Column.php
@@ -46,9 +46,6 @@ public function getSelector()
         return $this->selector;
     }
 
-    /**
-     * @return mixed
-     */
     public function getDump()
     {
         return $this->dump;
diff --git a/src/Webfactory/Slimdump/Config/Config.php b/src/Webfactory/Slimdump/Config/Config.php
@@ -49,8 +49,6 @@ public function findTable($tableName)
 
     /**
      * @param string $needle
-     *
-     * @return mixed
      */
     public static function findBySelector(array $haystack, $needle)
     {
diff --git a/src/Webfactory/Slimdump/Config/FakerReplacer.php b/src/Webfactory/Slimdump/Config/FakerReplacer.php
@@ -39,7 +39,7 @@ public function __construct()
      */
     public static function isFakerColumn($replacement)
     {
-        return 0 === strpos($replacement, self::PREFIX);
+        return str_starts_with($replacement, self::PREFIX);
     }
 
     /**
@@ -53,7 +53,7 @@ public function generateReplacement($replacementId)
     {
         $replacementMethodName = str_replace(self::PREFIX, '', $replacementId);
 
-        if (false !== strpos($replacementMethodName, '->')) {
+        if (str_contains($replacementMethodName, '->')) {
             [$modifierName, $replacementMethodName] = explode('->', $replacementMethodName);
 
             $this->validateReplacementConfiguredModifier($modifierName, $replacementMethodName);
diff --git a/src/Webfactory/Slimdump/Database/CsvOutputFormatDriver.php b/src/Webfactory/Slimdump/Database/CsvOutputFormatDriver.php
@@ -22,7 +22,7 @@ class CsvOutputFormatDriver implements OutputFormatDriverInterface
     /**
      * @var ?resource
      */
-    private $outputFile = null;
+    private $outputFile;
 
     /**
      * @var bool
diff --git a/test/Webfactory/Slimdump/Config/TableTest.php b/test/Webfactory/Slimdump/Config/TableTest.php
@@ -138,7 +138,6 @@ public function testDumpTriggerDefaultSetting()
      * @dataProvider  dumpTriggerAttributeValues
      *
      * @param string $value
-     * @param $expected
      *
      * @throws mixed InvalidDumpTypeException
      */

Original file line number	Diff line number	Diff line change
`@@ -46,9 +46,6 @@ public function getSelector()`
`46`	`46`	`return $this->selector;`
`47`	`47`	`}`
`48`	`48`
`49`		`- /**`
`50`		`- * @return mixed`
`51`		`- */`
`52`	`49`	`public function getDump()`
`53`	`50`	`{`
`54`	`51`	`return $this->dump;`
Original file line number	Diff line number	Diff line change
`@@ -49,8 +49,6 @@ public function findTable($tableName)`
`49`	`49`
`50`	`50`	`/**`
`51`	`51`	`* @param string $needle`
`52`		`- *`
`53`		`- * @return mixed`
`54`	`52`	`*/`
`55`	`53`	`public static function findBySelector(array $haystack, $needle)`
`56`	`54`	`{`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public function __construct()`
`39`	`39`	`*/`
`40`	`40`	`public static function isFakerColumn($replacement)`
`41`	`41`	`{`
`42`		`- return 0 === strpos($replacement, self::PREFIX);`
	`42`	`+ return str_starts_with($replacement, self::PREFIX);`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`/**`
`@@ -53,7 +53,7 @@ public function generateReplacement($replacementId)`
`53`	`53`	`{`
`54`	`54`	`$replacementMethodName = str_replace(self::PREFIX, '', $replacementId);`
`55`	`55`
`56`		`- if (false !== strpos($replacementMethodName, '->')) {`
	`56`	`+ if (str_contains($replacementMethodName, '->')) {`
`57`	`57`	`[$modifierName, $replacementMethodName] = explode('->', $replacementMethodName);`
`58`	`58`
`59`	`59`	`$this->validateReplacementConfiguredModifier($modifierName, $replacementMethodName);`
Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,6 @@ public function testDumpTriggerDefaultSetting()`
`138`	`138`	`* @dataProvider dumpTriggerAttributeValues`
`139`	`139`	`*`
`140`	`140`	`* @param string $value`
`141`		`- * @param $expected`
`142`	`141`	`*`
`143`	`142`	`* @throws mixed InvalidDumpTypeException`
`144`	`143`	`*/`