Move $method to the end of the constructor and give it the default of HTTP_GET

Author: lucasnetau

src/DohExecutor.php

@@ -30,10 +30,11 @@ class DohExecutor implements ExecutorInterface {
     const METHOD_POST = 'post';
 
     /**
-     * @param string         $nameserver
+     * @param string $nameserver
      * @param ?LoopInterface $loop
+     * @param string $method
      */
-    public function __construct($nameserver, $method, LoopInterface $loop = null)
+    public function __construct(string $nameserver, LoopInterface $loop = null, string $method = self::METHOD_GET)
     {
         if (!class_exists('\React\Http\Browser')) {
             throw new RuntimeException('DNS over HTTPS support requires reactphp/http library'); //@codeCoverageIgnore

tests/FunctionalTests.php

@@ -15,7 +15,7 @@ class FunctionalTests extends TestCase
 {
     public function testResolveGoogleViaPostResolves()
     {
-        $executor = new DohExecutor('https://1.1.1.1/dns-query', DohExecutor::METHOD_POST);
+        $executor = new DohExecutor('https://1.1.1.1/dns-query', null,DohExecutor::METHOD_POST);
         $query = new Query('one.one.one.one', Message::TYPE_A, Message::CLASS_IN);
         $promise = $executor->query($query);
 
@@ -32,7 +32,7 @@ public function testResolveGoogleViaPostResolves()
 
     public function testResolveGoogleViaGetResolves()
     {
-        $executor = new DohExecutor('https://1.1.1.1/dns-query', DohExecutor::METHOD_GET);
+        $executor = new DohExecutor('https://1.1.1.1/dns-query', null,DohExecutor::METHOD_GET);
         $query = new Query('one.one.one.one', Message::TYPE_A, Message::CLASS_IN);
         $promise = $executor->query($query);
 
@@ -49,7 +49,7 @@ public function testResolveGoogleViaGetResolves()
 
     public function testResolveInvalidRejects()
     {
-        $executor = new DohExecutor('https://1.1.1.1/dns-query', DohExecutor::METHOD_POST);
+        $executor = new DohExecutor('https://1.1.1.1/dns-query');
         $query = new Query('example.invalid', Message::TYPE_A, Message::CLASS_IN);
         $promise = $executor->query($query);
 
@@ -66,7 +66,7 @@ public function testResolveInvalidRejects()
 
     public function testResolveToInvalidServerRejects()
     {
-        $executor = new DohExecutor('https://127.0.0.1:0/dns-query', DohExecutor::METHOD_POST);
+        $executor = new DohExecutor('https://127.0.0.1:0/dns-query');
         $query = new Query('google.com', Message::TYPE_A, Message::CLASS_IN);
         $promise = $executor->query($query);
 
@@ -84,7 +84,7 @@ public function testResolveToInvalidServerRejects()
 
     public function testQueryRejectsIfMessageExceedsMaximumMessageSize()
     {
-        $executor = $executor = new DohExecutor('https://127.0.0.1:0/dns-query', DohExecutor::METHOD_POST);
+        $executor = $executor = new DohExecutor('https://127.0.0.1:0/dns-query');
 
         $query = new Query('google.' . str_repeat('.com', 60000), Message::TYPE_A, Message::CLASS_IN);
         $promise = $executor->query($query);
@@ -103,6 +103,6 @@ public function testResolveViaInvalidHttpMethodThrows()
     {
         $this->expectException(\InvalidArgumentException::class);
 
-        new DohExecutor('https://1.1.1.1/dns-query', 'put');
+        new DohExecutor('https://1.1.1.1/dns-query', null, 'put');
     }
 }