Skip to content

Commit

Permalink
Support Laravel 12 (#15)
Browse files Browse the repository at this point in the history
* Refactoring

* Support Laravel 12
  • Loading branch information
staudenmeir authored Feb 16, 2025
1 parent 430ab63 commit f8c2be8
Show file tree
Hide file tree
Showing 10 changed files with 25 additions and 22 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ Use this command if you are in PowerShell on Windows (e.g. in VS Code):

| Laravel | Package |
|:--------|:--------|
| 12.x | 1.11 |
| 11.x | 1.9 |
| 10.x | 1.7 |
| 9.x | 1.6 |
Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
],
"require": {
"php": "^8.2",
"illuminate/database": "^11.0"
"illuminate/database": "^12.0"
},
"require-dev": {
"laravel/framework": "^11.0",
"orchestra/testbench-core": "^9.5",
"laravel/framework": "^12.0",
"orchestra/testbench-core": "^10.0",
"phpstan/phpstan": "^2.0",
"phpunit/phpunit": "^11.0"
},
Expand Down
8 changes: 5 additions & 3 deletions src/DatabaseServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace Staudenmeir\LaravelMigrationViews;

use Illuminate\Contracts\Foundation\Application;
use Illuminate\Support\ServiceProvider;
use Staudenmeir\LaravelMigrationViews\Facades\Schema;

Expand All @@ -14,11 +15,12 @@ class DatabaseServiceProvider extends ServiceProvider
*/
public function register()
{
$this->app->bind(Schema::class, function ($app) {
/** @var array{db: \Illuminate\Database\DatabaseManager} $app */
$this->app->bind(Schema::class, function (Application $app) {
/** @var \Illuminate\Database\DatabaseManager $db */
$db = $app->make('db');

return Schema::getSchemaBuilder(
$app['db']->connection()
$db->connection()
);
});
}
Expand Down
16 changes: 8 additions & 8 deletions src/Facades/Schema.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
use Staudenmeir\LaravelMigrationViews\Schema\Grammars\SqlServerGrammar;

/**
* @method static void createView(string $name, string|\Illuminate\Database\Eloquent\Builder<*>|\Illuminate\Database\Query\Builder $query, list<string|\Illuminate\Database\Query\Expression>|null $columns = null, bool $orReplace = false, ?string $algorithm = null)
* @method static void createOrReplaceView(string $name, string|\Illuminate\Database\Eloquent\Builder<*>|\Illuminate\Database\Query\Builder $query, list<string|\Illuminate\Database\Query\Expression>|null $columns = null)
* @method static void createMaterializedView(string $name, string|\Illuminate\Database\Eloquent\Builder<*>|\Illuminate\Database\Query\Builder $query, list<string|\Illuminate\Database\Query\Expression>|null $columns = null)
* @method static void createView(string $name, string|\Illuminate\Database\Eloquent\Builder<*>|\Illuminate\Database\Query\Builder $query, list<string|\Illuminate\Database\Query\Expression<*>>|null $columns = null, bool $orReplace = false, ?string $algorithm = null)
* @method static void createOrReplaceView(string $name, string|\Illuminate\Database\Eloquent\Builder<*>|\Illuminate\Database\Query\Builder $query, list<string|\Illuminate\Database\Query\Expression<*>>|null $columns = null)
* @method static void createMaterializedView(string $name, string|\Illuminate\Database\Eloquent\Builder<*>|\Illuminate\Database\Query\Builder $query, list<string|\Illuminate\Database\Query\Expression<*>>|null $columns = null)
* @method static void renameView(string $from, string $to)
* @method static void dropView(string $name, bool $ifExists = false)
* @method static void dropViewIfExists(string $name)
Expand Down Expand Up @@ -63,27 +63,27 @@ public static function getSchemaBuilder(Connection $connection)
return match ($connection->getDriverName()) {
'mysql' => new MySqlBuilder(
$connection->setSchemaGrammar(
$connection->withTablePrefix(new MySqlGrammar())
new MySqlGrammar($connection)
)
),
'mariadb' => new MariaDbBuilder(
$connection->setSchemaGrammar(
$connection->withTablePrefix(new MariaDbGrammar())
new MariaDbGrammar($connection)
)
),
'pgsql' => new PostgresBuilder(
$connection->setSchemaGrammar(
$connection->withTablePrefix(new PostgresGrammar())
new PostgresGrammar($connection)
)
),
'sqlite' => new SQLiteBuilder(
$connection->setSchemaGrammar(
$connection->withTablePrefix(new SQLiteGrammar())
new SQLiteGrammar($connection)
)
),
'sqlsrv' => new SqlServerBuilder(
$connection->setSchemaGrammar(
$connection->withTablePrefix(new SqlServerGrammar())
new SqlServerGrammar($connection)
)
),
default => throw new RuntimeException('This database is not supported.'), // @codeCoverageIgnore
Expand Down
6 changes: 3 additions & 3 deletions src/Schema/Builders/ManagesViews.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ trait ManagesViews
*
* @param string $name
* @param string|\Illuminate\Database\Eloquent\Builder<*>|\Illuminate\Database\Query\Builder $query
* @param list<string|\Illuminate\Database\Query\Expression>|null $columns
* @param list<string|\Illuminate\Database\Query\Expression<*>>|null $columns
* @param bool $orReplace
* @param bool $materialized
* @param string|null $algorithm
Expand Down Expand Up @@ -41,7 +41,7 @@ public function createView(
*
* @param string $name
* @param string|\Illuminate\Database\Eloquent\Builder<*>|\Illuminate\Database\Query\Builder $query
* @param list<string|\Illuminate\Database\Query\Expression>|null $columns
* @param list<string|\Illuminate\Database\Query\Expression<*>>|null $columns
* @return void
*/
public function createOrReplaceView($name, $query, ?array $columns = null)
Expand All @@ -54,7 +54,7 @@ public function createOrReplaceView($name, $query, ?array $columns = null)
*
* @param string $name
* @param string|\Illuminate\Database\Eloquent\Builder<*>|\Illuminate\Database\Query\Builder $query
* @param list<string|\Illuminate\Database\Query\Expression>|null $columns
* @param list<string|\Illuminate\Database\Query\Expression<*>>|null $columns
* @return void
*/
public function createMaterializedView(string $name, $query, ?array $columns = null): void
Expand Down
2 changes: 1 addition & 1 deletion src/Schema/Builders/SQLiteBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class SQLiteBuilder extends Base
*
* @param string $name
* @param string|\Illuminate\Database\Eloquent\Builder<*>|\Illuminate\Database\Query\Builder $query
* @param list<string|\Illuminate\Database\Query\Expression>|null $columns
* @param list<string|\Illuminate\Database\Query\Expression<*>>|null $columns
* @param bool $orReplace
* @param bool $materialized
* @return void
Expand Down
2 changes: 1 addition & 1 deletion src/Schema/Builders/SqlServerBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class SqlServerBuilder extends Base
*
* @param string $name
* @param string|\Illuminate\Database\Eloquent\Builder<*>|\Illuminate\Database\Query\Builder $query
* @param list<string|\Illuminate\Database\Query\Expression>|null $columns
* @param list<string|\Illuminate\Database\Query\Expression<*>>|null $columns
* @param bool $orReplace
* @param bool $materialized
* @return void
Expand Down
2 changes: 1 addition & 1 deletion src/Schema/Grammars/CompilesViews.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ trait CompilesViews
*
* @param string $name
* @param string $query
* @param list<string|\Illuminate\Database\Query\Expression>|null $columns
* @param list<string|\Illuminate\Database\Query\Expression<*>>|null $columns
* @param bool $orReplace
* @param bool $materialized
* @param string|null $algorithm
Expand Down
2 changes: 1 addition & 1 deletion src/Schema/Grammars/Traits/CompilesMySqlViews.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ trait CompilesMySqlViews
*
* @param string $name
* @param string $query
* @param list<string|\Illuminate\Database\Query\Expression>|null $columns
* @param list<string|\Illuminate\Database\Query\Expression<*>>|null $columns
* @param bool $orReplace
* @param bool $materialized
* @param string|null $algorithm
Expand Down
2 changes: 1 addition & 1 deletion src/Schema/Grammars/ViewGrammar.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ interface ViewGrammar
*
* @param string $name
* @param string $query
* @param list<string|\Illuminate\Database\Query\Expression>|null $columns
* @param list<string|\Illuminate\Database\Query\Expression<*>>|null $columns
* @param bool $orReplace
* @param bool $materialized
* @param string|null $algorithm
Expand Down

0 comments on commit f8c2be8

Please sign in to comment.