WIP: SF5 Compatibility, Drop FOS USER

BadPixxel · Apr 26, 2023 · 2e691ea · 2e691ea
1 parent 56138ab
commit 2e691ea
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git a/src/Controller/TemplatesAdminController.php b/src/Controller/TemplatesAdminController.php
@@ -23,7 +23,6 @@
 use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Component\HttpKernel\KernelInterface;
 use Symfony\Component\Security\Core\User\UserInterface;
-use Symfony\Component\Templating\EngineInterface;
 use Twig\Environment;
 use Twig\Error\LoaderError;
 use Twig\Loader\FilesystemLoader;
@@ -86,14 +85,14 @@ public function listAction(Request $request): Response
      * Complete Debug of an Email Template
      *
      * @param KernelInterface $kernel
-     * @param EngineInterface $twig
+     * @param Environment     $twig
      * @param string          $emailCode
      *
      * @throws LoaderError
      *
      * @return Response
      */
-    public function viewAction(KernelInterface $kernel, EngineInterface $twig, string $emailCode): Response
+    public function viewAction(KernelInterface $kernel, Environment $twig, string $emailCode): Response
     {
         //==============================================================================
         // Identify Email Class

diff --git a/src/Models/AbstractSmsAdmin.php b/src/Models/AbstractSmsAdmin.php
@@ -60,7 +60,6 @@ protected function configureListFields(ListMapper $list): void
             ->add('email')
             ->add('subject')
             ->add('textContent')
-            ->add('')
         ;
     }
 

diff --git a/src/Models/UserEmails/MetadataTrait.php b/src/Models/UserEmails/MetadataTrait.php
@@ -54,6 +54,13 @@ trait MetadataTrait
      * @ORM\Column(name="refreshed_at", type="datetime", nullable=true)
      */
     protected ?DateTime $refreshedAt = null;
+
+    /**
+     * @var null|GetEmailEventReportEvents[]
+     *
+     * @ORM\Column(name="events", type="array", nullable=true)
+     */
+    protected ?array $events = null;
     /**
      * @var array
      */
@@ -73,13 +80,6 @@ trait MetadataTrait
         //        Event::EVENT_UNSUBSCRIBED
     );
 
-    /**
-     * @var null|GetEmailEventReportEvents[]
-     *
-     * @ORM\Column(name="events", type="array", nullable=true)
-     */
-    private ?array $events = null;
-
     //==============================================================================
     // MAIN FUNCTIONS
     //==============================================================================

diff --git a/src/Resources/views/Admin/action_refresh.html.twig b/src/Resources/views/Admin/action_refresh.html.twig
@@ -10,7 +10,7 @@ file that was distributed with this source code.
 #}
 
 {% if object is defined and object.id is not empty %}
-    {% if admin.canAccessObject('edit', object) and admin.hasRoute('refresh') %}
+    {% if admin.checkAccess('edit', object) and admin.hasRoute('refresh') %}
         <li>
             <a class="sonata-action-element text-purple" href="{{ admin.generateObjectUrl('refresh', object) }}">
                 <i class="fa fa-refresh" aria-hidden="true"></i>