Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Laravel 10 Support #5788

Open
wants to merge 10 commits into
base: 1.6
Choose a base branch
from
18 changes: 16 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,23 @@ jobs:
strategy:
fail-fast: false
matrix:
php: [7.3, 7.4, 8.0, 8.1]
laravel: ['8.*', '9.*']
php: [7.3, 7.4, 8.0, 8.1, 8.2]
laravel: ['8.*', '9.*', '10.*']
exclude:
- php: 8.2
laravel: 8.*
- php: 7.3
laravel: 9.*
- php: 7.4
laravel: 9.*
- php: 8.2
laravel: 9.*
- php: 7.3
laravel: 10.*
- php: 7.4
laravel: 10.*
- php: 8.0
laravel: 10.*

name: 'PHP ${{ matrix.php }} / Laravel ${{ matrix.laravel }}'

Expand Down Expand Up @@ -52,6 +62,10 @@ jobs:
- name: Show laravel version
run: composer show laravel/framework

# Generate vendor symlink
- name: Generate vendor symlink
run: ./vendor/bin/testbench

# Install NPM dependencies
- name: Install Dependencies
run: npm install
Expand Down
9 changes: 4 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,9 @@
],
"require": {
"php": "^7.3|^7.4|^8.0",
"illuminate/support": "~8.0|~9.0",
"illuminate/support": "~8.0|~9.0|~10.0",
"intervention/image": "^2.4",
"doctrine/dbal": "^2.5|^3.1",
"larapack/doctrine-support": "~0.1.4",
"doctrine/dbal": "^3.1|^3.5",
"laravel/ui": ">=1.0",
"arrilot/laravel-widgets": "^3.7",
"league/flysystem": "~1.1|~2.0|~3.0",
Expand All @@ -28,8 +27,8 @@
"require-dev": {
"phpunit/phpcov": ">=6.0",
"phpunit/phpunit": ">=8.0",
"laravel/framework": "~8.0|~9.0",
"orchestra/testbench": ">=4.0",
"laravel/framework": "~8.0|~9.0|~10.0",
"orchestra/testbench": ">=6.0",
"laravel/browser-kit-testing": ">=6.1.0",
"orchestra/testbench-browser-kit": ">=4.0"
},
Expand Down
2 changes: 1 addition & 1 deletion src/Database/Schema/SchemaManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public static function listTableDetails($tableName)

$indexes = static::manager()->listTableIndexes($tableName);

return new Table($tableName, $columns, $indexes, $foreignKeys, false, []);
return new Table($tableName, $columns, $indexes, [], $foreignKeys, []);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion src/Database/Schema/Table.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public static function make($table)

$options = $table['options'];

return new self($name, $columns, $indexes, $foreignKeys, false, $options);
return new self($name, $columns, $indexes, [], $foreignKeys, $options);
}

public function getColumnsIndexes($columns, $sort = false)
Expand Down
2 changes: 0 additions & 2 deletions src/VoyagerServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
use Illuminate\Support\Facades\View;
use Illuminate\Support\Str;
use Intervention\Image\ImageServiceProvider;
use Larapack\DoctrineSupport\DoctrineSupportServiceProvider;
use TCG\Voyager\Events\FormFieldsRegistered;
use TCG\Voyager\Facades\Voyager as VoyagerFacade;
use TCG\Voyager\FormFields\After\DescriptionHandler;
Expand Down Expand Up @@ -59,7 +58,6 @@ public function register()
$this->app->register(VoyagerEventServiceProvider::class);
$this->app->register(ImageServiceProvider::class);
$this->app->register(VoyagerDummyServiceProvider::class);
$this->app->register(DoctrineSupportServiceProvider::class);

$loader = AliasLoader::getInstance();
$loader->alias('Voyager', VoyagerFacade::class);
Expand Down