Merge branch '4.3' into 4.4

OskarStark · OskarStark · commit 4a616f1a991a · 2019-10-23T10:28:53.000+02:00
* 4.3:
  Changing my e-mail
  Fix Doctrine Entity Listeners event class
diff --git a/contributing/code_of_conduct/care_team.rst b/contributing/code_of_conduct/care_team.rst
@@ -31,7 +31,7 @@ of them at once by emailing **care@symfony.com**:
 
 * **Michelle Sanver**
 
-  * *E-mail*: hello [at] michellesanver.com
+  * *E-mail*: michelle [at] liip.ch
   * *Twitter*: `@michellesanver <https://twitter.com/michellesanver>`_
   * *SymfonyConnect*: `michellesanver <https://connect.symfony.com/profile/michellesanver>`_
 
diff --git a/doctrine/events.rst b/doctrine/events.rst
@@ -233,13 +233,13 @@ define a listener for the ``postUpdate`` Doctrine event::
     namespace App\EventListener;
 
     use App\Entity\User;
-    use Doctrine\ORM\Event\PreUpdateEventArgs;
+    use Doctrine\Common\Persistence\Event\LifecycleEventArgs;
 
     class UserChangedNotifier
     {
         // the entity listener methods receive two arguments:
         // the entity instance and the lifecycle event
-        public function postUpdate(User $user, PreUpdateEventArgs $event)
+        public function postUpdate(User $user, LifecycleEventArgs $event)
         {
             // ... do something to notify the changes
         }

Original file line number	Diff line number	Diff line change
@@ -233,13 +233,13 @@ define a listener for the ``postUpdate`` Doctrine event::
`233`	`233`	`namespace App\EventListener;`
`234`	`234`
`235`	`235`	`use App\Entity\User;`
`236`		`- use Doctrine\ORM\Event\PreUpdateEventArgs;`
	`236`	`+ use Doctrine\Common\Persistence\Event\LifecycleEventArgs;`
`237`	`237`
`238`	`238`	`class UserChangedNotifier`
`239`	`239`	`{`
`240`	`240`	`// the entity listener methods receive two arguments:`
`241`	`241`	`// the entity instance and the lifecycle event`
`242`		`- public function postUpdate(User $user, PreUpdateEventArgs $event)`
	`242`	`+ public function postUpdate(User $user, LifecycleEventArgs $event)`
`243`	`243`	`{`
`244`	`244`	`// ... do something to notify the changes`
`245`	`245`	`}`