Skip to content

Commit 73c6336

Browse files
committed
Replace PHP-CS-Fixer with PHP_CodeSniffer
I have recently created "respect/coding-standard" with the PHP_CodeSniffer rules that I intend to use in all components that I maintain. The reason for changing to PHP_CodeSniffer is that I have had broken builds after some minor or patch update of PHP-CS-Fixer. This commit will replace all configurations of PHP-CS-Fixer and replace with PHP_CodeSniffer. It will also execute PHP_CodeSniffer on Travis builds. Signed-off-by: Henrique Moody <[email protected]>
1 parent 3087bd3 commit 73c6336

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+255
-198
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
/.* export-ignore
2+
/phpcs.xml.dist export-ignore
23
/phpunit.xml.dist export-ignore
34
/tests export-ignore

.gitignore

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
.php_cs.cache
2-
.couscous/
1+
.phpcs.cache
32
composer.lock
4-
Makefile
3+
phpcs.xml
54
phpunit.xml
65
vendor/

.php_cs.cache

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"php":"7.2.3","version":"2.11.0:v2.11.0#2ac8defbe07599b79005cca764bfffe7aeac0bf2","rules":{"binary_operator_spaces":true,"blank_line_after_opening_tag":true,"blank_line_before_statement":{"statements":["return"]},"braces":{"allow_single_line_closure":true},"cast_spaces":true,"class_attributes_separation":{"elements":["method"]},"class_definition":{"singleLine":true},"concat_space":{"spacing":"none"},"declare_equal_normalize":true,"function_typehint_space":true,"include":true,"increment_style":true,"lowercase_cast":true,"magic_constant_casing":true,"method_argument_space":true,"native_function_casing":true,"new_with_braces":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_blank_lines":{"tokens":["curly_brace_block","extra","parenthesis_brace_block","square_brace_block","throw","use"]},"no_leading_import_slash":true,"no_leading_namespace_whitespace":true,"no_mixed_echo_print":{"use":"echo"},"no_multiline_whitespace_around_double_arrow":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_unneeded_curly_braces":true,"no_unneeded_final_method":true,"no_unused_imports":true,"no_whitespace_before_comma_in_array":true,"no_whitespace_in_blank_line":true,"normalize_index_brace":true,"object_operator_without_whitespace":true,"php_unit_fqcn_annotation":true,"phpdoc_annotation_without_dot":true,"phpdoc_indent":true,"phpdoc_inline_tag":true,"phpdoc_no_access":true,"phpdoc_no_alias_tag":true,"phpdoc_no_empty_return":true,"phpdoc_no_package":true,"phpdoc_no_useless_inheritdoc":true,"phpdoc_return_self_reference":true,"phpdoc_scalar":true,"phpdoc_separation":true,"phpdoc_single_line_var_spacing":true,"phpdoc_to_comment":true,"phpdoc_trim":true,"phpdoc_types":true,"phpdoc_var_without_name":true,"protected_to_private":true,"return_type_declaration":true,"semicolon_after_instruction":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_class_element_per_statement":true,"single_line_comment_style":{"comment_types":["hash"]},"single_quote":true,"space_after_semicolon":{"remove_in_empty_for_expressions":true},"standardize_increment":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,"yoda_style":true,"blank_line_after_namespace":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_constants":true,"lowercase_keywords":true,"no_break_comment":true,"no_closing_tag":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_import_per_statement":true,"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"visibility_required":true,"encoding":true,"full_opening_tag":true,"void_return":true,"declare_strict_types":true,"non_printable_character":{"use_escape_sequences_in_strings":true},"random_api_migration":{"replacements":{"mt_rand":"random_int","rand":"random_int"}},"pow_to_exponentiation":true,"mb_str_functions":true,"no_multiline_whitespace_before_semicolons":true,"no_useless_else":true,"no_useless_return":true,"ordered_imports":true,"phpdoc_order":true,"array_syntax":{"syntax":"short"},"no_short_echo_tag":true},"hashes":{"src\/Stringifier.php":3208716286,"src\/Quoters\/CodeQuoter.php":1533189238,"src\/Quoter.php":2980616127,"src\/stringify.php":931297305,"src\/Stringifiers\/ObjectStringifier.php":769132450,"src\/Stringifiers\/JsonSerializableStringifier.php":889559733,"src\/Stringifiers\/NullStringifier.php":777503971,"src\/Stringifiers\/InfiniteStringifier.php":3702196378,"src\/Stringifiers\/BoolStringifier.php":2848167023,"src\/Stringifiers\/JsonParsableStringifier.php":2925421316,"src\/Stringifiers\/ArrayStringifier.php":2223781617,"src\/Stringifiers\/TraversableStringifier.php":2583157109,"src\/Stringifiers\/NanStringifier.php":1132847196,"src\/Stringifiers\/ResourceStringifier.php":2818690467,"src\/Stringifiers\/StringableObjectStringifier.php":1468810915,"src\/Stringifiers\/DateTimeStringifier.php":941725598,"src\/Stringifiers\/ThrowableStringifier.php":3465475836,"src\/Stringifiers\/ClusterStringifier.php":1603447365,"tests\/unit\/Quoters\/CodeQuoterTest.php":2890101821,"tests\/unit\/Stringifiers\/ClusterStringifierTest.php":1589093609,"tests\/unit\/Stringifiers\/StringableObjectStringifierTest.php":3246015514,"tests\/unit\/Stringifiers\/JsonSerializableStringifierTest.php":2860077306,"tests\/unit\/Stringifiers\/NullStringifierTest.php":1668298499,"tests\/unit\/Stringifiers\/BoolStringifierTest.php":2367954854,"tests\/unit\/Stringifiers\/ArrayStringifierTest.php":1713816966,"tests\/unit\/Stringifiers\/ResourceStringifierTest.php":3256501379,"tests\/unit\/Stringifiers\/DateTimeStringifierTest.php":218461015,"tests\/unit\/Stringifiers\/ThrowableStringifierTest.php":1587675716,"tests\/unit\/Stringifiers\/InfiniteStringifierTest.php":1579464589,"tests\/unit\/Stringifiers\/ObjectStringifierTest.php":757101255,"tests\/unit\/Stringifiers\/NanStringifierTest.php":2937436759,"tests\/unit\/Stringifiers\/TraversableStringifierTest.php":1039981065,"tests\/unit\/Stringifiers\/JsonParsableStringifierTest.php":1198212455,"tests\/integration\/stringify-array.phpt":2838177671,"tests\/integration\/stringify-object-stringable.phpt":3555699116,"tests\/integration\/stringify-null.phpt":999007070,"tests\/integration\/stringify-object.phpt":1045480538,"tests\/integration\/stringify-string.phpt":3120180057,"tests\/integration\/stringify-int.phpt":1947617993,"tests\/integration\/stringify-object-traversable.phpt":1775818702,"tests\/integration\/stringify-object-throwable.phpt":3012592631,"tests\/integration\/stringify-object-jsonSerializable.phpt":4118407949,"tests\/integration\/stringify-float.phpt":3566366260,"tests\/integration\/stringify-object-dateTime.phpt":3654860991,"tests\/integration\/stringify-resource.phpt":3835353175,"tests\/integration\/stringify-bool.phpt":4123311986,"\/tests\/unit\/Quoters\/CodeQuoterTest.php":2890101821,"\/tests\/unit\/Stringifiers\/ClusterStringifierTest.php":1589093609,"\/tests\/unit\/Stringifiers\/StringableObjectStringifierTest.php":3246015514,"\/tests\/unit\/Stringifiers\/JsonSerializableStringifierTest.php":2860077306,"\/tests\/unit\/Stringifiers\/NullStringifierTest.php":1668298499,"\/tests\/unit\/Stringifiers\/BoolStringifierTest.php":2367954854,"\/tests\/unit\/Stringifiers\/ArrayStringifierTest.php":1713816966,"\/tests\/unit\/Stringifiers\/ResourceStringifierTest.php":3256501379,"\/tests\/unit\/Stringifiers\/DateTimeStringifierTest.php":218461015,"\/tests\/unit\/Stringifiers\/ThrowableStringifierTest.php":1587675716,"\/tests\/unit\/Stringifiers\/InfiniteStringifierTest.php":1579464589,"\/tests\/unit\/Stringifiers\/ObjectStringifierTest.php":757101255,"\/tests\/unit\/Stringifiers\/NanStringifierTest.php":2937436759,"\/tests\/unit\/Stringifiers\/TraversableStringifierTest.php":1039981065,"\/tests\/unit\/Stringifiers\/JsonParsableStringifierTest.php":1198212455,"\/tests\/integration\/stringify-array.phpt":2838177671,"\/tests\/integration\/stringify-object-stringable.phpt":3555699116,"\/tests\/integration\/stringify-null.phpt":999007070,"\/tests\/integration\/stringify-object.phpt":1045480538,"\/tests\/integration\/stringify-string.phpt":3120180057,"\/tests\/integration\/stringify-int.phpt":1947617993,"\/tests\/integration\/stringify-object-traversable.phpt":1775818702,"\/tests\/integration\/stringify-object-throwable.phpt":3012592631,"\/tests\/integration\/stringify-object-jsonSerializable.phpt":4118407949,"\/tests\/integration\/stringify-float.phpt":3566366260,"\/tests\/integration\/stringify-object-dateTime.phpt":3654860991,"\/tests\/integration\/stringify-resource.phpt":3835353175,"\/tests\/integration\/stringify-bool.phpt":4123311986,"\/src\/Stringifier.php":3208716286,"\/src\/Quoters\/CodeQuoter.php":1533189238,"\/src\/Quoter.php":2980616127,"\/src\/stringify.php":931297305,"\/src\/Stringifiers\/ObjectStringifier.php":769132450,"\/src\/Stringifiers\/JsonSerializableStringifier.php":889559733,"\/src\/Stringifiers\/NullStringifier.php":777503971,"\/src\/Stringifiers\/InfiniteStringifier.php":3702196378,"\/src\/Stringifiers\/BoolStringifier.php":2848167023,"\/src\/Stringifiers\/JsonParsableStringifier.php":2925421316,"\/src\/Stringifiers\/ArrayStringifier.php":2223781617,"\/src\/Stringifiers\/TraversableStringifier.php":2583157109,"\/src\/Stringifiers\/NanStringifier.php":1132847196,"\/src\/Stringifiers\/ResourceStringifier.php":2818690467,"\/src\/Stringifiers\/StringableObjectStringifier.php":1468810915,"\/src\/Stringifiers\/DateTimeStringifier.php":941725598,"\/src\/Stringifiers\/ThrowableStringifier.php":3465475836,"\/src\/Stringifiers\/ClusterStringifier.php":1603447365}}

.travis.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,7 @@ jobs:
3939
- stage: Quality assurance
4040
env: DOCHEADER
4141
script: vendor/bin/docheader check src/ tests/
42+
43+
- stage: Quality assurance
44+
env: CODE_STANDARD
45+
script: vendor/bin/phpcs

composer.json

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,15 @@
1515
"php": ">=7.1"
1616
},
1717
"require-dev": {
18-
"friendsofphp/php-cs-fixer": "^2.8",
1918
"malukenho/docheader": "^0.1.7",
20-
"phpunit/phpunit": "^6.4"
19+
"phpunit/phpunit": "^6.4",
20+
"respect/coding-standard": "^1.0",
21+
"squizlabs/php_codesniffer": "^3.4"
2122
},
2223
"autoload": {
2324
"psr-4": {
24-
"Respect\\Stringifier\\": "src/"
25+
"Respect\\Stringifier\\": "src/",
26+
"Respect\\Stringifier\\Test\\": "tests/src/"
2527
},
2628
"files": [
2729
"src/stringify.php"
@@ -32,5 +34,8 @@
3234
"test": "vendor/bin/phpunit",
3335
"test-unit": "vendor/bin/phpunit --testsuite=unit",
3436
"test-integration": "vendor/bin/phpunit --testsuite=integration"
37+
},
38+
"config": {
39+
"sort-packages": true
3540
}
3641
}

phpcs.xml.dist

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0"?>
2+
<ruleset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:noNamespaceSchemaLocation="vendor/squizlabs/php_codesniffer/phpcs.xsd" >
4+
5+
<arg name="basepath" value="." />
6+
<arg name="cache" value=".phpcs.cache" />
7+
<arg name="colors" />
8+
<arg name="extensions" value="php,phpt" />
9+
<arg value="p" />
10+
<arg value="s" />
11+
12+
<file>src/</file>
13+
<file>tests/</file>
14+
15+
<rule ref="Respect" />
16+
</ruleset>

src/Quoter.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ interface Quoter
2121
* @param string $string The string to add quotes to
2222
* @param int $depth The current depth
2323
*
24-
* @return string
2524
*/
2625
public function quote(string $string, int $depth): string;
2726
}

src/Quoters/CodeQuoter.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
namespace Respect\Stringifier\Quoters;
1515

1616
use Respect\Stringifier\Quoter;
17+
use function sprintf;
1718

1819
/**
1920
* Add "`" quotes around a string depending on its level.
@@ -27,7 +28,7 @@ final class CodeQuoter implements Quoter
2728
*/
2829
public function quote(string $string, int $depth): string
2930
{
30-
if (0 === $depth) {
31+
if ($depth === 0) {
3132
return sprintf('`%s`', $string);
3233
}
3334

src/Stringifiers/ArrayStringifier.php

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,10 @@
1616
use Respect\Stringifier\Quoter;
1717
use Respect\Stringifier\Stringifier;
1818
use function array_keys;
19+
use function count;
1920
use function implode;
2021
use function is_array;
22+
use function range;
2123
use function sprintf;
2224

2325
/**
@@ -47,14 +49,6 @@ final class ArrayStringifier implements Stringifier
4749
*/
4850
private $itemsLimit;
4951

50-
/**
51-
* Initializes the stringifier.
52-
*
53-
* @param Stringifier $stringifier
54-
* @param Quoter $quoter
55-
* @param int $maximumDepth
56-
* @param int $itemsLimit
57-
*/
5852
public function __construct(Stringifier $stringifier, Quoter $quoter, int $maximumDepth, int $itemsLimit)
5953
{
6054
$this->stringifier = $stringifier;
@@ -90,7 +84,7 @@ public function stringify($raw, int $depth): ?string
9084
}
9185

9286
$items[$itemsCount] = '';
93-
if (false === $isSequential) {
87+
if ($isSequential === false) {
9488
$items[$itemsCount] .= sprintf('%s: ', $this->stringifier->stringify($key, $depth + 1));
9589
}
9690
$items[$itemsCount] .= $this->stringifier->stringify($value, $depth + 1);
@@ -100,11 +94,7 @@ public function stringify($raw, int $depth): ?string
10094
}
10195

10296
/**
103-
* Returns whether the array is sequential or not.
104-
*
105-
* @param array $array
106-
*
107-
* @return bool
97+
* @param mixed[] $array
10898
*/
10999
private function isSequential(array $array): bool
110100
{

src/Stringifiers/BoolStringifier.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,6 @@ final class BoolStringifier implements Stringifier
2929
*/
3030
private $quoter;
3131

32-
/**
33-
* Initializes the stringifier.
34-
*
35-
* @param Quoter $quoter
36-
*/
3732
public function __construct(Quoter $quoter)
3833
{
3934
$this->quoter = $quoter;

0 commit comments

Comments
 (0)