Skip to content

Commit 5082fcc

Browse files
Merge pull request #41 from stackkit/development
Add Laravel 9 support
2 parents 8c09a9c + 55208b5 commit 5082fcc

23 files changed

+332
-303
lines changed

.github/workflows/run-tests.yml

+10-26
Original file line numberDiff line numberDiff line change
@@ -12,42 +12,26 @@ jobs:
1212
strategy:
1313
matrix:
1414
php: [8.1, 8.0, 7.4, 7.3, 7.2]
15-
laravel: [8.*, 7.*, 6.*, 5.8.*, 5.7.*, 5.6.*]
15+
laravel: [9.*, 8.*, 7.*, 6.*]
1616
os: [ubuntu-latest]
1717
include:
18+
- laravel: 9.*
19+
testbench: 7.*
1820
- laravel: 8.*
1921
testbench: 6.*
2022
- laravel: 7.*
2123
testbench: 5.*
2224
- laravel: 6.*
2325
testbench: 4.*
24-
- laravel: 5.8.*
25-
testbench: 3.8.*
26-
- laravel: 5.7.*
27-
testbench: 3.7.*
28-
- laravel: 5.6.*
29-
testbench: 3.6.*
3026
exclude:
31-
- laravel: 8.*
27+
- laravel: 9.*
3228
php: 7.2
33-
- laravel: 5.7.*
34-
php: 7.4
35-
- laravel: 5.6.*
29+
- laravel: 9.*
30+
php: 7.3
31+
- laravel: 9.*
3632
php: 7.4
37-
- laravel: 5.5.*
38-
php: 7.4
39-
- laravel: 5.8.*
40-
php: 8.0
41-
- laravel: 5.7.*
42-
php: 8.0
43-
- laravel: 5.6.*
44-
php: 8.0
45-
- laravel: 5.6.*
46-
php: 8.1
47-
- laravel: 5.7.*
48-
php: 8.1
49-
- laravel: 5.8.*
50-
php: 8.1
33+
- laravel: 8.*
34+
php: 7.2
5135
- laravel: 6.*
5236
php: 8.1
5337
- laravel: 7.*
@@ -91,4 +75,4 @@ jobs:
9175
CI_DB_DATABASE: test
9276
CI_DB_USERNAME: root
9377
CI_DB_PASSWORD: root
94-
run: vendor/bin/phpunit
78+
run: vendor/bin/phpunit

README.md

+2-4
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,16 @@ We feel the package is currently feature complete, but feel free to send a pull
1919

2020
# Requirements
2121

22-
This package requires Laravel 5.6 or higher.
22+
This package requires Laravel 6.0 or higher.
2323

2424
Please check the table below for supported Laravel and PHP versions:
2525

2626
|Laravel Version| PHP Version |
2727
|---|---|
28-
| 5.6 | 7.2 or 7.3
29-
| 5.7 | 7.2 or 7.3
30-
| 5.8 | 7.2 or 7.3 or 7.4
3128
| 6.x | 7.2 or 7.3 or 7.4 or 8.0
3229
| 7.x | 7.2 or 7.3 or 7.4 or 8.0
3330
| 8.x | 7.3 or 7.4 or 8.0 or 8.1
31+
| 9.x | 8.0 or 8.1
3432

3533
# Installation
3634

composer.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
},
3131
"require-dev": {
3232
"mockery/mockery": "^1.2",
33-
"orchestra/testbench": "^3.5 || ^3.6 || ^3.7 || ^3.8 || ^4.0 || ^5.0",
34-
"symfony/console": "^4.4|^5.0"
33+
"orchestra/testbench": "^3.5 || ^3.6 || ^3.7 || ^3.8 || ^4.0 || ^5.0"
3534
}
3635
}

src/Config.php

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace Stackkit\LaravelDatabaseEmails;
46

57
class Config
@@ -9,7 +11,7 @@ class Config
911
*
1012
* @return int
1113
*/
12-
public static function maxAttemptCount()
14+
public static function maxAttemptCount(): int
1315
{
1416
return max(config('laravel-database-emails.attempts', 1), 3);
1517
}
@@ -19,7 +21,7 @@ public static function maxAttemptCount()
1921
*
2022
* @return bool
2123
*/
22-
public static function encryptEmails()
24+
public static function encryptEmails(): bool
2325
{
2426
return config('laravel-database-emails.encrypt', false);
2527
}
@@ -29,7 +31,7 @@ public static function encryptEmails()
2931
*
3032
* @return bool
3133
*/
32-
public static function testing()
34+
public static function testing(): bool
3335
{
3436
return (bool) config('laravel-database-emails.testing.enabled', false);
3537
}
@@ -39,7 +41,7 @@ public static function testing()
3941
*
4042
* @return string
4143
*/
42-
public static function testEmailAddress()
44+
public static function testEmailAddress(): string
4345
{
4446
return config('laravel-database-emails.testing.email');
4547
}
@@ -49,7 +51,7 @@ public static function testEmailAddress()
4951
*
5052
* @return int
5153
*/
52-
public static function cronjobEmailLimit()
54+
public static function cronjobEmailLimit(): int
5355
{
5456
return config('laravel-database-emails.limit', 20);
5557
}
@@ -59,7 +61,7 @@ public static function cronjobEmailLimit()
5961
*
6062
* @return bool
6163
*/
62-
public static function sendImmediately()
64+
public static function sendImmediately(): bool
6365
{
6466
return (bool) config('laravel-database-emails.immediately', false);
6567
}

0 commit comments

Comments
 (0)