From 5ee52b3e5095796abc8c6f0f56f7f8b04e26a07a Mon Sep 17 00:00:00 2001 From: Eric de Ruiter Date: Wed, 21 Jun 2023 12:19:48 +0200 Subject: [PATCH 1/7] Added support for laravel 10 + composer 2.2 compat fixes --- assets/bin/dev | 6 +++++- composer.json | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/assets/bin/dev b/assets/bin/dev index 613f7fa..884365a 100755 --- a/assets/bin/dev +++ b/assets/bin/dev @@ -2,7 +2,11 @@ set -eu -cd $(dirname "$0")/../../ +if [ -n "${COMPOSER_RUNTIME_BIN_DIR:-}" ]; then + cd ${COMPOSER_RUNTIME_BIN_DIR}/../../ +else + cd $(dirname "$0")/../../ +fi COMPOSE="docker-compose" COMPOSE_SERVICE="app" diff --git a/composer.json b/composer.json index 6d00ea9..a814352 100644 --- a/composer.json +++ b/composer.json @@ -20,9 +20,9 @@ "barryvdh/laravel-ide-helper": "^2.6", "thisisdevelopment/laravel-test-snapshot": "^0.3.0", "vlucas/phpdotenv": "^4.0|^5.0", - "illuminate/console": "6.x | 7.x | 8.x | 9.x", - "illuminate/support": "6.x | 7.x | 8.x | 9.x", - "illuminate/database": "6.x | 7.x | 8.x | 9.x" + "illuminate/console": "6.x | 7.x | 8.x | 9.x | 10.x", + "illuminate/support": "6.x | 7.x | 8.x | 9.x | 10.x", + "illuminate/database": "6.x | 7.x | 8.x | 9.x | 10.x" }, "minimum-stability": "dev", "prefer-stable": true, From bfb19a10479a02e2c24db251bbbbfbf2e1106460 Mon Sep 17 00:00:00 2001 From: Eric de Ruiter Date: Thu, 25 Apr 2024 17:42:13 +0200 Subject: [PATCH 2/7] Added support for laravel 11 --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index a814352..89abfed 100644 --- a/composer.json +++ b/composer.json @@ -20,9 +20,9 @@ "barryvdh/laravel-ide-helper": "^2.6", "thisisdevelopment/laravel-test-snapshot": "^0.3.0", "vlucas/phpdotenv": "^4.0|^5.0", - "illuminate/console": "6.x | 7.x | 8.x | 9.x | 10.x", - "illuminate/support": "6.x | 7.x | 8.x | 9.x | 10.x", - "illuminate/database": "6.x | 7.x | 8.x | 9.x | 10.x" + "illuminate/console": "6.x | 7.x | 8.x | 9.x | 10.x | 11.x", + "illuminate/support": "6.x | 7.x | 8.x | 9.x | 10.x | 11.x", + "illuminate/database": "6.x | 7.x | 8.x | 9.x | 10.x | 11.x" }, "minimum-stability": "dev", "prefer-stable": true, From 4a9fe8f3e9c7de9020ce068d4e875d780367b301 Mon Sep 17 00:00:00 2001 From: Bob Fanger Date: Fri, 12 Jul 2024 14:09:43 +0200 Subject: [PATCH 3/7] fix: Use `docker compose` instead of `docker-compose` Fixes: vendor/thisisdevelopment/laravel-base-dev/assets/bin/dev: line 26: docker-compose: command not found --- assets/bin/dev | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/bin/dev b/assets/bin/dev index 884365a..e831790 100755 --- a/assets/bin/dev +++ b/assets/bin/dev @@ -7,7 +7,7 @@ if [ -n "${COMPOSER_RUNTIME_BIN_DIR:-}" ]; then else cd $(dirname "$0")/../../ fi -COMPOSE="docker-compose" +COMPOSE="docker compose" COMPOSE_SERVICE="app" if [ ! -f "docker-compose.yml" ]; then From d05f37bdfa7a8227c3d8b150579bb63878496a4a Mon Sep 17 00:00:00 2001 From: Jeroen Faijdherbe Date: Mon, 17 Mar 2025 15:44:04 +0100 Subject: [PATCH 4/7] Added support for Laravel 12 Also bumped minimum PHP version to 8.1, thereby deprecating all Laravel 6, 7 ,8 and 9. --- composer.json | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index 89abfed..ff9f99e 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,11 @@ { "name": "thisisdevelopment/laravel-base-dev", "description": "Base dev dependencies for thisisdevelopment/laravel-base", - "keywords": ["laravel", "base", "dev"], + "keywords": [ + "laravel", + "base", + "dev" + ], "license": "MIT", "authors": [ { @@ -14,20 +18,19 @@ } ], "require": { - "php": ">=8.0", + "php": "^8.1", "squizlabs/php_codesniffer": "^3.5", "barryvdh/laravel-debugbar": "^3.2", - "barryvdh/laravel-ide-helper": "^2.6", + "barryvdh/laravel-ide-helper": "^2.6 | ^3.5", "thisisdevelopment/laravel-test-snapshot": "^0.3.0", "vlucas/phpdotenv": "^4.0|^5.0", - "illuminate/console": "6.x | 7.x | 8.x | 9.x | 10.x | 11.x", - "illuminate/support": "6.x | 7.x | 8.x | 9.x | 10.x | 11.x", - "illuminate/database": "6.x | 7.x | 8.x | 9.x | 10.x | 11.x" + "illuminate/console": "^10.0|^11.0|^12.0", + "illuminate/support": "^10.0|^11.0|^12.0", + "illuminate/database": "^10.0|^11.0|^12.0" }, "minimum-stability": "dev", "prefer-stable": true, - "require-dev": { - }, + "require-dev": {}, "bin": [ "assets/bin/dev", "assets/bin/wait-db", From 20a296a7668c4d06391672d9439e13ef3691be11 Mon Sep 17 00:00:00 2001 From: Jeroen Faijdherbe Date: Tue, 18 Mar 2025 11:06:43 +0100 Subject: [PATCH 5/7] Fixed framework incompatibility --- src/Helpers/SQLiteConnection.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Helpers/SQLiteConnection.php b/src/Helpers/SQLiteConnection.php index 06eaa72..68f7b05 100644 --- a/src/Helpers/SQLiteConnection.php +++ b/src/Helpers/SQLiteConnection.php @@ -25,6 +25,7 @@ public function addJsonContainsFunction() protected function getDefaultQueryGrammar() { - return $this->withTablePrefix(new SQLiteGrammar()); // here comes our custom Grammar object + return new SQLiteGrammar($this) + ->setTablePrefix($this->tablePrefix); // here comes our custom Grammar object } -} \ No newline at end of file +} From 68471505b312c0bd290ec397a1ac8c07c33cd487 Mon Sep 17 00:00:00 2001 From: Jeroen Faijdherbe Date: Fri, 21 Mar 2025 15:35:49 +0100 Subject: [PATCH 6/7] Moved thisisdevelopment/laravel-test-snapshot to suggest. --- composer.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index ff9f99e..df44862 100644 --- a/composer.json +++ b/composer.json @@ -22,12 +22,14 @@ "squizlabs/php_codesniffer": "^3.5", "barryvdh/laravel-debugbar": "^3.2", "barryvdh/laravel-ide-helper": "^2.6 | ^3.5", - "thisisdevelopment/laravel-test-snapshot": "^0.3.0", "vlucas/phpdotenv": "^4.0|^5.0", "illuminate/console": "^10.0|^11.0|^12.0", "illuminate/support": "^10.0|^11.0|^12.0", "illuminate/database": "^10.0|^11.0|^12.0" }, + "suggest": { + "thisisdevelopment/laravel-test-snapshot": "Speed up tests by snapshotting migrations.", + }, "minimum-stability": "dev", "prefer-stable": true, "require-dev": {}, From abfd72ebe73e787c0bf8b24317f1aa3550ca2cc0 Mon Sep 17 00:00:00 2001 From: Jeroen Faijdherbe Date: Mon, 24 Mar 2025 09:42:34 +0100 Subject: [PATCH 7/7] fix broken composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index df44862..c83a71d 100644 --- a/composer.json +++ b/composer.json @@ -28,7 +28,7 @@ "illuminate/database": "^10.0|^11.0|^12.0" }, "suggest": { - "thisisdevelopment/laravel-test-snapshot": "Speed up tests by snapshotting migrations.", + "thisisdevelopment/laravel-test-snapshot": "Speed up tests by snapshotting migrations." }, "minimum-stability": "dev", "prefer-stable": true,