Browse Source
* php-cs-fixer: PSR2 rule. * php-cs-fixer: PSR2 rule - fix views. * Travis setup refactoring. * Add php-cs-fixer to travis cs tests. * Fix tests on hhvm-3.12 * improve travis config * composer update * revert composer update * improve travis config * Fix CS. * Extract config to separate classes. * Extract config to separate classes. * Add file header. * Force short array syntax. * binary_operator_spaces fixer * Fix broken tests * cast_spaces fixer * concat_space fixer * dir_constant fixer * ereg_to_preg fixer * function_typehint_space fixer * hash_to_slash_comment fixer * is_null fixer * linebreak_after_opening_tag fixer * lowercase_cast fixer * magic_constant_casing fixer * modernize_types_casting fixer * native_function_casing fixer * new_with_braces fixer * no_alias_functions fixer * no_blank_lines_after_class_opening fixer * no_blank_lines_after_phpdoc fixer * no_empty_comment fixer * no_empty_phpdoc fixer * no_empty_statement fixer * no_extra_consecutive_blank_lines fixer * no_leading_import_slash fixer * no_leading_namespace_whitespace fixer * no_mixed_echo_print fixer * no_multiline_whitespace_around_double_arrow fixer * no_multiline_whitespace_before_semicolons fixer * no_php4_constructor fixer * no_short_bool_cast fixer * no_singleline_whitespace_before_semicolons fixer * no_spaces_around_offset fixer * no_trailing_comma_in_list_call fixer * no_trailing_comma_in_singleline_array fixer * no_unneeded_control_parentheses fixer * no_unused_imports fixer * no_useless_return fixer * no_whitespace_before_comma_in_array fixer * no_whitespace_in_blank_line fixer * not_operator_with_successor_space fixer * object_operator_without_whitespace fixer * ordered_imports fixer * php_unit_construct fixer * php_unit_dedicate_assert fixer * php_unit_fqcn_annotation fixer * phpdoc_indent fixer * phpdoc_no_access fixer * phpdoc_no_empty_return fixer * phpdoc_no_package fixer * phpdoc_no_useless_inheritdoc fixer * Fix broken tests * phpdoc_return_self_reference fixer * phpdoc_single_line_var_spacing fixer * phpdoc_single_line_var_spacing fixer * phpdoc_to_comment fixer * phpdoc_trim fixer * phpdoc_var_without_name fixer * psr4 fixer * self_accessor fixer * short_scalar_cast fixer * single_blank_line_before_namespace fixer * single_quote fixer * standardize_not_equals fixer * ternary_operator_spaces fixer * trailing_comma_in_multiline_array fixer * trim_array_spaces fixer * protected_to_private fixer * unary_operator_spaces fixer * whitespace_after_comma_in_array fixer * `parent::setRules()` -> `$this->setRules()` * blank_line_after_opening_tag fixer * Update finder config. * Revert changes for YiiRequirementChecker. * Fix array formatting. * Add missing import. * Fix CS for new code merged from master. * Fix some indentation issues.tags/2.0.13
Robert Korulczyk
7 years ago
committed by
Alexander Makarov
504 changed files with 5790 additions and 2890 deletions
@ -0,0 +1,29 @@
|
||||
<?php |
||||
|
||||
if (!class_exists('yii\cs\YiisoftConfig', true)) { |
||||
// @todo change error message |
||||
fwrite(STDERR, "Your php-cs-version is outdated: please upgrade it.\n"); |
||||
die(16); |
||||
} |
||||
|
||||
return yii\cs\YiisoftConfig::create() |
||||
->setCacheFile(__DIR__ . '/tests/runtime/php_cs.cache') |
||||
->mergeRules([ |
||||
'braces' => [ |
||||
'allow_single_line_closure' => true, |
||||
], |
||||
]) |
||||
->setFinder( |
||||
PhpCsFixer\Finder::create() |
||||
->in(__DIR__) |
||||
->exclude('docs') |
||||
->exclude('apps') |
||||
->exclude('extensions') |
||||
// requirement checker should work even on PHP 4.3, so it needs special treatment |
||||
->exclude('framework/requirements') |
||||
->notPath('framework/classes.php') |
||||
->notPath('framework/helpers/mimeTypes.php') |
||||
->notPath('framework/views/messageConfig.php') |
||||
// temporary disable messages processing - conflicts with header fixer |
||||
->exclude('framework/messages') |
||||
); |
||||
@ -0,0 +1 @@
|
||||
This should be moved to separate package, like `yii\yii2-cs`. |
||||
@ -0,0 +1,174 @@
|
||||
<?php |
||||
/** |
||||
* @link http://www.yiiframework.com/ |
||||
* @copyright Copyright (c) 2008 Yii Software LLC |
||||
* @license http://www.yiiframework.com/license/ |
||||
*/ |
||||
|
||||
namespace yii\cs; |
||||
|
||||
use PhpCsFixer\Config; |
||||
use yii\helpers\ArrayHelper; |
||||
|
||||
/** |
||||
* Basic rules used by Yii 2 ecosystem. |
||||
* |
||||
* @author Robert Korulczyk <robert@korulczyk.pl> |
||||
* @since 2.0.0 |
||||
*/ |
||||
class YiiConfig extends Config |
||||
{ |
||||
/** |
||||
* {@inheritdoc} |
||||
*/ |
||||
public function __construct($name = 'yii-cs-config') |
||||
{ |
||||
parent::__construct($name); |
||||
|
||||
$this->setRiskyAllowed(true); |
||||
|
||||
$this->setRules([ |
||||
'@PSR2' => true, |
||||
'array_syntax' => [ |
||||
'syntax' => 'short', |
||||
], |
||||
'binary_operator_spaces' => [ |
||||
'align_double_arrow' => false, |
||||
'align_equals' => false, |
||||
], |
||||
'blank_line_after_opening_tag' => true, |
||||
'cast_spaces' => true, |
||||
'concat_space' => [ |
||||
'spacing' => 'one', |
||||
], |
||||
'dir_constant' => true, |
||||
'ereg_to_preg' => true, |
||||
'function_typehint_space' => true, |
||||
'hash_to_slash_comment' => true, |
||||
// 'heredoc_to_nowdoc' => true, // needs more discussion |
||||
// 'include' => true, // needs more discussion |
||||
'is_null' => [ |
||||
'use_yoda_style' => false, |
||||
], |
||||
'linebreak_after_opening_tag' => true, |
||||
'lowercase_cast' => true, |
||||
'magic_constant_casing' => true, |
||||
// 'mb_str_functions' => true, // needs more discussion |
||||
// 'method_separation' => true, // conflicts with current Yii style with double line between properties and methods |
||||
'modernize_types_casting' => true, |
||||
'native_function_casing' => true, |
||||
'new_with_braces' => true, |
||||
'no_alias_functions' => true, |
||||
'no_blank_lines_after_class_opening' => true, |
||||
'no_blank_lines_after_phpdoc' => true, |
||||
'no_empty_comment' => true, |
||||
'no_empty_phpdoc' => true, |
||||
'no_empty_statement' => true, |
||||
'no_extra_consecutive_blank_lines' => [ |
||||
'tokens' => [ |
||||
'break', |
||||
'continue', |
||||
// 'extra', // conflicts with current Yii style with double line between properties and methods |
||||
'return', |
||||
'throw', |
||||
'use', |
||||
'use_trait', |
||||
// 'curly_brace_block', // breaks namespaces blocks |
||||
'parenthesis_brace_block', |
||||
'square_brace_block', |
||||
], |
||||
], |
||||
'no_leading_import_slash' => true, |
||||
'no_leading_namespace_whitespace' => true, |
||||
'no_mixed_echo_print' => true, |
||||
'no_multiline_whitespace_around_double_arrow' => true, |
||||
'no_multiline_whitespace_before_semicolons' => true, |
||||
'no_php4_constructor' => true, |
||||
'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_else' => true, // needs more discussion |
||||
'no_useless_return' => true, |
||||
'no_whitespace_before_comma_in_array' => true, |
||||
'no_whitespace_in_blank_line' => true, |
||||
// 'non_printable_character' => true, // breaks Formatter::asCurrency() tests |
||||
'normalize_index_brace' => true, |
||||
'object_operator_without_whitespace' => true, |
||||
// 'ordered_class_elements' => [ // needs more discussion |
||||
// 'order' => [ |
||||
// 'use_trait', |
||||
// 'constant_public', |
||||
// 'constant_protected', |
||||
// 'constant_private', |
||||
// 'property_public', |
||||
// 'property_protected', |
||||
// 'property_private', |
||||
// 'construct', |
||||
// 'destruct', |
||||
// 'magic', |
||||
// ], |
||||
// ], |
||||
'ordered_imports' => [ |
||||
'sortAlgorithm' => 'alpha', |
||||
'importsOrder' => [ |
||||
'const', |
||||
'function', |
||||
'class', |
||||
], |
||||
], |
||||
'php_unit_construct' => true, |
||||
'php_unit_dedicate_assert' => true, |
||||
'php_unit_fqcn_annotation' => true, |
||||
// 'php_unit_strict' => true, // needs more attention |
||||
// 'phpdoc_add_missing_param_annotation' => [ // needs more attention |
||||
// 'only_untyped' => false, |
||||
// ], |
||||
'phpdoc_indent' => true, |
||||
// 'phpdoc_inline_tag' => true, // see https://github.com/yiisoft/yii2/issues/11635 |
||||
'phpdoc_no_access' => true, |
||||
'phpdoc_no_empty_return' => true, |
||||
'phpdoc_no_package' => true, |
||||
'phpdoc_no_useless_inheritdoc' => true, |
||||
// 'phpdoc_order', // may be useful, but should be configurable: https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues/1602 |
||||
'phpdoc_return_self_reference' => true, |
||||
'phpdoc_scalar' => true, |
||||
'phpdoc_single_line_var_spacing' => true, |
||||
// 'phpdoc_summary' => true, // needs more attention (summary should be separated by blank line from description) |
||||
// 'phpdoc_to_comment' => true, // breaks phpdoc for define('CONSTANT', $value); |
||||
'phpdoc_trim' => true, |
||||
// 'phpdoc_types' => true, // conflicts with yii\base\Object typehits https://github.com/yiisoft/yii2/pull/12699 |
||||
'phpdoc_var_without_name' => true, |
||||
'protected_to_private' => true, |
||||
'psr4' => true, |
||||
'self_accessor' => true, |
||||
'short_scalar_cast' => true, |
||||
'single_blank_line_before_namespace' => true, |
||||
'single_quote' => true, |
||||
'standardize_not_equals' => true, |
||||
'ternary_operator_spaces' => true, |
||||
'trailing_comma_in_multiline_array' => true, |
||||
'trim_array_spaces' => true, |
||||
'unary_operator_spaces' => true, |
||||
'whitespace_after_comma_in_array' => true, |
||||
]); |
||||
} |
||||
|
||||
/** |
||||
* Merge current rules config with provided list of rules. |
||||
* |
||||
* @param array $rules |
||||
* @return $this |
||||
* @see setRules() |
||||
* @see ArrayHelper::merge() |
||||
*/ |
||||
public function mergeRules(array $rules) |
||||
{ |
||||
$this->setRules(ArrayHelper::merge($this->getRules(), $rules)); |
||||
|
||||
return $this; |
||||
} |
||||
} |
||||
@ -0,0 +1,39 @@
|
||||
<?php |
||||
/** |
||||
* @link http://www.yiiframework.com/ |
||||
* @copyright Copyright (c) 2008 Yii Software LLC |
||||
* @license http://www.yiiframework.com/license/ |
||||
*/ |
||||
|
||||
namespace yii\cs; |
||||
|
||||
/** |
||||
* Basic rules used by Yii 2 official packages. |
||||
* |
||||
* @author Robert Korulczyk <robert@korulczyk.pl> |
||||
* @since 2.0.0 |
||||
*/ |
||||
final class YiisoftConfig extends YiiConfig |
||||
{ |
||||
/** |
||||
* {@inheritdoc} |
||||
*/ |
||||
public function __construct() |
||||
{ |
||||
parent::__construct('yiisoft-cs-config'); |
||||
|
||||
$header = <<<HEADER |
||||
@link http://www.yiiframework.com/ |
||||
@copyright Copyright (c) 2008 Yii Software LLC |
||||
@license http://www.yiiframework.com/license/ |
||||
HEADER; |
||||
|
||||
$this->mergeRules([ |
||||
'header_comment' => [ |
||||
'header' => $header, |
||||
'commentType' => 'PHPDoc', |
||||
'separate' => 'bottom', |
||||
], |
||||
]); |
||||
} |
||||
} |
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue