Merge pull request #97 from samuelwilliams/master

Update PHP-CS-Fixer configuration
yswery · Mar 5, 2020 · 7b65b03 · 7b65b03
2 parents 50de52e + 88aa273
commit 7b65b03
Show file tree

Hide file tree

Showing 16 changed files with 41 additions and 38 deletions.
diff --git a/.php_cs.dist b/.php_cs.dist
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of PHP DNS Server.
+ *
+ * (c) Yif Swery <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 $header = <<<'EOF'
 This file is part of PHP DNS Server.
 
@@ -17,12 +26,13 @@ $finder = PhpCsFixer\Finder::create()
 
 $config = PhpCsFixer\Config::create()
     ->setRiskyAllowed(true)
-    ->setRules(array(
+    ->setRules([
         '@Symfony' => true,
-        'header_comment' => array('header' => $header),
-        'array_syntax' => array('syntax' => 'short'),
-    ))
+        'header_comment' => ['header' => $header],
+        'array_syntax' => ['syntax' => 'short'],
+        'no_superfluous_phpdoc_tags' => false,
+    ])
     ->setFinder($finder)
 ;
 
-return $config;
+return $config;
diff --git a/composer.json b/composer.json
@@ -5,7 +5,8 @@
         "phpunit/phpunit": "~7.3",
         "php-coveralls/php-coveralls": "~2.1",
         "bamarni/composer-bin-plugin": "^1.3",
-        "humbug/box":  ">=3.6"
+        "humbug/box":  ">=3.6",
+        "friendsofphp/php-cs-fixer": "^2.16"
     },
     "license": "MIT",
     "authors": [

diff --git a/src/Event/QueryReceiveEvent.php b/src/Event/QueryReceiveEvent.php
@@ -11,8 +11,8 @@
 
 namespace yswery\DNS\Event;
 
-use yswery\DNS\Message;
 use Symfony\Component\EventDispatcher\Event;
+use yswery\DNS\Message;
 
 class QueryReceiveEvent extends Event
 {

diff --git a/src/Event/Subscriber/EchoLogger.php b/src/Event/Subscriber/EchoLogger.php
@@ -15,9 +15,9 @@
 use Psr\Log\LogLevel;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use yswery\DNS\Event\Events;
-use yswery\DNS\Event\ServerExceptionEvent;
 use yswery\DNS\Event\QueryReceiveEvent;
 use yswery\DNS\Event\QueryResponseEvent;
+use yswery\DNS\Event\ServerExceptionEvent;
 use yswery\DNS\Event\ServerStartEvent;
 
 class EchoLogger extends AbstractLogger implements EventSubscriberInterface

diff --git a/src/RdataDecoder.php b/src/RdataDecoder.php
@@ -42,9 +42,7 @@ class RdataDecoder
     public static function decodeRdata(int $type, string $rdata)
     {
         if (!array_key_exists($type, self::$methodMap)) {
-            throw new UnsupportedTypeException(
-                sprintf('Record type "%s" is not a supported type.', RecordTypeEnum::getName($type))
-            );
+            throw new UnsupportedTypeException(sprintf('Record type "%s" is not a supported type.', RecordTypeEnum::getName($type)));
         }
 
         return call_user_func(['self', self::$methodMap[$type]], $rdata);

diff --git a/src/RdataEncoder.php b/src/RdataEncoder.php
@@ -37,9 +37,7 @@ class RdataEncoder
     public static function encodeRdata(int $type, $rdata): string
     {
         if (!array_key_exists($type, self::$methodMap)) {
-            throw new UnsupportedTypeException(
-                sprintf('Record type "%s" is not a supported type.', RecordTypeEnum::getName($type))
-            );
+            throw new UnsupportedTypeException(sprintf('Record type "%s" is not a supported type.', RecordTypeEnum::getName($type)));
         }
 
         return call_user_func(['self', self::$methodMap[$type]], $rdata);

diff --git a/src/Resolver/AbstractResolver.php b/src/Resolver/AbstractResolver.php
@@ -11,8 +11,8 @@
 
 namespace yswery\DNS\Resolver;
 
-use yswery\DNS\ResourceRecord;
 use yswery\DNS\RecordTypeEnum;
+use yswery\DNS\ResourceRecord;
 use yswery\DNS\UnsupportedTypeException;
 
 abstract class AbstractResolver implements ResolverInterface
@@ -245,9 +245,7 @@ protected function extractRdata(array $resourceRecord, int $type, string $parent
             case RecordTypeEnum::TYPE_ANY:
                 return '';
             default:
-                throw new UnsupportedTypeException(
-                    sprintf('Resource Record type "%s" is not a supported type.', RecordTypeEnum::getName($type))
-                );
+                throw new UnsupportedTypeException(sprintf('Resource Record type "%s" is not a supported type.', RecordTypeEnum::getName($type)));
         }
     }
 }
diff --git a/src/Resolver/SystemResolver.php b/src/Resolver/SystemResolver.php
@@ -11,9 +11,9 @@
 
 namespace yswery\DNS\Resolver;
 
-use yswery\DNS\UnsupportedTypeException;
-use yswery\DNS\ResourceRecord;
 use yswery\DNS\RecordTypeEnum;
+use yswery\DNS\ResourceRecord;
+use yswery\DNS\UnsupportedTypeException;
 
 /**
  * Use the host system's configured DNS.
@@ -120,9 +120,7 @@ protected function extractPhpRdata(array $resourceRecord)
                     'target' => $resourceRecord['target'],
                 ];
             default:
-                throw new UnsupportedTypeException(
-                    sprintf('Record type "%s" is not a supported type.', RecordTypeEnum::getName($type))
-                );
+                throw new UnsupportedTypeException(sprintf('Record type "%s" is not a supported type.', RecordTypeEnum::getName($type)));
         }
     }
 

diff --git a/src/Resolver/XmlResolver.php b/src/Resolver/XmlResolver.php
@@ -12,8 +12,8 @@
 namespace yswery\DNS\Resolver;
 
 use yswery\DNS\ClassEnum;
-use yswery\DNS\ResourceRecord;
 use yswery\DNS\RecordTypeEnum;
+use yswery\DNS\ResourceRecord;
 use yswery\DNS\UnsupportedTypeException;
 
 class XmlResolver extends AbstractResolver

diff --git a/src/Server.php b/src/Server.php
@@ -14,18 +14,18 @@
 use React\Datagram\Socket;
 use React\Datagram\SocketInterface;
 use React\EventLoop\LoopInterface;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\EventDispatcher\Event;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use yswery\DNS\Config\FileConfig;
-use yswery\DNS\Event\ServerExceptionEvent;
+use yswery\DNS\Event\Events;
 use yswery\DNS\Event\MessageEvent;
 use yswery\DNS\Event\QueryReceiveEvent;
 use yswery\DNS\Event\QueryResponseEvent;
+use yswery\DNS\Event\ServerExceptionEvent;
 use yswery\DNS\Event\ServerStartEvent;
+use yswery\DNS\Filesystem\FilesystemManager;
 use yswery\DNS\Resolver\JsonFileSystemResolver;
 use yswery\DNS\Resolver\ResolverInterface;
-use yswery\DNS\Event\Events;
-use yswery\DNS\Filesystem\FilesystemManager;
 
 class Server
 {

diff --git a/tests/DecoderTest.php b/tests/DecoderTest.php
@@ -11,13 +11,13 @@
 
 namespace yswery\DNS\Tests;
 
+use PHPUnit\Framework\TestCase;
 use yswery\DNS\Decoder;
 use yswery\DNS\Encoder;
+use yswery\DNS\RdataDecoder;
 use yswery\DNS\RdataEncoder;
 use yswery\DNS\RecordTypeEnum;
 use yswery\DNS\ResourceRecord;
-use PHPUnit\Framework\TestCase;
-use yswery\DNS\RdataDecoder;
 
 class DecoderTest extends TestCase
 {

diff --git a/tests/DummyResolver.php b/tests/DummyResolver.php
@@ -12,8 +12,8 @@
 namespace yswery\DNS\Tests;
 
 use yswery\DNS\RecordTypeEnum;
-use yswery\DNS\ResourceRecord;
 use yswery\DNS\Resolver\ResolverInterface;
+use yswery\DNS\ResourceRecord;
 
 class DummyResolver implements ResolverInterface
 {

diff --git a/tests/EncoderTest.php b/tests/EncoderTest.php
@@ -11,13 +11,13 @@
 
 namespace yswery\DNS\Tests;
 
+use PHPUnit\Framework\TestCase;
 use yswery\DNS\ClassEnum;
 use yswery\DNS\Encoder;
 use yswery\DNS\Header;
+use yswery\DNS\RdataEncoder;
 use yswery\DNS\RecordTypeEnum;
 use yswery\DNS\ResourceRecord;
-use yswery\DNS\RdataEncoder;
-use PHPUnit\Framework\TestCase;
 
 class EncoderTest extends TestCase
 {

diff --git a/tests/Resolver/JsonResolverTest.php b/tests/Resolver/JsonResolverTest.php
@@ -11,9 +11,9 @@
 
 namespace yswery\DNS\Tests\Resolver;
 
+use yswery\DNS\RecordTypeEnum;
 use yswery\DNS\Resolver\JsonResolver;
 use yswery\DNS\ResourceRecord;
-use yswery\DNS\RecordTypeEnum;
 
 class JsonResolverTest extends AbstractResolverTest
 {

diff --git a/tests/Resolver/YamlResolverTest.php b/tests/Resolver/YamlResolverTest.php
@@ -12,9 +12,9 @@
 namespace yswery\DNS\Tests\Resolver;
 
 use Symfony\Component\Yaml\Exception\ParseException;
+use yswery\DNS\RecordTypeEnum;
 use yswery\DNS\Resolver\YamlResolver;
 use yswery\DNS\ResourceRecord;
-use yswery\DNS\RecordTypeEnum;
 
 class YamlResolverTest extends AbstractResolverTest
 {

diff --git a/tests/ServerTest.php b/tests/ServerTest.php
@@ -11,19 +11,19 @@
 
 namespace yswery\DNS\Tests;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use yswery\DNS\ClassEnum;
 use yswery\DNS\Decoder;
+use yswery\DNS\Encoder;
 use yswery\DNS\Header;
 use yswery\DNS\Message;
 use yswery\DNS\RecordTypeEnum;
-use yswery\DNS\Encoder;
+use yswery\DNS\Resolver\JsonResolver;
 use yswery\DNS\Resolver\StackableResolver;
 use yswery\DNS\Resolver\XmlResolver;
 use yswery\DNS\ResourceRecord;
 use yswery\DNS\Server;
-use yswery\DNS\Resolver\JsonResolver;
-use PHPUnit\Framework\TestCase;
 
 class ServerTest extends TestCase
 {