Bug - Removed do-not-use alias for exporter service

sonata-project · Apr 29, 2021 · b7d6261 · b7d6261
1 parent d471f78
commit b7d6261
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Controller/CRUDController.php b/src/Controller/CRUDController.php
@@ -163,7 +163,7 @@ public function listAction()
             'form' => $formView,
             'datagrid' => $datagrid,
             'csrf_token' => $this->getCsrfToken('sonata.batch'),
-            'export_formats' => $this->has('sonata.admin.admin_exporter') ?
+            'export_formats' => $this->has('sonata.admin.admin_exporter.do-not-use') ?
                 $this->get('sonata.admin.admin_exporter.do-not-use')->getAvailableFormats($this->admin) :
                 $this->admin->getExportFormats(),
         ]);
@@ -940,7 +940,7 @@ public function exportAction(Request $request)
         $format = $request->get('format');
 
         // NEXT_MAJOR: remove the check
-        if (!$this->has('sonata.admin.admin_exporter')) {
+        if (!$this->has('sonata.admin.admin_exporter.do-not-use')) {
             @trigger_error(
                 'Not registering the exporter bundle is deprecated since version 3.14. You must register it to be able to use the export action in 4.0.',
                 \E_USER_DEPRECATED
@@ -954,7 +954,7 @@ public function exportAction(Request $request)
                 date('Y_m_d_H_i_s', strtotime('now')),
                 $format
             );
-            $exporter = $this->get('sonata.admin.exporter.do-not-use');
+            $exporter = $this->get('sonata.admin.exporter');
         } else {
             $adminExporter = $this->get('sonata.admin.admin_exporter.do-not-use');
             $allowedExportFormats = $adminExporter->getAvailableFormats($this->admin);

diff --git a/tests/Controller/CRUDControllerTest.php b/tests/Controller/CRUDControllerTest.php
@@ -274,7 +274,7 @@ protected function setUp(): void
         $this->container->set('templating', $templating);
         $this->container->set('twig', $twig);
         $this->container->set('session', $this->session);
-        $this->container->set('sonata.admin.exporter.do-not-use', $exporter);
+        $this->container->set('sonata.admin.exporter', $exporter);
         $this->container->set('sonata.admin.audit.manager.do-not-use', $this->auditManager);
         $this->container->set('sonata.admin.object.manipulator.acl.admin.do-not-use', $this->adminObjectAclManipulator);
         $this->container->set('security.csrf.token_manager', $this->csrfProvider);