From cd2e4448e2252b2c6c71fb9f843bc898e1d7906b Mon Sep 17 00:00:00 2001 From: PJ Dietz Date: Mon, 10 Aug 2020 07:39:55 -0400 Subject: [PATCH] Update CS rules --- .php_cs.dist | 38 ++++++++++++++++++- src/Message/Message.php | 2 +- src/Message/Request.php | 2 +- src/Message/Response.php | 2 +- src/Message/ServerRequest.php | 4 +- src/Message/Stream.php | 4 +- src/Message/UploadedFile.php | 2 +- src/Message/Uri.php | 2 +- src/Routing/Route/TemplateRoute.php | 2 +- src/Routing/Router.php | 2 +- .../unit/Routing/Route/PrefixRouteTest.php | 2 +- .../unit/Transmission/TransmitterTest.php | 2 +- 12 files changed, 50 insertions(+), 14 deletions(-) diff --git a/.php_cs.dist b/.php_cs.dist index 7808176..09ee1bf 100644 --- a/.php_cs.dist +++ b/.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 ]); diff --git a/src/Message/Message.php b/src/Message/Message.php index af80d3b..cfe0581 100644 --- a/src/Message/Message.php +++ b/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. diff --git a/src/Message/Request.php b/src/Message/Request.php index 83016cd..33cddc0 100644 --- a/src/Message/Request.php +++ b/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. diff --git a/src/Message/Response.php b/src/Message/Response.php index 09d7480..2269186 100644 --- a/src/Message/Response.php +++ b/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. diff --git a/src/Message/ServerRequest.php b/src/Message/ServerRequest.php index ff38f79..df6fb0a 100644 --- a/src/Message/ServerRequest.php +++ b/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'; } /** diff --git a/src/Message/Stream.php b/src/Message/Stream.php index cf75406..c8deb1d 100644 --- a/src/Message/Stream.php +++ b/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 diff --git a/src/Message/UploadedFile.php b/src/Message/UploadedFile.php index 42dbb62..c18c4b8 100644 --- a/src/Message/UploadedFile.php +++ b/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; /** diff --git a/src/Message/Uri.php b/src/Message/Uri.php index 0449276..8e0e273 100644 --- a/src/Message/Uri.php +++ b/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. diff --git a/src/Routing/Route/TemplateRoute.php b/src/Routing/Route/TemplateRoute.php index 730b3a9..df2f99c 100644 --- a/src/Routing/Route/TemplateRoute.php +++ b/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 diff --git a/src/Routing/Router.php b/src/Routing/Router.php index 860892c..73b3902 100644 --- a/src/Routing/Router.php +++ b/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; } } diff --git a/test/tests/unit/Routing/Route/PrefixRouteTest.php b/test/tests/unit/Routing/Route/PrefixRouteTest.php index dd884e2..dad929e 100644 --- a/test/tests/unit/Routing/Route/PrefixRouteTest.php +++ b/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); diff --git a/test/tests/unit/Transmission/TransmitterTest.php b/test/tests/unit/Transmission/TransmitterTest.php index 9fe0c44..506c845 100644 --- a/test/tests/unit/Transmission/TransmitterTest.php +++ b/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';