Merge branch '2.8' into 3.4

javiereguiluz · javiereguiluz · commit c9b77a77e355 · 2018-11-15T10:44:39.000+01:00
* 2.8: [#10308] add use statement and fix array Encourage use of constants delete var_dump() functions in examples
diff --git a/components/event_dispatcher/generic_event.rst b/components/event_dispatcher/generic_event.rst
@@ -76,8 +76,6 @@ access the event arguments::
     );
     $dispatcher->dispatch('foo', $event);
 
-    var_dump($event['counter']);
-
     class FooListener
     {
         public function handler(GenericEvent $event)
@@ -97,8 +95,6 @@ Filtering data::
     $event = new GenericEvent($subject, array('data' => 'Foo'));
     $dispatcher->dispatch('foo', $event);
 
-    var_dump($event['data']);
-
     class FooListener
     {
         public function filter(GenericEvent $event)
diff --git a/doctrine/event_listeners_subscribers.rst b/doctrine/event_listeners_subscribers.rst
@@ -143,15 +143,16 @@ interface and have an event method for each event it subscribes to::
     use Doctrine\Common\EventSubscriber;
     // for Doctrine < 2.4: use Doctrine\ORM\Event\LifecycleEventArgs;
     use Doctrine\Common\Persistence\Event\LifecycleEventArgs;
+    use Doctrine\ORM\Events;
     use AppBundle\Entity\Product;
 
     class SearchIndexerSubscriber implements EventSubscriber
     {
         public function getSubscribedEvents()
         {
             return array(
-                'postPersist',
-                'postUpdate',
+                Events::postPersist,
+                Events::postUpdate,
             );
         }
 

Original file line number	Diff line number	Diff line change
`@@ -143,15 +143,16 @@ interface and have an event method for each event it subscribes to::`
`143`	`143`	`use Doctrine\Common\EventSubscriber;`
`144`	`144`	`// for Doctrine < 2.4: use Doctrine\ORM\Event\LifecycleEventArgs;`
`145`	`145`	`use Doctrine\Common\Persistence\Event\LifecycleEventArgs;`
	`146`	`+ use Doctrine\ORM\Events;`
`146`	`147`	`use AppBundle\Entity\Product;`
`147`	`148`
`148`	`149`	`class SearchIndexerSubscriber implements EventSubscriber`
`149`	`150`	`{`
`150`	`151`	`public function getSubscribedEvents()`
`151`	`152`	`{`
`152`	`153`	`return array(`
`153`		`- 'postPersist',`
`154`		`- 'postUpdate',`
	`154`	`+ Events::postPersist,`
	`155`	`+ Events::postUpdate,`
`155`	`156`	`);`
`156`	`157`	`}`
`157`	`158`