[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
This commit is contained in:
Markus Podar
2020-12-29 11:11:05 +01:00
committed by GitHub
parent 25cc68c75f
commit 64a6b90258
6 changed files with 19 additions and 44 deletions
+4 -14
View File
@@ -18,15 +18,8 @@ jobs:
COMPOSER_NO_INTERACTION: 1 COMPOSER_NO_INTERACTION: 1
strategy: strategy:
matrix: matrix:
php: [8.0, 7.4, 7.3, 7.2] php: [8.0, 7.4, 7.3]
lumen: [8.*, 7.*, 6.*] lumen: [8.*]
exclude:
- lumen: 6.*
php: 8.0
- lumen: 7.*
php: 8.0
- lumen: 8.*
php: 7.2
name: P${{ matrix.php }} - Lumen${{ matrix.lumen }} name: P${{ matrix.php }} - Lumen${{ matrix.lumen }}
steps: steps:
- name: Checkout code - name: Checkout code
@@ -82,11 +75,8 @@ jobs:
COMPOSER_NO_INTERACTION: 1 COMPOSER_NO_INTERACTION: 1
strategy: strategy:
matrix: matrix:
php: [7.4, 7.3, 7.2] php: [8.0, 7.4, 7.3]
laravel: [8.*, 7.*, 6.*] laravel: [8.*]
exclude:
- laravel: 8.*
php: 7.2
name: P${{ matrix.php }} - Laravel${{ matrix.laravel }} name: P${{ matrix.php }} - Laravel${{ matrix.laravel }}
steps: steps:
- name: Checkout code - name: Checkout code
+2 -4
View File
@@ -19,12 +19,10 @@ jobs:
strategy: strategy:
matrix: matrix:
php: [8.0, 7.4, 7.3, 7.2] php: [8.0, 7.4, 7.3]
laravel: [8.*, 7.*, 6.*] laravel: [8.*]
dependency-version: [prefer-lowest, prefer-stable] dependency-version: [prefer-lowest, prefer-stable]
exclude: exclude:
- laravel: 8.*
php: 7.2
- php: 8.0 - php: 8.0
dependency-version: prefer-lowest dependency-version: prefer-lowest
+2
View File
@@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file.
[Next release](https://github.com/barryvdh/laravel-ide-helper/compare/v2.8.1...master) [Next release](https://github.com/barryvdh/laravel-ide-helper/compare/v2.8.1...master)
-------------- --------------
### Changed
- Dropped support for Laravel 6 and Laravel 7, as well as support for PHP 7.2 [\# / mfn]()
### Added ### Added
- Fix phpdoc generate for custom cast with parameter [\#986 / artelkr](https://github.com/barryvdh/laravel-ide-helper/pull/986) - Fix phpdoc generate for custom cast with parameter [\#986 / artelkr](https://github.com/barryvdh/laravel-ide-helper/pull/986)
+11 -11
View File
@@ -20,25 +20,25 @@
} }
], ],
"require": { "require": {
"php": ">=7.2", "php": "^7.3 || ^8.0",
"ext-json": "*", "ext-json": "*",
"barryvdh/reflection-docblock": "^2.0.6", "barryvdh/reflection-docblock": "^2.0.6",
"composer/composer": "^1.6 || ^2", "composer/composer": "^1.6 || ^2",
"doctrine/dbal": "~2.3", "doctrine/dbal": "^2.6 || ^3",
"illuminate/console": "^6 || ^7 || ^8", "illuminate/console": "^8",
"illuminate/filesystem": "^6 || ^7 || ^8", "illuminate/filesystem": "^8",
"illuminate/support": "^6 || ^7 || ^8", "illuminate/support": "^8",
"phpdocumentor/type-resolver": "^1.1.0" "phpdocumentor/type-resolver": "^1.1.0"
}, },
"require-dev": { "require-dev": {
"ext-pdo_sqlite": "*", "ext-pdo_sqlite": "*",
"friendsofphp/php-cs-fixer": "^2", "friendsofphp/php-cs-fixer": "^2",
"illuminate/config": "^6 || ^7 || ^8", "illuminate/config": "^8",
"illuminate/view": "^6 || ^7 || ^8", "illuminate/view": "^8",
"mockery/mockery": "^1.3.3", "mockery/mockery": "^1.4",
"orchestra/testbench": "^4 || ^5 || ^6", "orchestra/testbench": "^6",
"phpunit/phpunit": "^8.5 || ^9", "phpunit/phpunit": "^8.5 || ^9",
"spatie/phpunit-snapshot-assertions": "^1.4 || ^2.2 || ^3 || ^4", "spatie/phpunit-snapshot-assertions": "^3 || ^4",
"vimeo/psalm": "^3.12" "vimeo/psalm": "^3.12"
}, },
"config": { "config": {
@@ -46,7 +46,7 @@
}, },
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.8-dev" "dev-master": "2.9-dev"
}, },
"laravel": { "laravel": {
"providers": [ "providers": [
@@ -6,19 +6,9 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\LaravelCustomCas
use Barryvdh\LaravelIdeHelper\Console\ModelsCommand; use Barryvdh\LaravelIdeHelper\Console\ModelsCommand;
use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\AbstractModelsCommand; use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\AbstractModelsCommand;
use Illuminate\Foundation\Application;
class Test extends AbstractModelsCommand class Test extends AbstractModelsCommand
{ {
protected function setUp(): void
{
parent::setUp();
if (version_compare(Application::VERSION, '7.0', '<')) {
$this->markTestSkipped('This test requires Laravel 7.0 or higher');
}
}
public function test(): void public function test(): void
{ {
$command = $this->app->make(ModelsCommand::class); $command = $this->app->make(ModelsCommand::class);
-5
View File
@@ -6,7 +6,6 @@ namespace Barryvdh\LaravelIdeHelper\Tests;
use Barryvdh\LaravelIdeHelper\Method; use Barryvdh\LaravelIdeHelper\Method;
use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Builder;
use Illuminate\Foundation\Application;
use PHPUnit\Framework\TestCase; use PHPUnit\Framework\TestCase;
class MethodTest extends TestCase class MethodTest extends TestCase
@@ -59,10 +58,6 @@ DOC;
*/ */
public function testEloquentBuilderOutput() public function testEloquentBuilderOutput()
{ {
if ((int) Application::VERSION < 8) {
$this->markTestSkipped('This test requires Laravel 8.0 or higher');
}
$reflectionClass = new \ReflectionClass(Builder::class); $reflectionClass = new \ReflectionClass(Builder::class);
$reflectionMethod = $reflectionClass->getMethod('with'); $reflectionMethod = $reflectionClass->getMethod('with');