Skip to content

Commit e7c4cf4

Browse files
authored
[1.x] Supports PHP 8.4 (#419)
* [1.x] Supports PHP 8.4 * wip Signed-off-by: Mior Muhammad Zaki <[email protected]> * wip Signed-off-by: Mior Muhammad Zaki <[email protected]> --------- Signed-off-by: Mior Muhammad Zaki <[email protected]>
1 parent 52db5d2 commit e7c4cf4

File tree

2 files changed

+27
-6
lines changed

2 files changed

+27
-6
lines changed

Diff for: .github/workflows/tests.yml

+25-6
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ jobs:
3636
php: [8.1, 8.2, 8.3]
3737
laravel: [10, 11]
3838
stability: [prefer-lowest, prefer-stable]
39+
include:
40+
- php: 8.4
41+
laravel: 11
42+
stability: prefer-stable
3943

4044
name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - Stability ${{ matrix.stability }} - MySQL 5.7
4145

@@ -55,9 +59,13 @@ jobs:
5559
- name: Install redis-cli
5660
run: sudo apt-get install -qq redis-tools
5761

58-
- name: Install dependencies
62+
- name: Require cachewerk/relay
5963
run: |
6064
composer require cachewerk/relay --no-interaction --no-update
65+
if: matrix.php != 8.4
66+
67+
- name: Install dependencies
68+
run: |
6169
composer update --prefer-dist --no-interaction --no-progress --${{ matrix.stability }}
6270
6371
- name: Execute tests
@@ -114,9 +122,13 @@ jobs:
114122
- name: Install redis-cli
115123
run: sudo apt-get install -qq redis-tools
116124

117-
- name: Install dependencies
125+
- name: Require cachewerk/relay
118126
run: |
119127
composer require cachewerk/relay --no-interaction --no-update
128+
if: matrix.php != 8.4
129+
130+
- name: Install dependencies
131+
run: |
120132
composer update --prefer-dist --no-interaction --no-progress --${{ matrix.stability }}
121133
122134
- name: Execute tests
@@ -171,11 +183,14 @@ jobs:
171183
- name: Install redis-cli
172184
run: sudo apt-get install -qq redis-tools
173185

174-
- name: Install dependencies
186+
- name: Require cachewerk/relay
175187
run: |
176-
composer require "illuminate/contracts=^${{ matrix.laravel }}" --dev --no-update
177188
composer require cachewerk/relay --no-interaction --no-update
178-
composer update --prefer-dist --no-interaction --no-progress
189+
if: matrix.php != 8.4
190+
191+
- name: Install dependencies
192+
run: |
193+
composer update --prefer-dist --no-interaction --no-progress --${{ matrix.stability }} --with="illuminate/contracts=^${{ matrix.laravel }}"
179194
180195
- name: Execute tests
181196
run: vendor/bin/pest -vvv
@@ -220,9 +235,13 @@ jobs:
220235
- name: Install redis-cli
221236
run: sudo apt-get install -qq redis-tools
222237

223-
- name: Install dependencies
238+
- name: Require cachewerk/relay
224239
run: |
225240
composer require cachewerk/relay --no-interaction --no-update
241+
if: matrix.php != 8.4
242+
243+
- name: Install dependencies
244+
run: |
226245
composer update --prefer-dist --no-interaction --no-progress --${{ matrix.stability }}
227246
228247
- name: Execute tests

Diff for: src/Storage/DatabaseStorage.php

+2
Original file line numberDiff line numberDiff line change
@@ -445,6 +445,7 @@ protected function periods(): array
445445
*/
446446
public function values(string $type, ?array $keys = null): Collection
447447
{
448+
/** @phpstan-ignore return.type */
448449
return $this->connection()
449450
->table('pulse_values')
450451
->select('timestamp', 'key', 'value')
@@ -529,6 +530,7 @@ public function aggregate(
529530

530531
$orderBy ??= $aggregates[0];
531532

533+
/** @phpstan-ignore return.type */
532534
return $this->connection()
533535
->query()
534536
->select([

0 commit comments

Comments
 (0)