Fix wrong expectations in tests and switch authentication to DeepL header based authentication

Author: sathielemann

src/Client.php

@@ -83,6 +83,8 @@ public function __construct($authKey, $apiVersion = 2, $host = 'api.deepl.com')
         $this->apiVersion = $apiVersion;
         $this->host       = $host;
         $this->curl       = curl_init();
+
+        curl_setopt($this->curl, CURLOPT_RETURNTRANSFER, 1);
     }
 
     /**
@@ -117,9 +119,6 @@ public function request($url, $body = '', $method = 'POST')
                 curl_setopt($this->curl, CURLOPT_POSTFIELDS, $body);
                 break;
             case 'GET':
-                curl_setopt($this->curl, CURLOPT_POST, false);
-                curl_setopt($this->curl, CURLOPT_CUSTOMREQUEST, 'GET');
-                break;
             default:
                 break;
         }
@@ -158,7 +157,6 @@ public function request($url, $body = '', $method = 'POST')
      */
     public function setProxy($proxy)
     {
-
         $this->proxy = $proxy;
     }
 
@@ -192,16 +190,16 @@ public function setTimeout($timeout)
      */
     public function buildBaseUrl(string $resource = 'translate'): string
     {
-        if (!empty($this->authKey)) {
-            return sprintf(
-                self::API_URL_BASE,
-                self::API_URL_SCHEMA,
-                $this->host,
-                $this->apiVersion,
-                $resource,
-                $this->authKey
-            );
-        }
+//        if (!empty($this->authKey)) {
+//            return sprintf(
+//                self::API_URL_BASE,
+//                self::API_URL_SCHEMA,
+//                $this->host,
+//                $this->apiVersion,
+//                $resource,
+//                $this->authKey
+//            );
+//        }
 
         return sprintf(
             self::API_URL_BASE_NO_AUTH,

src/Glossary.php

@@ -39,7 +39,7 @@ public function __construct($authKey, $apiVersion = 2, $host = 'api.deepl.com',
      */
     public function listGlossaries()
     {
-        return $this->client->request($this->client->buildBaseUrl(self::API_URL_RESOURCE_GLOSSARIES));
+        return $this->client->request($this->client->buildBaseUrl(self::API_URL_RESOURCE_GLOSSARIES), '', 'GET');
     }
 
     /**

tests/integration/DeepLApiTest.php

@@ -383,7 +383,7 @@ public function testTranslateWithHTML()
             ),
             array(
                 'detected_source_language' => "EN",
-                'text'                     => "Ein weiterer Text<br>neue Zeile <p>dies ist ein Absatz</p></br> ",
+                'text'                     => "Eine weitere<br>neue Textzeile <p>, die ein Absatz ist</p></br> ",
             ),
 
         );

tests/integration/GlossaryTest.php

@@ -31,6 +31,17 @@ public static function setUpBeforeClass(): void
         self::$authKey = $authKey;
     }
 
+    public static function tearDownAfterClass(): void
+    {
+        $glossaryAPI = new Glossary(self::$authKey);
+
+        $glossariesResponse = $glossaryAPI->listGlossaries();
+
+        foreach ($glossariesResponse['glossaries'] as $glossary) {
+            $glossaryAPI->deleteGlossary($glossary['glossary_id']);
+        }
+    }
+
     /**
      * Test Glossary creation
      */

tests/unit/ClientTest.php

@@ -190,7 +190,7 @@ public function testBuildBaseUrlHost()
     {
         $authKey     = '123456';
         $host        = 'myownhost.dev';
-        $expectedUrl = 'https://' . $host . '/v2/translate?auth_key=' . $authKey;
+        $expectedUrl = 'https://' . $host . '/v2/translate';
         $testSubject = new Client($authKey, 2, $host);
         $result      = $testSubject->buildBaseUrl();
 
@@ -203,7 +203,7 @@ public function testBuildBaseUrlHost()
     public function testBuildBaseUrl()
     {
         $authKey     = '123456';
-        $expectedUrl = 'https://api.deepl.com/v2/translate?auth_key=' . $authKey;
+        $expectedUrl = 'https://api.deepl.com/v2/translate';
         $testSubject = new Client($authKey);
         $result      = $testSubject->buildBaseUrl();