corrected errors

developer_manual/dependencyinjection.rst

@@ -3,7 +3,7 @@ Dependency Injection
 
 .. sectionauthor:: Bernhard Posselt <nukeawhale@gmail.com>
 
-Dependency Injection is a pattern that helps you to decouple dependencies between classes. The result is cleaner and more testable code. A good overview over how it works and what the benefits are can be seen on `Google's Clean Code Talks <http://www.youtube.com/watch?v=RlfLCWKxHJ0>`_
+`Dependency Injection <http://en.wikipedia.org/wiki/Dependency_injection>`_ is a programming pattern that helps you decouple dependencies between classes. The result is cleaner and more testable code. A good overview over how it works and what the benefits are can be seen on `Google's Clean Code Talks <http://www.youtube.com/watch?v=RlfLCWKxHJ0>`_
 
 Basic Problem
 -------------
@@ -36,7 +36,7 @@ This class prints out all prenames of a person and is called by using:
   PersonController::listNames();
 
 
-This looks like clean code until the first tests are written. **Tests are absolutely necessary in every application!. Do not think that your app is too small to require them.** The code will eventuell grow bigger and will have to be refactored. 
+This looks like clean code until the first tests are written. **Tests are absolutely necessary in every application! Do not think that your app is too small to require them.** The code will eventuell grow bigger and will have to be refactored. 
 
 If code is refactored code will be written. If code is being written there will be bugs. If there will be bugs then every possible failure must be tested. This is tiresome and must be automated.
 
@@ -45,20 +45,21 @@ If the code already comes with tests, this is not a problem: If the code is bein
 **Back to the above example**: How would a test for the SQL query look like? 
 
 * ``\OCP\DB`` needs to be `monkey patched <http://en.wikipedia.org/wiki/Monkey_patch>`_ to make the query accessible
+* The monkey patching must not conflict with other tests which use the same class
 * There must be a database connection or the test will fail
 * If data is inserted into the database, it needs to be deleted afterwards
 
-This is a significant amount of work that needs to be done for every test. If something is hard to do, people tend to not do it at all. Because tests are necessary they need to be written and therefore they must be as easy as possible.
+This is a significant amount of work that needs to be done for every test. If something is hard to do, people tend to not do it that often or even won't do it at all. Because tests are necessary they need to be written and therefore they must be as easy as possible.
 
 Inject Dependencies
 -------------------
 The reason why the class is hard to test is because it depends on ``\OCP\DB``. To be able to test it, the class needs to be replaced with a `mock object <http://en.wikipedia.org/wiki/Mock_object>`_.
 
-To do that, the class needs to be passed in. This can be done using a `Setter <http://stackoverflow.com/questions/4478661/getter-and-setter>`_, the constructor or as an additional method parameter. The most common method is constructor injection.
+The mock object is then passed to the class. This can be done by using a `Setter <http://stackoverflow.com/questions/4478661/getter-and-setter>`_ or by using an additional parameter in the constructor or method. The most common one is constructor injection.
 
-With this knowledge, the example can be refactored by simply passing in the the object, that does the database request. Now the first problem arises: ``\OCP\DB`` uses static methods so you cant use objects. This is because ownCloud does not use static correctly.
+With this knowledge, the example can be refactored by simply passing in the the object, which executes the database request. But at this point the first problem arises: ``\OCP\DB`` uses static methods and can not be instatiated as an object. This is because ownCloud uses static incorrectly.
 
-To get around this problem, you need to wrap the static method call, which is more like a function call, in an object and pass that in. Also by using constructor injection, the method must not be static. The refacored class would look like this:
+To get around this problem, the static method call, which is more like a function call, needs to be wrapped in an object. This object can now be passed in. Because the object is passed into the constructor the ``findNames`` method must not be static. The refactored class would look like this:
 
 .. code-block:: php
 
@@ -96,7 +97,7 @@ To get around this problem, you need to wrap the static method call, which is mo
   $controller->listNames();
 
 
-Now we can write a simple test for it:
+Now a first, simple test can be written:
 
 .. note:: The other methods that are called on the mock object need to be implemented too, but for the sake of simplicity this is not done in this example
 
@@ -168,16 +169,16 @@ The code also depends on another function: **echo**. Because this is usually har
   $controller = new PersonController($api);
   echo $controller->listNames();
 
-The output test can now be done as a simple string comparison
+The output test can now be implemented as a simple string comparison
 
 
 Use a container
 ---------------
-The above example works fine in small cases, but if the class depends on four other classes, that each depend on two other classes there need to be **eight** instantiations. If one parameter of a class changes, every line that instantiates the class will have to change too. 
+The above example works fine in small cases, but if the class depends on four other classes, that each depend on two other classes there will be **eight** instantiations. Also if one constructor parameter of a class changes, every line that instantiates the class will have to change too. 
 
 The solution is to define the injected classes as dependencies and let the system handle the rest.
 
-Pimple is a simple implementation of such a container. The documentation on how to use it can be seen on the `Pimple Homepage <http://pimple.sensiolabs.org/>`_
+Pimple is a simple implementation of such a container. The documentation on how to use it can be read on the `Pimple Homepage <http://pimple.sensiolabs.org/>`_
 
 The dependencies can now be defined like this:
 
@@ -209,4 +210,6 @@ The output could look like this:
   echo $container['PersonController']->listNames();
 
 
-Every needed dependency of a class is now automatically handled by the container. Also by using the **share** method, we can get rid of of the often used `anti-pattern Singleton <http://en.wikipedia.org/wiki/Singleton_pattern>`_ because every call to the container will only produce the object once.
+The container figures out all dependencies and instantiates the objects accordingly. Also by using the **share** method, the `anti-pattern Singleton <http://en.wikipedia.org/wiki/Singleton_pattern>`_ can be avoided. From the Pimple Tutorial::
+
+  By default, each time you get an object, Pimple returns a new instance of it. If you want the same instance to be returned for all calls, wrap your anonymous function with the share() method

developer_manual/tutorial.rst

@@ -144,7 +144,7 @@ Dependency Injection
 --------------------
 Dependency Injection helps you to create testable code. A good overview over how it works and what the benefits are can be seen on `Google's Clean Code Talks <http://www.youtube.com/watch?v=RlfLCWKxHJ0>`_
 
-The container is configured in :file:`appinfo/dicontainer.php`. We use Pimple for the container. The documentation on how to use it can be seen on the `Pimple Homepage <http://pimple.sensiolabs.org/>`_
+The container is configured in :file:`appinfo/dicontainer.php`. We use Pimple for the container. The documentation on how to use it can be read on the `Pimple Homepage <http://pimple.sensiolabs.org/>`_
 
 To add your own classes simply open the :file:`appinfo/dicontainer.php` and add a line like this to the constructor: