From 65283574f3f284253ab32ca2c38d10e16de88f17 Mon Sep 17 00:00:00 2001 From: thomascombe Date: Fri, 11 Feb 2022 09:17:26 +0100 Subject: [PATCH 1/3] Allow Laravel 9 and Backpack 5 --- composer.json | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index feaba78..9790afe 100644 --- a/composer.json +++ b/composer.json @@ -19,8 +19,8 @@ ], "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" }, @@ -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": { From d3ec98e8ae77c87ea6edd8937297640151763ef0 Mon Sep 17 00:00:00 2001 From: thomascombe Date: Wed, 22 Jun 2022 07:19:08 +0200 Subject: [PATCH 2/3] Fix phpcs --- .gitignore | 1 + src/Models/ImportExport.php | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1b2c307..753253c 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,5 @@ coverage phpunit.xml psalm.xml testbench.yaml +vendor ./vendor diff --git a/src/Models/ImportExport.php b/src/Models/ImportExport.php index 2f6f3f7..908d978 100644 --- a/src/Models/ImportExport.php +++ b/src/Models/ImportExport.php @@ -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; From c6a2f87ab1e079dd47dd1a86b10596433a4671e9 Mon Sep 17 00:00:00 2001 From: thomascombe Date: Mon, 1 Aug 2022 11:02:10 +0200 Subject: [PATCH 3/3] Update composer dependencies --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 9790afe..a65eab7 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ "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",