Merge branch 'main' into 10.x

Author: Kurt Friars

src/Concerns/ListensToSchemaEvents.php

@@ -4,15 +4,14 @@
 
 use Closure;
 use Illuminate\Database\Connection;
-use Illuminate\Database\Schema\Builder;
 use Illuminate\Support\Collection;
 use Plank\LaravelSchemaEvents\Events\TableChanged;
 use Plank\LaravelSchemaEvents\Events\TableCreated;
 use Plank\LaravelSchemaEvents\Events\TableDropped;
 use Plank\LaravelSchemaEvents\Events\TableRenamed;
 
 /**
- * @mixin Builder
+ * @mixin \Illuminate\Database\Schema\Builder
  */
 trait ListensToSchemaEvents
 {

src/Events/TableChanged.php

@@ -44,7 +44,7 @@ public static function from(Connection $connection, Blueprint $blueprint): self
             connection: $connection->getName(),
             databaseName: $connection->getDatabaseName(),
             driverName: $connection->getDriverName(),
-            table: $blueprint->getTable(),
+            table: $connection->getTablePrefix().$blueprint->getTable(),
             addedColumns: self::parseAddedColumns($blueprint),
             droppedColumns: self::parseDroppedColumns($blueprint),
             renamedColumns: self::parseRenamedColumns($blueprint),

src/Events/TableCreated.php

@@ -32,7 +32,7 @@ public static function from(Connection $connection, Blueprint $blueprint): self
             connection: $connection->getName(),
             databaseName: $connection->getDatabaseName(),
             driverName: $connection->getDriverName(),
-            table: $blueprint->getTable(),
+            table: $connection->getTablePrefix().$blueprint->getTable(),
             columns: self::parseAddedColumns($blueprint),
             indexes: self::parseAddedIndexes($blueprint),
             foreignKeys: self::parseAddedForeignKeys($blueprint),

src/Events/TableDropped.php

@@ -19,7 +19,7 @@ public static function from(Connection $connection, string $table)
             connection: $connection->getName(),
             databaseName: $connection->getDatabaseName(),
             driverName: $connection->getDriverName(),
-            table: $table,
+            table: $connection->getTablePrefix().$table,
         );
     }
 }

src/Events/TableRenamed.php

@@ -20,8 +20,8 @@ public static function from(Connection $connection, string $from, string $to)
             connection: $connection->getName(),
             databaseName: $connection->getDatabaseName(),
             driverName: $connection->getDriverName(),
-            from: $from,
-            to: $to,
+            from: $connection->getTablePrefix().$from,
+            to: $connection->getTablePrefix().$to,
         );
     }
 }