From 48e664f82b39a502f7bda217aa7502c096368ccb Mon Sep 17 00:00:00 2001 From: oscarotero Date: Mon, 18 Sep 2017 22:05:07 +0200 Subject: [PATCH] code style --- .php_cs | 130 ++++++++++++++++++ phpcs.xml => phpcs.xml.dist | 1 + phpunit.xml | 17 --- phpunit.xml.dist | 33 +++++ src/CallableMiddleware.php | 4 +- src/Dispatcher.php | 7 +- src/Factory.php | 10 +- src/Factory/ServerRequestFactory.php | 2 +- src/RequestHandler.php | 2 +- tests/CallableHandlerTest.php | 4 +- .../ContainerResolverTest.php | 2 +- tests/DispatcherTest.php | 4 +- tests/HelperFixContentLengthTest.php | 6 +- 13 files changed, 184 insertions(+), 38 deletions(-) create mode 100644 .php_cs rename phpcs.xml => phpcs.xml.dist (89%) delete mode 100644 phpunit.xml create mode 100644 phpunit.xml.dist diff --git a/.php_cs b/.php_cs new file mode 100644 index 0000000..89dd374 --- /dev/null +++ b/.php_cs @@ -0,0 +1,130 @@ +files() + ->name('*.php') + ->in(__DIR__ . '/src') + ->in(__DIR__ . '/tests') +; + +return PhpCsFixer\Config::create() + ->setRules(array( + '@PSR2' => true, + 'array_syntax' => ['syntax' => 'short'], + 'binary_operator_spaces' => ['align_double_arrow' => false, 'align_equals' => false], + 'blank_line_after_namespace' => true, + 'blank_line_after_opening_tag' => false, + 'blank_line_before_return' => false, + 'braces' => ['allow_single_line_closure' => false], + 'cast_spaces' => true, + 'class_definition' => ['singleLine' => false, 'singleItemSingleLine' => true, 'multiLineExtendsEachSingleLine' => true], + 'class_keyword_remove' => false, + 'combine_consecutive_unsets' => true, + 'concat_space' => false, + 'declare_equal_normalize' => ['space' => 'single'], + 'declare_strict_types' => false, + 'elseif' => true, + 'encoding' => true, + 'full_opening_tag' => true, + 'function_declaration' => true, + 'function_typehint_space' => true, + 'general_phpdoc_annotation_remove' => ['expectedExceptionMessageRegExp', 'expectedException', 'expectedExceptionMessage'], + 'hash_to_slash_comment' => true, + 'header_comment' => false, + 'heredoc_to_nowdoc' => true, + 'include' => true, + 'indentation_type' => true, + 'line_ending' => true, + 'linebreak_after_opening_tag' => true, + 'lowercase_cast' => true, + 'lowercase_constants' => true, + 'lowercase_keywords' => true, + 'mb_str_functions' => false, + 'method_argument_space' => true, + 'method_separation' => true, + 'native_function_casing' => true, + 'native_function_invocation' => false, + 'new_with_braces' => true, + 'no_blank_lines_after_class_opening' => true, + 'no_blank_lines_after_phpdoc' => false, + 'no_blank_lines_before_namespace' => false, + 'no_closing_tag' => true, + 'no_empty_comment' => true, + 'no_empty_phpdoc' => true, + 'no_empty_statement' => true, + 'no_extra_consecutive_blank_lines' => ['break', 'continue', 'extra', 'return', 'throw', 'use', 'parenthesis_brace_block', 'square_brace_block', 'curly_brace_block'], + 'no_leading_import_slash' => true, + 'no_leading_namespace_whitespace' => true, + 'no_mixed_echo_print' => ['use' => 'echo'], + 'no_multiline_whitespace_around_double_arrow' => true, + 'no_multiline_whitespace_before_semicolons' => true, + 'no_short_bool_cast' => true, + 'no_short_echo_tag' => true, + 'no_singleline_whitespace_before_semicolons' => true, + 'no_spaces_after_function_name' => true, + 'no_spaces_around_offset' => true, + 'no_spaces_inside_parenthesis' => true, + 'no_trailing_comma_in_list_call' => true, + 'no_trailing_comma_in_singleline_array' => true, + 'no_trailing_whitespace' => true, + 'no_trailing_whitespace_in_comment' => true, + 'no_unneeded_control_parentheses' => true, + 'no_unused_imports' => true, + 'no_useless_else' => true, + 'no_useless_return' => true, + 'no_whitespace_before_comma_in_array' => true, + 'no_whitespace_in_blank_line' => true, + 'normalize_index_brace' => true, + 'not_operator_with_space' => false, + 'not_operator_with_successor_space' => false, + 'object_operator_without_whitespace' => true, + 'ordered_class_elements' => false, + 'ordered_imports' => true, + 'php_unit_fqcn_annotation' => true, + 'php_unit_strict' => false, + 'phpdoc_add_missing_param_annotation' => true, + 'phpdoc_align' => true, + 'phpdoc_inline_tag' => true, + 'phpdoc_no_access' => true, + 'phpdoc_no_alias_tag' => ['property-read' => 'property', 'property-write' => 'property', 'type' => 'var'], + 'phpdoc_no_empty_return' => true, + 'phpdoc_no_package' => true, + 'phpdoc_no_useless_inheritdoc' => true, + 'phpdoc_order' => true, + 'phpdoc_return_self_reference' => true, + 'phpdoc_scalar' => true, + 'phpdoc_separation' => false, + 'phpdoc_single_line_var_spacing' => true, + 'phpdoc_summary' => false, + 'phpdoc_to_comment' => true, + 'phpdoc_trim' => true, + 'phpdoc_types' => true, + 'phpdoc_var_without_name' => true, + 'pow_to_exponentiation' => false, + 'pre_increment' => true, + 'protected_to_private' => true, + 'return_type_declaration' => true, + 'self_accessor' => true, + 'semicolon_after_instruction' => true, + 'short_scalar_cast' => true, + 'single_blank_line_at_eof' => true, + 'single_blank_line_before_namespace' => false, + 'single_class_element_per_statement' => true, + 'single_import_per_statement' => true, + 'single_line_after_imports' => true, + 'single_quote' => true, + 'space_after_semicolon' => true, + 'standardize_not_equals' => true, + 'strict_param' => false, + 'switch_case_semicolon_to_colon' => true, + 'switch_case_space' => true, + 'ternary_operator_spaces' => true, + 'ternary_to_null_coalescing' => false, + 'trailing_comma_in_multiline_array' => true, + 'trim_array_spaces' => true, + 'unary_operator_spaces' => true, + 'visibility_required' => true, + 'whitespace_after_comma_in_array' => true, + )) + ->setFinder($finder) +; diff --git a/phpcs.xml b/phpcs.xml.dist similarity index 89% rename from phpcs.xml rename to phpcs.xml.dist index 59b947b..7814331 100644 --- a/phpcs.xml +++ b/phpcs.xml.dist @@ -4,6 +4,7 @@ + diff --git a/phpunit.xml b/phpunit.xml deleted file mode 100644 index 43838b6..0000000 --- a/phpunit.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - tests - - - diff --git a/phpunit.xml.dist b/phpunit.xml.dist new file mode 100644 index 0000000..ca1cc62 --- /dev/null +++ b/phpunit.xml.dist @@ -0,0 +1,33 @@ + + + + + tests + + + + + + ./src + + ./tests + ./vendor + + + + diff --git a/src/CallableMiddleware.php b/src/CallableMiddleware.php index 77597d3..9868421 100644 --- a/src/CallableMiddleware.php +++ b/src/CallableMiddleware.php @@ -2,10 +2,10 @@ namespace Middlewares\Utils; -use Psr\Http\Message\ServerRequestInterface; -use Psr\Http\Message\ResponseInterface; use Interop\Http\Server\MiddlewareInterface; use Interop\Http\Server\RequestHandlerInterface; +use Psr\Http\Message\ResponseInterface; +use Psr\Http\Message\ServerRequestInterface; class CallableMiddleware implements MiddlewareInterface { diff --git a/src/Dispatcher.php b/src/Dispatcher.php index 5e1a902..3833e5e 100644 --- a/src/Dispatcher.php +++ b/src/Dispatcher.php @@ -2,12 +2,11 @@ namespace Middlewares\Utils; -use Interop\Http\Server\RequestHandlerInterface; +use Closure; use Interop\Http\Server\MiddlewareInterface; -use Psr\Http\Message\ServerRequestInterface; +use Interop\Http\Server\RequestHandlerInterface; use Psr\Http\Message\ResponseInterface; -use Closure; -use RuntimeException; +use Psr\Http\Message\ServerRequestInterface; use UnexpectedValueException; class Dispatcher diff --git a/src/Factory.php b/src/Factory.php index e4a6fdb..2721299 100644 --- a/src/Factory.php +++ b/src/Factory.php @@ -2,14 +2,14 @@ namespace Middlewares\Utils; -use Psr\Http\Message\ResponseInterface; -use Psr\Http\Message\StreamInterface; -use Psr\Http\Message\UriInterface; -use Psr\Http\Message\ServerRequestInterface; use Interop\Http\Factory\ResponseFactoryInterface; +use Interop\Http\Factory\ServerRequestFactoryInterface; use Interop\Http\Factory\StreamFactoryInterface; use Interop\Http\Factory\UriFactoryInterface; -use Interop\Http\Factory\ServerRequestFactoryInterface; +use Psr\Http\Message\ResponseInterface; +use Psr\Http\Message\ServerRequestInterface; +use Psr\Http\Message\StreamInterface; +use Psr\Http\Message\UriInterface; /** * Simple class to create instances of PSR-7 classes. diff --git a/src/Factory/ServerRequestFactory.php b/src/Factory/ServerRequestFactory.php index c30b764..719e283 100644 --- a/src/Factory/ServerRequestFactory.php +++ b/src/Factory/ServerRequestFactory.php @@ -29,7 +29,7 @@ public function createServerRequestFromArray(array $server) /** * Create a Server request * - * @param array $server + * @param array $server * @param string $method * @param string $uri * diff --git a/src/RequestHandler.php b/src/RequestHandler.php index 766ec27..0d29bfd 100644 --- a/src/RequestHandler.php +++ b/src/RequestHandler.php @@ -3,8 +3,8 @@ namespace Middlewares\Utils; use Interop\Http\Server\RequestHandlerInterface; -use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Message\ResponseInterface; +use Psr\Http\Message\ServerRequestInterface; class RequestHandler implements RequestHandlerInterface { diff --git a/tests/CallableHandlerTest.php b/tests/CallableHandlerTest.php index 89597bd..9bfd533 100644 --- a/tests/CallableHandlerTest.php +++ b/tests/CallableHandlerTest.php @@ -2,10 +2,10 @@ namespace Middlewares\Tests; -use Middlewares\Utils\Factory; use Middlewares\Utils\CallableHandler; -use Psr\Http\Message\ResponseInterface; +use Middlewares\Utils\Factory; use PHPUnit\Framework\TestCase; +use Psr\Http\Message\ResponseInterface; class CallableHandlerTest extends TestCase { diff --git a/tests/CallableResolver/ContainerResolverTest.php b/tests/CallableResolver/ContainerResolverTest.php index dd44512..ae045cb 100644 --- a/tests/CallableResolver/ContainerResolverTest.php +++ b/tests/CallableResolver/ContainerResolverTest.php @@ -2,11 +2,11 @@ namespace Middlewares\Tests\CallableResolver; -use Psr\Container\ContainerInterface; use Middlewares\Utils\CallableResolver\CallableResolverInterface; use Middlewares\Utils\CallableResolver\ContainerResolver; use PHPUnit\Framework\TestCase; use Prophecy\Prophecy\ObjectProphecy; +use Psr\Container\ContainerInterface; final class ContainerResolverTest extends TestCase { diff --git a/tests/DispatcherTest.php b/tests/DispatcherTest.php index 0e536d2..619b49f 100644 --- a/tests/DispatcherTest.php +++ b/tests/DispatcherTest.php @@ -2,10 +2,10 @@ namespace Middlewares\Tests; -use Middlewares\Utils\Dispatcher; use Middlewares\Utils\CallableMiddleware; -use Psr\Http\Message\ResponseInterface; +use Middlewares\Utils\Dispatcher; use PHPUnit\Framework\TestCase; +use Psr\Http\Message\ResponseInterface; class DispatcherTest extends TestCase { diff --git a/tests/HelperFixContentLengthTest.php b/tests/HelperFixContentLengthTest.php index ceb1f06..891673d 100644 --- a/tests/HelperFixContentLengthTest.php +++ b/tests/HelperFixContentLengthTest.php @@ -2,11 +2,11 @@ namespace Middlewares\Tests; -use Middlewares\Utils\Helpers; use Middlewares\Utils\Factory; -use Zend\Diactoros\CallbackStream; -use Psr\Http\Message\ResponseInterface; +use Middlewares\Utils\Helpers; use PHPUnit\Framework\TestCase; +use Psr\Http\Message\ResponseInterface; +use Zend\Diactoros\CallbackStream; class HelperFixContentLengthTest extends TestCase {