mirror of
https://github.com/yiisoft/yii2.git
synced 2026-03-04 22:44:53 +01:00
Added php-cs-fixer coding standards validation to Travis CI (#14100)
* 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.
This commit is contained in:
committed by
Alexander Makarov
parent
ab68caa867
commit
ba0ab403b5
@@ -1,4 +1,9 @@
|
||||
<?php
|
||||
/**
|
||||
* @link http://www.yiiframework.com/
|
||||
* @copyright Copyright (c) 2008 Yii Software LLC
|
||||
* @license http://www.yiiframework.com/license/
|
||||
*/
|
||||
|
||||
namespace yiiunit\framework\data;
|
||||
|
||||
@@ -20,7 +25,7 @@ class ArrayDataProviderTest extends TestCase
|
||||
{
|
||||
$simpleArray = [
|
||||
['name' => 'zero'],
|
||||
['name' => 'one']
|
||||
['name' => 'one'],
|
||||
];
|
||||
$dataProvider = new ArrayDataProvider(['allModels' => $simpleArray]);
|
||||
$this->assertEquals($simpleArray, $dataProvider->getModels());
|
||||
@@ -43,7 +48,7 @@ class ArrayDataProviderTest extends TestCase
|
||||
],
|
||||
'defaultOrder' => [
|
||||
'sort' => SORT_ASC,
|
||||
]
|
||||
],
|
||||
],
|
||||
]
|
||||
);
|
||||
@@ -55,7 +60,7 @@ class ArrayDataProviderTest extends TestCase
|
||||
{
|
||||
$simpleArray = [
|
||||
['innerArray' => ['sortField' => 1]],
|
||||
['innerArray' => ['sortField' => 0]]
|
||||
['innerArray' => ['sortField' => 0]],
|
||||
];
|
||||
$dataProvider = new ArrayDataProvider(
|
||||
[
|
||||
@@ -71,13 +76,13 @@ class ArrayDataProviderTest extends TestCase
|
||||
],
|
||||
'defaultOrder' => [
|
||||
'sort' => SORT_ASC,
|
||||
]
|
||||
],
|
||||
],
|
||||
]
|
||||
);
|
||||
$sortedArray = [
|
||||
['innerArray' => ['sortField' => 0]],
|
||||
['innerArray' => ['sortField' => 1]]
|
||||
['innerArray' => ['sortField' => 1]],
|
||||
];
|
||||
$this->assertEquals($sortedArray, $dataProvider->getModels());
|
||||
}
|
||||
@@ -86,44 +91,44 @@ class ArrayDataProviderTest extends TestCase
|
||||
{
|
||||
// source data
|
||||
$unsortedProjects = [
|
||||
['title'=>'Zabbix', 'license'=>'GPL'],
|
||||
['title'=>'munin', 'license'=>'GPL'],
|
||||
['title'=>'Arch Linux', 'license'=>'GPL'],
|
||||
['title'=>'Nagios', 'license'=>'GPL'],
|
||||
['title'=>'zend framework', 'license'=>'BSD'],
|
||||
['title'=>'Zope', 'license'=>'ZPL'],
|
||||
['title'=>'active-record', 'license'=>false],
|
||||
['title'=>'ActiveState', 'license'=>false],
|
||||
['title'=>'mach', 'license'=>false],
|
||||
['title'=>'MySQL', 'license'=>'GPL'],
|
||||
['title'=>'mssql', 'license'=>'EULA'],
|
||||
['title'=>'Master-Master', 'license'=>false],
|
||||
['title'=>'Zend Engine', 'license'=>false],
|
||||
['title'=>'Mageia Linux', 'license'=>'GNU GPL'],
|
||||
['title'=>'nginx', 'license'=>'BSD'],
|
||||
['title'=>'Mozilla Firefox', 'license'=>'MPL'],
|
||||
['title' => 'Zabbix', 'license' => 'GPL'],
|
||||
['title' => 'munin', 'license' => 'GPL'],
|
||||
['title' => 'Arch Linux', 'license' => 'GPL'],
|
||||
['title' => 'Nagios', 'license' => 'GPL'],
|
||||
['title' => 'zend framework', 'license' => 'BSD'],
|
||||
['title' => 'Zope', 'license' => 'ZPL'],
|
||||
['title' => 'active-record', 'license' => false],
|
||||
['title' => 'ActiveState', 'license' => false],
|
||||
['title' => 'mach', 'license' => false],
|
||||
['title' => 'MySQL', 'license' => 'GPL'],
|
||||
['title' => 'mssql', 'license' => 'EULA'],
|
||||
['title' => 'Master-Master', 'license' => false],
|
||||
['title' => 'Zend Engine', 'license' => false],
|
||||
['title' => 'Mageia Linux', 'license' => 'GNU GPL'],
|
||||
['title' => 'nginx', 'license' => 'BSD'],
|
||||
['title' => 'Mozilla Firefox', 'license' => 'MPL'],
|
||||
];
|
||||
|
||||
// expected data
|
||||
$sortedProjects = [
|
||||
// upper cased titles
|
||||
['title'=>'ActiveState', 'license'=>false],
|
||||
['title'=>'Arch Linux', 'license'=>'GPL'],
|
||||
['title'=>'Mageia Linux', 'license'=>'GNU GPL'],
|
||||
['title'=>'Master-Master', 'license'=>false],
|
||||
['title'=>'Mozilla Firefox', 'license'=>'MPL'],
|
||||
['title'=>'MySQL', 'license'=>'GPL'],
|
||||
['title'=>'Nagios', 'license'=>'GPL'],
|
||||
['title'=>'Zabbix', 'license'=>'GPL'],
|
||||
['title'=>'Zend Engine', 'license'=>false],
|
||||
['title'=>'Zope', 'license'=>'ZPL'],
|
||||
['title' => 'ActiveState', 'license' => false],
|
||||
['title' => 'Arch Linux', 'license' => 'GPL'],
|
||||
['title' => 'Mageia Linux', 'license' => 'GNU GPL'],
|
||||
['title' => 'Master-Master', 'license' => false],
|
||||
['title' => 'Mozilla Firefox', 'license' => 'MPL'],
|
||||
['title' => 'MySQL', 'license' => 'GPL'],
|
||||
['title' => 'Nagios', 'license' => 'GPL'],
|
||||
['title' => 'Zabbix', 'license' => 'GPL'],
|
||||
['title' => 'Zend Engine', 'license' => false],
|
||||
['title' => 'Zope', 'license' => 'ZPL'],
|
||||
// lower cased titles
|
||||
['title'=>'active-record', 'license'=>false],
|
||||
['title'=>'mach', 'license'=>false],
|
||||
['title'=>'mssql', 'license'=>'EULA'],
|
||||
['title'=>'munin', 'license'=>'GPL'],
|
||||
['title'=>'nginx', 'license'=>'BSD'],
|
||||
['title'=>'zend framework', 'license'=>'BSD'],
|
||||
['title' => 'active-record', 'license' => false],
|
||||
['title' => 'mach', 'license' => false],
|
||||
['title' => 'mssql', 'license' => 'EULA'],
|
||||
['title' => 'munin', 'license' => 'GPL'],
|
||||
['title' => 'nginx', 'license' => 'BSD'],
|
||||
['title' => 'zend framework', 'license' => 'BSD'],
|
||||
];
|
||||
|
||||
$dataProvider = new ArrayDataProvider(
|
||||
@@ -140,7 +145,7 @@ class ArrayDataProviderTest extends TestCase
|
||||
],
|
||||
'defaultOrder' => [
|
||||
'sort' => SORT_ASC,
|
||||
]
|
||||
],
|
||||
],
|
||||
'pagination' => [
|
||||
'pageSize' => 100500,
|
||||
|
||||
Reference in New Issue
Block a user