Skip to content

Commit fbcaf4f

Browse files
authored
Merge pull request #70 from sensiolabs/move-components/dependency-injection
Move dependency injection articles to topic
2 parents 3918ee8 + dbaaf7f commit fbcaf4f

22 files changed

+1402
-1626
lines changed

_build/redirection_map

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
/cookbook/console /components/console
1313
/cookbook/tools/autoloader /components/class_loader
1414
/cookbook/tools/finder /components/finder
15-
/cookbook/service_container/parentservices /components/dependency_injection/parentservices
16-
/cookbook/service_container/factories /components/dependency_injection/factories
17-
/cookbook/service_container/tags /components/dependency_injection/tags
15+
/cookbook/service_container/parentservices /service_container/parent_services
16+
/cookbook/service_container/factories /service_container/factories
17+
/cookbook/service_container/tags /service_container/tags
1818
/reference/configuration/mongodb /bundles/DoctrineMongoDBBundle/config
1919
/reference/YAML /components/yaml
2020
/cookbook/console/generating_urls /cookbook/console/sending_emails
@@ -247,8 +247,17 @@
247247
/components/debug/class_loader /components/debug
248248
/components/debug/introduction /components/debug
249249
/components/debug/index /components/debug
250+
/components/dependency_injection/advanced /service_container/alias_private
251+
/components/dependency_injection/definitions /service_container/definitions
250252
/components/dependency_injection/introduction /components/dependency_injection
251253
/components/dependency_injection/index /components/dependency_injection
254+
/components/dependency_injection/factories /service_container/factories
255+
/components/dependency_injection/lazy_services /service_container/lazy_services
256+
/components/dependency_injection/parameters /service_container/parameters
257+
/components/dependency_injection/parent_services /service_container/parent_services
258+
/components/dependency_injection/synthetic_services /service_container/synthetic_services
259+
/components/dependency_injection/tags /service_container/tags
260+
/components/dependency_injection/types /service_container/injection_types
252261
/components/event_dispatcher/introduction /components/event_dispatcher
253262
/components/expression_language/introduction /components/expression_language
254263
/components/expression_language/index /components/expression_language

components/dependency_injection/advanced.rst

Lines changed: 0 additions & 220 deletions
This file was deleted.

components/dependency_injection/compilation.rst

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ The service container can be compiled for various reasons. These reasons
88
include checking for any potential issues such as circular references and
99
making the container more efficient by resolving parameters and removing
1010
unused services. Also, certain features - like using
11-
:doc:`parent services </components/dependency_injection/parentservices>`
11+
:doc:`parent services </service_container/parent_services>`
1212
- require the container to be compiled.
1313

1414
It is compiled by running::
@@ -47,7 +47,7 @@ and can be registered with the container with::
4747
The main work of the extension is done in the ``load`` method. In the ``load``
4848
method you can load configuration from one or more configuration files as
4949
well as manipulate the container definitions using the methods shown in
50-
:doc:`/components/dependency_injection/definitions`.
50+
:doc:`/service_container/definitions`.
5151

5252
The ``load`` method is passed a fresh container to set up, which is then
5353
merged afterwards into the container it is registered with. This allows
@@ -331,10 +331,10 @@ being compiled::
331331
}
332332

333333
The container's parameters and definitions can be manipulated using the
334-
methods described in the :doc:`/components/dependency_injection/definitions`.
335-
One common thing to do in a compiler pass is to search for all services
336-
that have a certain tag in order to process them in some way or dynamically
337-
plug each into some other service.
334+
methods described in the :doc:`/service_container/definitions`. One common
335+
thing to do in a compiler pass is to search for all services that have a
336+
certain tag in order to process them in some way or dynamically plug each into
337+
some other service.
338338

339339
Registering a Compiler Pass
340340
---------------------------
@@ -519,4 +519,3 @@ have the cache will be considered stale.
519519

520520
In the full-stack framework the compilation and caching of the container
521521
is taken care of for you.
522-

0 commit comments

Comments
 (0)