[book][doctrine] A few small tweaks - also trying to add some PHP config

Author: weaverryan

book/doctrine/dbal.rst

@@ -132,16 +132,17 @@ which is the first one defined or the one configured via the
 Each connection is also accessible via the ``doctrine.dbal.[name]_connection``
 service where ``[name]`` if the name of the connection.
 
-Registering custom Mapping Types
+Registering Custom Mapping Types
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-You can register custom types through the configuration. They will be added to
-all configured connections.
+You can register custom mapping types through the configuration. They will
+be added to all configured connections.
 
 .. configuration-block::
 
  .. code-block:: yaml
 
+ # app/config/config.yml
  doctrine:
  dbal:
  types:
@@ -150,6 +151,7 @@ all configured connections.
 
  .. code-block:: xml
 
+ <!-- app/config/config.xml -->
  <container xmlns="http://symfony.com/schema/dic/services"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xmlns:doctrine="http://symfony.com/schema/dic/doctrine"
@@ -164,6 +166,18 @@ all configured connections.
  </doctrine:config>
  </container>
 
+ .. code-block:: php
+ 
+ // app/config/config.php
+ $container->loadFromExtension('doctrine', array(
+ 'dbal' => array(
+ 'types' => array(
+ 'custom_first' => 'Acme\HelloBundle\Type\CustomFirst',
+ 'custom_second' => 'Acme\HelloBundle\Type\CustomSecond',
+ ),
+ ),
+ ));
+
 .. _PDO: http://www.php.net/pdo
 .. _documentation: http://www.doctrine-project.org/docs/dbal/2.0/en
 .. _Doctrine: http://www.doctrine-project.org

book/doctrine/orm.rst

@@ -460,19 +460,22 @@ that use this connection.
  </services>
  </container>
 
-Registering custom DQL functions
+Registering Custom DQL Functions
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-You can register custom DQL functions throught the configuration.
+You can register custom DQL functions through the configuration.
 
 .. configuration-block::
 
  .. code-block:: yaml
 
+ # app/config/config.yml
  doctrine:
  orm:
+ # ...
  entity_managers:
  default:
+ # ...
  dql:
  string_functions:
  test_string: Acme\HelloBundle\DQL\StringFunction
@@ -484,6 +487,7 @@ You can register custom DQL functions throught the configuration.
 
  .. code-block:: xml
 
+ <!-- app/config/config.xml -->
  <container xmlns="http://symfony.com/schema/dic/services"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xmlns:doctrine="http://symfony.com/schema/dic/doctrine"
@@ -492,7 +496,9 @@ You can register custom DQL functions throught the configuration.
 
  <doctrine:config>
  <doctrine:orm>
+ <!-- ... -->
  <doctrine:entity-manager name="default">
+ <!-- ... -->
  <doctrine:dql>
  <doctrine:string-function name="test_string>Acme\HelloBundle\DQL\StringFunction</doctrine:string-function>
  <doctrine:string-function name="second_string>Acme\HelloBundle\DQL\SecondStringFunction</doctrine:string-function>
@@ -504,6 +510,32 @@ You can register custom DQL functions throught the configuration.
  </doctrine:config>
  </container>
 
+ .. code-block:: php
+
+ // app/config/config.php
+ $container->loadFromExtension('doctrine', array(
+ 'orm' => array(
+ // ...
+ 'entity_managers' => array(
+ 'default' => array(
+ // ...
+ 'dql' => array(
+ 'string_functions' => array(
+ 'test_string' => 'Acme\HelloBundle\DQL\StringFunction',
+ 'second_string' => 'Acme\HelloBundle\DQL\SecondStringFunction',
+ ),
+ 'numeric_functions' => array(
+ 'test_numeric' => 'Acme\HelloBundle\DQL\NumericFunction',
+ ),
+ 'datetime_functions' => array(
+ 'test_datetime' => 'Acme\HelloBundle\DQL\DatetimeFunction',
+ ),
+ ),
+ ),
+ ),
+ ),
+ ));
+
 .. index::
  single: Doctrine; ORM Console Commands
  single: CLI; Doctrine ORM