Use php-cs-fixer/shim version directly as dev dependency

.github/workflows/pull-request-checks.yaml

@@ -7,11 +7,15 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                php: ['7.3', '7.4']
+                php: ['7.4']
+                composer-options:
+                    - --prefer-dist --no-progress --no-interaction
+                    - --prefer-dist --no-progress --no-interaction --prefer-lowest
+
         steps:
             # Checkout & installation
             - name: Checkout repository
-              uses: actions/checkout@v2
+              uses: actions/checkout@v4
 
             - name: Setup PHP
               uses: shivammathur/setup-php@v2
@@ -20,18 +24,19 @@ jobs:
                 ini-values: "memory_limit=-1"
                 php-version: "${{ matrix.php }}"
 
-            - name: Composer install
-              run: composer update --prefer-dist --no-progress --no-suggest --no-interaction --prefer-lowest
+            # Install project
+            - name: Install dependencies
+              run: composer install --prefer-dist --no-progress --no-interaction
 
-            - name: PHPCS Fixer install
-              run: composer bin php-cs-fixer update
+            - name: Composer update
+              run: composer update ${{ matrix.composer-options }}
 
             # Linters
             - name: Run Composer linter
               run: composer validate --strict --no-check-lock
 
             - name: Run lint PHP
-              run: vendor-bin/php-cs-fixer/vendor/friendsofphp/php-cs-fixer/php-cs-fixer fix --ansi --verbose --diff --dry-run
+              run: composer run-script php-cs-fixer-dry-run
 
              # Tests
             - name: Run PHP unit test suite

Form/Type/SiteType.php

@@ -26,7 +26,7 @@ public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults([
             'choices' => $this->siteRepository->findAll(),
-            'choice_label' => static function (SiteInterface $site = null) {
+            'choice_label' => static function (?SiteInterface $site = null) {
                 return (string) $site;
             },
             'choice_value' => 'id',

Router/HostnameIdentifiedLoader.php

@@ -30,7 +30,7 @@ public function __construct(IdentifierMappingInterface $identifierMapping)
         $this->identifierMapping = $identifierMapping;
     }
 
-    public function load($resource, string $type = null): RouteCollection
+    public function load($resource, ?string $type = null): RouteCollection
     {
         $this->resourceStack[] = $resource;
 
@@ -52,7 +52,7 @@ public function load($resource, string $type = null): RouteCollection
         return $collection;
     }
 
-    public function supports($resource, string $type = null): bool
+    public function supports($resource, ?string $type = null): bool
     {
         return null === $type && !\in_array($resource, $this->resourceStack, true);
     }

Router/PathIdentifiedUrlGenerator.php

@@ -18,7 +18,7 @@ final class PathIdentifiedUrlGenerator implements UrlGeneratorInterface
     private $defaultIdentifier;
     private $urlGenerator;
 
-    public function __construct(UrlGeneratorInterface $urlGenerator, string $routeParameter = 'site', string $defaultIdentifier = null)
+    public function __construct(UrlGeneratorInterface $urlGenerator, string $routeParameter = 'site', ?string $defaultIdentifier = null)
     {
         $this->routeParameter = $routeParameter;
         $this->defaultIdentifier = $defaultIdentifier;

Site/IdentifierMapping.php

@@ -39,7 +39,7 @@ public function findIdentifierByHostname(string $hostname): ?string
         return null;
     }
 
-    public function findHostnamesByIdentifier(string $identifier, string $locale = null): array
+    public function findHostnamesByIdentifier(string $identifier, ?string $locale = null): array
     {
         if (!isset($this->mapping[$identifier])) {
             return [];

Site/IdentifierMappingInterface.php

@@ -11,5 +11,5 @@ public function findIdentifierByHostname(string $hostname): ?string;
     /**
      * @return string[]
      */
-    public function findHostnamesByIdentifier(string $identifier, string $locale = null): array;
+    public function findHostnamesByIdentifier(string $identifier, ?string $locale = null): array;
 }

Site/PrefixedPathIdentifiedSiteResolver.php

@@ -17,9 +17,8 @@ final class PrefixedPathIdentifiedSiteResolver implements SiteResolverInterface
 
     /**
      * @param string[] $identifiers
-     * @param string   $defaultIdentifier
      */
-    public function __construct(SiteRepositoryInterface $siteRepository, array $identifiers, string $defaultIdentifier = null)
+    public function __construct(SiteRepositoryInterface $siteRepository, array $identifiers, ?string $defaultIdentifier = null)
     {
         $this->siteRepository = $siteRepository;
         $this->defaultIdentifier = $defaultIdentifier;

Tests/Site/IdentifierMappingTest.php

@@ -47,7 +47,7 @@ protected function setUp(): void
     /**
      * @dataProvider identifierMappingData
      */
-    public function testFindIdentifierByHostnameReturnsCorrectIdentifier(string $hostname, string $expectedIdentifier = null): void
+    public function testFindIdentifierByHostnameReturnsCorrectIdentifier(string $hostname, ?string $expectedIdentifier = null): void
     {
         $identifier = $this->identifierMapping->findIdentifierByHostname($hostname);
 

composer.json

@@ -25,7 +25,7 @@
         }
     ],
     "require": {
-        "php": ">=7.3",
+        "php": ">=7.4",
         "symfony/config": "^4.4 | ^5.0 | ^6.0",
         "symfony/dependency-injection": "^4.4 | ^5.0 | ^6.0",
         "symfony/event-dispatcher": "^4.4 | ^5.0 | ^6.0",
@@ -34,7 +34,7 @@
         "symfony/yaml": "^4.4 | ^5.0 | ^6.0"
     },
     "require-dev": {
-        "bamarni/composer-bin-plugin": "^1.8",
+        "php-cs-fixer/shim": "^3.57",
         "phpunit/phpunit": "^8.5 | ^9.0",
         "symfony/doctrine-bridge": "^4.4 | ^5.0 | ^6.0",
         "symfony/form": "^4.4 | ^5.0 | ^6.0",
@@ -55,9 +55,10 @@
         }
     },
     "config": {
-        "sort-packages": true,
-        "allow-plugins": {
-            "bamarni/composer-bin-plugin": true
-        }
+        "sort-packages": true
+    },
+    "scripts": {
+        "php-cs-fixer-dry-run": "vendor/bin/php-cs-fixer fix --ansi --verbose --diff --dry-run",
+        "php-cs-fixer-fix": "vendor/bin/php-cs-fixer fix --ansi --verbose --diff"
     }
 }