Skip to content

Commit eeb1c3c

Browse files
authored
Merge pull request #59 from ably/feature/support-laravel-12
[ECO-5208] Support laravel 12
2 parents 4bbde23 + b2e643b commit eeb1c3c

File tree

4 files changed

+30
-9
lines changed

4 files changed

+30
-9
lines changed

.github/workflows/check.yml

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ jobs:
1616
strategy:
1717
fail-fast: false
1818
matrix:
19-
php-version: [7.2, 7.3, 7.4, 8.0, 8.1, 8.2]
20-
laravel-version: [6.*, 7.*, 8.*, 9.*, 10.*, 11.*]
19+
php-version: [7.2, 7.3, 7.4, 8.0, 8.1, 8.2, 8.3, 8.4]
20+
laravel-version: [6.*, 7.*, 8.*, 9.*, 10.*, 11.*, 12.*]
2121
include:
2222
- laravel-version: 6.*
2323
testbench: 4.*
@@ -31,8 +31,20 @@ jobs:
3131
testbench: 8.*
3232
- laravel-version: 11.*
3333
testbench: 9.*
34+
- laravel-version: 12.*
35+
testbench: 10.*
3436

3537
exclude:
38+
- laravel-version: 12.*
39+
php-version: 7.2
40+
- laravel-version: 12.*
41+
php-version: 7.3
42+
- laravel-version: 12.*
43+
php-version: 7.4
44+
- laravel-version: 12.*
45+
php-version: 8.0
46+
- laravel-version: 12.*
47+
php-version: 8.1
3648
- laravel-version: 11.*
3749
php-version: 7.2
3850
- laravel-version: 11.*
@@ -67,6 +79,14 @@ jobs:
6779
php-version: 8.2
6880
- laravel-version: 7.*
6981
php-version: 8.2
82+
- laravel-version: 6.*
83+
php-version: 8.3
84+
- laravel-version: 7.*
85+
php-version: 8.3
86+
- laravel-version: 6.*
87+
php-version: 8.4
88+
- laravel-version: 7.*
89+
php-version: 8.4
7090

7191
name: P${{ matrix.php-version }} - L${{ matrix.laravel-version }}
7292

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,10 +126,11 @@ npm run dev
126126
],
127127
```
128128

129-
**3. Update token expiry. Default: 3600 seconds (1 hr)**
129+
**3. Update token expiry. Default: 28800 seconds (8 hrs)**
130+
- Default expiry set to 8 hrs in order to reduce CPU workload for auth requests. Check [discussion](https://github.com/ably/laravel-broadcaster/issues/55#issuecomment-2582845145).
130131
- Set `ABLY_TOKEN_EXPIRY` in **.env** file.
131132
```dotenv
132-
ABLY_TOKEN_EXPIRY=21600
133+
ABLY_TOKEN_EXPIRY=43200
133134
```
134135
- Update ably section under `config/broadcasting.php` with
135136
```php

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
"require": {
1818
"php": "^7.2 || ^8.0",
1919
"ably/ably-php": "^1.1",
20-
"illuminate/support": "^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0 || ^11.0",
20+
"illuminate/support": "^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0 || ^11.0 || ^12.0",
2121
"ext-json" : "*"
2222
},
2323
"require-dev": {
24-
"phpunit/phpunit": "^8.5 || ^9.5 || ^10.0 || ^11.0",
25-
"orchestra/testbench": "4.* || 8.* || 9.*"
24+
"phpunit/phpunit": "^8.5 || ^9.5 || ^10.0 || ^11.0 || ^12.0",
25+
"orchestra/testbench": "4.* || 8.* || 9.* || 10.*"
2626
},
2727
"autoload": {
2828
"psr-4": {

src/AblyBroadcaster.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ class AblyBroadcaster extends Broadcaster
2727
* Used for setting expiry of issues tokens.
2828
*
2929
* @var int|mixed
30-
* @default 1 hr
30+
* @default 8 hr
3131
*/
32-
private $tokenExpiry = 3600;
32+
private $tokenExpiry = 28800;
3333

3434
/**
3535
* Public channel capabilities. By default, all public channels are given subscribe, history and channel-metadata access.

0 commit comments

Comments
 (0)