Merge branch '2.6' into 5177-change-echo-and-print-in-examples

Conflicts: book/doctrine.rst components/event_dispatcher/introduction.rst components/serializer.rst
symfony · snoek09 · May 23, 2015 · May 23, 2015 · May 23, 2015 · May 23, 2015
commit f234cd33a84ff9d2b03734ece4f952c8fe2d6764
diff --git a/book/doctrine.rst b/book/doctrine.rst
@@ -1198,8 +1198,8 @@ to the given ``Category`` object via their ``category_id`` value.
 
         $category = $product->getCategory();
 
-        // prints "Proxies\AcmeStoreBundleEntityCategoryProxy"
-        dump(get_class($category));
+        // prints "Proxies\AppBundleEntityCategoryProxy"
+        echo get_class($category);
 
     This proxy object extends the true ``Category`` object, and looks and
     acts exactly like it. The difference is that, by using a proxy object,

diff --git a/components/event_dispatcher/introduction.rst b/components/event_dispatcher/introduction.rst
@@ -636,7 +636,7 @@ dispatched, are passed as arguments to the listener::
     {
         public function myEventListener(Event $event, $eventName, EventDispatcherInterface $dispatcher)
         {
-            // ... do something with the event name
+            echo $eventName;
         }
     }
 

diff --git a/components/serializer.rst b/components/serializer.rst
@@ -358,8 +358,8 @@ having unique identifiers::
     });
 
     $serializer = new Serializer(array($normalizer), array($encoder));
-    dump($serializer->serialize($org, 'json'));
-    // {"name":"Les-Tilleuls.coop","members":[{"name":"K\u00e9vin", organization: "Les-Tilleuls.coop"]}
+    echo $serializer->serialize($org, 'json');
+    // {"name":"Les-Tilleuls.coop","members":[{"name":"K\u00e9vin", organization: "Les-Tilleuls.coop"}]}
 
 JMSSerializer
 -------------
-Original file line number
+Diff line change
@@ Expand Up / @@ -636,7 +636,7 @@ dispatched, are passed as arguments to the listener:: @@
         {
             public function myEventListener(Event $event, $eventName, EventDispatcherInterface $dispatcher)
             {
-                // ... do something with the event name
+                echo $eventName;
             }
         }
@@ Expand Down @@