Merge pull request #17 from NaokiTsuchiya/update-workflow

NaokiTsuchiya · Oct 15, 2022 · 1dd4777 · 1dd4777
2 parents e9b50a6 + 8d05b6b
commit 1dd4777
Show file tree

Hide file tree

Showing 8 changed files with 57 additions and 59 deletions.
diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -27,7 +27,7 @@ jobs:
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
 
       - name: Cache dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -23,7 +23,7 @@ jobs:
             dependencies: 'lowest'
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup PHP ${{ matrix.php-version }}
         uses: shivammathur/setup-php@v2
@@ -37,7 +37,7 @@ jobs:
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
 
       - name: Cache dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -55,6 +55,6 @@ jobs:
         run: ./vendor/bin/phpunit --coverage-clover=coverage.xml
 
       - name: Upload coverage report
-        uses: codecov/codecov-action@v2
+        uses: codecov/codecov-action@v3
         with:
           file: ./coverage.xml
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -27,7 +27,7 @@ jobs:
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
 
       - name: Cache dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -44,7 +44,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -68,7 +68,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -80,7 +80,7 @@ jobs:
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
 
       - name: Cache dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

diff --git a/composer.json b/composer.json
@@ -13,7 +13,7 @@
         "yiisoft/yii": "^1.1.22"
     },
     "require-dev": {
-        "bamarni/composer-bin-plugin": "^1.4",
+        "bamarni/composer-bin-plugin": "^1.8",
         "phpunit/phpunit": "^9.5"
     },
     "autoload": {

diff --git a/src/UrlRuleList.php b/src/UrlRuleList.php
@@ -24,9 +24,7 @@ public function __invoke(CUrlManager $urlManager): array
         return $rules;
     }
 
-    /**
-     * @param ReflectionClass<object> $reflectionClass
-     */
+    /** @param ReflectionClass<object> $reflectionClass */
     private function getRulesProperty(ReflectionClass $reflectionClass): ReflectionProperty
     {
         if ($reflectionClass->hasProperty('_rules')) {

diff --git a/tests/UrlRuleListTest.php b/tests/UrlRuleListTest.php
@@ -41,7 +41,7 @@ public function testInvoke(): void
                         ],
                     ],
                 ],
-            ]
+            ],
         );
         $urlManager = $app->getUrlManager();
         $rules = ($this->urlRuleList)($urlManager);
@@ -65,7 +65,7 @@ public function testExtendUrlManager(): void
                         ],
                     ],
                 ],
-            ]
+            ],
         );
         $urlManager = $app->getUrlManager();
         assert($urlManager instanceof ExtendUrlManager);
@@ -90,7 +90,7 @@ public function testExtendExtendUrlManager(): void
                         ],
                     ],
                 ],
-            ]
+            ],
         );
         $urlManager = $app->getUrlManager();
         assert($urlManager instanceof ExtendExtendUrlManager);

diff --git a/vendor-bin/tools/composer.json b/vendor-bin/tools/composer.json
@@ -1,12 +1,12 @@
 {
     "require-dev": {
-        "doctrine/coding-standard": "^9.0",
-        "phpmd/phpmd": "^2.11",
-        "phpmetrics/phpmetrics": "^2.7",
-        "phpstan/phpstan": "^1.2",
-        "psalm/plugin-phpunit": "^0.16.1",
-        "squizlabs/php_codesniffer": "^3.6",
-        "vimeo/psalm": "^4.15"
+        "doctrine/coding-standard": "^10.0",
+        "phpmd/phpmd": "^2.13",
+        "phpmetrics/phpmetrics": "^2.8",
+        "phpstan/phpstan": "^1.8",
+        "psalm/plugin-phpunit": "^0.17.0",
+        "squizlabs/php_codesniffer": "^3.7",
+        "vimeo/psalm": "^4.29"
     },
     "config": {
         "allow-plugins": {

diff --git a/vendor-bin/tools/composer.lock b/vendor-bin/tools/composer.lock