Skip to content

Commit d0d3b5f

Browse files
mikaeljorhultmikaeljorhult
authored
Laravel 10 support (#27)
* Bump dependencies. * Upgrade test suite to work with PHPUnit 10. * Update dependency matrix for tests.
1 parent 65ec5f5 commit d0d3b5f

12 files changed

+25
-27
lines changed

‎.github/workflows/run-tests.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ jobs:
88
runs-on: ubuntu-latest
99
strategy:
1010
matrix:
11-
php: [8.1, 8.0]
12-
laravel: [9.*]
11+
php: [8.2, 8.1]
12+
laravel: [10.*]
1313
dependency-version: [prefer-lowest, prefer-stable]
1414
include:
15-
- laravel: 9.*
16-
testbench: 7.*
15+
- laravel: 10.*
16+
testbench: 8.*
1717

1818
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
1919

‎composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
"type": "library",
66
"license": "MIT",
77
"require": {
8-
"php": "^8.0",
9-
"laravel/framework": "^9.0",
8+
"php": "^8.1",
9+
"laravel/framework": "^10.0",
1010
"ext-json": "*"
1111
},
1212
"require-dev": {
13-
"orchestra/testbench": "^7.0"
13+
"orchestra/testbench": "^8.0"
1414
},
1515
"autoload": {
1616
"psr-4": {

‎phpunit.xml.dist

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,21 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<phpunit backupGlobals="false"
3-
backupStaticAttributes="false"
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
4+
backupGlobals="false"
45
beStrictAboutTestsThatDoNotTestAnything="false"
56
bootstrap="vendor/autoload.php"
67
colors="true"
7-
convertErrorsToExceptions="true"
8-
convertNoticesToExceptions="true"
9-
convertWarningsToExceptions="true"
108
processIsolation="false"
119
stopOnFailure="false"
1210
>
1311
<testsuites>
1412
<testsuite name="Laraflash Test Suite">
15-
<directory suffix=".php">./tests/</directory>
13+
<directory>tests</directory>
1614
</testsuite>
1715
</testsuites>
18-
<filter>
19-
<whitelist processUncoveredFilesFromWhitelist="true">
16+
<coverage>
17+
<include>
2018
<directory suffix=".php">./src/</directory>
21-
</whitelist>
22-
</filter>
23-
</phpunit>
19+
</include>
20+
</coverage>
21+
</phpunit>

‎tests/ArrayMessagesStorageTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
use Coderello\Laraflash\MessagesStorage\ArrayMessagesStorage;
66
use Coderello\Laraflash\Tests\Support\FlashMessageFactory;
77

8-
class ArrayMessagesStorageTest extends AbstractTestCase
8+
class ArrayMessagesStorageTest extends TestCase
99
{
1010
/** @var ArrayMessagesStorage */
1111
protected $arrayMessagesStorage;

‎tests/FlashMessageFactoryTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
use Coderello\Laraflash\FlashMessage\FlashMessage;
66
use Coderello\Laraflash\FlashMessage\FlashMessageFactory;
77

8-
class FlashMessageFactoryTest extends AbstractTestCase
8+
class FlashMessageFactoryTest extends TestCase
99
{
1010
/** @var FlashMessageFactory */
1111
protected $flashMessageFactory;

‎tests/FlashMessageTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
use Coderello\Laraflash\FlashMessage\FlashMessage;
88
use Illuminate\Support\Arr;
99

10-
class FlashMessageTest extends AbstractTestCase
10+
class FlashMessageTest extends TestCase
1111
{
1212
/** @var FlashMessage */
1313
protected $flashMessage;

‎tests/LaraflashPreparerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
use Coderello\Laraflash\Tests\Support\MessagesStorage;
1010
use Illuminate\Support\Facades\Request;
1111

12-
class LaraflashPreparerTest extends AbstractTestCase
12+
class LaraflashPreparerTest extends TestCase
1313
{
1414
/** @var Laraflash */
1515
protected $laraflash;

‎tests/LaraflashRendererTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
use Coderello\Laraflash\Tests\Support\MessagesStorage;
1010
use Illuminate\Config\Repository as ConfigRepository;
1111

12-
class LaraflashRendererTest extends AbstractTestCase
12+
class LaraflashRendererTest extends TestCase
1313
{
1414
/** @var ConfigRepository */
1515
protected $configRepository;

‎tests/LaraflashTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
use Coderello\Laraflash\Tests\Support\LaraflashRenderer;
88
use Coderello\Laraflash\Tests\Support\MessagesStorage;
99

10-
class LaraflashTest extends AbstractTestCase
10+
class LaraflashTest extends TestCase
1111
{
1212
/** @var FlashMessageFactory */
1313
protected $flashMessageFactory;

‎tests/SessionMessagesStorageTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
use Coderello\Laraflash\Tests\Support\FlashMessageFactory;
77
use Illuminate\Contracts\Session\Session;
88

9-
class SessionMessagesStorageTest extends AbstractTestCase
9+
class SessionMessagesStorageTest extends TestCase
1010
{
1111
/** @var Session */
1212
protected $session;

0 commit comments

Comments
 (0)