From 1f43dbfc5e550ab82ef64d6a4723e46067bb15c9 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 25 Jan 2012 15:55:08 +0100 Subject: [PATCH] removed conflict merge --- book/part12.rst | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/book/part12.rst b/book/part12.rst index f8174c24a58..83ac3977f5d 100644 --- a/book/part12.rst +++ b/book/part12.rst @@ -86,15 +86,11 @@ injection; all dependencies of our objects were injected into their constructors (for instance, the event dispatchers were injected into the framework so that we had total control of its creation and configuration). -Does it mean that we have to make a choice between flexibility, -<<<<<<< .merge_file_8XJJxl -customization, ease of testing and not having to copy and paste the same code -======= -customization, ease of testing and not to copy and paste the same code ->>>>>>> .merge_file_kv38Yk -into each application front controller? As you might expect, there is a -solution. We can solve all these issues and some more by using the Symfony2 -dependency injection container: +Does it mean that we have to make a choice between flexibility, customization, +ease of testing and not to copy and paste the same code into each application +front controller? As you might expect, there is a solution. We can solve all +these issues and some more by using the Symfony2 dependency injection +container: .. code-block:: json