Merged main into develop

werkbot · Dec 19, 2022 · b829793 · b829793
2 parents ff1f9ec + bbb2b56
commit b829793
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/Factory/SeederFixtureFactory.php b/src/Factory/SeederFixtureFactory.php
@@ -5,6 +5,7 @@
 use SilverStripe\AssetAdmin\Controller\AssetAdmin;
 use SilverStripe\Core\Environment;
 use SilverStripe\Assets\Folder;
+use SilverStripe\Assets\File;
 use SilverStripe\Assets\Image;
 use SilverStripe\Dev\FixtureBlueprint;
 use SilverStripe\Dev\FixtureFactory;
@@ -37,7 +38,7 @@ public function __construct($createObjectCallback = null, $seedObject = null)
     public function createObject($name, $identifier, $data = null)
     {
         // Create a Folder for any seeder images generated
-        $folder = Folder::find_or_make("SeederImages");
+        $folder = Folder::find_or_make("SeederFiles");
         //
         if (!isset($this->blueprints[$name])) {
             $this->blueprints[$name] = new FixtureBlueprint($name);
@@ -51,8 +52,8 @@ public function createObject($name, $identifier, $data = null)
         }
         $this->fixtures[$class][$identifier] = $obj->ID;
 
-        // For any images, lets store the image
-        if ($class == Image::class) {
+        // For any images and videos, store the file
+        if ($class == File::class || $class == Image::class) {
             $contents = @file_get_contents($data['URL']);
             $obj->setFromString($contents, $data['Name']);
             $obj->ParentID = $folder->ID;
@@ -85,4 +86,4 @@ public function createObject($name, $identifier, $data = null)
 
         return $obj;
     }
-}
+}
diff --git a/src/Tasks/SeederBuildTask.php b/src/Tasks/SeederBuildTask.php
@@ -138,4 +138,4 @@ public function run($request)
             echo 'Must run in development or test environment';
         }
     }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -138,4 +138,4 @@ public function run($request) @@
                 echo 'Must run in development or test environment';
             }
         }
-    }
+    }