Merge branch '3.4' into 4.1

javiereguiluz · javiereguiluz · commit 552c48865ad9 · 2018-11-15T10:45:40.000+01:00
* 3.4: [#10308] add use statement and fix array Encourage use of constants Update code-splitting.rst delete var_dump() functions in examples Update image to reflect given state machine example configuration
diff --git a/_images/components/workflow/pull_request.png b/_images/components/workflow/pull_request.png
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
@@ -144,14 +144,15 @@ interface and have an event method for each event it subscribes to::
     // for Doctrine < 2.4: use Doctrine\ORM\Event\LifecycleEventArgs;
     use Doctrine\Common\Persistence\Event\LifecycleEventArgs;
     use App\Entity\Product;
+    use Doctrine\ORM\Events;
 
     class SearchIndexerSubscriber implements EventSubscriber
     {
         public function getSubscribedEvents()
         {
             return array(
-                'postPersist',
-                'postUpdate',
+                Events::postPersist,
+                Events::postUpdate,
             );
         }
 
diff --git a/frontend/encore/code-splitting.rst b/frontend/encore/code-splitting.rst
@@ -20,7 +20,7 @@ clicked a link:
         const player = new VideoPlayer('some-element');
     });
 
-In this example, the VidePlayer module and everything it imports will be packaged
+In this example, the VideoPlayer module and everything it imports will be packaged
 into the final, built JavaScript file, even though it may not be very common for
 someone to actually need it. A better solution is to use `dynamic imports`_: load
 the code via AJAX when it's needed:

Original file line number	Diff line number	Diff line change
`@@ -144,14 +144,15 @@ interface and have an event method for each event it subscribes to::`
`144`	`144`	`// for Doctrine < 2.4: use Doctrine\ORM\Event\LifecycleEventArgs;`
`145`	`145`	`use Doctrine\Common\Persistence\Event\LifecycleEventArgs;`
`146`	`146`	`use App\Entity\Product;`
	`147`	`+ use Doctrine\ORM\Events;`
`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`