From 87e81740247472c54ef182f74cd143db7f116425 Mon Sep 17 00:00:00 2001 From: Harings Rob Date: Tue, 3 Jan 2023 10:24:14 +0100 Subject: [PATCH 1/5] Revert "Fix activity package." This reverts commit 48886cdcfa36f0e21315d503416a8152ce9d2d34. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 0b474a3d3..e85d76c81 100644 --- a/composer.json +++ b/composer.json @@ -39,7 +39,7 @@ "matthewbdaly/laravel-azure-storage": "^1.3|^2.0", "myclabs/php-enum": "^1.5", "pragmarx/google2fa-qrcode": "^1.0|^2.0", - "spatie/laravel-activitylog": "^3.0|^4.0", + "spatie/laravel-activitylog": "^4.0", "spatie/laravel-analytics": "^3.0|^4.0", "spatie/once": "^2.0|^3.0" }, From 9331790ac3ca0cfe455d2f4573e6b6748c533538 Mon Sep 17 00:00:00 2001 From: Harings Rob Date: Tue, 3 Jan 2023 10:24:20 +0100 Subject: [PATCH 2/5] Revert "Fix analytics package." This reverts commit 63518c8bc35ace5bdbf7e1a6bf75e469c2b14209. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index e85d76c81..465b5a922 100644 --- a/composer.json +++ b/composer.json @@ -40,7 +40,7 @@ "myclabs/php-enum": "^1.5", "pragmarx/google2fa-qrcode": "^1.0|^2.0", "spatie/laravel-activitylog": "^4.0", - "spatie/laravel-analytics": "^3.0|^4.0", + "spatie/laravel-analytics": "^4.0", "spatie/once": "^2.0|^3.0" }, "require-dev": { From 650e850c37aa4c238b512ea1434b138d677d5dd4 Mon Sep 17 00:00:00 2001 From: Harings Rob Date: Tue, 3 Jan 2023 10:24:25 +0100 Subject: [PATCH 3/5] Revert "Remove eol laravel versions." This reverts commit 45e55e21c58d2b07f35b656e3aade6530e842252. --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e6af70e39..fdec92b8e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,7 +14,7 @@ jobs: matrix: os: [ubuntu-latest] php: [8.1, 8.0, 7.4, 7.3] - laravel: [9.*, 8.*] + laravel: [9.*, 8.*, 7.*, 6.*, 5.8.*] dbal: [^2.12, ^3.0] include: - laravel: 9.* From ec3dac2e4211c4b11733b31bd0ae0ae8e21d4a59 Mon Sep 17 00:00:00 2001 From: Harings Rob Date: Tue, 3 Jan 2023 10:24:30 +0100 Subject: [PATCH 4/5] Revert "Cleanup composer for stable versions." This reverts commit 059caa67c149bceb01918492d1bb3fa122387b0c. --- .github/workflows/main.yml | 24 ++++++++++++++++++++++++ composer.json | 16 ++++++++-------- 2 files changed, 32 insertions(+), 8 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fdec92b8e..8576de89c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -21,6 +21,12 @@ jobs: testbench: 7.* - laravel: 8.* testbench: 6.* + - laravel: 7.* + testbench: 5.* + - laravel: 6.* + testbench: 4.* + - laravel: 5.8.* + testbench: 3.8.* exclude: - laravel: 9.* php: 7.4 @@ -28,6 +34,24 @@ jobs: php: 7.3 - laravel: 8.* php: 8.1 + - laravel: 7.* + php: 8.1 + - laravel: 7.* + php: 8.0 + - laravel: 6.* + php: 8.1 + - laravel: 6.* + php: 8.0 + - laravel: 5.8.* + php: 8.1 + - laravel: 5.8.* + php: 8.0 + - dbal: ^3.0 + laravel: 5.8.* + - dbal: ^3.0 + laravel: 6.* + - dbal: ^3.0 + laravel: 7.* - dbal: ^2.12 laravel: 8.* - dbal: ^2.12 diff --git a/composer.json b/composer.json index 465b5a922..03f4a6e42 100644 --- a/composer.json +++ b/composer.json @@ -27,27 +27,27 @@ "ext-json": "*", "ext-pdo": "*", "astrotomic/laravel-translatable": "^11.5", - "cartalyst/tags": "^11.0|^12.0", + "cartalyst/tags": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0", "doctrine/dbal": "^2.12|^3.0", "guzzlehttp/guzzle": "^6.2|^7.0", "imgix/imgix-php": "^3.0", - "laravel/framework": "^8.0|^9.0", - "laravel/socialite": "^5.0", - "laravel/ui": "^3.0|^4.0", + "laravel/framework": "~5.6|~5.7|~5.8|^6.0|^7.0|^8.0|^9.0", + "laravel/socialite": "^4.2|^5.0", + "laravel/ui": "^1.0|^2.0|^3.0|^4.0", "league/flysystem-aws-s3-v3": "^1.0|^2.0|^3.0", "league/glide-laravel": "^1.0", "matthewbdaly/laravel-azure-storage": "^1.3|^2.0", "myclabs/php-enum": "^1.5", "pragmarx/google2fa-qrcode": "^1.0|^2.0", - "spatie/laravel-activitylog": "^4.0", - "spatie/laravel-analytics": "^4.0", + "spatie/laravel-activitylog": "^2.5|^3.2|^4.0", + "spatie/laravel-analytics": "^3.6|^4.0", "spatie/once": "^2.0|^3.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "^2.16|^3.0", "kalnoy/nestedset": "^5.0|^6.0", - "nunomaduro/collision": "^5.0|^6.0", - "orchestra/testbench": "^6.0|^7.0", + "nunomaduro/collision": "^3.0|^4.2|^5.0|^6.0", + "orchestra/testbench": "~3.3|~3.4|~3.5|~3.6|~3.7|~3.8|^4.0|^5.0|^6.0|^7.0", "phpunit/phpunit": "~5.0|~6.0|~7.0|~8.0|~9.0", "chillerlan/php-qrcode": "~2.0|~3.0|~4.0" }, From 373dc2d38976483ed364250384d8939420c99145 Mon Sep 17 00:00:00 2001 From: Harings Rob Date: Tue, 3 Jan 2023 10:32:23 +0100 Subject: [PATCH 5/5] #2029: Use str_after_last --- src/Http/Controllers/Admin/ModuleController.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Http/Controllers/Admin/ModuleController.php b/src/Http/Controllers/Admin/ModuleController.php index 903861e7b..df2c79278 100644 --- a/src/Http/Controllers/Admin/ModuleController.php +++ b/src/Http/Controllers/Admin/ModuleController.php @@ -460,7 +460,7 @@ public function show($id, $submoduleId = null) */ public function edit($id, $submoduleId = null) { - $parameter = Str::singular(Str::afterLast($this->moduleName, '.')); + $parameter = Str::singular(str_after_last($this->moduleName, '.')); $id = $this->request->route()->parameter($parameter, $id); $item = $this->repository->getById($id, $this->formWith, $this->formWithCount); @@ -529,7 +529,7 @@ public function create($parentModuleId = null) */ public function update($id, $submoduleId = null) { - $parameter = Str::singular(Str::afterLast($this->moduleName, '.')); + $parameter = Str::singular(str_after_last($this->moduleName, '.')); $id = $this->request->route()->parameter($parameter, $id); $item = $this->repository->getById($id, $this->formWith, $this->formWithCount); @@ -727,7 +727,7 @@ public function bulkPublish() */ public function duplicate($id, $submoduleId = null) { - $parameter = Str::singular(Str::afterLast($this->moduleName, '.')); + $parameter = Str::singular(str_after_last($this->moduleName, '.')); $id = $this->request->route()->parameter($parameter, $id); $item = $this->repository->getById($id, $this->formWith, $this->formWithCount); @@ -757,7 +757,7 @@ public function duplicate($id, $submoduleId = null) */ public function destroy($id, $submoduleId = null) { - $parameter = Str::singular(Str::afterLast($this->moduleName, '.')); + $parameter = Str::singular(str_after_last($this->moduleName, '.')); $id = $this->request->route()->parameter($parameter, $id); $item = $this->repository->getById($id, $this->formWith, $this->formWithCount);