Merge pull request #14385 from nupplaphil/feat/php-cs-fixer-update

[PHP-CS] Moving the php-cs-fixer dependency to the right place

.php-cs-fixer.dist.php

@@ -7,6 +7,8 @@
 
 declare(strict_types=1);
 
+require_once __DIR__ . '/bin/dev/php-cs-fixer/vendor/autoload.php';
+
 $finder = PhpCsFixer\Finder::create()
 	->in(__DIR__)
 	->notPath('addon')
@@ -41,10 +43,10 @@ return $config
 			],
 		],
 		'blank_line_after_namespace'   => true,
-		'braces'                       => [
-			'position_after_anonymous_constructs'         => 'same',
-			'position_after_control_structures'           => 'same',
-			'position_after_functions_and_oop_constructs' => 'next',
+		'braces_position'        => [
+			'anonymous_classes_opening_brace'  => 'same_line',
+			'control_structures_opening_brace' => 'same_line',
+			'functions_opening_brace'          => 'next_line_unless_newline_at_signature_end',
 		],
 		'elseif'               => true,
 		'encoding'             => true,
@@ -58,10 +60,9 @@ return $config
 			'syntax' => 'long',
 		],
 		'lowercase_keywords'                 => true,
-		'method_argument_space'              => [],
 		'no_closing_tag'                     => true,
 		'no_spaces_after_function_name'      => true,
-		'no_spaces_inside_parenthesis'       => true,
+		'spaces_inside_parentheses'          => false,
 		'no_trailing_whitespace'             => true,
 		'no_trailing_whitespace_in_comment'  => true,
 		'no_unused_imports'                  => true,
@@ -74,7 +75,7 @@ return $config
 		'visibility_required'                => [
 			'elements' => ['property', 'method']
 		],
-		'new_with_braces' => true,
+		'new_with_parentheses' => true,
 	])
 	->setFinder($finder)
 	->setIndent("\t");

.php_cs.dist

@@ -1,82 +0,0 @@
-<?php
-/**
- * SPDX-FileCopyrightText: 2010 - 2024 the Friendica project
- *
- * SPDX-License-Identifier: CC0-1.0
- **/
-
-declare(strict_types=1);
-
-require_once __DIR__ . '/bin/dev/php-cs-fixer/vendor/autoload.php';
-
-$finder = PhpCsFixer\Finder::create()
-	->in(__DIR__)
-	->notPath('addon')
-	->notPath('bin/dev')
-	->notPath('config')
-	->notPath('doc')
-	->notPath('images')
-	->notPath('mods')
-	->notPath('spec')
-	->notPath('vendor')
-	->notPath('view/asset')
-	->notPath('lang')
-	->notPath('view/smarty3/compiled');
-
-$config = new PhpCsFixer\Config();
-return $config
-	->setRules([
-		'@PSR1'                   => true,
-		'@PSR2'                   => true,
-		'@PSR12'                  => true,
-		'align_multiline_comment' => true,
-		'array_indentation'       => true,
-		'array_syntax'            => [
-			'syntax' => 'short',
-		],
-		'binary_operator_spaces' => [
-			'default'   => 'single_space',
-			'operators' => [
-				'=>' => 'align_single_space_minimal',
-				'='  => 'align_single_space_minimal',
-				'??' => 'align_single_space_minimal',
-			],
-		],
-		'blank_line_after_namespace'   => true,
-		'braces'                       => [
-			'position_after_anonymous_constructs'         => 'same',
-			'position_after_control_structures'           => 'same',
-			'position_after_functions_and_oop_constructs' => 'next',
-		],
-		'elseif'               => true,
-		'encoding'             => true,
-		'full_opening_tag'     => true,
-		'function_declaration' => [
-			'closure_function_spacing' => 'one',
-		],
-		'indentation_type' => true,
-		'line_ending'      => true,
-		'list_syntax'      => [
-			'syntax' => 'long',
-		],
-		'lowercase_keywords'                 => true,
-		'method_argument_space'              => [],
-		'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,
-		'no_unused_imports'                  => true,
-		'single_blank_line_at_eof'           => true,
-		'single_class_element_per_statement' => true,
-		'single_import_per_statement'        => true,
-		'single_line_after_imports'          => true,
-		'switch_case_space'                  => true,
-		'ternary_operator_spaces'            => false,
-		'visibility_required'                => [
-			'elements' => ['property', 'method']
-		],
-		'new_with_braces' => true,
-	])
-	->setFinder($finder)
-	->setIndent("\t");

bin/dev/php-cs-fixer/composer.json

@@ -1,5 +1,5 @@
 {
     "require": {
-        "friendsofphp/php-cs-fixer": "^2.18"
+        "friendsofphp/php-cs-fixer": "^3.46"
     }
 }

composer.json

@@ -135,8 +135,7 @@
 		"mockery/mockery": "^1.3",
 		"mikey179/vfsstream": "^1.6",
 		"phpunit/phpunit": "^9",
-		"dms/phpunit-arraysubset-asserts": "^0.3.1",
-		"friendsofphp/php-cs-fixer": "^3.46"
+		"dms/phpunit-arraysubset-asserts": "^0.3.1"
 	},
 	"scripts": {
 		"test": "phpunit",
@@ -145,13 +144,11 @@
 		"cs:install": "@composer install --working-dir=bin/dev/php-cs-fixer",
 		"cs:check": [
 			"@cs:install",
-			"bin/dev/php-cs-fixer/vendor/bin/php-cs-fixer fix --dry-run --diff"
+			"bin/dev/php-cs-fixer/vendor/bin/php-cs-fixer check --diff"
 		],
 		"cs:fix": [
 			"@cs:install",
 			"bin/dev/php-cs-fixer/vendor/bin/php-cs-fixer fix"
-		],
-		"cs:check-v3": "vendor/bin/php-cs-fixer check --diff",
-		"cs:fix-v3": "vendor/bin/php-cs-fixer fix"
+		]
 	}
 }