Merge pull request #488 from garak/ci-fix-fixer

fix fixer check in CI

Author: garak

.github/workflows/build.yaml

@@ -6,7 +6,7 @@ on:
 
 jobs:
     check:
-        runs-on: ubuntu-22.04
+        runs-on: ubuntu-24.04
         steps:
             - name: Checkout
               uses: actions/checkout@v4
@@ -15,15 +15,17 @@ jobs:
             - name: Validate composer.json
               run: composer validate --strict --no-check-lock
     cs-fixer:
-        runs-on: ubuntu-22.04
+        runs-on: ubuntu-24.04
         name: PHP-CS-Fixer
         steps:
             - name: Checkout
               uses: actions/checkout@v4
             - name: Fix CS
               uses: docker://oskarstark/php-cs-fixer-ga
+              with:
+                args: --diff --dry-run
     tests:
-        runs-on: ubuntu-22.04
+        runs-on: ubuntu-24.04
         strategy:
             fail-fast: false
             matrix:

src/DependencyInjection/Compiler/AddExtensionsPass.php

@@ -13,7 +13,6 @@
  * @author Christophe Coevoet <[email protected]>
  *
  * @internal
- * @final
  */
 final class AddExtensionsPass implements CompilerPassInterface
 {

src/DependencyInjection/Compiler/AddProvidersPass.php

@@ -13,7 +13,6 @@
  * @author Christophe Coevoet <[email protected]>
  *
  * @internal
- * @final
  */
 final class AddProvidersPass implements CompilerPassInterface
 {

src/DependencyInjection/Compiler/AddRenderersPass.php

@@ -14,7 +14,6 @@
  * @author Christophe Coevoet <[email protected]>
  *
  * @internal
- * @final
  */
 final class AddRenderersPass implements CompilerPassInterface
 {

src/DependencyInjection/Compiler/AddVotersPass.php

@@ -13,7 +13,6 @@
  * @author Christophe Coevoet <[email protected]>
  *
  * @internal
- * @final
  */
 final class AddVotersPass implements CompilerPassInterface
 {

src/DependencyInjection/Compiler/MenuBuilderPass.php

@@ -11,7 +11,6 @@
  * @author Christophe Coevoet <[email protected]>
  *
  * @internal
- * @final
  */
 final class MenuBuilderPass implements CompilerPassInterface
 {

src/DependencyInjection/Compiler/RegisterMenusPass.php

@@ -13,7 +13,6 @@
  * @author Christophe Coevoet <[email protected]>
  *
  * @internal
- * @final
  */
 final class RegisterMenusPass implements CompilerPassInterface
 {

src/DependencyInjection/KnpMenuExtension.php

@@ -32,7 +32,7 @@ public function load(array $configs, ContainerBuilder $container): void
             $container->setParameter('knp_menu.renderer.twig.template', $config['twig']['template']);
         }
         if ($config['templating']) {
-            trigger_deprecation('knplabs/knp-menu-bundle', '3.3', 'Using the templating component is deprecated since version 3.3, this option will be removed in version 4.');
+            \trigger_deprecation('knplabs/knp-menu-bundle', '3.3', 'Using the templating component is deprecated since version 3.3, this option will be removed in version 4.');
             $loader->load('templating.xml');
         }
 

src/Provider/BuilderAliasProvider.php

@@ -19,7 +19,8 @@ final class BuilderAliasProvider implements MenuProviderInterface
     private array $builders = [];
 
     public function __construct(private KernelInterface $kernel, private ContainerInterface $container, private FactoryInterface $menuFactory)
-    {}
+    {
+    }
 
     /**
      * Looks for a menu with the bundle:class:method format.
@@ -79,7 +80,6 @@ private function getBuilder(string $bundleName, string $className): object
         $name = \sprintf('%s:%s', $bundleName, $className);
 
         if (!isset($this->builders[$name])) {
-
             $bundle = $this->kernel->getBundle($bundleName);
             $try = $bundle->getNamespace().'\\Menu\\'.$className;
 

src/Templating/Helper/MenuHelper.php

@@ -11,14 +11,15 @@
 class MenuHelper extends TemplatingHelper
 {
     public function __construct(private Helper $helper, private MatcherInterface $matcher, private MenuManipulator $menuManipulator)
-    {}
+    {
+    }
 
     /**
      * Retrieves an item following a path in the tree.
      *
-     * @param \Knp\Menu\ItemInterface|string $menu
+     * @param ItemInterface|string $menu
      *
-     * @return \Knp\Menu\ItemInterface
+     * @return ItemInterface
      */
     public function get($menu, array $path = [], array $options = [])
     {
@@ -28,8 +29,8 @@ public function get($menu, array $path = [], array $options = [])
     /**
      * Renders a menu with the specified renderer.
      *
-     * @param \Knp\Menu\ItemInterface|string|array $menu
-     * @param string                               $renderer
+     * @param ItemInterface|string|array $menu
+     * @param string                     $renderer
      *
      * @return string
      */

tests/Provider/BuilderAliasProviderTest.php

@@ -44,7 +44,7 @@ public function testGetExistentMenu(): void
 
     public function testGetContainerAwareMenu(): void
     {
-        if (!interface_exists(ContainerAwareInterface::class)) {
+        if (!\interface_exists(ContainerAwareInterface::class)) {
             self::markTestSkipped('missing interface');
         }
         $item = $this->getMockBuilder('Knp\Menu\ItemInterface')->getMock();

tests/Stubs/Menu/ContainerAwareBuilder.php

@@ -11,7 +11,7 @@ class ContainerAwareBuilder implements ContainerAwareInterface
 {
     private ContainerInterface $container;
 
-    public function setContainer(ContainerInterface $container = null): void
+    public function setContainer(?ContainerInterface $container = null): void
     {
         $this->container = $container;
     }