DP-460 Upgrade to PHP 8.1 / Laravel 9

daniilly · daniilly · commit e5bbc865e6fe · 2023-02-28T14:03:33.000+02:00
- Resolve conflict with db.schema component
diff --git a/composer.json b/composer.json
@@ -34,7 +34,7 @@
   "minimum-stability": "dev",
   "prefer-stable":     true,
   "require":     {
-    "dreamfactory/df-database": "~0.11"
+    "dreamfactory/df-database": "~1.0"
   },
   "autoload":    {
     "psr-4": {
diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php
@@ -23,7 +23,7 @@ class ServiceProvider extends \Illuminate\Support\ServiceProvider
     public function register()
     {
         // Add our database extensions.
-        $this->app->resolving('db.schema', function (DbSchemaExtensions $db){
+        $this->app->resolving('df.db.schema', function (DbSchemaExtensions $db){
             $db->extend('mysql', function ($connection){
                 return new MySqlSchema($connection);
             });

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class ServiceProvider extends \Illuminate\Support\ServiceProvider`
`23`	`23`	`public function register()`
`24`	`24`	`{`
`25`	`25`	`// Add our database extensions.`
`26`		`- $this->app->resolving('db.schema', function (DbSchemaExtensions $db){`
	`26`	`+ $this->app->resolving('df.db.schema', function (DbSchemaExtensions $db){`
`27`	`27`	`$db->extend('mysql', function ($connection){`
`28`	`28`	`return new MySqlSchema($connection);`
`29`	`29`	`});`