Rebase main

src/Controller/ProfileController.php

@@ -121,24 +121,26 @@ public function editAction(Request $request, UserNotifier $userNotifier): Respon
  }
 
  $oldEmail = $user->getEmail();
+ $oldUsername = $user->getUsername();
  $form = $this->createForm(ProfileFormType::class, $user);
 
  $form->handleRequest($request);
 
  if ($form->isSubmitted() && $form->isValid()) {
- $uow = $this->getEM()->getUnitOfWork();
- $uow->computeChangeSets();
- $changeSet = $uow->getEntityChangeSet($user);
+ $diffs = array_filter([
+ $oldEmail !== $user->getEmail() ? 'email' : null,
+ $oldUsername !== $user->getUsername() ? 'username' : null,
+ ]);
 
- $diffs = array_intersect(array_keys($changeSet), ['email', 'username']);
-
- if (!empty($diffs) && $user instanceof User) {
+ if (!empty($diffs)) {
  $reason = sprintf('Your %s has been changed', implode(' and ', $diffs));
- $userNotifier->notifyChange($changeSet['email'][0] ?? $user->getEmail(), $reason);
- }
 
- if ($oldEmail !== $user->getEmail()) {
- $user->resetPasswordRequest();
+ if ($oldEmail !== $user->getEmail()) {
+ $userNotifier->notifyChange($oldEmail, $reason);
+ $user->resetPasswordRequest();
+ }
+
+ $userNotifier->notifyChange($user->getEmail(), $reason);
  }
 
  $this->getEM()->persist($user);

src/Security/UserNotifier.php

@@ -1,4 +1,14 @@
-<?php
+<?php declare(strict_types=1);
+
+/*
+ * This file is part of Packagist.
+ *
+ * (c) Jordi Boggiano <[email protected]>
+ * Nils Adermann <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
 
 namespace App\Security;