fix: Don't change REGEXP heredoc marker to default one

.github/template-sync.json

@@ -5,7 +5,8 @@
 			"branch": "sync",
 			"after": {
 				"plugins": [
-					".github/template-sync/replace-bootstrap-in-cs-fixer.js"
+					".github/template-sync/replace-bootstrap-in-cs-fixer.js",
+					".github/template-sync/remove-php-cs-fixer-from-require-dev.js"
 				]
 			}
 		}

.github/template-sync/remove-php-cs-fixer-from-require-dev.js

@@ -0,0 +1,21 @@
+const { readFile, writeFile } = require('fs/promises');
+
+module.exports = () => async (template, source) => {
+	const sourceComposerJson = JSON.parse(
+		(await readFile(source.path('composer.json'))).toString(),
+	);
+	const { 'php-cs-fixer/shim': _, ...requireDevWithoutPackage } =
+		sourceComposerJson['require-dev'];
+
+	await writeFile(
+		source.path('composer.json'),
+		JSON.stringify({
+			...sourceComposerJson,
+			'require-dev': requireDevWithoutPackage,
+		}),
+	);
+
+	return {
+		reserved: [],
+	};
+};

.github/template-sync/replace-bootstrap-in-cs-fixer.js

@@ -7,7 +7,7 @@ module.exports = () => async (template, source) => {
 		.toString()
 		.replace(
 			'vendor/tenantcloud/php-cs-fixer-rule-sets/bootstrap.php',
-			'bootstrap.php'
+			'bootstrap.php',
 		);
 
 	await writeFile(source.path('.php-cs-fixer.dist.php'), sourceCsFixerConfig);

.github/workflows/template-sync.yml

@@ -22,7 +22,7 @@ jobs:
                   token: ${{ secrets.GITHUB_TOKEN }}
 
             - name: Reformat using Prettier
-              uses: actionsx/prettier@v2
+              uses: actionsx/prettier@v3
               with:
                   args: --write .
 

.github/workflows/tests.yml

@@ -67,7 +67,7 @@ jobs:
               uses: actions/checkout@v3
 
             - name: Run prettier
-              uses: actionsx/prettier@v2
+              uses: actionsx/prettier@v3
               with:
                   args: --check .
 

composer.json

@@ -4,16 +4,15 @@
 	"license": "MIT",
 	"require": {
 		"php": ">=8.2",
-		"php-cs-fixer/shim": "^3.54",
+		"friendsofphp/php-cs-fixer": "^3.54",
 		"kubawerlos/php-cs-fixer-custom-fixers": "^3.21"
 	},
 	"require-dev": {
 		"pestphp/pest": "^2.8",
 		"phpstan/phpstan": "~1.10.21",
 		"phpstan/phpstan-phpunit": "^1.3",
 		"phpstan/phpstan-webmozart-assert": "^1.2",
-		"phpstan/phpstan-mockery": "^1.1",
-		"php-cs-fixer/shim": "^3.54"
+		"phpstan/phpstan-mockery": "^1.1"
 	},
 	"autoload": {
 		"psr-4": {

phpstan.neon

@@ -8,8 +8,3 @@ parameters:
 	paths:
 		- src
 		- tests
-
-	ignoreErrors:
-		-
-			message: '#.*#'
-			path: 'src/Config.php'

src/Config.php

@@ -3,14 +3,15 @@
 namespace TenantCloud\PhpCsFixer;
 
 use PhpCsFixer\Config as PhpCsFixerConfig;
+use PhpCsFixer\ConfigInterface;
 use PhpCsFixerCustomFixers\Fixers;
 use TenantCloud\PhpCsFixer\RuleSet\TenantCloudSet;
 
 final class Config
 {
 	private function __construct() {}
 
-	public static function make(): PhpCsFixerConfig
+	public static function make(): ConfigInterface
 	{
 		return (new PhpCsFixerConfig())
 			->registerCustomFixers(new Fixers())

src/RuleSet/TenantCloudSet.php

@@ -195,7 +195,8 @@ private function enabled(): iterable
 			'global_namespace_import' => true,
 			'heredoc_closing_marker'  => [
 				'reserved_closing_markers' => [
-					'CSS', 'DIFF', 'HTML', 'JS', 'JSON', 'LUA', 'MD', 'PHP', 'PYTHON', 'RST', 'TS', 'SQL', 'XML', 'YAML',
+					'CSS', 'DIFF', 'HTML', 'JS', 'JSON', 'LUA', 'MD', 'PHP',
+					'PYTHON', 'REGEXP', 'RST', 'TS', 'SQL', 'XML', 'YAML',
 				],
 			],
 			// Forces proper indentation on Heredoc/Nowdoc