Skip to content

Commit 64a6b90

Browse files
authored
[2.9] Drop support for: Laravel 6, Laravel 7, PHP 7.2 and add doctrine/dbal ^3 (#1114)
* composer.json: drop support for PHP 7.2/Laravel 6+7 and bump dependencies * tests: remove framework version tests They don't apply anymore, we're Laravel 8+ only from now on * changelog: update for ending support for L6/7 and PHP7.2
1 parent 25cc68c commit 64a6b90

File tree

6 files changed

+19
-44
lines changed

6 files changed

+19
-44
lines changed

.github/workflows/run-integration-tests.yml

+4-14
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,8 @@ jobs:
1818
COMPOSER_NO_INTERACTION: 1
1919
strategy:
2020
matrix:
21-
php: [8.0, 7.4, 7.3, 7.2]
22-
lumen: [8.*, 7.*, 6.*]
23-
exclude:
24-
- lumen: 6.*
25-
php: 8.0
26-
- lumen: 7.*
27-
php: 8.0
28-
- lumen: 8.*
29-
php: 7.2
21+
php: [8.0, 7.4, 7.3]
22+
lumen: [8.*]
3023
name: P${{ matrix.php }} - Lumen${{ matrix.lumen }}
3124
steps:
3225
- name: Checkout code
@@ -82,11 +75,8 @@ jobs:
8275
COMPOSER_NO_INTERACTION: 1
8376
strategy:
8477
matrix:
85-
php: [7.4, 7.3, 7.2]
86-
laravel: [8.*, 7.*, 6.*]
87-
exclude:
88-
- laravel: 8.*
89-
php: 7.2
78+
php: [8.0, 7.4, 7.3]
79+
laravel: [8.*]
9080
name: P${{ matrix.php }} - Laravel${{ matrix.laravel }}
9181
steps:
9282
- name: Checkout code

.github/workflows/run-tests.yml

+2-4
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,10 @@ jobs:
1919

2020
strategy:
2121
matrix:
22-
php: [8.0, 7.4, 7.3, 7.2]
23-
laravel: [8.*, 7.*, 6.*]
22+
php: [8.0, 7.4, 7.3]
23+
laravel: [8.*]
2424
dependency-version: [prefer-lowest, prefer-stable]
2525
exclude:
26-
- laravel: 8.*
27-
php: 7.2
2826
- php: 8.0
2927
dependency-version: prefer-lowest
3028

CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file.
44

55
[Next release](https://github.com/barryvdh/laravel-ide-helper/compare/v2.8.1...master)
66
--------------
7+
### Changed
8+
- Dropped support for Laravel 6 and Laravel 7, as well as support for PHP 7.2 [\# / mfn]()
79

810
### Added
911
- Fix phpdoc generate for custom cast with parameter [\#986 / artelkr](https://github.com/barryvdh/laravel-ide-helper/pull/986)

composer.json

+11-11
Original file line numberDiff line numberDiff line change
@@ -20,33 +20,33 @@
2020
}
2121
],
2222
"require": {
23-
"php": ">=7.2",
23+
"php": "^7.3 || ^8.0",
2424
"ext-json": "*",
2525
"barryvdh/reflection-docblock": "^2.0.6",
2626
"composer/composer": "^1.6 || ^2",
27-
"doctrine/dbal": "~2.3",
28-
"illuminate/console": "^6 || ^7 || ^8",
29-
"illuminate/filesystem": "^6 || ^7 || ^8",
30-
"illuminate/support": "^6 || ^7 || ^8",
27+
"doctrine/dbal": "^2.6 || ^3",
28+
"illuminate/console": "^8",
29+
"illuminate/filesystem": "^8",
30+
"illuminate/support": "^8",
3131
"phpdocumentor/type-resolver": "^1.1.0"
3232
},
3333
"require-dev": {
3434
"ext-pdo_sqlite": "*",
3535
"friendsofphp/php-cs-fixer": "^2",
36-
"illuminate/config": "^6 || ^7 || ^8",
37-
"illuminate/view": "^6 || ^7 || ^8",
38-
"mockery/mockery": "^1.3.3",
39-
"orchestra/testbench": "^4 || ^5 || ^6",
36+
"illuminate/config": "^8",
37+
"illuminate/view": "^8",
38+
"mockery/mockery": "^1.4",
39+
"orchestra/testbench": "^6",
4040
"phpunit/phpunit": "^8.5 || ^9",
41-
"spatie/phpunit-snapshot-assertions": "^1.4 || ^2.2 || ^3 || ^4",
41+
"spatie/phpunit-snapshot-assertions": "^3 || ^4",
4242
"vimeo/psalm": "^3.12"
4343
},
4444
"config": {
4545
"sort-packages": true
4646
},
4747
"extra": {
4848
"branch-alias": {
49-
"dev-master": "2.8-dev"
49+
"dev-master": "2.9-dev"
5050
},
5151
"laravel": {
5252
"providers": [

tests/Console/ModelsCommand/LaravelCustomCasts/Test.php

-10
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,9 @@
66

77
use Barryvdh\LaravelIdeHelper\Console\ModelsCommand;
88
use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\AbstractModelsCommand;
9-
use Illuminate\Foundation\Application;
109

1110
class Test extends AbstractModelsCommand
1211
{
13-
protected function setUp(): void
14-
{
15-
parent::setUp();
16-
17-
if (version_compare(Application::VERSION, '7.0', '<')) {
18-
$this->markTestSkipped('This test requires Laravel 7.0 or higher');
19-
}
20-
}
21-
2212
public function test(): void
2313
{
2414
$command = $this->app->make(ModelsCommand::class);

tests/MethodTest.php

-5
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
use Barryvdh\LaravelIdeHelper\Method;
88
use Illuminate\Database\Eloquent\Builder;
9-
use Illuminate\Foundation\Application;
109
use PHPUnit\Framework\TestCase;
1110

1211
class MethodTest extends TestCase
@@ -59,10 +58,6 @@ public function testOutput()
5958
*/
6059
public function testEloquentBuilderOutput()
6160
{
62-
if ((int) Application::VERSION < 8) {
63-
$this->markTestSkipped('This test requires Laravel 8.0 or higher');
64-
}
65-
6661
$reflectionClass = new \ReflectionClass(Builder::class);
6762
$reflectionMethod = $reflectionClass->getMethod('with');
6863

0 commit comments

Comments
 (0)