NEW Use embed/embed v4

silverstripe · Feb 28, 2022 · 61ee159 · 61ee159
1 parent 546d37e
commit 61ee159
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 5 deletions.
diff --git a/code/Exceptions/InvalidUrlException.php b/code/Exceptions/InvalidUrlException.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace SilverStripe\AssetAdmin\Exceptions;
+
+use Exception;
+
+class InvalidUrlException extends Exception
+{
+}
diff --git a/code/Extensions/RemoteFileModalExtension.php b/code/Extensions/RemoteFileModalExtension.php
@@ -2,7 +2,8 @@
 
 namespace SilverStripe\AssetAdmin\Extensions;
 
-use Embed\Exceptions\InvalidUrlException;
+use Embed\Http\NetworkException;
+use Embed\Http\RequestException;
 use SilverStripe\Admin\LeftAndMain;
 use SilverStripe\Admin\ModalController;
 use SilverStripe\AssetAdmin\Forms\RemoteFileFormFactory;
@@ -100,7 +101,7 @@ public function remoteEditFormSchema(HTTPRequest $request)
         try {
             $form = $this->remoteEditForm();
             return $this->getSchemaResponse($schemaID, $form);
-        } catch (InvalidUrlException $exception) {
+        } catch (NetworkException | RequestException $exception) {
             $errors = ValidationResult::create()
                 ->addError($exception->getMessage());
             // @todo - Don't create dummy form (pass $form = null)

diff --git a/code/Forms/RemoteFileFormFactory.php b/code/Forms/RemoteFileFormFactory.php
@@ -2,8 +2,8 @@
 
 namespace SilverStripe\AssetAdmin\Forms;
 
-use Embed\Exceptions\InvalidUrlException;
 use InvalidArgumentException;
+use SilverStripe\AssetAdmin\Exceptions\InvalidUrlException;
 use SilverStripe\Control\Director;
 use SilverStripe\Control\RequestHandler;
 use SilverStripe\Core\Config\Configurable;

diff --git a/composer.json b/composer.json
@@ -5,7 +5,7 @@
     "license": "BSD-3-Clause",
     "require": {
         "php": "^7.4 || ^8.0",
-        "silverstripe/framework": "^4.10",
+        "silverstripe/framework": "^4.11",
         "silverstripe/admin": "^1.7",
         "silverstripe/graphql": "^3.5 || ^4"
     },

diff --git a/tests/php/Forms/RemoteFileFormFactoryTest.php b/tests/php/Forms/RemoteFileFormFactoryTest.php
@@ -2,7 +2,9 @@
 
 namespace SilverStripe\AssetAdmin\Tests\Forms;
 
-use Embed\Exceptions\InvalidUrlException;
+use Embed\Http\NetworkException;
+use Embed\Http\RequestException;
+use SilverStripe\AssetAdmin\Exceptions\InvalidUrlException;
 use SilverStripe\AssetAdmin\Forms\RemoteFileFormFactory;
 use SilverStripe\AssetAdmin\Tests\Forms\RemoteFileFormFactoryTest\MockEmbed;
 use SilverStripe\Core\Injector\Injector;