From a39816a383985d1e787e0658d68eef1febd3069e Mon Sep 17 00:00:00 2001 From: Akihito Koriyama Date: Wed, 17 Oct 2018 15:57:34 +0900 Subject: [PATCH 1/2] use bear/cs coding standard --- .php_cs | 130 -------------------------------------------------- .php_cs.dist | 1 + composer.json | 3 +- 3 files changed, 3 insertions(+), 131 deletions(-) delete mode 100644 .php_cs create mode 120000 .php_cs.dist diff --git a/.php_cs b/.php_cs deleted file mode 100644 index 33566d83..00000000 --- a/.php_cs +++ /dev/null @@ -1,130 +0,0 @@ -setRiskyAllowed(true) - ->setRules(array( - '@PSR2' => true, - 'header_comment' => ['header' => $header, 'commentType' => 'PHPDoc', 'separate' => 'none'], - 'array_syntax' => ['syntax' => 'short'], - 'binary_operator_spaces' => ['align_equals' => false, 'align_double_arrow' => false], - 'blank_line_after_opening_tag' => true, - 'blank_line_after_namespace' => false, - 'blank_line_before_return' => true, - 'cast_spaces' => true, -// 'class_keyword_remove' => true, - 'combine_consecutive_unsets' => true, - 'concat_space' => ['spacing' => 'one'], - 'declare_equal_normalize' => true, - 'declare_strict_types' => true, - 'dir_constant' => true, - 'ereg_to_preg' => true, - 'function_typehint_space' => true, - 'general_phpdoc_annotation_remove' => true, - 'hash_to_slash_comment' => true, - 'heredoc_to_nowdoc' => true, - 'include' => true, - 'indentation_type' => true, - 'is_null' => ['use_yoda_style' => false], - 'linebreak_after_opening_tag' => true, - 'lowercase_cast' => true, -// 'mb_str_functions' => true, - 'method_separation' => true, - 'modernize_types_casting' => true, - 'native_function_casing' => true, -// 'native_function_invocation' => true, - 'new_with_braces' => false, // - 'no_alias_functions' => true, - 'no_blank_lines_after_class_opening' => true, - 'no_blank_lines_after_phpdoc' => true, - 'no_blank_lines_before_namespace' => true, - 'no_empty_comment' => true, - 'no_empty_phpdoc' => true, - 'no_empty_statement' => true, - 'no_extra_consecutive_blank_lines' => ['break', 'continue', 'curly_brace_block', 'extra', 'parenthesis_brace_block', 'return', 'square_brace_block', 'throw', 'use', 'useTrait'], - '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_php4_constructor' => false, - 'no_short_bool_cast' => true, - 'no_short_echo_tag' => false, - '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_trailing_whitespace' => true, - 'no_trailing_whitespace_in_comment' => true, - 'no_unneeded_control_parentheses' => true, - 'no_unreachable_default_argument_value' => 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' => true, - 'object_operator_without_whitespace' => true, - 'ordered_class_elements' => true, - 'ordered_imports' => true, - 'php_unit_construct' => true, - 'php_unit_dedicate_assert' => true, - 'php_unit_fqcn_annotation' => true, - 'php_unit_strict' => true, -// 'phpdoc_add_missing_param_annotation' => true, - 'phpdoc_align' => true, - 'phpdoc_annotation_without_dot' => true, - 'phpdoc_indent' => 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' => false, - 'phpdoc_no_package' => true, -// 'phpdoc_no_useless_inheritdoc' => true, - 'phpdoc_order' => true, - 'phpdoc_return_self_reference' => true, - 'phpdoc_scalar' => true, - 'phpdoc_separation' => true, - 'phpdoc_single_line_var_spacing' => true, -// 'phpdoc_summary' => true, - 'phpdoc_to_comment' => true, - 'phpdoc_trim' => true, - 'phpdoc_types' => true, - 'phpdoc_var_without_name' => true, - 'pow_to_exponentiation' => true, -// 'pre_increment' => true, - 'protected_to_private' => true, - 'psr0' => true, - 'psr4' => true, - 'random_api_migration' => true, - 'return_type_declaration' => ['space_before' => 'one'], - 'self_accessor' => true, - 'short_scalar_cast' => true, -// 'silenced_deprecation_error' => true, -// 'simplified_null_return' => true, -// 'single_blank_line_before_namespace' => true, - 'single_quote' => true, - 'space_after_semicolon' => true, - 'standardize_not_equals' => true, -// 'strict_comparison' => true, - 'ternary_operator_spaces' => true, - 'strict_param' => true, - 'ternary_to_null_coalescing' => true, -// 'trailing_comma_in_multiline_array' => true, - 'trim_array_spaces' => true, - 'unary_operator_spaces' => true, - 'whitespace_after_comma_in_array' => true - )) - ->setFinder( - PhpCsFixer\Finder::create() - ->exclude('tests/Fake') - ->exclude('doc') - ->in(__DIR__) - )->setLineEnding("\n"); diff --git a/.php_cs.dist b/.php_cs.dist new file mode 120000 index 00000000..11cff011 --- /dev/null +++ b/.php_cs.dist @@ -0,0 +1 @@ +vendor/bear/cs/php7.0/.php_cs.dist \ No newline at end of file diff --git a/composer.json b/composer.json index 800c90c1..d81739c6 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,8 @@ "psr/log": "^1.0.2" }, "require-dev": { - "phpunit/phpunit": "^6.5" + "phpunit/phpunit": "^6.5", + "bear/cs": "1.0.0" }, "autoload": { "psr-4": { From bf37c013d79a6e349009adb6f0c318a62bc5f4f1 Mon Sep 17 00:00:00 2001 From: Akihito Koriyama Date: Wed, 17 Oct 2018 15:57:43 +0900 Subject: [PATCH 2/2] fix cs --- src/Annotation/DefaultSchemeHost.php | 6 +----- src/Exception/ExceptionInterface.php | 6 +----- src/Exception/LogicException.php | 6 +----- src/Exception/RuntimeException.php | 6 +----- src/Extension/Application/AbstractApp.php | 6 +----- src/Extension/Application/AppInterface.php | 6 +----- src/Extension/Error/ErrorInterface.php | 11 +---------- src/Extension/Error/NullError.php | 6 +----- src/Extension/ExtensionInterface.php | 6 +----- src/Extension/Router/NullMatch.php | 6 +----- src/Extension/Router/RouterInterface.php | 8 ++------ src/Extension/Router/RouterMatch.php | 9 ++------- src/Extension/Transfer/HttpCacheInterface.php | 6 +----- src/Extension/Transfer/NullHttpCache.php | 6 +----- src/Extension/Transfer/TransferInterface.php | 6 +----- src/Inject/PsrLoggerInject.php | 8 +------- src/Inject/ResourceInject.php | 8 +------- src/Module/Annotation/DoctrineAnnotationModule.php | 6 +----- src/Module/Cache/DoctrineCacheModule.php | 6 +----- src/Module/Constant/NamedModule.php | 9 +-------- src/Module/Resource/ResourceModule.php | 6 +----- src/Module/SundayModule.php | 6 +----- src/Provide/Application/App.php | 6 +----- src/Provide/Application/AppModule.php | 6 +----- src/Provide/Error/ErrorModule.php | 6 +----- src/Provide/Error/ErrorPage.php | 6 +----- src/Provide/Error/VndError.php | 6 +----- src/Provide/Representation/RepresentationModule.php | 6 +----- src/Provide/Router/RouterModule.php | 6 +----- src/Provide/Router/WebRouter.php | 8 +------- src/Provide/Transfer/HttpCacheModule.php | 6 +----- src/Provide/Transfer/HttpResponder.php | 6 +----- src/Provide/Transfer/HttpResponderModule.php | 6 +----- 33 files changed, 35 insertions(+), 182 deletions(-) diff --git a/src/Annotation/DefaultSchemeHost.php b/src/Annotation/DefaultSchemeHost.php index dc2b1e0d..c91e0773 100644 --- a/src/Annotation/DefaultSchemeHost.php +++ b/src/Annotation/DefaultSchemeHost.php @@ -1,11 +1,7 @@ query ? '?' : ''; - $string = "{$this->method} {$this->path}{$querySymbol}" . \http_build_query($this->query); - return $string; + return "{$this->method} {$this->path}{$querySymbol}" . \http_build_query($this->query); } } diff --git a/src/Extension/Transfer/HttpCacheInterface.php b/src/Extension/Transfer/HttpCacheInterface.php index 14ac0145..69857d50 100644 --- a/src/Extension/Transfer/HttpCacheInterface.php +++ b/src/Extension/Transfer/HttpCacheInterface.php @@ -1,11 +1,7 @@ names = $names; diff --git a/src/Module/Resource/ResourceModule.php b/src/Module/Resource/ResourceModule.php index 6a804fc2..13b11290 100644 --- a/src/Module/Resource/ResourceModule.php +++ b/src/Module/Resource/ResourceModule.php @@ -1,11 +1,7 @@