diff --git a/assets/bin/dev b/assets/bin/dev index 613f7fa..e831790 100755 --- a/assets/bin/dev +++ b/assets/bin/dev @@ -2,8 +2,12 @@ set -eu -cd $(dirname "$0")/../../ -COMPOSE="docker-compose" +if [ -n "${COMPOSER_RUNTIME_BIN_DIR:-}" ]; then + cd ${COMPOSER_RUNTIME_BIN_DIR}/../../ +else + cd $(dirname "$0")/../../ +fi +COMPOSE="docker compose" COMPOSE_SERVICE="app" if [ ! -f "docker-compose.yml" ]; then diff --git a/composer.json b/composer.json index 6d00ea9..c83a71d 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,21 @@ } ], "require": { - "php": ">=8.0", + "php": "^8.1", "squizlabs/php_codesniffer": "^3.5", "barryvdh/laravel-debugbar": "^3.2", - "barryvdh/laravel-ide-helper": "^2.6", - "thisisdevelopment/laravel-test-snapshot": "^0.3.0", + "barryvdh/laravel-ide-helper": "^2.6 | ^3.5", "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": "^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": { - }, + "require-dev": {}, "bin": [ "assets/bin/dev", "assets/bin/wait-db", 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 +}