fix stan

Pushword · Nov 14, 2023 · 5161093 · 5161093
1 parent ef6041f
commit 5161093
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/packages/admin/src/AdminTrait.php b/packages/admin/src/AdminTrait.php
@@ -46,7 +46,7 @@ trait AdminTrait
 
     protected TokenStorageInterface $securityTokenStorage;
 
-    protected string $formFieldKey = '';
+    protected string $formFieldKey = 'admin_page_form_fields';
 
     /**
      * @var string

diff --git a/packages/admin/src/Menu/PageMenuProvider.php b/packages/admin/src/Menu/PageMenuProvider.php
@@ -58,9 +58,15 @@ public function getMenu(): ItemInterface
                     'route' => 'admin_page_list',
                     'routeParameters' => ['filter[host][value][]' => $host],
                 ]);
-                if ($this->isRequestingPageEdit($host) && ! $isRequesteingRedirection) {
-                    $hostMenu->setCurrent(true);
+                if (! $this->isRequestingPageEdit($host)) {
+                    continue;
                 }
+
+                if ($isRequesteingRedirection) {
+                    continue;
+                }
+
+                $hostMenu->setCurrent(true);
             }
         } elseif ($this->isRequestingPageEdit() && ! $isRequesteingRedirection) {
             $pageMenu->setCurrent(true);
@@ -79,9 +85,15 @@ public function getMenu(): ItemInterface
                     'route' => 'admin_redirection_list',
                     'routeParameters' => ['filter[host][value][]' => $host],
                 ]);
-                if ($this->isRequestingPageEdit($host) && $isRequesteingRedirection) {
-                    $hostMenu->setCurrent(true);
+                if (! $this->isRequestingPageEdit($host)) {
+                    continue;
                 }
+
+                if (! $isRequesteingRedirection) {
+                    continue;
+                }
+
+                $hostMenu->setCurrent(true);
             }
         } elseif ($this->isRequestingPageEdit() && $isRequesteingRedirection) {
             $redirectionMenu->setCurrent(true);

diff --git a/packages/admin/src/PageAdmin.php b/packages/admin/src/PageAdmin.php
@@ -102,8 +102,6 @@ protected function exists(string $name): bool
     protected function configureFormFields(FormMapper $form): void
     {
         $this->apps->switchCurrentApp($this->getSubject());
-
-        $this->formFieldKey = $this->formFieldKey ?: 'admin_page_form_fields';
         $fields = $this->getFormFields();
         if (! isset($fields[0]) || ! \is_array($fields[0]) || ! isset($fields[1]) || ! \is_array($fields[1])) {
             throw new \LogicException();