Update CS rules

.php_cs.dist

@@ -7,6 +7,7 @@ $finder = PhpCsFixer\Finder::create()
 
 return PhpCsFixer\Config::create()
     ->setFinder($finder)
+    ->setRiskyAllowed(true)
     ->setRules([
         '@PSR2' => true,
         'align_multiline_comment' => true,
@@ -19,5 +20,40 @@ return PhpCsFixer\Config::create()
             'import_constants' => true,
             'import_functions' => true,
         ],
-        'single_quote' => true
+        'linebreak_after_opening_tag' => true,
+        'lowercase_cast' => true,
+        'lowercase_static_reference' => true,
+        'method_chaining_indentation' => true,
+        'modernize_types_casting' => true,
+        'multiline_comment_opening_closing' => true,
+        'multiline_whitespace_before_semicolons' => true,
+        'native_function_casing' => true,
+        'no_alternative_syntax' => true,
+        'no_extra_blank_lines' => true,
+        'no_leading_import_slash' => true,
+        'no_mixed_echo_print' => ['use' => 'print'],
+        'no_short_bool_cast' => true,
+        'no_singleline_whitespace_before_semicolons' => true,
+        'no_spaces_around_offset' => true,
+        'no_trailing_comma_in_list_call' => true,
+        'no_trailing_comma_in_singleline_array' => true,
+        'no_unneeded_control_parentheses' => true,
+        'no_unused_imports' => true,
+        'no_useless_return' => true,
+        'no_whitespace_before_comma_in_array' => true,
+        'no_whitespace_in_blank_line' => true,
+        'normalize_index_brace' => true,
+        'nullable_type_declaration_for_default_null_value' => true,
+        'ordered_imports' => [
+            'sort_algorithm' => 'alpha'
+        ],
+        'ordered_interfaces' => [
+            'direction' => 'ascend',
+            'order' => 'alpha',
+        ],
+        'single_quote' => true,
+        'space_after_semicolon' => true,
+        'standardize_not_equals' => true,
+        'ternary_operator_spaces' => true,
+        'ternary_to_null_coalescing' => true
     ]);

src/Message/Message.php

@@ -2,9 +2,9 @@
 
 namespace WellRESTed\Message;
 
+use InvalidArgumentException;
 use Psr\Http\Message\MessageInterface;
 use Psr\Http\Message\StreamInterface;
-use InvalidArgumentException;
 
 /**
  * Message defines core functionality for classes that represent HTTP messages.

src/Message/Request.php

@@ -2,10 +2,10 @@
 
 namespace WellRESTed\Message;
 
+use InvalidArgumentException;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\StreamInterface;
 use Psr\Http\Message\UriInterface;
-use InvalidArgumentException;
 
 /**
  * Representation of an outgoing, client-side request.

src/Message/Response.php

@@ -2,9 +2,9 @@
 
 namespace WellRESTed\Message;
 
+use InvalidArgumentException;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\StreamInterface;
-use InvalidArgumentException;
 
 /**
  * Representation of an outgoing, server-side response.

src/Message/ServerRequest.php

@@ -2,11 +2,11 @@
 
 namespace WellRESTed\Message;
 
+use InvalidArgumentException;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\StreamInterface;
 use Psr\Http\Message\UploadedFileInterface;
 use Psr\Http\Message\UriInterface;
-use InvalidArgumentException;
 
 /**
  * Representation of an incoming, server-side HTTP request.
@@ -509,7 +509,7 @@ class ServerRequest extends Request implements ServerRequestInterface
 
     private function isContentHeader(string $name): bool
     {
-        return ($name === 'CONTENT_LENGTH' || $name === 'CONTENT_TYPE');
+        return $name === 'CONTENT_LENGTH' || $name === 'CONTENT_TYPE';
     }
 
     /**

src/Message/Stream.php

@@ -2,9 +2,9 @@
 
 namespace WellRESTed\Message;
 
-use Psr\Http\Message\StreamInterface;
-use InvalidArgumentException;
 use Exception;
+use InvalidArgumentException;
+use Psr\Http\Message\StreamInterface;
 use RuntimeException;
 
 class Stream implements StreamInterface

src/Message/UploadedFile.php

@@ -2,9 +2,9 @@
 
 namespace WellRESTed\Message;
 
+use InvalidArgumentException;
 use Psr\Http\Message\StreamInterface;
 use Psr\Http\Message\UploadedFileInterface;
-use InvalidArgumentException;
 use RuntimeException;
 
 /**

src/Message/Uri.php

@@ -2,8 +2,8 @@
 
 namespace WellRESTed\Message;
 
-use Psr\Http\Message\UriInterface;
 use InvalidArgumentException;
+use Psr\Http\Message\UriInterface;
 
 /**
  * Value object representing a URI.

src/Routing/Route/TemplateRoute.php

@@ -57,7 +57,7 @@ class TemplateRoute extends Route
         if ($firstVarPos === false) {
             return $requestTarget === $this->target;
         }
-        return (substr($requestTarget, 0, $firstVarPos) === substr($this->target, 0, $firstVarPos));
+        return substr($requestTarget, 0, $firstVarPos) === substr($this->target, 0, $firstVarPos);
     }
 
     private function processMatches(array $matches): array

src/Routing/Router.php

@@ -276,6 +276,6 @@ class Router
     private function startsWith(string $haystack, string $needle): bool
     {
         $length = strlen($needle);
-        return (substr($haystack, 0, $length) === $needle);
+        return substr($haystack, 0, $length) === $needle;
     }
 }

test/tests/unit/Routing/Route/PrefixRouteTest.php

@@ -11,7 +11,7 @@ use WellRESTed\Test\TestCase;
 class PrefixRouteTest extends TestCase
 {
     use ProphecyTrait;
-    
+
     public function testTrimsAsteriskFromEndOfTarget()
     {
         $methodMap = $this->prophesize(MethodMap::class);

test/tests/unit/Transmission/TransmitterTest.php

@@ -5,12 +5,12 @@ namespace WellRESTed\Test\Unit\Transmission;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
 use Psr\Http\Message\StreamInterface;
+use RuntimeException;
 use WellRESTed\Message\Response;
 use WellRESTed\Message\ServerRequest;
 use WellRESTed\Test\TestCase;
 use WellRESTed\Transmission\HeaderStack;
 use WellRESTed\Transmission\Transmitter;
-use RuntimeException;
 
 require_once __DIR__ . '/../../../src/HeaderStack.php';