Skip to content

Commit c0c0555

Browse files
andrey-helldarandrey-helldar
authored
Merge pull request #73 from TheDragonCode/3.x
Added Laravel 11 support
2 parents a0349ee + 4495ad7 commit c0c0555

File tree

25 files changed

+102
-127
lines changed

25 files changed

+102
-127
lines changed

‎.github/workflows/phpunit.yml‎

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,27 +9,36 @@ jobs:
99
strategy:
1010
fail-fast: true
1111
matrix:
12-
php: [ "7.3", "7.4", "8.0", "8.1", "8.2" ]
13-
laravel: [ "6.0", "7.0", "8.0", "9.0", "10.0" ]
12+
php: [ "7.3", "7.4", "8.0", "8.1", "8.2", "8.3" ]
13+
laravel: [ "6.0", "7.0", "8.0", "9.0", "10.0", "11.0" ]
1414
exclude:
1515
- laravel: "6.0"
1616
php: "8.1"
1717

1818
- laravel: "6.0"
1919
php: "8.2"
2020

21+
- laravel: "6.0"
22+
php: "8.3"
23+
2124
- laravel: "7.0"
2225
php: "8.1"
2326

2427
- laravel: "7.0"
2528
php: "8.2"
2629

30+
- laravel: "7.0"
31+
php: "8.3"
32+
2733
- laravel: "9.0"
2834
php: "7.3"
2935

3036
- laravel: "9.0"
3137
php: "7.4"
3238

39+
- laravel: "9.0"
40+
php: "8.3"
41+
3342
- laravel: "10.0"
3443
php: "7.3"
3544

@@ -39,6 +48,18 @@ jobs:
3948
- laravel: "10.0"
4049
php: "8.0"
4150

51+
- laravel: "11.0"
52+
php: "7.3"
53+
54+
- laravel: "11.0"
55+
php: "7.4"
56+
57+
- laravel: "11.0"
58+
php: "8.0"
59+
60+
- laravel: "11.0"
61+
php: "8.1"
62+
4263
name: PHP ${{ matrix.php }}, Laravel ${{ matrix.laravel }}
4364

4465
steps:
@@ -50,7 +71,7 @@ jobs:
5071
with:
5172
php-version: ${{ matrix.php }}
5273
extensions: curl, mbstring, zip, pcntl, pdo, pdo_sqlite, iconv
53-
coverage: none
74+
coverage: xdebug
5475

5576
- name: Install dependencies
5677
run: composer require --dev laravel/framework:^${{ matrix.laravel }}

‎composer.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,16 @@
4848
"dragon-code/laravel-routes-core": "^4.1 || ^5.0",
4949
"dragon-code/laravel-support": "^3.3",
5050
"dragon-code/support": "^5.6 || ^6.1",
51-
"illuminate/contracts": ">=6.0 <11.0",
52-
"illuminate/http": ">=6.0 <11.0",
53-
"illuminate/routing": ">=6.0 <11.0",
54-
"illuminate/support": ">=6.0 <11.0",
55-
"illuminate/view": ">=6.0 <11.0"
51+
"illuminate/contracts": ">=6.0 <12.0",
52+
"illuminate/http": ">=6.0 <12.0",
53+
"illuminate/routing": ">=6.0 <12.0",
54+
"illuminate/support": ">=6.0 <12.0",
55+
"illuminate/view": ">=6.0 <12.0"
5656
},
5757
"require-dev": {
5858
"mockery/mockery": "^1.0",
59-
"orchestra/testbench": ">=4.0 <9.0",
60-
"phpunit/phpunit": "^8.0 || ^9.6"
59+
"orchestra/testbench": ">=4.0 <10.0",
60+
"phpunit/phpunit": "^8.0 || ^9.6 || ^10.0"
6161
},
6262
"conflict": {
6363
"garygreen/pretty-routes": "*"

‎config/pretty-routes.php‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
<?php
2-
/*
2+
/**
33
* This file is part of the "dragon-code/pretty-routes" project.
44
*
55
* For the full copyright and license information, please view the LICENSE
66
* file that was distributed with this source code.
77
*
8-
* @author Andrey Helldar <[email protected]>
9-
*
10-
* @copyright 2021 Andrey Helldar
11-
*
8+
* @author Andrey Helldar <[email protected]>
9+
* @copyright 2024 Andrey Helldar
1210
* @license MIT
1311
*
1412
* @see https://github.com/TheDragonCode/pretty-routes

‎phpunit.php‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
<?php
2-
/*
2+
/**
33
* This file is part of the "dragon-code/pretty-routes" project.
44
*
55
* For the full copyright and license information, please view the LICENSE
66
* file that was distributed with this source code.
77
*
8-
* @author Andrey Helldar <[email protected]>
9-
*
10-
* @copyright 2021 Andrey Helldar
11-
*
8+
* @author Andrey Helldar <[email protected]>
9+
* @copyright 2024 Andrey Helldar
1210
* @license MIT
1311
*
1412
* @see https://github.com/TheDragonCode/pretty-routes

‎phpunit.xml‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!--
2+
<!--~
33
~ This file is part of the "dragon-code/pretty-routes" project.
44
~
55
~ For the full copyright and license information, please view the LICENSE
66
~ file that was distributed with this source code.
77
~
8-
~ @author Andrey Helldar <[email protected]>
9-
~
10-
~ @copyright 2021 Andrey Helldar
11-
~
8+
~ @author Andrey Helldar <[email protected]>
9+
~ @copyright 2024 Andrey Helldar
1210
~ @license MIT
1311
~
1412
~ @see https://github.com/TheDragonCode/pretty-routes
@@ -21,8 +19,8 @@
2119
bootstrap="phpunit.php"
2220
colors="true"
2321
convertErrorsToExceptions="true"
24-
convertNoticesToExceptions="true"
25-
convertWarningsToExceptions="true"
22+
convertNoticesToExceptions="false"
23+
convertWarningsToExceptions="false"
2624
processIsolation="false"
2725
stopOnError="false"
2826
stopOnFailure="false"

‎resources/lang/en/info.php‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
<?php
2-
/*
2+
/**
33
* This file is part of the "dragon-code/pretty-routes" project.
44
*
55
* For the full copyright and license information, please view the LICENSE
66
* file that was distributed with this source code.
77
*
8-
* @author Andrey Helldar <[email protected]>
9-
*
10-
* @copyright 2021 Andrey Helldar
11-
*
8+
* @author Andrey Helldar <[email protected]>
9+
* @copyright 2024 Andrey Helldar
1210
* @license MIT
1311
*
1412
* @see https://github.com/TheDragonCode/pretty-routes

‎resources/lang/es/info.php‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
<?php
2-
/*
2+
/**
33
* This file is part of the "dragon-code/pretty-routes" project.
44
*
55
* For the full copyright and license information, please view the LICENSE
66
* file that was distributed with this source code.
77
*
8-
* @author Andrey Helldar <[email protected]>
9-
*
10-
* @copyright 2021 Andrey Helldar
11-
*
8+
* @author Andrey Helldar <[email protected]>
9+
* @copyright 2024 Andrey Helldar
1210
* @license MIT
1311
*
1412
* @see https://github.com/TheDragonCode/pretty-routes

‎resources/lang/fr/info.php‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
<?php
2-
/*
2+
/**
33
* This file is part of the "dragon-code/pretty-routes" project.
44
*
55
* For the full copyright and license information, please view the LICENSE
66
* file that was distributed with this source code.
77
*
8-
* @author Andrey Helldar <[email protected]>
9-
*
10-
* @copyright 2021 Andrey Helldar
11-
*
8+
* @author Andrey Helldar <[email protected]>
9+
* @copyright 2024 Andrey Helldar
1210
* @license MIT
1311
*
1412
* @see https://github.com/TheDragonCode/pretty-routes

‎resources/lang/ru/info.php‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
<?php
2-
/*
2+
/**
33
* This file is part of the "dragon-code/pretty-routes" project.
44
*
55
* For the full copyright and license information, please view the LICENSE
66
* file that was distributed with this source code.
77
*
8-
* @author Andrey Helldar <[email protected]>
9-
*
10-
* @copyright 2021 Andrey Helldar
11-
*
8+
* @author Andrey Helldar <[email protected]>
9+
* @copyright 2024 Andrey Helldar
1210
* @license MIT
1311
*
1412
* @see https://github.com/TheDragonCode/pretty-routes

‎resources/lang/tr/info.php‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
<?php
2-
/*
2+
/**
33
* This file is part of the "dragon-code/pretty-routes" project.
44
*
55
* For the full copyright and license information, please view the LICENSE
66
* file that was distributed with this source code.
77
*
8-
* @author Andrey Helldar <[email protected]>
9-
*
10-
* @copyright 2021 Andrey Helldar
11-
*
8+
* @author Andrey Helldar <[email protected]>
9+
* @copyright 2024 Andrey Helldar
1210
* @license MIT
1311
*
1412
* @see https://github.com/TheDragonCode/pretty-routes

0 commit comments

Comments
 (0)