Skip to content

Commit b67598f

Browse files
bastianallgeierbastianallgeier
authored
Merge pull request #58 from getkirby/release/v5
3.0.0
2 parents 2c233c9 + 50d6fd5 commit b67598f

File tree

14 files changed

+306
-348
lines changed

14 files changed

+306
-348
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 19 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -9,32 +9,32 @@ jobs:
99
timeout-minutes: 5
1010
strategy:
1111
matrix:
12-
php: ["8.1", "8.2", "8.3"]
12+
php: ["8.2", "8.3", "8.4"]
1313
env:
1414
extensions: mbstring, pcov
1515
ini: pcov.directory=., "pcov.exclude=\"~(vendor|tests)~\""
1616

1717
steps:
1818
- name: Checkout
19-
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # pin@v3
19+
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
2020

2121
- name: Setup PHP cache environment
2222
id: ext-cache
23-
uses: shivammathur/cache-extensions@fc01a9cdc93341e96c2078d848f2e96240d83c17 # pin@v1
23+
uses: shivammathur/cache-extensions@270463ea3e30925f5661b16e508feab532dbf309 # v1
2424
with:
2525
php-version: ${{ matrix.php }}
2626
extensions: ${{ env.extensions }}
2727
key: php-v1
2828

2929
- name: Cache PHP extensions
30-
uses: actions/cache@e12d46a63a90f2fae62d114769bbf2a179198b5c # pin@v3
30+
uses: actions/cache@2f8e54208210a422b2efd51efaa6bd6d7ca8920f # v3
3131
with:
3232
path: ${{ steps.ext-cache.outputs.dir }}
3333
key: ${{ steps.ext-cache.outputs.key }}
3434
restore-keys: ${{ steps.ext-cache.outputs.key }}
3535

3636
- name: Setup PHP environment
37-
uses: shivammathur/setup-php@6d7209f44a25a59e904b1ee9f3b0c33ab2cd888d # pin@v2
37+
uses: shivammathur/setup-php@0f7f1d08e3e32076e51cae65eb0b0c871405b16e # v2
3838
with:
3939
php-version: ${{ matrix.php }}
4040
extensions: ${{ env.extensions }}
@@ -52,7 +52,7 @@ jobs:
5252
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
5353

5454
- name: Cache dependencies
55-
uses: actions/cache@e12d46a63a90f2fae62d114769bbf2a179198b5c # pin@v3
55+
uses: actions/cache@2f8e54208210a422b2efd51efaa6bd6d7ca8920f # v3
5656
with:
5757
path: ${{ steps.composerCache.outputs.dir }}
5858
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -63,7 +63,7 @@ jobs:
6363

6464
- name: Cache analysis data
6565
id: finishPrepare
66-
uses: actions/cache@e12d46a63a90f2fae62d114769bbf2a179198b5c # pin@v3
66+
uses: actions/cache@2f8e54208210a422b2efd51efaa6bd6d7ca8920f # v3
6767
with:
6868
path: ~/.cache/psalm
6969
key: backend-analysis-${{ matrix.php }}-v2
@@ -73,18 +73,9 @@ jobs:
7373
run: phpunit --coverage-clover ${{ github.workspace }}/clover.xml
7474

7575
- name: Statically analyze using Psalm
76-
if: always() && steps.finishPrepare.outcome == 'success'
76+
if: always() && steps.finishPrepare.outcome == 'success' && matrix.php != '8.4'
7777
run: psalm --output-format=github --php-version=${{ matrix.php }}
7878

79-
# - name: Upload coverage results to Codecov
80-
# uses: codecov/codecov-action@66b3de25f6f91f65eb92c514d31d6b6f13d5ab18 # pin@v3
81-
# with:
82-
# file: ${{ github.workspace }}/clover.xml
83-
# flags: backend
84-
# env_vars: PHP
85-
# env:
86-
# PHP: ${{ matrix.php }}
87-
8879
analysis:
8980
name: Analysis
9081

@@ -96,33 +87,33 @@ jobs:
9687

9788
steps:
9889
- name: Checkout
99-
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # pin@v3
90+
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
10091

10192
- name: Setup PHP cache environment
10293
id: ext-cache
103-
uses: shivammathur/cache-extensions@fc01a9cdc93341e96c2078d848f2e96240d83c17 # pin@v1
94+
uses: shivammathur/cache-extensions@270463ea3e30925f5661b16e508feab532dbf309 # v1
10495
with:
10596
php-version: ${{ env.php }}
10697
extensions: ${{ env.extensions }}
10798
key: php-v1
10899

109100
- name: Cache PHP extensions
110-
uses: actions/cache@e12d46a63a90f2fae62d114769bbf2a179198b5c # pin@v3
101+
uses: actions/cache@2f8e54208210a422b2efd51efaa6bd6d7ca8920f # v3
111102
with:
112103
path: ${{ steps.ext-cache.outputs.dir }}
113104
key: ${{ steps.ext-cache.outputs.key }}
114105
restore-keys: ${{ steps.ext-cache.outputs.key }}
115106

116107
- name: Setup PHP environment
117108
id: finishPrepare
118-
uses: shivammathur/setup-php@6d7209f44a25a59e904b1ee9f3b0c33ab2cd888d # pin@v2
109+
uses: shivammathur/setup-php@0f7f1d08e3e32076e51cae65eb0b0c871405b16e # v2
119110
with:
120111
php-version: ${{ env.php }}
121112
extensions: ${{ env.extensions }}
122113
coverage: none
123114
tools: |
124-
composer:2.3.7, composer-normalize:2.28.0,
125-
composer-unused:0.7.12, phpcpd:6.0.3, phpmd:2.12.0
115+
composer:2.4.4, composer-normalize:2.28.3, composer-require-checker:4.1.0,
116+
composer-unused:0.7.12, phpmd:2.13.0
126117
127118
- name: Validate composer.json/composer.lock
128119
if: always() && steps.finishPrepare.outcome == 'success'
@@ -140,7 +131,7 @@ jobs:
140131
- name: Cache dependencies
141132
id: composerCache2
142133
if: always() && steps.composerCache1.outcome == 'success'
143-
uses: actions/cache@e12d46a63a90f2fae62d114769bbf2a179198b5c # pin@v3
134+
uses: actions/cache@2f8e54208210a422b2efd51efaa6bd6d7ca8920f # v3
144135
with:
145136
path: ${{ steps.composerCache1.outputs.dir }}
146137
key: ${{ runner.os }}-composer-locked-${{ hashFiles('**/composer.lock') }}
@@ -155,10 +146,6 @@ jobs:
155146
if: always() && steps.composerInstall.outcome == 'success'
156147
run: composer-unused --no-progress
157148

158-
- name: Check for duplicated code
159-
if: always() && steps.composerInstall.outcome == 'success'
160-
run: phpcpd --fuzzy --exclude tests --exclude vendor .
161-
162149
- name: Statically analyze using PHPMD
163150
if: always() && steps.composerInstall.outcome == 'success'
164151
run: phpmd . github phpmd.xml.dist --exclude 'tests/*,vendor/*'
@@ -171,17 +158,17 @@ jobs:
171158

172159
steps:
173160
- name: Checkout
174-
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # pin@v3
161+
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
175162

176163
- name: Setup PHP environment
177-
uses: shivammathur/setup-php@6d7209f44a25a59e904b1ee9f3b0c33ab2cd888d # pin@v2
164+
uses: shivammathur/setup-php@0f7f1d08e3e32076e51cae65eb0b0c871405b16e # v2
178165
with:
179166
coverage: none
180167
tools: php-cs-fixer:3.8.0
181168

182169
- name: Cache analysis data
183170
id: finishPrepare
184-
uses: actions/cache@e12d46a63a90f2fae62d114769bbf2a179198b5c # pin@v3
171+
uses: actions/cache@2f8e54208210a422b2efd51efaa6bd6d7ca8920f # v3
185172
with:
186173
path: ~/.php-cs-fixer
187174
key: coding-style
@@ -199,7 +186,7 @@ jobs:
199186
if: >
200187
always() && steps.finishPrepare.outcome == 'success' &&
201188
github.event_name == 'pull_request'
202-
uses: reviewdog/action-suggester@ab82daa6ea9b84fe43db7747bb10fa087f34e1ab # pin@v1
189+
uses: reviewdog/action-suggester@4747dbc9f9e37adba0943e681cc20db466642158 # v1
203190
with:
204191
tool_name: PHP-CS-Fixer
205192
fail_on_error: "true"

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -967,7 +967,7 @@ KQL only offers access to data in your site. It does not support any mutations.
967967
## Plugins
968968

969969
- [KQL + 11ty](https://github.com/getkirby/eleventykit)
970-
- [KQL + Nuxt](https://nuxt-kql.jhnn.dev)
970+
- [KQL + Nuxt](https://github.com/johannschopplich/cacao-kit-frontend)
971971

972972
## What's Kirby?
973973
- **[getkirby.com](https://getkirby.com)** – Get to know the CMS.

‎composer.json‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"description": "Kirby Query Language",
44
"license": "MIT",
55
"type": "kirby-plugin",
6-
"version": "2.2.0",
6+
"version": "3.0.0",
77
"keywords": [
88
"kirby",
99
"cms",
@@ -54,11 +54,9 @@
5454
"analyze": [
5555
"@analyze:composer",
5656
"@analyze:psalm",
57-
"@analyze:phpcpd",
5857
"@analyze:phpmd"
5958
],
6059
"analyze:composer": "composer validate --strict --no-check-version --no-check-all",
61-
"analyze:phpcpd": "phpcpd --fuzzy --exclude tests --exclude vendor .",
6260
"analyze:phpmd": "phpmd . ansi phpmd.xml.dist --exclude 'dependencies/*,tests/*,vendor/*'",
6361
"analyze:psalm": "psalm",
6462
"ci": [

0 commit comments

Comments
 (0)