samuelwilliams / PHP-DNS-SERVER

tests/Resolver/JsonResolverTest.php

Spacing +2 added lines, -2 removed lines

@@ -23,8 +23,8 @@
     public function setUp()
     {
         $files = [
-            __DIR__.'/../Resources/example.com.json',
-            __DIR__.'/../Resources/test_records.json',
+            __DIR__ . '/../Resources/example.com.json',
+            __DIR__ . '/../Resources/test_records.json',
         ];
         $this->resolver = new JsonResolver($files, 300);
     }

src/Encoder.php

Spacing +8 added lines, -8 removed lines

@@ -23,10 +23,10 @@ 
     public static function encodeMessage(Message $message): string
     {
         return
-            self::encodeHeader($message->getHeader()).
-            self::encodeResourceRecords($message->getQuestions()).
-            self::encodeResourceRecords($message->getAnswers()).
-            self::encodeResourceRecords($message->getAuthoritatives()).
+            self::encodeHeader($message->getHeader()) .
+            self::encodeResourceRecords($message->getQuestions()) .
+            self::encodeResourceRecords($message->getAnswers()) .
+            self::encodeResourceRecords($message->getAuthoritatives()) .
             self::encodeResourceRecords($message->getAdditionals());
     }
 
@@ -43,11 +43,11 @@ 
             return chr(0);
         }
 
-        $domain = rtrim($domain, '.').'.';
+        $domain = rtrim($domain, '.') . '.';
         $res = '';
 
         foreach (explode('.', $domain) as $label) {
-            $res .= chr(strlen($label)).$label;
+            $res .= chr(strlen($label)) . $label;
         }
 
         return $res;
@@ -78,13 +78,13 @@ 
     {
         $encoded = self::encodeDomainName($rr->getName());
         if ($rr->isQuestion()) {
-            return $encoded.pack('nn', $rr->getType(), $rr->getClass());
+            return $encoded . pack('nn', $rr->getType(), $rr->getClass());
         }
 
         $data = RdataEncoder::encodeRdata($rr->getType(), $rr->getRdata());
         $encoded .= pack('nnNn', $rr->getType(), $rr->getClass(), $rr->getTtl(), strlen($data));
 
-        return $encoded.$data;
+        return $encoded . $data;
     }
 
     /**

src/Event/Subscriber/EchoLogger.php

Spacing +3 added lines, -3 removed lines

@@ -44,19 +44,19 @@
     public function onQueryReceive(QueryReceiveEvent $event): void
     {
         foreach ($event->getMessage()->getQuestions() as $question) {
-            $this->log(LogLevel::INFO, 'Query: '.$question);
+            $this->log(LogLevel::INFO, 'Query: ' . $question);
         }
     }
 
     public function onQueryResponse(QueryResponseEvent $event): void
     {
         foreach ($event->getMessage()->getAnswers() as $answer) {
-            $this->log(LogLevel::INFO, 'Answer: '.$answer);
+            $this->log(LogLevel::INFO, 'Answer: ' . $answer);
         }
     }
 
     public function log($level, $message, array $context = [])
     {
-        echo sprintf('[%s] %s: %s'.PHP_EOL, date('c'), $level, $message);
+        echo sprintf('[%s] %s: %s' . PHP_EOL, date('c'), $level, $message);
     }
 }

tests/EncoderTest.php

Spacing +13 added lines, -13 removed lines

@@ -24,13 +24,13 @@ 
     public function testEncodeDomainName()
     {
         $input_1 = 'www.example.com.';
-        $expectation_1 = chr(3).'www'.chr(7).'example'.chr(3).'com'."\0";
+        $expectation_1 = chr(3) . 'www' . chr(7) . 'example' . chr(3) . 'com' . "\0";
 
         $input_2 = '.';
         $expectation_2 = "\0";
 
         $input_3 = 'tld.';
-        $expectation_3 = chr(3).'tld'."\0";
+        $expectation_3 = chr(3) . 'tld' . "\0";
 
         $this->assertEquals($expectation_1, Encoder::encodeDomainName($input_1));
         $this->assertEquals($expectation_2, Encoder::encodeDomainName($input_2));
@@ -50,7 +50,7 @@ 
             ->setQuestion(true);
 
         $expectation_1 =
-            chr(3).'www'.chr(7).'example'.chr(3).'com'."\0".
+            chr(3) . 'www' . chr(7) . 'example' . chr(3) . 'com' . "\0" .
             pack('nn', 1, 1);
 
         $input_2 = [];
@@ -61,11 +61,11 @@ 
             ->setQuestion(2);
 
         $expectation_2 =
-            chr(6).'domain'.chr(3).'com'.chr(2).'au'."\0".
+            chr(6) . 'domain' . chr(3) . 'com' . chr(2) . 'au' . "\0" .
             pack('nn', 15, 1);
 
         $input_3 = [$input_1[0], $input_2[0]];
-        $expectation_3 = $expectation_1.$expectation_2;
+        $expectation_3 = $expectation_1 . $expectation_2;
 
         $this->assertEquals($expectation_1, Encoder::encodeResourceRecords($input_1));
         $this->assertEquals($expectation_2, Encoder::encodeResourceRecords($input_2));
@@ -87,7 +87,7 @@ 
         $type = RecordTypeEnum::TYPE_MX;
         $ipAddress = '192.163.5.2';
 
-        $rdata = pack('n', $preference).$exchangeEncoded;
+        $rdata = pack('n', $preference) . $exchangeEncoded;
         $rdata2 = inet_pton($ipAddress);
 
         $decoded1 = (new ResourceRecord())
@@ -105,8 +105,8 @@ 
             ->setType(RecordTypeEnum::TYPE_A)
             ->setRdata($ipAddress);
 
-        $encoded1 = $nameEncoded.pack('nnNn', $type, $class, $ttl, strlen($rdata)).$rdata;
-        $encoded2 = $nameEncoded.pack('nnNn', 1, $class, $ttl, strlen($rdata2)).$rdata2;
+        $encoded1 = $nameEncoded . pack('nnNn', $type, $class, $ttl, strlen($rdata)) . $rdata;
+        $encoded2 = $nameEncoded . pack('nnNn', 1, $class, $ttl, strlen($rdata2)) . $rdata2;
 
         $this->assertEquals($encoded1, Encoder::encodeResourceRecords([$decoded1]));
         $this->assertEquals($encoded2, Encoder::encodeResourceRecords([$decoded2]));
@@ -124,7 +124,7 @@ 
         $encoded_2 = inet_pton($decoded_2);
 
         $decoded_5 = 'dns1.example.com.';
-        $encoded_5 = chr(4).'dns1'.chr(7).'example'.chr(3).'com'."\0";
+        $encoded_5 = chr(4) . 'dns1' . chr(7) . 'example' . chr(3) . 'com' . "\0";
 
         $decoded_6 = [
             'mname' => 'example.com.',
@@ -137,8 +137,8 @@ 
         ];
 
         $encoded_6 =
-            chr(7).'example'.chr(3).'com'."\0".
-            chr(10).'postmaster'.chr(7).'example'.chr(3).'com'."\0".
+            chr(7) . 'example' . chr(3) . 'com' . "\0" .
+            chr(10) . 'postmaster' . chr(7) . 'example' . chr(3) . 'com' . "\0" .
             pack('NNNNN', 1970010188, 1800, 7200, 10800, 3600);
 
         $decoded_7 = [
@@ -146,10 +146,10 @@ 
             'exchange' => 'mail.example.com.',
         ];
 
-        $encoded_7 = pack('n', 15).chr(4).'mail'.chr(7).'example'.chr(3).'com'."\0";
+        $encoded_7 = pack('n', 15) . chr(4) . 'mail' . chr(7) . 'example' . chr(3) . 'com' . "\0";
 
         $decoded_8 = 'This is a comment.';
-        $encoded_8 = chr(18).$decoded_8;
+        $encoded_8 = chr(18) . $decoded_8;
 
         $this->assertEquals($encoded_1, RdataEncoder::encodeRdata(1, $decoded_1));
         $this->assertEquals($encoded_2, RdataEncoder::encodeRdata(28, $decoded_2));

tests/DecoderTest.php

Spacing +14 added lines, -14 removed lines

@@ -24,13 +24,13 @@ 
     public function testDecodeDomainName()
     {
         $decoded_1 = 'www.example.com.';
-        $encoded_1 = chr(3).'www'.chr(7).'example'.chr(3).'com'."\0";
+        $encoded_1 = chr(3) . 'www' . chr(7) . 'example' . chr(3) . 'com' . "\0";
 
         $decoded_2 = '.';
         $encoded_2 = "\0";
 
         $decoded_3 = 'tld.';
-        $encoded_3 = chr(3).'tld'."\0";
+        $encoded_3 = chr(3) . 'tld' . "\0";
 
         $offset = 0;
         $this->assertEquals($decoded_1, Decoder::decodeDomainName($encoded_1, $offset));
@@ -53,7 +53,7 @@ 
             ->setQuestion(true);
 
         $encoded_1 =
-            chr(3).'www'.chr(7).'example'.chr(3).'com'."\0".
+            chr(3) . 'www' . chr(7) . 'example' . chr(3) . 'com' . "\0" .
             pack('nn', 1, 1);
 
         $decoded_2[] = (new ResourceRecord())
@@ -62,11 +62,11 @@ 
             ->setQuestion(true);
 
         $encoded_2 =
-            chr(6).'domain'.chr(3).'com'.chr(2).'au'."\0".
+            chr(6) . 'domain' . chr(3) . 'com' . chr(2) . 'au' . "\0" .
             pack('nn', 15, 1);
 
         $decoded_3 = [$decoded_1[0], $decoded_2[0]];
-        $encoded_3 = $encoded_1.$encoded_2;
+        $encoded_3 = $encoded_1 . $encoded_2;
 
         $offset = 0;
         $this->assertEquals($decoded_1, Decoder::decodeResourceRecords($encoded_1, 1, $offset, true));
@@ -91,7 +91,7 @@ 
         $type = RecordTypeEnum::TYPE_MX;
         $ipAddress = '192.163.5.2';
 
-        $rdata = pack('n', $priority).$exchangeEncoded;
+        $rdata = pack('n', $priority) . $exchangeEncoded;
         $rdata2 = inet_pton($ipAddress);
 
         $decoded1[] = (new ResourceRecord())
@@ -113,9 +113,9 @@ 
 
         $decoded3 = array_merge($decoded1, $decoded2);
 
-        $encoded1 = $nameEncoded.pack('nnNn', $type, $class, $ttl, strlen($rdata)).$rdata;
-        $encoded2 = $nameEncoded.pack('nnNn', 1, $class, $ttl, strlen($rdata2)).$rdata2;
-        $encoded3 = $encoded1.$encoded2;
+        $encoded1 = $nameEncoded . pack('nnNn', $type, $class, $ttl, strlen($rdata)) . $rdata;
+        $encoded2 = $nameEncoded . pack('nnNn', 1, $class, $ttl, strlen($rdata2)) . $rdata2;
+        $encoded3 = $encoded1 . $encoded2;
 
         $this->assertEquals($decoded1, Decoder::decodeResourceRecords($encoded1));
         $this->assertEquals($decoded2, Decoder::decodeResourceRecords($encoded2));
@@ -134,7 +134,7 @@ 
         $encoded_2 = inet_pton($decoded_2);
 
         $decoded_5 = 'dns1.example.com.';
-        $encoded_5 = chr(4).'dns1'.chr(7).'example'.chr(3).'com'."\0";
+        $encoded_5 = chr(4) . 'dns1' . chr(7) . 'example' . chr(3) . 'com' . "\0";
 
         $decoded_6_prime = [
             'mname' => 'example.com.',
@@ -147,18 +147,18 @@ 
         ];
 
         $encoded_6 =
-            chr(7).'example'.chr(3).'com'."\0".
-            chr(10).'postmaster'.chr(7).'example'.chr(3).'com'."\0".
+            chr(7) . 'example' . chr(3) . 'com' . "\0" .
+            chr(10) . 'postmaster' . chr(7) . 'example' . chr(3) . 'com' . "\0" .
             pack('NNNNN', 1970010188, 1800, 7200, 10800, 3600);
 
-        $encoded_7 = pack('n', 10).chr(4).'mail'.chr(7).'example'.chr(3).'com'."\0";
+        $encoded_7 = pack('n', 10) . chr(4) . 'mail' . chr(7) . 'example' . chr(3) . 'com' . "\0";
         $decoded_7_prime = [
             'preference' => 10,
             'exchange' => 'mail.example.com.',
         ];
 
         $decoded_8 = 'This is a comment.';
-        $encoded_8 = chr(strlen($decoded_8)).$decoded_8;
+        $encoded_8 = chr(strlen($decoded_8)) . $decoded_8;
 
         $this->assertEquals($decoded_1, RdataDecoder::decodeRdata(RecordTypeEnum::TYPE_A, $encoded_1));
         $this->assertEquals($decoded_2, RdataDecoder::decodeRdata(RecordTypeEnum::TYPE_AAAA, $encoded_2));

src/RdataEncoder.php

Spacing +5 added lines, -5 removed lines

@@ -83,8 +83,8 @@ 
     public static function soa(array $rdata): string
     {
         return
-            Encoder::encodeDomainName($rdata['mname']).
-            Encoder::encodeDomainName($rdata['rname']).
+            Encoder::encodeDomainName($rdata['mname']) .
+            Encoder::encodeDomainName($rdata['rname']) .
             pack(
                 'NNNNN',
                 $rdata['serial'],
@@ -104,7 +104,7 @@ 
      */
     public static function mx(array $rdata): string
     {
-        return pack('n', (int) $rdata['preference']).Encoder::encodeDomainName($rdata['exchange']);
+        return pack('n', (int) $rdata['preference']) . Encoder::encodeDomainName($rdata['exchange']);
     }
 
     /**
@@ -118,7 +118,7 @@ 
     {
         $rdata = substr($rdata, 0, 255);
 
-        return chr(strlen($rdata)).$rdata;
+        return chr(strlen($rdata)) . $rdata;
     }
 
     /**
@@ -130,7 +130,7 @@ 
      */
     public static function srv(array $rdata): string
     {
-        return pack('nnn', (int) $rdata['priority'], (int) $rdata['weight'], (int) $rdata['port']).
+        return pack('nnn', (int) $rdata['priority'], (int) $rdata['weight'], (int) $rdata['port']) .
             Encoder::encodeDomainName($rdata['target']);
     }
 }

src/Server.php

Spacing +2 added lines, -2 removed lines

@@ -74,10 +74,10 @@
 
         $this->loop = \React\EventLoop\Factory::create();
         $factory = new \React\Datagram\Factory($this->loop);
-        $factory->createServer($this->ip.':'.$this->port)->then(function (Socket $server) {
+        $factory->createServer($this->ip . ':' . $this->port)->then(function(Socket $server) {
             $this->dispatch(Events::SERVER_START, new ServerStartEvent($server));
             $server->on('message', [$this, 'onMessage']);
-        })->otherwise(function (\Exception $exception) {
+        })->otherwise(function(\Exception $exception) {
             $this->dispatch(Events::SERVER_START_FAIL, new ServerExceptionEvent($exception));
         });
     }

bin/PhpDnsInstaller.php

Spacing +7 added lines, -7 removed lines

@@ -37,8 +37,8 @@ 
 
         // create default config
         file_put_contents('/etc/phpdns.json', json_encode(getcwd()));
-    } catch (\Symfony\Component\Filesystem\Exception\IOException $e){
-        die("An error occurred during installation\n".$e->getMessage());
+    } catch (\Symfony\Component\Filesystem\Exception\IOException $e) {
+        die("An error occurred during installation\n" . $e->getMessage());
     }
 
 } else {
@@ -54,12 +54,12 @@ 
     try {
         echo "Creating required directories and config files...\n";
 
-        $filesystem->mkdir(getcwd().'\\zones');
-        $filesystem->mkdir(getcwd().'\\logs');
+        $filesystem->mkdir(getcwd() . '\\zones');
+        $filesystem->mkdir(getcwd() . '\\logs');
 
         // create default config
-        file_put_contents(getcwd().'\\phpdns.json', json_encode(getcwd()));
-    } catch (\Symfony\Component\Filesystem\Exception\IOException $e){
-        die("An error occurred during installation\n".$e->getMessage());
+        file_put_contents(getcwd() . '\\phpdns.json', json_encode(getcwd()));
+    } catch (\Symfony\Component\Filesystem\Exception\IOException $e) {
+        die("An error occurred during installation\n" . $e->getMessage());
     }
 }
\ No newline at end of file

src/Resolver/JsonFileSystemResolver.php

Spacing +4 added lines, -4 removed lines

@@ -50,7 +50,7 @@ 
         $this->filesystemManager = $filesystemManager;
         $this->defaultTtl = $defaultTtl;
 
-        $zones = glob($filesystemManager->zonePath().'/*.json');
+        $zones = glob($filesystemManager->zonePath() . '/*.json');
         foreach ($zones as $file) {
             $zone = json_decode(file_get_contents($file), true);
             $resourceRecords = $this->isLegacyFormat($zone) ? $this->processLegacyZone($zone) : $this->processZone($zone);
@@ -95,7 +95,7 @@ 
      */
     protected function processZone(array $zone): array
     {
-        $parent = rtrim($zone['domain'], '.').'.';
+        $parent = rtrim($zone['domain'], '.') . '.';
         $defaultTtl = $zone['default-ttl'];
         $rrs = $zone['resource-records'];
         $resourceRecords = [];
@@ -124,7 +124,7 @@ 
      */
     protected function isLegacyFormat(array $zone): bool
     {
-        $keys = array_map(function ($value) {
+        $keys = array_map(function($value) {
             return strtolower($value);
         }, array_keys($zone));
 
@@ -142,7 +142,7 @@ 
     {
         $resourceRecords = [];
         foreach ($zones as $domain => $types) {
-            $domain = rtrim($domain, '.').'.';
+            $domain = rtrim($domain, '.') . '.';
             foreach ($types as $type => $data) {
                 $data = (array) $data;
                 $type = RecordTypeEnum::getTypeFromName($type);