[TASK] Further cleanup

georgringer · Sep 9, 2019 · 09e2c04 · 09e2c04
1 parent f107d79
commit 09e2c04
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/Classes/Domain/Repository/PageSpeedRepository.php b/Classes/Domain/Repository/PageSpeedRepository.php
@@ -90,7 +90,7 @@ protected function getCacheIdentifier(string $url, string $strategy): string
      * @param string $locale
      * @return string
      */
-    protected function getResponseFromApi(string $identifier, string $strategy, string $locale = 'en')
+    protected function getResponseFromApi(string $identifier, string $strategy, string $locale = 'en'): string
     {
         $url = sprintf('https://www.googleapis.com/pagespeedonline/v4/runPagespeed?screenshot=true&url=%s&strategy=%s&locale=%s&key=%s',
             rawurlencode($identifier),
@@ -108,14 +108,13 @@ protected function getResponseFromApi(string $identifier, string $strategy, stri
      */
     protected function apiCall($url): string
     {
-        // Initiate the Request Factory, which allows to run multiple requests
-        /** @var RequestFactory $requestFactory */
         $requestFactory = GeneralUtility::makeInstance(RequestFactory::class);
         $additionalOptions = [
-            // Additional options, see http://docs.guzzlephp.org/en/latest/request-options.html
             'allow_redirects' => true,
-            'cookies' => false
+            'cookies' => false,
+            'force_ip_resolve' => 'v4'
         ];
+
         $response = $requestFactory->request($url, 'GET', $additionalOptions);
         if ($response->getStatusCode() === 200) {
             $content = $response->getBody()->getContents();
@@ -146,7 +145,7 @@ protected function getLocale(): string
      * @param string $identifier
      * @return string|NULL
      */
-    protected function getFromCache($identifier)
+    protected function getFromCache($identifier): ?string
     {
         return $this->cache->get($identifier);
     }

diff --git a/README.rst b/README.rst
@@ -19,7 +19,7 @@ Screenshot
 
 Requirements
 ------------
-- TYPO3 CMS 7.2+
+- TYPO3 CMS 9.5+
 - Google Account
 
 Installation & Configuration

diff --git a/Resources/Private/Templates/Main.html b/Resources/Private/Templates/Main.html
@@ -2,8 +2,6 @@
 {namespace core=Typo3\Cms\Core\ViewHelpers}
 
 <div class="page-speed">
-	<script type="text/javascript" src="../typo3conf/ext/page_speed/Resources/Public/js/main.js"></script>
-
 	<div class="row">
 		<div class="col-sm-4">
 			<h1>{f:translate(key:'{lll}module.header')}</h1>