feat: Moved Log entity to a different namespace to handle with a di…

…fferent entity-manager and avoid flushing Log in the same transaction with other entities
roadiz · Jul 12, 2023 · dab54cd · dab54cd
1 parent e9d9f18
commit dab54cd
Show file tree

Hide file tree

Showing 57 changed files with 86 additions and 414 deletions.
diff --git a/src/AjaxControllers/AjaxAbstractFieldsController.php b/src/AjaxControllers/AjaxAbstractFieldsController.php
@@ -10,9 +10,6 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
-/**
- * @package Themes\Rozier\AjaxControllers
- */
 abstract class AjaxAbstractFieldsController extends AbstractAjaxController
 {
     private HandlerFactoryInterface $handlerFactory;

diff --git a/src/AjaxControllers/AjaxCustomFormFieldsController.php b/src/AjaxControllers/AjaxCustomFormFieldsController.php
@@ -8,9 +8,6 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
-/**
- * @package Themes\Rozier\AjaxControllers
- */
 class AjaxCustomFormFieldsController extends AjaxAbstractFieldsController
 {
     /**

diff --git a/src/AjaxControllers/AjaxCustomFormsExplorerController.php b/src/AjaxControllers/AjaxCustomFormsExplorerController.php
@@ -13,9 +13,6 @@
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Themes\Rozier\Models\CustomFormModel;
 
-/**
- * @package Themes\Rozier\AjaxControllers
- */
 class AjaxCustomFormsExplorerController extends AbstractAjaxController
 {
     private UrlGeneratorInterface $urlGenerator;

diff --git a/src/AjaxControllers/AjaxDocumentsExplorerController.php b/src/AjaxControllers/AjaxDocumentsExplorerController.php
@@ -16,9 +16,6 @@
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Themes\Rozier\Models\DocumentModel;
 
-/**
- * @package Themes\Rozier\AjaxControllers
- */
 class AjaxDocumentsExplorerController extends AbstractAjaxController
 {
     private RendererInterface $renderer;

diff --git a/src/AjaxControllers/AjaxEntitiesExplorerController.php b/src/AjaxControllers/AjaxEntitiesExplorerController.php
@@ -26,9 +26,6 @@
 use Themes\Rozier\Explorer\SettingExplorerItem;
 use Themes\Rozier\Explorer\UserExplorerItem;
 
-/**
- * @package Themes\Rozier\AjaxControllers
- */
 class AjaxEntitiesExplorerController extends AbstractAjaxController
 {
     private RendererInterface $renderer;

diff --git a/src/AjaxControllers/AjaxExplorerProviderController.php b/src/AjaxControllers/AjaxExplorerProviderController.php
@@ -15,9 +15,6 @@
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Exception\InvalidParameterException;
 
-/**
- * @package Themes\Rozier\AjaxControllers
- */
 class AjaxExplorerProviderController extends AbstractAjaxController
 {
     private ContainerInterface $psrContainer;

diff --git a/src/AjaxControllers/AjaxFolderTreeController.php b/src/AjaxControllers/AjaxFolderTreeController.php
@@ -10,9 +10,6 @@
 use Themes\Rozier\Widgets\FolderTreeWidget;
 use Themes\Rozier\Widgets\TreeWidgetFactory;
 
-/**
- * @package Themes\Rozier\AjaxControllers
- */
 class AjaxFolderTreeController extends AbstractAjaxController
 {
     private TreeWidgetFactory $treeWidgetFactory;

diff --git a/src/AjaxControllers/AjaxFoldersController.php b/src/AjaxControllers/AjaxFoldersController.php
@@ -11,9 +11,6 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
-/**
- * @package Themes\Rozier\AjaxControllers
- */
 class AjaxFoldersController extends AbstractAjaxController
 {
     private HandlerFactoryInterface $handlerFactory;

diff --git a/src/AjaxControllers/AjaxFoldersExplorerController.php b/src/AjaxControllers/AjaxFoldersExplorerController.php
@@ -9,9 +9,6 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
-/**
- * @package Themes\Rozier\AjaxControllers
- */
 class AjaxFoldersExplorerController extends AbstractAjaxController
 {
     /**

diff --git a/src/AjaxControllers/AjaxNodeTreeController.php b/src/AjaxControllers/AjaxNodeTreeController.php
@@ -15,9 +15,6 @@
 use Themes\Rozier\Widgets\NodeTreeWidget;
 use Themes\Rozier\Widgets\TreeWidgetFactory;
 
-/**
- * @package Themes\Rozier\AjaxControllers
- */
 class AjaxNodeTreeController extends AbstractAjaxController
 {
     private NodeChrootResolver $nodeChrootResolver;

diff --git a/src/AjaxControllers/AjaxNodeTypeFieldsController.php b/src/AjaxControllers/AjaxNodeTypeFieldsController.php
@@ -8,9 +8,6 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
-/**
- * @package Themes\Rozier\AjaxControllers
- */
 class AjaxNodeTypeFieldsController extends AjaxAbstractFieldsController
 {
     /**

diff --git a/src/AjaxControllers/AjaxNodeTypesController.php b/src/AjaxControllers/AjaxNodeTypesController.php
@@ -12,9 +12,6 @@
 use Symfony\Component\Routing\Exception\InvalidParameterException;
 use Themes\Rozier\Models\NodeTypeModel;
 
-/**
- * @package Themes\Rozier\AjaxControllers
- */
 class AjaxNodeTypesController extends AjaxAbstractFieldsController
 {
     /**

diff --git a/src/AjaxControllers/AjaxNodesController.php b/src/AjaxControllers/AjaxNodesController.php
@@ -25,9 +25,6 @@
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\Workflow\Registry;
 
-/**
- * @package Themes\Rozier\AjaxControllers
- */
 class AjaxNodesController extends AbstractAjaxController
 {
     private NodeNamePolicyInterface $nodeNamePolicy;

diff --git a/src/AjaxControllers/AjaxSearchNodesSourcesController.php b/src/AjaxControllers/AjaxSearchNodesSourcesController.php
@@ -14,9 +14,6 @@
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 
-/**
- * @package Themes\Rozier\AjaxControllers
- */
 class AjaxSearchNodesSourcesController extends AbstractAjaxController
 {
     public const RESULT_COUNT = 8;

diff --git a/src/AjaxControllers/AjaxTagTreeController.php b/src/AjaxControllers/AjaxTagTreeController.php
@@ -10,9 +10,6 @@
 use Themes\Rozier\Widgets\TagTreeWidget;
 use Themes\Rozier\Widgets\TreeWidgetFactory;
 
-/**
- * @package Themes\Rozier\AjaxControllers
- */
 class AjaxTagTreeController extends AbstractAjaxController
 {
     private TreeWidgetFactory $treeWidgetFactory;

diff --git a/src/AjaxControllers/AjaxTagsController.php b/src/AjaxControllers/AjaxTagsController.php
@@ -19,9 +19,6 @@
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Themes\Rozier\Models\TagModel;
 
-/**
- * @package Themes\Rozier\AjaxControllers
- */
 class AjaxTagsController extends AbstractAjaxController
 {
     private HandlerFactoryInterface $handlerFactory;

diff --git a/src/Controllers/Attributes/AttributeGroupController.php b/src/Controllers/Attributes/AttributeGroupController.php
@@ -10,9 +10,6 @@
 use Symfony\Component\HttpFoundation\Request;
 use Themes\Rozier\Controllers\AbstractAdminController;
 
-/**
- * @package Themes\Rozier\Controllers\Attributes
- */
 class AttributeGroupController extends AbstractAdminController
 {
     /**

diff --git a/src/Controllers/CustomForms/CustomFormAnswersController.php b/src/Controllers/CustomForms/CustomFormAnswersController.php
@@ -15,9 +15,6 @@
 use Symfony\Component\Validator\Constraints\NotNull;
 use Themes\Rozier\RozierApp;
 
-/**
- * @package Themes\Rozier\Controllers
- */
 class CustomFormAnswersController extends RozierApp
 {
     /**
@@ -28,7 +25,7 @@ class CustomFormAnswersController extends RozierApp
      *
      * @return Response
      */
-    public function listAction(Request $request, int $customFormId)
+    public function listAction(Request $request, int $customFormId): Response
     {
         $this->denyAccessUnlessGranted('ROLE_ACCESS_CUSTOMFORMS');
         /*
@@ -55,14 +52,14 @@ public function listAction(Request $request, int $customFormId)
     }
 
     /**
-     * Return an deletion form for requested node-type.
+     * Return a deletion form for requested node-type.
      *
      * @param Request $request
      * @param int $customFormAnswerId
      *
      * @return Response
      */
-    public function deleteAction(Request $request, int $customFormAnswerId)
+    public function deleteAction(Request $request, int $customFormAnswerId): Response
     {
         $this->denyAccessUnlessGranted('ROLE_ACCESS_CUSTOMFORMS_DELETE');
 
@@ -106,7 +103,7 @@ public function deleteAction(Request $request, int $customFormAnswerId)
      *
      * @return FormInterface
      */
-    private function buildDeleteForm(CustomFormAnswer $customFormAnswer)
+    private function buildDeleteForm(CustomFormAnswer $customFormAnswer): FormInterface
     {
         $builder = $this->createFormBuilder()
                         ->add('customFormAnswerId', HiddenType::class, [

diff --git a/src/Controllers/CustomForms/CustomFormFieldAttributesController.php b/src/Controllers/CustomForms/CustomFormFieldAttributesController.php
@@ -4,26 +4,25 @@
 
 namespace Themes\Rozier\Controllers\CustomForms;
 
-use Doctrine\Common\Collections\Collection;
 use RZ\Roadiz\CoreBundle\Entity\CustomFormAnswer;
 use RZ\Roadiz\CoreBundle\Entity\CustomFormFieldAttribute;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
 use Themes\Rozier\RozierApp;
+use Twig\Error\RuntimeError;
 
-/**
- * @package Themes\Rozier\Controllers
- */
 class CustomFormFieldAttributesController extends RozierApp
 {
     /**
      * List every node-types.
      *
      * @param Request $request
-     * @param int     $customFormAnswerId
+     * @param int $customFormAnswerId
      *
-     * @return \Symfony\Component\HttpFoundation\Response
+     * @return Response
+     * @throws RuntimeError
      */
-    public function listAction(Request $request, int $customFormAnswerId)
+    public function listAction(Request $request, int $customFormAnswerId): Response
     {
         $this->denyAccessUnlessGranted('ROLE_ACCESS_CUSTOMFORMS');
         /*

diff --git a/src/Controllers/CustomForms/CustomFormFieldsController.php b/src/Controllers/CustomForms/CustomFormFieldsController.php
@@ -16,10 +16,8 @@
 use Symfony\Component\Validator\Constraints\NotNull;
 use Themes\Rozier\Forms\CustomFormFieldType;
 use Themes\Rozier\RozierApp;
+use Twig\Error\RuntimeError;
 
-/**
- * @package Themes\Rozier\Controllers
- */
 class CustomFormFieldsController extends RozierApp
 {
     /**
@@ -30,7 +28,7 @@ class CustomFormFieldsController extends RozierApp
      *
      * @return Response
      */
-    public function listAction(Request $request, int $customFormId)
+    public function listAction(Request $request, int $customFormId): Response
     {
         $this->denyAccessUnlessGranted('ROLE_ACCESS_CUSTOMFORMS');
 
@@ -56,7 +54,7 @@ public function listAction(Request $request, int $customFormId)
      *
      * @return Response
      */
-    public function editAction(Request $request, int $customFormFieldId)
+    public function editAction(Request $request, int $customFormFieldId): Response
     {
         $this->denyAccessUnlessGranted('ROLE_ACCESS_CUSTOMFORMS');
 
@@ -95,69 +93,66 @@ public function editAction(Request $request, int $customFormFieldId)
     }
 
     /**
-     * Return an creation form for requested node-type.
+     * Return a creation form for requested node-type.
      *
      * @param Request $request
-     * @param int     $customFormId
+     * @param int $customFormId
      *
      * @return Response
+     * @throws RuntimeError
      */
-    public function addAction(Request $request, int $customFormId)
+    public function addAction(Request $request, int $customFormId): Response
     {
         $this->denyAccessUnlessGranted('ROLE_ACCESS_CUSTOMFORMS');
 
-        $field = new CustomFormField();
         $customForm = $this->em()->find(CustomForm::class, $customFormId);
+        if ($customForm === null) {
+            throw new ResourceNotFoundException();
+        }
+
+        $field = new CustomFormField();
         $field->setCustomForm($customForm);
+        $this->assignation['customForm'] = $customForm;
+        $this->assignation['field'] = $field;
+        $form = $this->createForm(CustomFormFieldType::class, $field);
+        $form->handleRequest($request);
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            try {
+                $this->em()->persist($field);
+                $this->em()->flush();
 
-        if (
-            $customForm !== null &&
-            $field !== null
-        ) {
-            $this->assignation['customForm'] = $customForm;
-            $this->assignation['field'] = $field;
-            $form = $this->createForm(CustomFormFieldType::class, $field);
-            $form->handleRequest($request);
+                $msg = $this->getTranslator()->trans(
+                    'customFormField.%name%.created',
+                    ['%name%' => $field->getName()]
+                );
+                $this->publishConfirmMessage($request, $msg, $field);
 
-            if ($form->isSubmitted() && $form->isValid()) {
-                try {
-                    $this->em()->persist($field);
-                    $this->em()->flush();
-
-                    $msg = $this->getTranslator()->trans(
-                        'customFormField.%name%.created',
-                        ['%name%' => $field->getName()]
-                    );
-                    $this->publishConfirmMessage($request, $msg, $field);
-
-                    /*
-                     * Redirect to update schema page
-                     */
-                    return $this->redirectToRoute(
-                        'customFormFieldsListPage',
-                        [
-                            'customFormId' => $customFormId,
-                        ]
-                    );
-                } catch (Exception $e) {
-                    $msg = $e->getMessage();
-                    $this->publishErrorMessage($request, $msg, $field);
-                    /*
-                     * Redirect to add page
-                     */
-                    return $this->redirectToRoute(
-                        'customFormFieldsAddPage',
-                        ['customFormId' => $customFormId]
-                    );
-                }
+                /*
+                 * Redirect to update schema page
+                 */
+                return $this->redirectToRoute(
+                    'customFormFieldsListPage',
+                    [
+                        'customFormId' => $customFormId,
+                    ]
+                );
+            } catch (Exception $e) {
+                $msg = $e->getMessage();
+                $this->publishErrorMessage($request, $msg, $field);
+                /*
+                 * Redirect to add page
+                 */
+                return $this->redirectToRoute(
+                    'customFormFieldsAddPage',
+                    ['customFormId' => $customFormId]
+                );
             }
-
-            $this->assignation['form'] = $form->createView();
-
-            return $this->render('@RoadizRozier/custom-form-fields/add.html.twig', $this->assignation);
         }
 
-        throw new ResourceNotFoundException();
+        $this->assignation['form'] = $form->createView();
+
+        return $this->render('@RoadizRozier/custom-form-fields/add.html.twig', $this->assignation);
     }
 
     /**