Skip to content

Merge branch 'master' into feat/import-feature #3

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.

Sign up for GitHub

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

Closed
bastos71 wants to merge 5 commits into from
Closed

Merge branch 'master' into feat/import-feature #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6528357
Allow Laravel 9 and Backpack 5
thomascombe Feb 11, 2022
7ad88f8
Merge branch 'feat/import-feature-l9'
thomascombe Jun 22, 2022
d3ec98e
Fix phpcs
thomascombe Jun 22, 2022
c6a2f87
Update composer dependencies
thomascombe Aug 1, 2022
a83dda4
Merge branch 'master' into feat/import-feature
bserprixwq Aug 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ coverage
phpunit.xml
psalm.xml
testbench.yaml
vendor
./vendor
11 changes: 7 additions & 4 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
],
"require": {
"php": "^7.4|^8.0",
"backpack/crud": "4.1.*",
"illuminate/contracts": "^6.0|^7.0|^8.0",
"backpack/crud": "4.1.*|~5.0",
"illuminate/contracts": "^6.0|^7.0|^8.0|^9.0",
"maatwebsite/excel": "^3.1",
"thomascombe/laravel-package-tools": "^1.7"
"spatie/laravel-package-tools": "^1.12"
},
"require-dev": {
"brianium/paratest": "^6.2",
Expand All @@ -49,7 +49,10 @@
"test-coverage": "vendor/bin/phpunit --coverage-html coverage"
},
"config": {
"sort-packages": true
"sort-packages": true,
"allow-plugins": {
"composer/package-versions-deprecated": true
}
},
"extra": {
"laravel": {
Expand Down
3 changes: 1 addition & 2 deletions src/Models/ImportExport.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
use Thomascombe\BackpackAsyncExport\Exports\ExportWithName;
use Thomascombe\BackpackAsyncExport\Models\Interfaces\ImportExportInterface;

class
ImportExport extends Model implements ImportExportInterface
class ImportExport extends Model implements ImportExportInterface
{
use CrudTrait;
use SoftDeletes;
Expand Down