Merge 595cf14 into 0ac4d26

tattersoftware · Jul 26, 2022 · aa6c03b · aa6c03b
2 parents 0ac4d26 + 595cf14
commit aa6c03b
Show file tree

Hide file tree

Showing 15 changed files with 195 additions and 181 deletions.
diff --git a/.github/workflows/deptrac.yml b/.github/workflows/deptrac.yml
@@ -31,7 +31,7 @@ jobs:
       - name: Set up PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.0'
+          php-version: '8.1'
           tools: phive
           extensions: intl, json, mbstring, xml
           coverage: none

diff --git a/.github/workflows/infection.yml b/.github/workflows/infection.yml
@@ -31,7 +31,7 @@ jobs:
       - name: Set up PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.0'
+          php-version: '8.1'
           tools: infection, phpunit
           extensions: intl, json, mbstring, gd, xml, sqlite3
           coverage: xdebug

diff --git a/.github/workflows/phpcpd.yml b/.github/workflows/phpcpd.yml
@@ -27,7 +27,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.0'
+          php-version: '8.1'
           tools: phpcpd
           extensions: dom, mbstring
           coverage: none

diff --git a/.github/workflows/phpcsfixer.yml b/.github/workflows/phpcsfixer.yml
@@ -16,13 +16,9 @@ on:
 
 jobs:
   build:
-    name: PHP ${{ matrix.php-versions }} Coding Standards
+    name: Coding Standards
     runs-on: ubuntu-latest
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
-    strategy:
-      fail-fast: false
-      matrix:
-        php-versions: ['7.4', '8.0', '8.1']
 
     steps:
       - name: Checkout
@@ -31,7 +27,7 @@ jobs:
       - name: Set up PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: ${{ matrix.php-versions }}
+          php-version: '8.1'
           extensions: json, tokenizer
           coverage: none
         env:

diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -25,9 +25,7 @@ jobs:
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
     strategy:
       matrix:
-        # Temporarily disabled 8.1 until CodeIgniter 4.2
-        # php-versions: ['7.4', '8.0', '8.1']
-        php-versions: ['7.4', '8.0']
+        php-versions: ['7.4', '8.0', '8.1']
 
     steps:
       - name: Checkout

diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml
@@ -31,7 +31,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.0'
+          php-version: '8.1'
           tools: phpstan, phpunit
           extensions: intl, json, mbstring, xml
           coverage: none

diff --git a/.github/workflows/rector.yml b/.github/workflows/rector.yml
@@ -63,5 +63,5 @@ jobs:
 
       - name: Analyze for refactoring
         run: |
-          composer global require --dev rector/rector:^0.12.16
+          composer global require --dev rector/rector:^0.13.8
           rector process --dry-run --no-progress-bar
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -11,6 +11,7 @@
         __DIR__ . '/tests/',
     ])
     ->exclude('build')
+    ->exclude('Views/errors')
     ->append([__FILE__]);
 
 $overrides = [];

diff --git a/app/Models/SubmissionModel.php b/app/Models/SubmissionModel.php
@@ -55,15 +55,15 @@ public function fromKind(Kind $kind): array
                     'body'  => $kind->body,
                     'html'  => $kind->body_html,
                 ]);
-            break;
+                break;
 
             case 'Link':
                 $row = array_merge($row, [
                     'title' => $kind->title,
                     'body'  => $kind->selftext,
                     'html'  => $kind->selftext_html,
                 ]);
-            break;
+                break;
 
             default:
                 throw new RuntimeException('Unsupport Kind:' . get_class($kind));

diff --git a/composer-unused.php b/composer-unused.php
@@ -7,11 +7,9 @@
 use ComposerUnused\ComposerUnused\Configuration\PatternFilter;
 use Webmozart\Glob\Glob;
 
-return static function (Configuration $config): Configuration {
-    return $config
-        // ->addNamedFilter(NamedFilter::fromString('symfony/config'))
-        // ->addPatternFilter(PatternFilter::fromString('/symfony-.*/'))
-        ->setAdditionalFilesFor('codeigniter4/framework', [
-            ...Glob::glob(__DIR__ . '/vendor/codeigniter4/framework/system/Helpers/*.php'),
-        ]);
-};
+return static fn (Configuration $config): Configuration => $config
+    // ->addNamedFilter(NamedFilter::fromString('symfony/config'))
+    // ->addPatternFilter(PatternFilter::fromString('/symfony-.*/'))
+    ->setAdditionalFilesFor('codeigniter4/framework', [
+        ...Glob::glob(__DIR__ . '/vendor/codeigniter4/framework/system/Helpers/*.php'),
+    ]);
diff --git a/composer.json b/composer.json
@@ -51,15 +51,16 @@
     "scripts": {
         "analyze": [
             "phpstan analyze",
-            "psalm"
+            "psalm",
+            "rector process --dry-run"
         ],
         "ci": [
             "Composer\\Config::disableProcessTimeout",
             "@deduplicate",
             "@analyze",
+            "@composer normalize --dry-run",
             "@test",
             "@inspect",
-            "rector process",
             "@style"
         ],
         "deduplicate": "phpcpd app/ src/",