diff --git a/cookbook/bundles/best_practices.rst b/cookbook/bundles/best_practices.rst index 337e802b475..eec23dadd67 100644 --- a/cookbook/bundles/best_practices.rst +++ b/cookbook/bundles/best_practices.rst @@ -263,7 +263,7 @@ The end user can provide values in any configuration file: .. code-block:: ini - ; app/config/config.ini + ; app/config/parameters.ini [parameters] acme_hello.email.from = fabien@example.com diff --git a/cookbook/configuration/external_parameters.rst b/cookbook/configuration/external_parameters.rst index 6a9c83ac03f..041e5ea4fd2 100644 --- a/cookbook/configuration/external_parameters.rst +++ b/cookbook/configuration/external_parameters.rst @@ -99,18 +99,18 @@ The container also has support for setting PHP constants as parameters. To take advantage of this feature, map the name of your constant to a parameter key, and define the type as ``constant``. - .. code-block:: xml +.. code-block:: xml - + - + - - GLOBAL_CONSTANT - My_Class::CONSTANT_NAME - - + + GLOBAL_CONSTANT + My_Class::CONSTANT_NAME + + .. note:: diff --git a/cookbook/form/form_collections.rst b/cookbook/form/form_collections.rst index eb76e6c433d..b3f0a8c2b07 100755 --- a/cookbook/form/form_collections.rst +++ b/cookbook/form/form_collections.rst @@ -418,7 +418,8 @@ into new ``Tag`` objects and added to the ``tags`` property of the ``Task`` obje and call ``$em->persist($tag)`` on each, you'll receive an error from Doctrine: - A new entity was found through the relationship 'Acme\TaskBundle\Entity\Task#tags' that was not configured to cascade persist operations for entity... + A new entity was found through the relationship `Acme\TaskBundle\Entity\Task#tags` + that was not configured to cascade persist operations for entity... To fix this, you may choose to "cascade" the persist operation automatically from the ``Task`` object to any related tags. To do this, add the ``cascade`` diff --git a/cookbook/security/entity_provider.rst b/cookbook/security/entity_provider.rst index dd9b207db51..2b5f7a132a8 100644 --- a/cookbook/security/entity_provider.rst +++ b/cookbook/security/entity_provider.rst @@ -193,9 +193,9 @@ for the purposes of this tutorial. Below is an export of my ``User`` table from MySQL. For details on how to create user records and encode their password, see :ref:`book-security-encoding-user-password`. -.. code-block:: text +.. code-block:: bash - mysql> select * from user; + $ mysql> select * from user; +----+----------+----------------------------------+------------------------------------------+--------------------+-----------+ | id | username | salt | password | email | is_active | +----+----------+----------------------------------+------------------------------------------+--------------------+-----------+ diff --git a/cookbook/symfony1.rst b/cookbook/symfony1.rst index 5eebdedc126..3ceb8d69deb 100644 --- a/cookbook/symfony1.rst +++ b/cookbook/symfony1.rst @@ -90,9 +90,11 @@ a bundle. With the help of a console command, the ``Resources/public/`` directory of each bundle is copied or symbolically-linked to the ``web/bundles/`` directory. This allows you to keep assets organized inside your bundle, but still make them available to the public. To make sure that all bundles are -available, run the following command:: +available, run the following command: - php app/console assets:install web +.. code-block:: bash + + $ php app/console assets:install web .. note:: @@ -185,16 +187,16 @@ Using the Console In symfony1, the console is in the root directory of your project and is called ``symfony``: -.. code-block:: text +.. code-block:: bash - php symfony + $ php symfony In Symfony2, the console is now in the app sub-directory and is called ``console``: -.. code-block:: text +.. code-block:: bash - php app/console + $ php app/console Applications ------------ @@ -262,7 +264,9 @@ In symfony1, the ``routing.yml`` and ``app.yml`` configuration files were automatically loaded inside any plugin. In Symfony2, routing and application configuration inside a bundle must be included manually. For example, to include a routing resource from a bundle called ``AcmeDemoBundle``, you can -do the following:: +do the following: + +.. code-block:: yaml # app/config/routing.yml _hello: diff --git a/cookbook/testing/bootstrap.rst b/cookbook/testing/bootstrap.rst index c9939249330..25c8dea6d53 100644 --- a/cookbook/testing/bootstrap.rst +++ b/cookbook/testing/bootstrap.rst @@ -25,7 +25,12 @@ with ``tests.bootstrap.php``: .. code-block:: xml - bootstrap = "tests.bootstrap.php" + + + Now, you can define in your ``phpunit.xml.dist`` file which environment you want the cache to be cleared: diff --git a/reference/dic_tags.rst b/reference/dic_tags.rst index c0b203cb9be..08ff7c621e4 100644 --- a/reference/dic_tags.rst +++ b/reference/dic_tags.rst @@ -580,26 +580,28 @@ Your custom loader's ``load`` method is responsible for returning a Now, register your loader as a service and tag it with ``translation.loader``: -.. code-block:: yaml +.. configuration-block:: + + .. code-block:: yaml - services: - main.translation.my_custom_loader: - class: Acme\MainBundle\Translation\MyCustomLoader - tags: - - { name: translation.loader, alias: bin } + services: + main.translation.my_custom_loader: + class: Acme\MainBundle\Translation\MyCustomLoader + tags: + - { name: translation.loader, alias: bin } -.. code-block:: xml + .. code-block:: xml - - - + + + -.. code-block:: php + .. code-block:: php - $container - ->register('main.translation.my_custom_loader', 'Acme\MainBundle\Translation\MyCustomLoader') - ->addTag('translation.loader', array('alias' => 'bin')) - ; + $container + ->register('main.translation.my_custom_loader', 'Acme\MainBundle\Translation\MyCustomLoader') + ->addTag('translation.loader', array('alias' => 'bin')) + ; The ``alias`` option is required and very important: it defines the file "suffix" that will be used for the resource files that use this loader. For