Use GuzzleClientFactory

Tuurlijk · Mar 12, 2022 · cdd42bd · cdd42bd
1 parent 81106f9
commit cdd42bd
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 41 deletions.
diff --git a/Classes/Adapter/Core/Framework.php b/Classes/Adapter/Core/Framework.php
@@ -14,7 +14,6 @@
  * The TYPO3 project - inspiring people to share!
  */
 
-use GuzzleHttp\Client;
 use GuzzleHttp\Exception\GuzzleException;
 use MichielRoos\H5p\Domain\Model\CachedAsset;
 use MichielRoos\H5p\Domain\Model\ConfigSetting;
@@ -34,6 +33,7 @@
 use MichielRoos\H5p\Domain\Repository\LibraryRepository;
 use MichielRoos\H5p\Domain\Repository\LibraryTranslationRepository;
 use stdClass;
+use TYPO3\CMS\Core\Http\Client\GuzzleClientFactory;
 use TYPO3\CMS\Core\Information\Typo3Version;
 use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Resource\ResourceFactory;
@@ -221,7 +221,7 @@ public function getPlatformInfo()
      */
     public function fetchExternalData($url, $data = null, $blocking = true, $stream = '')
     {
-        $client = new Client();
+        $client = new GuzzleClientFactory();
         $options = [
             // if $blocking is set, we want to do a synchronous request
             'synchronous' => $blocking,

diff --git a/composer.json b/composer.json
@@ -1,42 +1,45 @@
 {
-  "name": "michielroos/h5p",
-  "type": "typo3-cms-extension",
-  "description": "Create and add rich content to your website for free. Some examples of what you get with H5P are Interactive Video, Quizzes, Collage and Timeline.",
-  "keywords": [
-    "h5p",
-    "content",
-    "interactive",
-    "html5"
-  ],
-  "license": "GPL-2.0+",
-  "authors": [
-    {
-      "name": "Michiel Roos",
-      "homepage": "https://www.michielroos.com",
-      "role": "Developer"
+    "name": "michielroos/h5p",
+    "type": "typo3-cms-extension",
+    "description": "Create and add rich content to your website for free. Some examples of what you get with H5P are Interactive Video, Quizzes, Collage and Timeline.",
+    "keywords": [
+        "h5p",
+        "content",
+        "interactive",
+        "html5"
+    ],
+    "license": "GPL-2.0+",
+    "authors": [
+        {
+            "name": "Michiel Roos",
+            "homepage": "https://www.michielroos.com",
+            "role": "Developer"
+        }
+    ],
+    "require": {
+        "h5p/h5p-core": "^1.24",
+        "h5p/h5p-editor": "^1.24",
+        "guzzlehttp/guzzle": "^6.3",
+        "typo3/cms-core": "10.4.*"
+    },
+    "replace": {
+        "typo3-ter/h5p": "self.version"
+    },
+    "config": {
+        "bin-dir": "bin",
+        "optimize-autoloader": true
+    },
+    "extra": {
+        "typo3/cms": {
+            "extension-key": "h5p"
+        },
+        "branch-alias": {
+            "dev-master": "10.4-dev"
+        }
+    },
+    "autoload": {
+        "psr-4": {
+            "MichielRoos\\H5p\\": "Classes"
+        }
     }
-  ],
-  "require": {
-    "h5p/h5p-core": "^1.24",
-    "h5p/h5p-editor": "^1.24",
-    "guzzlehttp/guzzle": "^6.3",
-    "typo3/cms-core": "10.4.*"
-  },
-  "replace": {
-    "typo3-ter/h5p": "self.version"
-  },
-  "config": {
-    "bin-dir": "bin",
-    "optimize-autoloader": true
-  },
-  "extra": {
-    "branch-alias": {
-      "dev-master": "0.0.x-dev"
-    }
-  },
-  "autoload": {
-    "psr-4": {
-      "MichielRoos\\H5p\\": "Classes"
-    }
-  }
 }