minor fixes

Author: jrushlow

composer.json

@@ -16,7 +16,7 @@
         "php": ">=8.1",
         "doctrine/inflector": "^2.0",
         "nikic/php-parser": "^4.18|^5.0",
-        "php-cs-fixer/shim": "^v3.59.3",
+        "php-cs-fixer/shim": "^v3.64",
         "symfony/config": "^6.4|^7.0",
         "symfony/console": "^6.4|^7.0",
         "symfony/dependency-injection": "^6.4|^7.0",

src/Util/TemplateLinter.php

@@ -95,19 +95,14 @@ public function writeLinterMessage(OutputInterface $output): void
 
     private function setBinary(): void
     {
-        // Use Bundled PHP-CS-Fixer
+        // Use Bundled (shim) PHP-CS-Fixer
         if (null === $this->phpCsFixerBinaryPath) {
-            $pathCandidates = [
-                __DIR__.'/../../vendor/php-cs-fixer/shim/php-cs-fixer',
-                __DIR__.'/../../../php-cs-fixer/shim/php-cs-fixer',
-            ];
+            $shimLocation = \sprintf('%s/vendor/bin/php-cs-fixer', \dirname(__DIR__, 2));
 
-            foreach ($pathCandidates as $pathCandidate) {
-                if (is_file($pathCandidate)) {
-                    $this->phpCsFixerBinaryPath = $pathCandidate;
+            if (is_file($shimLocation)) {
+                $this->phpCsFixerBinaryPath = $shimLocation;
 
-                    return;
-                }
+                return;
             }
 
             return;

tests/Util/TemplateLinterTest.php

@@ -44,7 +44,9 @@ public function testPhpCsFixerVersion(): void
         $this->markTestSkippedOnWindows();
 
         $fixerPath = __DIR__.'/../../vendor/php-cs-fixer/shim/php-cs-fixer';
-        $expectedVersion = InstalledVersions::getVersion('php-cs-fixer/shim');
+
+        // Get the installed version and remove the preceding "v"
+        $expectedVersion = ltrim(InstalledVersions::getPrettyVersion('php-cs-fixer/shim'), 'v');
 
         $process = Process::fromShellCommandline(\sprintf('%s -V', $fixerPath));