Allow anonymous migration classes

Refs: wintercms/winter#148
wintercms · Feb 23, 2022 · b16bb17 · b16bb17
1 parent 4c28587
commit b16bb17
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/src/Database/Updater.php b/src/Database/Updater.php
@@ -25,7 +25,7 @@ public function setUp($file)
             return false;
         }
 
-        $this->isValidScript($object);
+        $this->isValidScript($object, $file);
 
         Eloquent::unguard();
 
@@ -52,7 +52,7 @@ public function packDown($file)
             return false;
         }
 
-        $this->isValidScript($object);
+        $this->isValidScript($object, $file);
 
         Eloquent::unguard();
 
@@ -76,8 +76,11 @@ public function resolve($file)
             return;
         }
 
-        require_once $file;
+        $instance = require_once $file;
 
+        if (is_object($instance)) {
+            return $instance;
+        }
         if ($class = $this->getClassFromFile($file)) {
             return new $class;
         }
@@ -86,7 +89,7 @@ public function resolve($file)
     /**
      * Checks if the object is a valid update script.
      */
-    protected function isValidScript($object)
+    protected function isValidScript($object, $file)
     {
         if ($object instanceof Updates\Migration) {
             return true;
@@ -96,8 +99,8 @@ protected function isValidScript($object)
         }
 
         throw new Exception(sprintf(
-            'Database script [%s] must inherit Winter\Storm\Database\Updates\Migration or Winter\Storm\Database\Updates\Seeder classes',
-            get_class($object)
+            'Database script [%s] must define a class that inherits the "Winter\Storm\Database\Updates\Migration" or "Winter\Storm\Database\Updates\Seeder" classes',
+            $file
         ));
     }