Skip to content

Service container docs, reference section #101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
7 commits merged into from
Feb 17, 2011
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
[dependency_injection] Updating the extension documentation for the l…
…atest changes.
  • Loading branch information
weaverryan committed Feb 17, 2011
commit 47fd408dbb82cd190d2b001a26bbab71ffebccea
16 changes: 8 additions & 8 deletions guides/dependency_injection/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ invokes the service container extension inside the ``FrameworkBundle``:
.. code-block:: yaml

# app/config/config.yml
app.config:
framework:
charset: UTF-8
error_handler: null
csrf_protection:
Expand All @@ -412,16 +412,16 @@ invokes the service container extension inside the ``FrameworkBundle``:
.. code-block:: xml

<!-- app/config/config.xml -->
<app:config charset="UTF-8" error-handler="null">
<framework charset="UTF-8" error-handler="null">
<app:csrf-protection enabled="true" secret="xxxxxxxxxx" />
<app:router resource="%kernel.root_dir%/config/routing.xml" cache-warmer="true" />
<!-- ... -->
</app:config>
</framework>

.. code-block:: php

// app/config/config.php
$container->loadFromExtension('app', 'config', array(
$container->loadFromExtension('framework', array(
'charset' => 'UTF-8',
'error_handler' => null,
'csrf-protection' => array('enabled' => true, 'secret' => 'xxxxxxxxxx'),
Expand All @@ -430,9 +430,9 @@ invokes the service container extension inside the ``FrameworkBundle``:
));

When the configuration is parsed, the container looks for an extension that
can handle the ``app.config`` configuration directive. The extension in question,
can handle the ``framework`` configuration directive. The extension in question,
which lives in the ``FrameworkBundle``, is invoked and the service configuration
for the ``FrameworkBundle`` is loaded. If you remove the ``app.config`` key
for the ``FrameworkBundle`` is loaded. If you remove the ``framework`` key
from your application configuration file entirely, the core Symfony2 services
won't be loaded. The point is that you're in control: the Symfony2 framework
doesn't contain any magic or perform any actions that you don't have control
Expand Down Expand Up @@ -647,9 +647,9 @@ the framework.

.. tip::

Be sure that ``swiftmailer.config`` entry appears in your application
Be sure that ``swiftmailer`` entry appears in your application
configuration. As we mentioned in :ref:`service-container-extension-configuration`,
the ``swiftmailer.config`` invokes the service extension from the
the ``swiftmailer`` invokes the service extension from the
``SwiftmailerBundle``, which registers the ``mailer`` service.

.. index::
Expand Down
16 changes: 8 additions & 8 deletions reference/map.rst.inc
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
* **Bundle Configuration**:

* :doc:`FrameworkBundle (app.config) <bundle_configuration/FrameworkBundle>` |
* :doc:`DoctrineBundle (doctrine.*) <bundle_configuration/DoctrineBundle>` |
* :doc:`DoctrineMongoDBBundle (doctrine_odm.mongodb) <bundle_configuration/DoctrineMongoDBBundle>` |
* :doc:`SecurityBundle (security.*) </guides/security/config_reference>` |
* :doc:`FrameworkBundle (swiftmailer.config) <bundle_configuration/SwiftMailerBundle>` |
* :doc:`TwigBundle (twig.config) <bundle_configuration/TwigBundle>` |
* :doc:`WebProfilerBundle (webprofiler.config) <bundle_configuration/WebProfilerBundle>` |
* :doc:`ZendBundle (zend.config) <bundle_configuration/ZendBundle>`
* :doc:`FrameworkBundle (framework) <bundle_configuration/FrameworkBundle>` |
* :doc:`DoctrineBundle (doctrine) <bundle_configuration/DoctrineBundle>` |
* :doc:`DoctrineMongoDBBundle (doctrine_mongo_db) <bundle_configuration/DoctrineMongoDBBundle>` |
* :doc:`SecurityBundle (security) </guides/security/config_reference>` |
* :doc:`FrameworkBundle (swiftmailer) <bundle_configuration/SwiftMailerBundle>` |
* :doc:`TwigBundle (twig) <bundle_configuration/TwigBundle>` |
* :doc:`WebProfilerBundle (web_profiler) <bundle_configuration/WebProfilerBundle>` |
* :doc:`ZendBundle (zend) <bundle_configuration/ZendBundle>`

* :doc:`/guides/forms/fields/index`
* :doc:`/guides/validator/constraints/index`