Fixed phpstan static usage warning, updated ci flows

ssddanbrown · ssddanbrown · commit 6364c541ea13 · 2022-11-03T14:14:22.000Z
CI flow updates to follow deprecation warnings
diff --git a/.github/workflows/analyse-php.yml b/.github/workflows/analyse-php.yml
@@ -18,10 +18,10 @@ jobs:
     - name: Get Composer Cache Directory
       id: composer-cache
       run: |
-        echo "::set-output name=dir::$(composer config cache-files-dir)"
+        echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
     - name: Cache composer packages
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: ${{ steps.composer-cache.outputs.dir }}
         key: ${{ runner.os }}-composer-8.1
diff --git a/.github/workflows/test-migrations.yml b/.github/workflows/test-migrations.yml
@@ -21,10 +21,10 @@ jobs:
       - name: Get Composer Cache Directory
         id: composer-cache
         run: |
-          echo "::set-output name=dir::$(composer config cache-files-dir)"
+          echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache composer packages
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ matrix.php }}
diff --git a/.github/workflows/test-php.yml b/.github/workflows/test-php.yml
@@ -21,10 +21,10 @@ jobs:
     - name: Get Composer Cache Directory
       id: composer-cache
       run: |
-        echo "::set-output name=dir::$(composer config cache-files-dir)"
+        echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
     - name: Cache composer packages
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: ${{ steps.composer-cache.outputs.dir }}
         key: ${{ runner.os }}-composer-${{ matrix.php }}
diff --git a/app/Util/SimpleListOptions.php b/app/Util/SimpleListOptions.php
@@ -34,7 +34,7 @@ public static function fromRequest(Request $request, string $typeKey, bool $sort
         $sort = setting()->getForCurrentUser($typeKey . '_sort', '');
         $order = setting()->getForCurrentUser($typeKey . '_sort_order', $sortDescDefault ? 'desc' : 'asc');
 
-        return new static($typeKey, $sort, $order, $search);
+        return new self($typeKey, $sort, $order, $search);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public static function fromRequest(Request $request, string $typeKey, bool $sort`
`34`	`34`	`$sort = setting()->getForCurrentUser($typeKey . '_sort', '');`
`35`	`35`	`$order = setting()->getForCurrentUser($typeKey . '_sort_order', $sortDescDefault ? 'desc' : 'asc');`
`36`	`36`
`37`		`- return new static($typeKey, $sort, $order, $search);`
	`37`	`+ return new self($typeKey, $sort, $order, $search);`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`/**`