Skip to content

Commit 7b554a6

Browse files
committed
Drop 7.2 support. Bump Laravel 7 to 26. Cover early framework bug.
1 parent f120f2c commit 7b554a6

File tree

3 files changed

+8
-11
lines changed

3 files changed

+8
-11
lines changed

.github/workflows/tests.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
strategy:
1010
fail-fast: false
1111
matrix:
12-
php: [ 7.2, 7.3, 7.4, 8.0 ]
12+
php: [ 7.3, 7.4, 8.0 ]
1313
laravel: [ 7.*, 8.* ]
1414
dependency-version: [ prefer-lowest, prefer-stable ]
1515
include:
@@ -23,11 +23,6 @@ jobs:
2323
- laravel: 8.*
2424
testbench: 6.*
2525

26-
exclude:
27-
# Laravel 8 requires PHP 7.3.
28-
- laravel: 8.*
29-
php: 7.2
30-
3126
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
3227

3328
steps:

composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
}
1111
],
1212
"require": {
13-
"php": "^7.2|^8.0",
14-
"illuminate/support": "^7.7.0|^8.0",
15-
"illuminate/console": "^7.7.0|^8.0",
16-
"illuminate/http": "^7.7.0|^8.0",
13+
"php": "^7.3|^8.0",
14+
"illuminate/support": "^7.26.0|^8.0",
15+
"illuminate/console": "^7.26.0|^8.0",
16+
"illuminate/http": "^7.26.0|^8.0",
1717
"guzzlehttp/guzzle": "^7.2"
1818
},
1919
"require-dev": {

tests/MiddlewareAndComponentTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ public function getEnvironmentSetUp($app)
1616
{
1717
config()->set('torchlight.blade_components', true);
1818
config()->set('torchlight.token', 'token');
19-
2019
}
2120

2221
protected function getView($view)
@@ -30,13 +29,15 @@ protected function getView($view)
3029

3130
protected function nullApiResponse()
3231
{
32+
$this->withoutExceptionHandling();
3333
Http::fake([
3434
'api.torchlight.dev/*' => Http::response(null, 200),
3535
]);
3636
}
3737

3838
protected function legitApiResponse()
3939
{
40+
$this->withoutExceptionHandling();
4041
$response = [
4142
"blocks" => [[
4243
"id" => "real_response_id",
@@ -84,6 +85,7 @@ public function it_sends_a_simple_request_with_highlighted_response()
8485

8586
$this->assertEquals(
8687
'<code class="torchlight" style="background-color: #292D3E;">this is the highlighted response from the server</code>',
88+
// See https://github.com/laravel/framework/pull/35874/files for the rtrim reasoning.
8789
rtrim($response->content())
8890
);
8991
}

0 commit comments

Comments
 (0)