Skip to content


Subversion checkout URL

You can clone with
Download ZIP
Browse files

Merge branch 'hotfix/345'

Close #345
  • Loading branch information...
commit 1b3165f64873ed0f645d630d56006b7baf247eb9 2 parents 5446890 + b28e23a
@weierophinney weierophinney authored
19 docs/languages/en/modules/zend.mvc.controllers.rst
@@ -66,9 +66,9 @@ The ``InjectApplicationEventInterface`` defines simply two methods:
public function setEvent(Zend\EventManager\EventInterface $event);
public function getEvent();
-.. _zend.mvc.controllers.interfaces.service-manager-aware:
+.. _zend.mvc.controllers.interfaces.service-locator-aware:
In most cases, you should define your controllers such that dependencies are injected by the application's
@@ -78,16 +78,17 @@ However, occasionally you may have objects you wish to use in your controller th
paths. Examples include forms, paginators, navigation, etc. In these cases, you may decide that it doesn't make
sense to inject those objects every time the controller is used.
-The ``ServiceManagerAwareInterface`` interface hints to the ``ServiceManager`` that it should inject itself into
-the controller. It defines simply one method:
+The ``ServiceLocatorAwareInterface`` interface hints to the ``ServiceManager`` that it should inject itself into
+the controller. It defines two simple methods:
.. code-block:: php
- use Zend\ServiceManager\ServiceManager;
- use Zend\ServiceManager\ServiceManagerAwareInterface;
+ use Zend\ServiceManager\ServiceLocatorInterface;
+ use Zend\ServiceManager\ServiceLocatorAwareInterface;
- public function setServiceManager(ServiceManager $serviceManager);
+ public function setServiceLocator(ServiceLocatorInterface $serviceLocator);
+ public function getServiceLocator();
.. _zend.mvc.controllers.interfaces.event-manager-aware:
@@ -223,7 +224,7 @@ Interfaces and Collaborators
- ``Zend\Mvc\InjectApplicationEventInterface``
-- ``Zend\ServiceManager\ServiceManagerAwareInterface``
+- ``Zend\ServiceManager\ServiceLocatorAwareInterface``
- ``Zend\EventManager\EventManagerAwareInterface``
@@ -282,7 +283,7 @@ Interfaces and Collaborators
- ``Zend\Mvc\InjectApplicationEventInterface``
-- ``Zend\ServiceManager\ServiceManagerAwareInterface``
+- ``Zend\ServiceManager\ServiceLocatorAwareInterface``
- ``Zend\EventManager\EventManagerAwareInterface``
2  docs/languages/en/modules/zend.mvc.plugins.rst
@@ -106,7 +106,7 @@ The Forward Plugin
Occasionally, you may want to dispatch additional controllers from within the matched controller -- for instance,
you might use this approach to build up "widgetized" content. The ``Forward`` plugin helps enable this.
-For the ``Forward`` plugin to work, the controller calling it must be ``ServiceManagerAware``; otherwise, the
+For the ``Forward`` plugin to work, the controller calling it must be ``ServiceLocatorAware``; otherwise, the
plugin will be unable to retrieve a configured and injected instance of the requested controller.
The plugin exposes a single method, ``dispatch()``, which takes two arguments:
2  docs/languages/en/modules/
@@ -129,7 +129,7 @@ following:
retrieved and injected. This service is **not** shared, though each instance it creates is injected with a shared
instance of ``SharedEventManager``.
-- For objects that implement ``Zend\ServiceManager\ServiceManagerAwareInterface``, the ``ServiceManager`` will
+- For objects that implement ``Zend\ServiceManager\ServiceLocatorAwareInterface``, the ``ServiceManager`` will
inject itself into the object.
Finally, the ``ServiceManager`` registers itself as the ``ServiceManager`` service, and aliases itself to the class
2  docs/languages/en/modules/zend.service-manager.quick-start.rst
@@ -21,7 +21,7 @@ application will typically rely on good configuration in the ``ServiceManager``
configured correctly with their dependencies. When creating factories, however, you may want to interact with the
``ServiceManager`` to retrieve other services to inject as dependencies. Additionally, there are some cases where
you may want to receive the ``ServiceManager`` to lazy-retrieve dependencies; as such, you'll want to implement
-``ServiceManagerAwareInterface``, and learn the API of the ``ServiceManager``.
+``ServiceLocatorAwareInterface``, and learn the API of the ``ServiceManager``.
.. _zend.service-manager.quick-start.config:

0 comments on commit 1b3165f

Please sign in to comment.
Something went wrong with that request. Please try again.