Merge pull request #74 from creative-commoners/pulls/3/broken-builds

API Update import() signature
silverstripe · Dec 13, 2022 · af1f85e · af1f85e
2 parents eba243d + 1ff8d18
commit af1f85e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -26,7 +26,7 @@
     "require-dev": {
         "phpunit/phpunit": "^9.5",
         "squizlabs/php_codesniffer": "^3.0",
-        "silverstripe/versioned": "^1.12"
+        "silverstripe/versioned": "^2"
     },
     "autoload": {
         "psr-4": {

diff --git a/src/RegistryAdmin.php b/src/RegistryAdmin.php
@@ -5,6 +5,8 @@
 use SilverStripe\Admin\ModelAdmin;
 use SilverStripe\Core\ClassInfo;
 use SilverStripe\ORM\DataObject;
+use SilverStripe\Control\HTTPResponse;
+use SilverStripe\Forms\Form;
 
 class RegistryAdmin extends ModelAdmin
 {
@@ -62,12 +64,12 @@ public function getCsvImportFilename()
         return sprintf('%s/%s', $feed->getStoragePath($this->modelClass), $feed->getImportFilename());
     }
 
-    public function import($data, $form, $request)
+    public function import(array $data, Form $form): HTTPResponse
     {
         if (!$this->showImportForm
             || (is_array($this->showImportForm) && !in_array($this->modelClass, $this->showImportForm ?? []))
         ) {
-            return false;
+            return $this->redirectBack();
         }
 
         $importers = $this->getModelImporters();
@@ -80,8 +82,7 @@ public function import($data, $form, $request)
                 _t('SilverStripe\\Admin\\ModelAdmin.NOCSVFILE', 'Please browse for a CSV file to import'),
                 'bad'
             );
-            $this->redirectBack();
-            return false;
+            return $this->redirectBack();
         }
 
         if (!empty($data['EmptyBeforeImport']) && $data['EmptyBeforeImport']) { //clear database before import