Merge pull request #4 from CorpusPHP/dependabot/composer/friendsofphp/php-cs-fixer-tw-2.18or-tw-3.0

Update friendsofphp/php-cs-fixer requirement from ^2.18 to ^2.18 || ^3.0

Author: donatj

.gitignore

@@ -1,5 +1,4 @@
 /vendor/
 composer.lock
 
-.php_cs.cache
-.phpunit.result.cache
+*.cache

.php_cs .php-cs-fixer.dist.php.php_cs renamed to .php-cs-fixer.dist.php

@@ -7,7 +7,7 @@
 	->name('*.php');
 
 
-return PhpCsFixer\Config::create()
+return (new PhpCsFixer\Config)
 	->setUsingCache(true)
 	->setIndent("\t")
 	->setLineEnding("\n")
@@ -37,6 +37,8 @@
 			'no_leading_import_slash'         => true,
 			'no_leading_namespace_whitespace' => true,
 
+			'array_indentation' => true,
+
 			'no_whitespace_in_blank_line' => true,
 
 			'phpdoc_add_missing_param_annotation' => [ 'only_untyped' => true, ],
@@ -103,7 +105,7 @@
 			],
 
 			'blank_line_before_statement' => [
-				'statements' => [ 'continue', 'try', 'switch', 'die', 'exit', 'throw', 'return', 'do' ],
+				'statements' => [ 'continue', 'try', 'switch', 'exit', 'throw', 'return', 'do' ],
 			],
 
 			'no_superfluous_phpdoc_tags' => [
@@ -119,6 +121,7 @@
 			'escape_implicit_backslashes' => true,
 			'explicit_indirect_variable'  => true,
 			'heredoc_to_nowdoc'           => true,
+			'heredoc_indentation'         => true,
 
 
 			'no_singleline_whitespace_before_semicolons' => true,
@@ -140,6 +143,7 @@
 
 			'method_chaining_indentation' => true,
 			'method_argument_space'       => [
+				'on_multiline'                     => 'ignore', // at least until they fix it
 				'keep_multiple_spaces_after_comma' => true,
 			],
 
@@ -156,8 +160,15 @@
 				'import_functions' => false,
 			],
 
-			'trailing_comma_in_multiline_array' => true,
-			'single_line_comment_style' => true,
+			'trailing_comma_in_multiline' => true,
+			'single_line_comment_style'   => true,
+
+			'is_null'    => true,
+			'yoda_style' => [
+				'equal'            => false,
+				'identical'        => false,
+				'less_and_greater' => null,
+			],
 		]
 	)
 	->setFinder($finder);

Makefile

@@ -10,6 +10,7 @@ fix: cbf
 .PHONY: test
 test: cs
 	vendor/bin/phpunit
+	vendor/bin/php-cs-fixer fix --dry-run
 
 .PHONY: cs
 cs:

composer.json

@@ -12,7 +12,7 @@
 		"guzzlehttp/psr7": "^1.8",
 		"corpus/coding-standard": "^0.4.0",
 		"squizlabs/php_codesniffer": "^3.6",
-		"friendsofphp/php-cs-fixer": "^2.18",
+		"friendsofphp/php-cs-fixer": "^3.0",
 		"donatj/mddoc": "dev-master",
 		"donatj/drop": "^1.0"
 	},