Fix autowire for export trait

Author: turegjorup

src/Controller/Admin/OIDCCrudController.php

@@ -6,7 +6,6 @@
 
 use App\Entity\OIDC;
 use App\Repository\SiteRepository;
-use App\Service\Exporter;
 use App\Trait\ExportCrudControllerTrait;
 use EasyCorp\Bundle\EasyAdminBundle\Config\Action;
 use EasyCorp\Bundle\EasyAdminBundle\Config\Actions;
@@ -24,10 +23,8 @@ class OIDCCrudController extends AbstractCrudController
     use ExportCrudControllerTrait;
 
     public function __construct(
-        Exporter $exporter,
         private readonly SiteRepository $siteRepository)
     {
-        $this->setExporter($exporter);
     }
 
     public static function getEntityFqcn(): string

src/Controller/Admin/ServerCrudController.php

@@ -9,7 +9,6 @@
 use App\Form\Type\Admin\MariaDbVersionFilter;
 use App\Form\Type\Admin\ServerTypeFilter;
 use App\Form\Type\Admin\SystemFilter;
-use App\Service\Exporter;
 use App\Trait\ExportCrudControllerTrait;
 use App\Types\DatabaseVersionType;
 use App\Types\HostingProviderType;
@@ -34,10 +33,8 @@ class ServerCrudController extends AbstractCrudController
     use ExportCrudControllerTrait;
 
     public function __construct(
-        Exporter $exporter,
         private readonly RequestStack $requestStack,
     ) {
-        $this->setExporter($exporter);
     }
 
     public static function getEntityFqcn(): string

src/Controller/Admin/SiteCrudController.php

@@ -12,7 +12,6 @@
 use App\Admin\Field\SiteTypeField;
 use App\Admin\Field\VersionField;
 use App\Entity\Site;
-use App\Service\Exporter;
 use App\Trait\ExportCrudControllerTrait;
 use EasyCorp\Bundle\EasyAdminBundle\Config\Action;
 use EasyCorp\Bundle\EasyAdminBundle\Config\Actions;
@@ -26,9 +25,8 @@ class SiteCrudController extends AbstractCrudController
 {
     use ExportCrudControllerTrait;
 
-    public function __construct(Exporter $exporter)
+    public function __construct()
     {
-        $this->setExporter($exporter);
     }
 
     public static function getEntityFqcn(): string

src/Trait/ExportCrudControllerTrait.php

@@ -13,21 +13,21 @@
 use EasyCorp\Bundle\EasyAdminBundle\Factory\FilterFactory;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Translation\TranslatableMessage;
+use Symfony\Contracts\Service\Attribute\Required;
 
 trait ExportCrudControllerTrait
 {
     private FilterFactory $filterFactory;
+    private Exporter $exporter;
 
-    /**
-     * @required
-     */
-    public function autowireExportCrudControllerTrait(FilterFactory $filterFactory): void
+    #[Required]
+    public function setFilterFactory(FilterFactory $filterFactory): void
     {
         $this->filterFactory = $filterFactory;
     }
-    private Exporter $exporter;
 
-    protected function setExporter(Exporter $exporter): void
+    #[Required]
+    public function setExporter(Exporter $exporter): void
     {
         $this->exporter = $exporter;
     }