Merge pull request #348 from kenjis/update-devkit

kenjis · web-flow · commit cefcc6fc618c · 2022-12-25T18:56:46.000+09:00
Update devkit
diff --git a/.github/workflows/deptrac.yml b/.github/workflows/deptrac.yml
@@ -39,13 +39,12 @@ jobs:
           COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Get composer cache directory
-        id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+        run: echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_ENV
 
       - name: Cache composer dependencies
         uses: actions/cache@v3
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ env.COMPOSER_CACHE_FILES_DIR }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
 
diff --git a/.github/workflows/infection.yml b/.github/workflows/infection.yml
@@ -45,13 +45,12 @@ jobs:
         uses: mheap/phpunit-matcher-action@v1
 
       - name: Get composer cache directory
-        id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+        run: echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_ENV
 
       - name: Cache composer dependencies
         uses: actions/cache@v3
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ env.COMPOSER_CACHE_FILES_DIR }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
 
diff --git a/.github/workflows/phpcsfixer.yml b/.github/workflows/phpcsfixer.yml
@@ -34,13 +34,12 @@ jobs:
           COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Get composer cache directory
-        id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+        run: echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_ENV
 
       - name: Cache composer dependencies
         uses: actions/cache@v3
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ env.COMPOSER_CACHE_FILES_DIR }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
 
diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
@@ -43,13 +43,12 @@ jobs:
           COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Get composer cache directory
-        id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+        run: echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_ENV
 
       - name: Cache composer dependencies
         uses: actions/cache@v3
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ env.COMPOSER_CACHE_FILES_DIR }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
 
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -42,13 +42,12 @@ jobs:
           COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Get composer cache directory
-        id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+        run: echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_ENV
 
       - name: Cache composer dependencies
         uses: actions/cache@v3
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ env.COMPOSER_CACHE_FILES_DIR }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
 
diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml
@@ -39,13 +39,12 @@ jobs:
           COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Get composer cache directory
-        id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+        run: echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_ENV
 
       - name: Cache composer dependencies
         uses: actions/cache@v3
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ env.COMPOSER_CACHE_FILES_DIR }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
 
diff --git a/.github/workflows/rector.yml b/.github/workflows/rector.yml
@@ -43,13 +43,12 @@ jobs:
           COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Get composer cache directory
-        id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+        run: echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_ENV
 
       - name: Cache composer dependencies
         uses: actions/cache@v3
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ env.COMPOSER_CACHE_FILES_DIR }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
 
@@ -63,5 +62,5 @@ jobs:
 
       - name: Analyze for refactoring
         run: |
-          composer global require --dev rector/rector:^0.14
+          composer global require --dev rector/rector:^0.15.1
           rector process --dry-run --no-progress-bar
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -10,11 +10,19 @@
         __DIR__ . '/app/',
         __DIR__ . '/tests/',
     ])
-    ->exclude('build')
-    ->exclude('Views/errors')
-    ->append([__FILE__]);
+    ->exclude([
+        'build',
+        'Views',
+    ])
+    ->append([
+        __FILE__,
+        __DIR__ . '/rector.php',
+    ]);
 
-$overrides = [];
+$overrides = [
+    // 'declare_strict_types' => true,
+    // 'void_return'          => true,
+];
 
 $options = [
     'finder'    => $finder,
diff --git a/app/Config/App.php b/app/Config/App.php
@@ -437,6 +437,7 @@ class App extends BaseConfig
      * Defaults to `Lax` as recommended in this link:
      *
      * @see https://portswigger.net/web-security/csrf/samesite-cookies
+     *
      * @deprecated `Config\Cookie` $samesite property is used.
      *
      * @var string
diff --git a/app/Libraries/Blog.php b/app/Libraries/Blog.php
@@ -34,9 +34,9 @@ public function __construct()
      * If $category is present, will locate within a
      * subfolder of that name.
      *
-     * @throws BlogException
-     *
      * @return Post[]
+     *
+     * @throws BlogException
      */
     public function getRecentPosts(int $limit = 5, int $offset = 0, ?string $category = null)
     {
@@ -250,7 +250,8 @@ protected function readPost(string $folder, string $filename)
 
         foreach ($contents as $line) {
             if (trim($line) === '---') {
-                $inFrontMatter = ! $inFrontMatter;
+                $inFrontMatter = $inFrontMatter ? false : true;
+
                 if (! $inFrontMatter) {
                     $inBody = true;
                 }
@@ -267,6 +268,7 @@ protected function readPost(string $folder, string $filename)
 
             $body[] = trim($line);
         }
+
         $post->body = implode("\n", $body);
 
         // Convert body using Markdown
diff --git a/app/Libraries/GitHub.php b/app/Libraries/GitHub.php
@@ -100,7 +100,7 @@ public function __construct(GitHubConfig $config, Client $client)
         $this->client = $client;
     }
 
-    //---------------------------------------------------------------------
+    // ---------------------------------------------------------------------
 
     /**
      * Interfaces with the client to execute
@@ -127,7 +127,7 @@ protected function api(array $methods, array $segments): array
         return $caller->{$final}(...$segments);
     }
 
-    //---------------------------------------------------------------------
+    // ---------------------------------------------------------------------
 
     /**
      * Retrieves releases and tags for configured repositories
@@ -244,7 +244,7 @@ public function getCommit(array $segments): array
         return $this->api(['repo', 'commits', 'show'], $segments);
     }
 
-    //---------------------------------------------------------------------
+    // ---------------------------------------------------------------------
 
     /**
      * Retrieves repo details for each configured repository as a Repo.
@@ -264,7 +264,7 @@ public function getRepos(): array
         return $this->storage['repos'];
     }
 
-    //---------------------------------------------------------------------
+    // ---------------------------------------------------------------------
 
     /**
      * Retrieves contributor information for a repository.
diff --git a/composer.json b/composer.json
@@ -66,10 +66,12 @@
             "@inspect",
             "@style"
         ],
+        "cs": "php-cs-fixer fix --ansi --verbose --dry-run --diff",
+        "cs-fix": "php-cs-fixer fix --ansi --verbose --diff",
+        "style": "@cs-fix",
         "deduplicate": "phpcpd app/ src/",
         "inspect": "deptrac analyze --cache-file=build/deptrac.cache",
         "mutate": "infection --threads=2 --skip-initial-tests --coverage=build/phpunit",
-        "style": "php-cs-fixer fix --verbose --ansi --using-cache=no",
         "test": "phpunit"
     }
 }
diff --git a/composer.lock b/composer.lock
diff --git a/rector.php b/rector.php
@@ -1,6 +1,7 @@
 <?php
 
 use Rector\CodeQuality\Rector\BooleanAnd\SimplifyEmptyArrayCheckRector;
+use Rector\CodeQuality\Rector\Class_\CompleteDynamicPropertiesRector;
 use Rector\CodeQuality\Rector\Expression\InlineIfToExplicitIfRector;
 use Rector\CodeQuality\Rector\For_\ForToForeachRector;
 use Rector\CodeQuality\Rector\Foreach_\UnusedForeachValueToArrayKeysRector;
@@ -29,15 +30,23 @@
 use Rector\Php56\Rector\FunctionLike\AddDefaultValueForUndefinedVariableRector;
 use Rector\Php73\Rector\FuncCall\JsonThrowOnErrorRector;
 use Rector\Php73\Rector\FuncCall\StringifyStrNeedlesRector;
-use Rector\Php74\Rector\Property\TypedPropertyRector;
+use Rector\PHPUnit\Rector\Class_\AnnotationWithValueToAttributeRector;
 use Rector\PHPUnit\Set\PHPUnitSetList;
+use Rector\Privatization\Rector\Property\PrivatizeFinalClassPropertyRector;
 use Rector\PSR4\Rector\FileWithoutNamespace\NormalizeNamespaceByPSR4ComposerAutoloadRector;
 use Rector\Set\ValueObject\LevelSetList;
 use Rector\Set\ValueObject\SetList;
 
 return static function (RectorConfig $rectorConfig): void {
-    $rectorConfig->sets([SetList::DEAD_CODE, LevelSetList::UP_TO_PHP_74, PHPUnitSetList::PHPUNIT_SPECIFIC_METHOD, PHPUnitSetList::PHPUNIT_80]);
+    $rectorConfig->sets([
+        SetList::DEAD_CODE,
+        LevelSetList::UP_TO_PHP_74,
+        PHPUnitSetList::PHPUNIT_SPECIFIC_METHOD,
+        PHPUnitSetList::PHPUNIT_100,
+    ]);
+
     $rectorConfig->parallel();
+
     // The paths to refactor (can also be supplied with CLI arguments)
     $rectorConfig->paths([
         __DIR__ . '/app/',
@@ -73,13 +82,14 @@
 
         // Note: requires php 8
         RemoveUnusedPromotedPropertyRector::class,
+        AnnotationWithValueToAttributeRector::class,
 
         // Ignore tests that might make calls without a result
         RemoveEmptyMethodCallRector::class => [
             __DIR__ . '/tests',
         ],
 
-        // Ignore files that should not be namespaced
+        // Ignore files that should not be namespaced to their folder
         NormalizeNamespaceByPSR4ComposerAutoloadRector::class => [
             __DIR__ . '/app/Helpers',
         ],
@@ -89,7 +99,16 @@
 
         // May be uninitialized on purpose
         AddDefaultValueForUndefinedVariableRector::class,
+
+        // PHPStan will report false positive errors
+        UnnecessaryTernaryExpressionRector::class => [
+            __DIR__ . '/app/Libraries/Blog.php',
+        ],
     ]);
+
+    // auto import fully qualified class names
+    $rectorConfig->importNames();
+
     $rectorConfig->rule(SimplifyUselessVariableRector::class);
     $rectorConfig->rule(RemoveAlwaysElseRector::class);
     $rectorConfig->rule(CountArrayToEmptyArrayComparisonRector::class);
@@ -112,9 +131,7 @@
     $rectorConfig->rule(MakeInheritedMethodVisibilitySameAsParentRector::class);
     $rectorConfig->rule(SimplifyEmptyArrayCheckRector::class);
     $rectorConfig->rule(NormalizeNamespaceByPSR4ComposerAutoloadRector::class);
-    $rectorConfig
-        ->ruleWithConfiguration(TypedPropertyRector::class, [
-            // Set to false if you use in libraries, or it does create breaking changes.
-            TypedPropertyRector::INLINE_PUBLIC => false,
-        ]);
+    $rectorConfig->rule(StringClassNameToClassConstantRector::class);
+    $rectorConfig->rule(PrivatizeFinalClassPropertyRector::class);
+    $rectorConfig->rule(CompleteDynamicPropertiesRector::class);
 };
diff --git a/tests/entities/ContributorTest.php b/tests/entities/ContributorTest.php
@@ -18,7 +18,7 @@ public function testStars(int $contributions, string $expected)
         $this->assertSame($expected, $contributor->stars);
     }
 
-    public function contributionsProvider(): array
+    public static function contributionsProvider(): array
     {
         return [
             [0, '★'],
diff --git a/tests/entities/PostTest.php b/tests/entities/PostTest.php
diff --git a/tests/libaries/BlogLibraryTest.php b/tests/libaries/BlogLibraryTest.php

Original file line number	Diff line number	Diff line change
`@@ -437,6 +437,7 @@ class App extends BaseConfig`
`437`	`437`	* Defaults to `Lax` as recommended in this link:
`438`	`438`	`*`
`439`	`439`	`* @see https://portswigger.net/web-security/csrf/samesite-cookies`
	`440`	`+ *`
`440`	`441`	* @deprecated `Config\Cookie` $samesite property is used.
`441`	`442`	`*`
`442`	`443`	`* @var string`