minor #6566 Fix misc deprecations (javiereguiluz)

javiereguiluz · javiereguiluz · commit 440980eb0683 · 2024-11-25T19:06:38.000+01:00
This PR was squashed before being merged into the 4.x branch. Discussion ---------- Fix misc deprecations Commits ------- 863350b Fix misc deprecations
diff --git a/src/Field/FormField.php b/src/Field/FormField.php
@@ -57,7 +57,6 @@ public static function addPanel($label = false, ?string $icon = null): self
     public static function addFieldset($label = false, ?string $icon = null): self
     {
         $field = new self();
-        $icon = $field->fixIconFormat($icon, 'FormField::addFieldset()');
 
         return $field
             ->setFieldFqcn(__CLASS__)
@@ -103,7 +102,6 @@ public static function addRow(string $breakpointName = ''): self
     public static function addTab(TranslatableInterface|string|false|null $label = null, ?string $icon = null): self
     {
         $field = new self();
-        $icon = $field->fixIconFormat($icon, 'FormField::addTab()');
 
         return $field
             ->setFieldFqcn(__CLASS__)
@@ -127,7 +125,6 @@ public static function addTab(TranslatableInterface|string|false|null $label = n
     public static function addColumn(int|string $cols = 'col', TranslatableInterface|string|false|null $label = null, ?string $icon = null, ?string $help = null): self
     {
         $field = new self();
-        // $icon = $field->fixIconFormat($icon, 'FormField::addTab()');
 
         return $field
             ->setFieldFqcn(__CLASS__)
@@ -143,7 +140,6 @@ public static function addColumn(int|string $cols = 'col', TranslatableInterface
 
     public function setIcon(string $iconCssClass): self
     {
-        $iconCssClass = $this->fixIconFormat($iconCssClass, 'FormField::setIcon()');
         $this->setCustomOption(self::OPTION_ICON, $iconCssClass);
 
         return $this;
@@ -178,19 +174,4 @@ private function hasLabelOrIcon(): bool
         return (null !== $this->dto->getLabel() && '' !== $this->dto->getLabel())
             || null !== $this->dto->getCustomOption(self::OPTION_ICON);
     }
-
-    private function fixIconFormat(?string $icon, string $methodName): ?string
-    {
-        if (null === $icon) {
-            return $icon;
-        }
-
-        if (!str_contains($icon, 'fa-') && !str_contains($icon, 'far-') && !str_contains($icon, 'fab-')) {
-            trigger_deprecation('easycorp/easyadmin-bundle', '4.4.0', 'The value passed as the $icon argument in "%s" method must be the full FontAwesome CSS class of the icon. For example, if you passed "user" before, you now must pass "fa fa-user" (or any style variant like "fa fa-solid fa-user").', $methodName);
-
-            $icon = sprintf('fa fa-%s', $icon);
-        }
-
-        return $icon;
-    }
 }
diff --git a/tests/PrettyUrlsTestApplication/config/packages/doctrine.php b/tests/PrettyUrlsTestApplication/config/packages/doctrine.php
@@ -1,6 +1,6 @@
 <?php
 
-$container->loadFromExtension('doctrine', [
+$config = [
     'dbal' => [
         'driver' => 'pdo_sqlite',
         'path' => '%kernel.cache_dir%/test_database.sqlite',
@@ -20,4 +20,14 @@
             ],
         ],
     ],
-]);
+];
+
+// TODO: make this config option unconditional when rising the Symfony requirements to 6.4
+// this option was added in doctrine-bundle PR 1554, released as Doctrine Bundle 2.7.1 (https://github.com/doctrine/DoctrineBundle/releases/tag/2.7.1)
+if (class_exists(Doctrine\Bundle\DoctrineBundle\DependencyInjection\Compiler\ControllerResolverPass::class)) {
+    $config['orm']['controller_resolver'] = [
+        'auto_mapping' => false,
+    ];
+}
+
+$container->loadFromExtension('doctrine', $config);
diff --git a/tests/PrettyUrlsTestApplication/config/packages/twig_component.php b/tests/PrettyUrlsTestApplication/config/packages/twig_component.php
@@ -0,0 +1,5 @@
+<?php
+
+$container->loadFromExtension('twig_component', [
+    'anonymous_template_directory' => 'components/',
+]);
diff --git a/tests/PrettyUrlsTestApplication/src/Controller/DashboardController.php b/tests/PrettyUrlsTestApplication/src/Controller/DashboardController.php
@@ -26,7 +26,7 @@ public function configureDashboard(): Dashboard
 
     public function configureMenuItems(): iterable
     {
-        yield MenuItem::linktoDashboard('Dashboard', 'fa fa-home');
+        yield MenuItem::linktoDashboard('Dashboard', 'fa6-solid:house');
         yield MenuItem::linkToCrud('Categories', 'fas fa-tags', Category::class);
         yield MenuItem::linkToCrud('Blog Posts', 'fas fa-tags', BlogPost::class);
     }
diff --git a/tests/PrettyUrlsTestApplication/src/Controller/SecondDashboardController.php b/tests/PrettyUrlsTestApplication/src/Controller/SecondDashboardController.php
@@ -35,7 +35,7 @@ public function configureDashboard(): Dashboard
 
     public function configureMenuItems(): iterable
     {
-        yield MenuItem::linktoDashboard('Dashboard', 'fa fa-home');
+        yield MenuItem::linktoDashboard('Dashboard', 'fa6-solid:house');
         yield MenuItem::linkToCrud('Users', 'fas fa-users', User::class);
     }
 }
diff --git a/tests/PrettyUrlsTestApplication/src/DataFixtures/AppFixtures.php b/tests/PrettyUrlsTestApplication/src/DataFixtures/AppFixtures.php
@@ -14,7 +14,7 @@
 
 class AppFixtures extends Fixture
 {
-    public function load(ObjectManager $manager)
+    public function load(ObjectManager $manager): void
     {
         for ($i = 0; $i < 30; ++$i) {
             $category = (new Category())
diff --git a/tests/TestApplication/config/packages/doctrine.php b/tests/TestApplication/config/packages/doctrine.php
@@ -1,6 +1,6 @@
 <?php
 
-$container->loadFromExtension('doctrine', [
+$config = [
     'dbal' => [
         'driver' => 'pdo_sqlite',
         'path' => '%kernel.cache_dir%/test_database.sqlite',
@@ -20,4 +20,14 @@
             ],
         ],
     ],
-]);
+];
+
+// TODO: make this config option unconditional when rising the Symfony requirements to 6.4
+// this option was added in doctrine-bundle PR 1554, released as Doctrine Bundle 2.7.1 (https://github.com/doctrine/DoctrineBundle/releases/tag/2.7.1)
+if (class_exists(Doctrine\Bundle\DoctrineBundle\DependencyInjection\Compiler\ControllerResolverPass::class)) {
+    $config['orm']['controller_resolver'] = [
+        'auto_mapping' => false,
+    ];
+}
+
+$container->loadFromExtension('doctrine', $config);
diff --git a/tests/TestApplication/config/packages/twig_component.php b/tests/TestApplication/config/packages/twig_component.php
@@ -0,0 +1,5 @@
+<?php
+
+$container->loadFromExtension('twig_component', [
+    'anonymous_template_directory' => 'components/',
+]);
diff --git a/tests/TestApplication/src/Controller/CustomHtmlAttributeDashboardController.php b/tests/TestApplication/src/Controller/CustomHtmlAttributeDashboardController.php
@@ -26,7 +26,7 @@ public function configureDashboard(): Dashboard
 
     public function configureMenuItems(): iterable
     {
-        yield MenuItem::linktoDashboard('Dashboard', 'fa fa-home');
+        yield MenuItem::linktoDashboard('Dashboard', 'fa6-solid:house');
         yield MenuItem::linkToCrud('Categories', 'fas fa-tags', Category::class)->setHtmlAttribute(
             'test-attribute', 'test'
         );
diff --git a/tests/TestApplication/src/Controller/DashboardController.php b/tests/TestApplication/src/Controller/DashboardController.php
@@ -26,7 +26,7 @@ public function configureDashboard(): Dashboard
 
     public function configureMenuItems(): iterable
     {
-        yield MenuItem::linktoDashboard('Dashboard', 'fa fa-home');
+        yield MenuItem::linktoDashboard('Dashboard', 'fa6-solid:house');
         yield MenuItem::linkToCrud('Categories', 'fas fa-tags', Category::class);
         yield MenuItem::linkToCrud('Blog Posts', 'fas fa-tags', BlogPost::class);
     }
diff --git a/tests/TestApplication/src/Controller/ErrorDashboardController.php b/tests/TestApplication/src/Controller/ErrorDashboardController.php
@@ -24,7 +24,7 @@ public function configureDashboard(): Dashboard
 
     public function configureMenuItems(): iterable
     {
-        yield MenuItem::linktoDashboard('Error Dashboard', 'fa fa-home');
+        yield MenuItem::linktoDashboard('Error Dashboard', 'fa6-solid:house');
         yield MenuItem::linkToCrud('ErrorFieldDoesNotBelongToAnyTabCrudController', null, ErrorFieldDoesNotBelongToAnyTabCrudController::class);
     }
 }
diff --git a/tests/TestApplication/src/Controller/FormFieldsetsCrudController.php b/tests/TestApplication/src/Controller/FormFieldsetsCrudController.php
@@ -20,12 +20,12 @@ public function configureFields(string $pageName): iterable
         return [
             // this field is out of any fieldset on purpose
             IdField::new('id'),
-            FormField::addFieldset('Fieldset 1')->setIcon('fa fa-cog')->addCssClass('bg-info'),
+            FormField::addFieldset('Fieldset 1')->setIcon('fa6-solid:gear')->addCssClass('bg-info'),
             TextField::new('title'),
-            FormField::addFieldset('Fieldset 2')->setIcon('fa fa-user')->addCssClass('bg-warning'),
+            FormField::addFieldset('Fieldset 2')->setIcon('fa6-solid:user')->addCssClass('bg-warning'),
             TextField::new('slug'),
             // this fieldset is added after all fields on purpose
-            FormField::addFieldset('Fieldset 3')->setIcon('fa fa-file-alt')->addCssClass('bg-danger'),
+            FormField::addFieldset('Fieldset 3')->setIcon('fa6-solid:file-lines')->addCssClass('bg-danger'),
         ];
     }
 }
diff --git a/tests/TestApplication/src/Controller/SecureDashboardController.php b/tests/TestApplication/src/Controller/SecureDashboardController.php
@@ -26,7 +26,7 @@ public function configureDashboard(): Dashboard
 
     public function configureMenuItems(): iterable
     {
-        yield MenuItem::linktoDashboard('Dashboard', 'fa fa-home');
+        yield MenuItem::linktoDashboard('Dashboard', 'fa6-solid:house');
         yield MenuItem::linkToCrud('Categories', 'fas fa-tags', Category::class);
         yield MenuItem::linkToCrud('Blog Posts', 'fas fa-tags', BlogPost::class);
     }
diff --git a/tests/TestApplication/src/DataFixtures/AppFixtures.php b/tests/TestApplication/src/DataFixtures/AppFixtures.php
@@ -14,7 +14,7 @@
 
 class AppFixtures extends Fixture
 {
-    public function load(ObjectManager $manager)
+    public function load(ObjectManager $manager): void
     {
         for ($i = 0; $i < 30; ++$i) {
             $category = (new Category())

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public function configureDashboard(): Dashboard`
`26`	`26`
`27`	`27`	`public function configureMenuItems(): iterable`
`28`	`28`	`{`
`29`		`- yield MenuItem::linktoDashboard('Dashboard', 'fa fa-home');`
	`29`	`+ yield MenuItem::linktoDashboard('Dashboard', 'fa6-solid:house');`
`30`	`30`	`yield MenuItem::linkToCrud('Categories', 'fas fa-tags', Category::class);`
`31`	`31`	`yield MenuItem::linkToCrud('Blog Posts', 'fas fa-tags', BlogPost::class);`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public function configureDashboard(): Dashboard`
`35`	`35`
`36`	`36`	`public function configureMenuItems(): iterable`
`37`	`37`	`{`
`38`		`- yield MenuItem::linktoDashboard('Dashboard', 'fa fa-home');`
	`38`	`+ yield MenuItem::linktoDashboard('Dashboard', 'fa6-solid:house');`
`39`	`39`	`yield MenuItem::linkToCrud('Users', 'fas fa-users', User::class);`
`40`	`40`	`}`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`
`15`	`15`	`class AppFixtures extends Fixture`
`16`	`16`	`{`
`17`		`- public function load(ObjectManager $manager)`
	`17`	`+ public function load(ObjectManager $manager): void`
`18`	`18`	`{`
`19`	`19`	`for ($i = 0; $i < 30; ++$i) {`
`20`	`20`	`$category = (new Category())`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public function configureDashboard(): Dashboard`
`24`	`24`
`25`	`25`	`public function configureMenuItems(): iterable`
`26`	`26`	`{`
`27`		`- yield MenuItem::linktoDashboard('Error Dashboard', 'fa fa-home');`
	`27`	`+ yield MenuItem::linktoDashboard('Error Dashboard', 'fa6-solid:house');`
`28`	`28`	`yield MenuItem::linkToCrud('ErrorFieldDoesNotBelongToAnyTabCrudController', null, ErrorFieldDoesNotBelongToAnyTabCrudController::class);`
`29`	`29`	`}`
`30`	`30`	`}`