From 6364c541ea13aa012862ba0a895958494fa55eb0 Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Thu, 3 Nov 2022 14:14:22 +0000 Subject: [PATCH] Fixed phpstan static usage warning, updated ci flows CI flow updates to follow deprecation warnings --- .github/workflows/analyse-php.yml | 4 ++-- .github/workflows/test-migrations.yml | 4 ++-- .github/workflows/test-php.yml | 4 ++-- app/Util/SimpleListOptions.php | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/analyse-php.yml b/.github/workflows/analyse-php.yml index 191399d78..fd56a53ef 100644 --- 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 index e9b66a0a6..d762d7eab 100644 --- 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 index 917038f59..4185e83c3 100644 --- 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 index cb7e75a2d..81d8a5876 100644 --- a/app/Util/SimpleListOptions.php +++ b/app/Util/SimpleListOptions.php @@ -34,7 +34,7 @@ class SimpleListOptions $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); } /**