Compare commits

...
Author SHA1 Message Date
laravel-ide-helper 0a43deb16c composer fix-style 2024-02-07 20:33:52 +00:00
Barry vd. Heuvel e0ee7deccc Merge branch 'master' into fix-lowest-stability 2024-02-07 21:33:11 +01:00
Barry vd. Heuvel 0fe86fd042 minimu dbal 3.1 2024-02-07 19:51:34 +01:00
Barry vd. Heuvel 964c964296 Drop dbal v2 2024-02-07 19:48:53 +01:00
barryvdh eb28477bf4 normalize composer.json 2024-02-07 18:43:23 +00:00
Barry vd. Heuvel 89288a5770 Fix lowest stability 2024-02-07 19:42:57 +01:00
4 changed files with 13 additions and 11 deletions
+4 -3
View File
@@ -18,16 +18,17 @@ jobs:
COMPOSER_NO_INTERACTION: 1 COMPOSER_NO_INTERACTION: 1
strategy: strategy:
fail-fast: false
matrix: matrix:
os: [ubuntu-20.04, windows-2019] os: [ubuntu-20.04, windows-2019]
php: [8.3, 8.2, 8.1, 8.0] php: [8.3, 8.2, 8.1, 8.0]
laravel: [9.*, 10.*] laravel: [9.*, 10.*]
dependency-version: [prefer-lowest, prefer-stable] stability: [prefer-lowest, prefer-stable]
exclude: exclude:
- php: 8.0 - php: 8.0
laravel: 10.* laravel: 10.*
- php: 8.0 - php: 8.0
dependency-version: prefer-lowest stability: prefer-lowest
steps: steps:
- name: Set git to use LF - name: Set git to use LF
if: ${{ matrix.os == 'windows-2019' }} if: ${{ matrix.os == 'windows-2019' }}
@@ -50,7 +51,7 @@ jobs:
composer remove vimeo/psalm --no-update --dev composer remove vimeo/psalm --no-update --dev
composer remove friendsofphp/php-cs-fixer --no-update --dev composer remove friendsofphp/php-cs-fixer --no-update --dev
composer require "laravel/framework:${{ matrix.laravel }}" --no-update --no-progress composer require "laravel/framework:${{ matrix.laravel }}" --no-update --no-progress
composer update --prefer-dist --no-progress composer update --prefer-dist --no-progress --${{ matrix.stability }}
- name: Execute Unit Tests - name: Execute Unit Tests
run: composer test-ci run: composer test-ci
+3 -2
View File
@@ -22,9 +22,9 @@
"require": { "require": {
"php": "^8.0", "php": "^8.0",
"ext-json": "*", "ext-json": "*",
"barryvdh/reflection-docblock": "^2.0.6", "barryvdh/reflection-docblock": "^2.1.1",
"composer/class-map-generator": "^1.0", "composer/class-map-generator": "^1.0",
"doctrine/dbal": "^2.6 || ^3.1.4", "doctrine/dbal": "^3.1.4",
"illuminate/console": "^9 || ^10", "illuminate/console": "^9 || ^10",
"illuminate/filesystem": "^9 || ^10", "illuminate/filesystem": "^9 || ^10",
"illuminate/support": "^9 || ^10", "illuminate/support": "^9 || ^10",
@@ -37,6 +37,7 @@
"illuminate/config": "^9 || ^10", "illuminate/config": "^9 || ^10",
"illuminate/view": "^9 || ^10", "illuminate/view": "^9 || ^10",
"mockery/mockery": "^1.4", "mockery/mockery": "^1.4",
"nesbot/carbon": "^2.62.1",
"orchestra/testbench": "^7 || ^8", "orchestra/testbench": "^7 || ^8",
"phpunit/phpunit": "^9", "phpunit/phpunit": "^9",
"spatie/phpunit-snapshot-assertions": "^4", "spatie/phpunit-snapshot-assertions": "^4",
+2 -2
View File
@@ -154,8 +154,8 @@ class Generator
continue; continue;
} }
// Skip the swoole // Skip the swoole
if ($facade == 'SwooleTW\Http\Server\Facades\Server' && $name == 'Server' && !class_exists('Swoole\Http\Server')) { if ($facade == 'SwooleTW\Http\Server\Facades\Server' && $name == 'Server' && !class_exists('Swoole\Http\Server')) {
continue; continue;
} }
@@ -4,9 +4,9 @@ declare(strict_types=1);
namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhpDocWithEnumDefaults\Models; namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhpDocWithEnumDefaults\Models;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Builder;
use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhpDocWithEnumDefaults\Enums\PostStatus; use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhpDocWithEnumDefaults\Enums\PostStatus;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Model;
class Post extends Model class Post extends Model
{ {