github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-11-28 20:00:47 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fixed phpstan static usage warning, updated ci flows

Browse Source 
CI flow updates to follow deprecation warnings
This commit is contained in:
Dan Brown 2022-11-03 14:14:22 +00:00
parent 8ec6b07690
commit 6364c541ea
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/analyse-php.yml vendored
View File

@ -18,10 +18,10 @@ jobs:
- name: Get Composer Cache Directory - name: Get Composer Cache Directory
id: composer-cache id: composer-cache
run: | run: |
echo "::set-output name=dir::$(composer config cache-files-dir)" echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
- name: Cache composer packages - name: Cache composer packages
uses: actions/cache@v2 uses: actions/cache@v3
with: with:
path: ${{ steps.composer-cache.outputs.dir }} path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-8.1 key: ${{ runner.os }}-composer-8.1

4
.github/workflows/test-migrations.yml vendored
View File

@ -21,10 +21,10 @@ jobs:
- name: Get Composer Cache Directory - name: Get Composer Cache Directory
id: composer-cache id: composer-cache
run: | run: |
echo "::set-output name=dir::$(composer config cache-files-dir)" echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
- name: Cache composer packages - name: Cache composer packages
uses: actions/cache@v2 uses: actions/cache@v3
with: with:
path: ${{ steps.composer-cache.outputs.dir }} path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ matrix.php }} key: ${{ runner.os }}-composer-${{ matrix.php }}

4
.github/workflows/test-php.yml vendored
View File

@ -21,10 +21,10 @@ jobs:
- name: Get Composer Cache Directory - name: Get Composer Cache Directory
id: composer-cache id: composer-cache
run: | run: |
echo "::set-output name=dir::$(composer config cache-files-dir)" echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
- name: Cache composer packages - name: Cache composer packages
uses: actions/cache@v2 uses: actions/cache@v3
with: with:
path: ${{ steps.composer-cache.outputs.dir }} path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ matrix.php }} key: ${{ runner.os }}-composer-${{ matrix.php }}

2
app/Util/SimpleListOptions.php
View File

@ -34,7 +34,7 @@ class SimpleListOptions
$sort = setting()->getForCurrentUser($typeKey . '_sort', ''); $sort = setting()->getForCurrentUser($typeKey . '_sort', '');
$order = setting()->getForCurrentUser($typeKey . '_sort_order', $sortDescDefault ? 'desc' : 'asc'); $order = setting()->getForCurrentUser($typeKey . '_sort_order', $sortDescDefault ? 'desc' : 'asc');
return new static($typeKey, $sort, $order, $search); return new self($typeKey, $sort, $order, $search);
} }
/** /**