Skip to content

Commit

Permalink
Merge branch '2.8'
Browse files Browse the repository at this point in the history
  • Loading branch information
wouterj committed Jul 28, 2015
2 parents 14b39c3 + a20ea5d commit 489adc2
Showing 1 changed file with 0 additions and 19 deletions.
19 changes: 0 additions & 19 deletions components/dependency_injection/factories.rst
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,8 @@ object::
}

To make the ``NewsletterManager`` object available as a service, you can
<<<<<<< HEAD
configure the service container to use the
``NewsletterFactory::createNewsletterManager()`` factory method:
=======
configure the service container to use the ``NewsletterManagerFactory``
factory class:
>>>>>>> 2.3

.. configuration-block::

Expand Down Expand Up @@ -82,18 +77,10 @@ factory class:
the configured class name may be used by compiler passes and therefore
should be set to a sensible value.

<<<<<<< HEAD
Now, the method will be called statically. If the factory class itself should
be instantiated and the resulting object's method called, configure the factory
itself as a service. In this case, the method (e.g. get) should be changed to
be non-static.
=======
When you specify the class to use for the factory (via ``factory_class``)
the method will be called statically. If the factory itself should be instantiated
and the resulting object's method called, configure the factory itself
as a service. In this case, the method (e.g. ``createNewsletterManager``)
should be changed to be non-static:
>>>>>>> 2.3

.. configuration-block::

Expand Down Expand Up @@ -130,18 +117,12 @@ should be changed to be non-static:
// ...
$container->register('newsletter_manager.factory', 'NewsletterManagerFactory');
<<<<<<< HEAD
$newsletterManager = new Definition();
$newsletterManager->setFactory(array(
new Reference('newsletter_manager.factory'),
'createNewsletterManager'
));
$container->setDefinition('newsletter_manager', $newsletterManager);
=======
The factory service is specified by its id name and not a reference
to the service itself. So, you do not need to use the ``@`` syntax for
this in YAML configurations.
>>>>>>> 2.3
Passing Arguments to the Factory Method
---------------------------------------
Expand Down

0 comments on commit 489adc2

Please sign in to comment.