cr remarks

Author: konradoboza

src/lib/EventListener/UserProfileListener.php

@@ -69,14 +69,10 @@ public static function getSubscribedEvents(): array
 
     public function onUserUpdate(FormActionEvent $event): void
     {
-        if (!$this->doesOriginateFromProfileEditing()) {
-            return;
-        }
-
         $form = $event->getForm();
         $data = $event->getData();
 
-        if (!($data instanceof UserUpdateData) || !$this->isUserProfileUpdate($data)) {
+        if (!($data instanceof UserUpdateData) || !$this->isSupported($data)) {
             return;
         }
 
@@ -98,12 +94,7 @@ public function onUserUpdate(FormActionEvent $event): void
 
     public function onUserCancel(FormActionEvent $event): void
     {
-        if (!$this->doesOriginateFromProfileEditing()) {
-            return;
-        }
-
         $data = $event->getData();
-
         if (!($data instanceof UserUpdateData) || !$this->isSupported($data)) {
             return;
         }
@@ -112,16 +103,6 @@ public function onUserCancel(FormActionEvent $event): void
         $event->stopPropagation();
     }
 
-    private function doesOriginateFromProfileEditing(): bool
-    {
-        $request = $this->requestStack->getMainRequest();
-        if ($request === null) {
-            return false;
-        }
-
-        return $request->attributes->get('_route') === 'ibexa.user.profile.edit';
-    }
-
     private function createRedirectToUserProfile(User $user): RedirectResponse
     {
         return new RedirectResponse(
@@ -136,7 +117,9 @@ private function createRedirectToUserProfile(User $user): RedirectResponse
 
     private function isSupported(UserUpdateData $data): bool
     {
-        return $this->isUserProfileUpdate($data) && $this->canEditUserProfile($data->user);
+        return $this->isUserProfileUpdate($data) &&
+            $this->canEditUserProfile($data->user) &&
+            $this->doesOriginateFromProfileEditing();
     }
 
     private function createUpdateStruct(UserUpdateData $data, string $languageCode): UserUpdateStruct
@@ -173,4 +156,14 @@ private function canEditUserProfile(User $user): bool
             $this->permissionResolver->canUser('user', 'selfedit', $user)
             && (new IsProfileAvailable($this->configuration))->isSatisfiedBy($user);
     }
+
+    private function doesOriginateFromProfileEditing(): bool
+    {
+        $request = $this->requestStack->getMainRequest();
+        if ($request === null) {
+            return false;
+        }
+
+        return $request->attributes->get('_route') === 'ibexa.user.profile.edit';
+    }
 }