Skip to content

Commit 4dd7e40

Browse files
authored
Merge pull request #5732 from jnoordsij/php8.4-support
Run CI tests on PHP 8.4 and fix deprecations
2 parents 8c4068a + 61eff1b commit 4dd7e40

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

.github/workflows/testing.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,27 +11,27 @@ permissions:
1111
jobs:
1212
test:
1313
runs-on: ubuntu-latest
14-
14+
1515
strategy:
1616
# if one job fails, abort the next ones too, because they'll probably fail - best to save the minutes
1717
fail-fast: false # to change to: true
18-
18+
1919
# run all combinations of the following, to make sure they're working together
2020
matrix:
2121
# os: [ubuntu-latest, macos-latest, windows-latest]
22-
php: ['8.1', '8.2', '8.3']
22+
php: ['8.1', '8.2', '8.3', '8.4']
2323
laravel: [^10.0, ^11.0]
2424
dbal: [^3.0]
2525
phpunit: [10.*]
26-
dependency-version: [stable] # to add: lowest
26+
dependency-version: [stable] # to add: lowest
2727
exclude:
2828
- laravel: "^11.0"
2929
php: "8.1"
3030
dbal: "^3.0"
3131

3232

3333
name: PHP ${{ matrix.php }}, Laravel ${{ matrix.laravel }}, PHPUnit ${{ matrix.phpunit }}, DBAL ${{ matrix.dbal }} --prefer-${{ matrix.dependency-version }}
34-
34+
3535
steps:
3636
- name: Checkout code
3737
uses: actions/checkout@v4

src/app/Console/Commands/Traits/PrettyCommandOutput.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ public function box($header, $color = 'green')
116116
*
117117
* @return void
118118
*/
119-
public function listChoice(string $question, array $options, string $default = 'no', string $hint = null)
119+
public function listChoice(string $question, array $options, string $default = 'no', ?string $hint = null)
120120
{
121121
foreach ($options as $key => $option) {
122122
$value = $key + 1;

src/app/Library/Auth/PasswordBroker.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class PasswordBroker extends OriginalPasswordBroker
2020
* @param array $credentials
2121
* @return string
2222
*/
23-
public function sendResetLink(array $credentials, Closure $callback = null)
23+
public function sendResetLink(array $credentials, ?Closure $callback = null)
2424
{
2525
// First we will check to see if we found a user at the given credentials and
2626
// if we did not we will redirect back to this current URI with a piece of

src/app/Library/Database/DatabaseSchema.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public static function getForTable(string $table, string $connection)
2222
return self::$schema[$connection][$table] ?? null;
2323
}
2424

25-
public static function getTables(string $connection = null): array
25+
public static function getTables(?string $connection = null): array
2626
{
2727
$connection = $connection ?: config('database.default');
2828

@@ -53,7 +53,7 @@ public function listTableIndexes(string $connection, string $table)
5353
return self::getIndexColumnNames($connection, $table);
5454
}
5555

56-
public function getManager(string $connection = null)
56+
public function getManager(?string $connection = null)
5757
{
5858
$connection = $connection ?: config('database.default');
5959

0 commit comments

Comments
 (0)