Switch around $method and $loop in the DohExecutor constructor, $method is more likely to be set than $loop

Author: lucasnetau

src/DohExecutor.php

@@ -43,10 +43,10 @@ class DohExecutor implements ExecutorInterface {
 
     /**
      * @param string $nameserver
-     * @param ?LoopInterface $loop
      * @param string $method
+     * @param ?LoopInterface $loop
      */
-    public function __construct(string $nameserver, LoopInterface $loop = null, string $method = self::METHOD_GET)
+    public function __construct(string $nameserver, string $method = self::METHOD_GET, LoopInterface $loop = null)
     {
         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 testResolveCloudflareViaPostResolves()
     {
-        $executor = new DohExecutor('https://1.1.1.1/dns-query', null,DohExecutor::METHOD_POST);
+        $executor = new DohExecutor('https://1.1.1.1/dns-query', 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 testResolveCloudflareViaPostResolves()
 
     public function testResolveCloudflareViaGetResolves()
     {
-        $executor = new DohExecutor('https://1.1.1.1/dns-query', null,DohExecutor::METHOD_GET);
+        $executor = new DohExecutor('https://1.1.1.1/dns-query',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 testResolveCloudflareViaGetResolves()
 
     public function testResolveCloudflareHostnameViaGetResolves()
     {
-        $executor = new DohExecutor('https://one.one.one.one/dns-query', null,DohExecutor::METHOD_GET);
+        $executor = new DohExecutor('https://one.one.one.one/dns-query',DohExecutor::METHOD_GET);
         $query = new Query('one.one.one.one', Message::TYPE_A, Message::CLASS_IN);
         $promise = $executor->query($query);
 
@@ -66,7 +66,7 @@ public function testResolveCloudflareHostnameViaGetResolves()
 
     public function testResolveSecondQueryReusesConnection()
     {
-        $executor = new DohExecutor('https://one.one.one.one/dns-query', null,DohExecutor::METHOD_GET);
+        $executor = new DohExecutor('https://one.one.one.one/dns-query');
         $query = new Query('one.one.one.one', Message::TYPE_A, Message::CLASS_IN);
         $promise1 = $executor->query($query);
         $promise2 = $executor->query($query);
@@ -88,7 +88,7 @@ public function testResolveSecondQueryReusesConnection()
 
     public function testResolveGoogleViaIPv6HostResolves()
     {
-        $executor = new DohExecutor('https://dns64.dns.google/dns-query', null,DohExecutor::METHOD_GET);
+        $executor = new DohExecutor('https://dns64.dns.google/dns-query');
         $query = new Query('google.com', Message::TYPE_A, Message::CLASS_IN);
         $promise = $executor->query($query);
 
@@ -105,7 +105,7 @@ public function testResolveGoogleViaIPv6HostResolves()
 
     public function testResolveGoogleViaIPv6IpResolves()
     {
-        $executor = new DohExecutor('https://[2001:4860:4860::8888]/dns-query', null,DohExecutor::METHOD_GET);
+        $executor = new DohExecutor('https://[2001:4860:4860::8888]/dns-query');
         $query = new Query('google.com', Message::TYPE_A, Message::CLASS_IN);
         $promise = $executor->query($query);
 
@@ -167,6 +167,8 @@ public function testQueryRejectsIfMessageExceedsMaximumMessageSize()
             $exception = $reason;
         });
 
+        Loop::run();
+
         /** @var \RuntimeException $exception */
         $this->assertInstanceOf('RuntimeException', $exception);
         $this->assertStringStartsWith('DNS query for '. $query->name . ' (A) failed: Query too large for HTTPS transport', $exception->getMessage());
@@ -176,7 +178,7 @@ public function testResolveViaInvalidHttpMethodThrows()
     {
         $this->expectException(\InvalidArgumentException::class);
 
-        new DohExecutor('https://1.1.1.1/dns-query', null, 'put');
+        new DohExecutor('https://1.1.1.1/dns-query', 'put');
     }
 
     public function testInvalidNameserverThrows()