Upgrade Fixer and Sniffer

.gitignore

@@ -1,2 +1,3 @@
 /vendor
 composer.lock
+filelist.tmp

composer.json

@@ -2,9 +2,9 @@
 	"name": "nette/coding-standard",
 	"license": "MIT",
 	"require": {
-		"php": "^7.2 || ^8.0",
-		"slevomat/coding-standard": "^8.6 <8.12",
-		"friendsofphp/php-cs-fixer": "^3.10 <3.16",
+		"php": "^7.4 || ^8.0",
+		"slevomat/coding-standard": "^8.6 <8.16",
+		"friendsofphp/php-cs-fixer": "^3.10 <3.59",
 		"squizlabs/php_codesniffer": "^3.6",
 		"kubawerlos/php-cs-fixer-custom-fixers": "^3.5"
 	},

fix.php

@@ -46,7 +46,7 @@
 
 
 // try to find out the PHP version from the composer.json
-$presetVersions = ['8.1', '8.0', '7.4', '7.3', '7.1'];
+$presetVersions = ['8.3', '8.2', '8.1', '8.0', '7.4', '7.3', '7.1'];
 
 
 $root = getcwd();

preset-fixer/base.php

@@ -8,9 +8,8 @@
 }, $files);
 
 $config = new PhpCsFixer\Config;
+$config->setParallelConfig(PhpCsFixer\Runner\Parallel\ParallelConfigFactory::detect());
 $config->registerCustomFixers([
-	new NetteCodingStandard\Fixer\Whitespace\StatementIndentationFixer,
-	new NetteCodingStandard\Fixer\Basic\CurlyBracesPositionFixer,
 	new NetteCodingStandard\Fixer\ClassNotation\ClassAndTraitVisibilityRequiredFixer,
 	new NetteCodingStandard\Fixer\FunctionNotation\MethodArgumentSpaceFixer,
 	new NetteCodingStandard\Fixer\FunctionNotation\FunctionDeclarationFixer,

preset-fixer/common/Nette.php

@@ -5,16 +5,14 @@
 return [
 	'@PSR12' => true,
 	'@PSR12:risky' => true,
-	'new_with_braces' => false, // new stdClass
+	'new_with_parentheses' => false, // new stdClass
 	'single_line_after_imports' => false, // Nette uses two empty lines
 	'blank_line_after_namespace' => false,
-	'ordered_imports' => true, // Use statements are alphabetically ordered
+	'ordered_imports' => false, // Use statements are alphabetically ordered
 	'blank_line_between_import_groups' => false,
 
-	// braces split
-	'braces' => false,
 	// Ensures a single space after language constructs
-	'single_space_after_construct' => true,
+	'single_space_around_construct' => true,
 	// The body of each control structure MUST be enclosed within braces
 	'control_structure_braces' => true,
 	// Control structure continuation keyword must be on the configured line
@@ -23,15 +21,10 @@
 	'declare_parentheses' => true,
 	// There must not be more than one statement per line
 	'no_multiple_statements_per_line' => true,
-
-
-	// overriden rules
-
 	// Curly braces must be placed as configured
-	'Nette/curly_braces_position' => true,
-
+	'braces_position' => true,
 	// Each statement must be indented
-	'Nette/statement_indentation' => true,
+	'statement_indentation' => true,
 
 	// In the argument list, there must be one space after each comma, and there must no be a space before each comma
 	'method_argument_space' => false,
@@ -106,7 +99,7 @@
 	// Remove useless semicolon statements
 	'no_empty_statement' => true,
 
-	'no_unneeded_curly_braces' => true,
+	'no_unneeded_braces' => true,
 
 	// Remove trailing commas in list() calls.
 	'no_trailing_comma_in_singleline' => true,
@@ -164,7 +157,7 @@
 	// Convert double quotes to single quotes for simple strings.
 	'single_quote' => true,
 
-	'escape_implicit_backslashes' => true,
+	'string_implicit_backslashes' => true,
 
 	// Convert ${..} to {$..}
 	'simple_to_complex_string_variable' => true,

preset-fixer/php83.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+$config = require __DIR__ . '/php82.php';
+
+$rules = [
+	'@PHP83Migration' => true,
+];
+
+$config->setRules($rules + $config->getRules());
+return $config;

preset-sniffer/php71.xml

@@ -2,6 +2,11 @@
 <ruleset name="PHP 7.1" namespace="Nette">
 	<rule ref="./Nette.xml"/>
 
+	<!-- Fixer and Sniffer do not have the same result of sorting uses. -->
+	<rule ref="SlevomatCodingStandard.Namespaces.AlphabeticallySortedUses.IncorrectlyOrderedUses">
+		<exclude-pattern>*\.phpt?</exclude-pattern>
+	</rule>
+
 	<!-- Enforces consistent formatting of return typehints: function foo(): ?int -->
 	<rule ref="SlevomatCodingStandard.TypeHints.ReturnTypeHintSpacing"/>
 

preset-sniffer/php83.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<ruleset name="PHP 8.3" namespace="Nette">
+	<rule ref="./php82.xml"/>
+
+	<config name="php_version" value="80300"/>
+</ruleset>