diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
new file mode 100644
index 0000000..a9e4b1c
--- /dev/null
+++ b/.php-cs-fixer.dist.php
@@ -0,0 +1,19 @@
+<?php
+$finder = PhpCsFixer\Finder::create()
+	->exclude('vendor')
+	->in(__DIR__)
+;
+return (new PhpCsFixer\Config())
+	->setRules([
+		'@PSR2' => true,
+		'array_syntax' => ['syntax' => 'short'],
+		'braces_position' => [
+			'functions_opening_brace' => 'same_line',
+			'anonymous_functions_opening_brace' => 'same_line',
+			'classes_opening_brace' => 'same_line',
+		],
+		'binary_operator_spaces' => ['operators' => ['=>' => 'align']],
+	])
+	->setIndent("\t")
+	->setFinder($finder)
+	;
diff --git a/.php_cs.dist b/.php_cs.dist
deleted file mode 100644
index a2fdf19..0000000
--- a/.php_cs.dist
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-$finder = PhpCsFixer\Finder::create()
-	->exclude('vendor')
-	->in(__DIR__)
-;
-return PhpCsFixer\Config::create()
-	->setRules([
-		'@PSR2' => true,
-		'array_syntax' => ['syntax' => 'short'],
-		'braces' => ['position_after_functions_and_oop_constructs' => 'same'],
-		'binary_operator_spaces' => ['align_double_arrow' => true, 'align_equals' => false],
-	])
-	->setIndent("\t")
-	->setFinder($finder)
-	;
diff --git a/composer.json b/composer.json
index 403d116..b3fed7f 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,7 @@
 	},
 	"require-dev": {
 		"php-parallel-lint/php-parallel-lint": "^1.0",
-		"friendsofphp/php-cs-fixer": "^2",
+		"friendsofphp/php-cs-fixer": "^v3.95.13",
 		"phpstan/phpstan": "^2.2",
 		"psalm/phar": "^6.16.1",
 		"phpunit/phpunit": "^11"
diff --git a/flake.nix b/flake.nix
index 37368ee..1ddcc64 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,8 +13,8 @@
       pkgs = import nixpkgs {
         inherit system;
       };
-      phpPackages = pkgs.phpPackages;
-      phpPackage = pkgs.php.buildEnv {
+      phpPackages = pkgs.php82Packages;
+      phpPackage = pkgs.php82.buildEnv {
         extensions = {
           enabled,
           all,
diff --git a/psalm.xml b/psalm.xml
index a84cd20..1251ff5 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -7,6 +7,7 @@
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
     ensureOverrideAttribute="false"
     findUnusedCode="false"
+    phpVersion="8.2"
 >
     <projectFiles>
         <directory name="src" />