Skip to content

Commit 32063cd

Browse files
committed
Fixing build bugs with new parser
Most of these are actual bugs that weren't caught before. Also, the bundles/ directory is not embedded anymore, so that was removed.
1 parent 88065b0 commit 32063cd

File tree

13 files changed

+21
-56
lines changed

13 files changed

+21
-56
lines changed

book/controller.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,7 @@ The Symfony templating engine is explained in great detail in the
527527
.. tip::
528528

529529
You can even avoid calling the ``render`` method by using the ``@Template``
530-
annotation. See the :doc:`FrameworkExtraBundle documentation</bundles/SensioFrameworkExtraBundle/annotations/view>`
530+
annotation. See the FrameworkExtraBundle
531531
more details.
532532

533533
.. tip::

book/doctrine.rst

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ be.
2020
easy, and explained in the ":doc:`/cookbook/doctrine/dbal`" cookbook entry.
2121

2222
You can also persist data to `MongoDB`_ using Doctrine ODM library. For
23-
more information, read the ":doc:`/bundles/DoctrineMongoDBBundle/index`"
23+
more information, read the DoctrineMongoDBBundle
2424
documentation.
2525

2626
A Simple Example: A Product
@@ -446,7 +446,7 @@ in your application. To do this, run:
446446
new column to the existing ``product`` table.
447447

448448
An even better way to take advantage of this functionality is via
449-
:doc:`migrations</bundles/DoctrineMigrationsBundle/index>`, which allow you to
449+
DoctrineMigrationsBundle, which allow you to
450450
generate these SQL statements and store them in migration classes that
451451
can be run systematically on your production server in order to track
452452
and migrate your database schema safely and reliably.
@@ -526,7 +526,7 @@ an ``UPDATE`` query if the record already exists in the database.
526526

527527
Doctrine provides a library that allows you to programmatically load testing
528528
data into your project (i.e. "fixture data"). For information, see
529-
:doc:`/bundles/DoctrineFixturesBundle/index`.
529+
DoctrineFixturesBundle/index.
530530

531531
Fetching Objects from the Database
532532
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -554,7 +554,7 @@ on its ``id`` value::
554554

555555
You can achieve the equivalent of this without writing any code by using
556556
the ``@ParamConverter`` shortcut. See the
557-
:doc:`FrameworkExtraBundle documentation</bundles/SensioFrameworkExtraBundle/annotations/converters>`
557+
FrameworkExtraBundle
558558
for more details.
559559

560560
When you query for a particular type of object, you always use what's known
@@ -1074,7 +1074,7 @@ table, and ``product.category_id`` column, and new foreign key:
10741074

10751075
This task should only be really used during development. For a more robust
10761076
method of systematically updating your production database, read about
1077-
:doc:`Doctrine migrations</bundles/DoctrineMigrationsBundle/index>`.
1077+
DoctrineMigrationsBundle.
10781078

10791079
Saving Related Entities
10801080
~~~~~~~~~~~~~~~~~~~~~~~
@@ -1527,7 +1527,7 @@ Some notable or interesting tasks include:
15271527

15281528
To be able to load data fixtures to your database, you will need to have
15291529
the ``DoctrineFixturesBundle`` bundle installed. To learn how to do it,
1530-
read the ":doc:`/bundles/DoctrineFixturesBundle/index`" entry of the
1530+
read the "DoctrineFixturesBundle" entry of the
15311531
documentation.
15321532

15331533
.. tip::
@@ -1557,7 +1557,6 @@ lifecycle.
15571557
For more information about Doctrine, see the *Doctrine* section of the
15581558
:doc:`cookbook</cookbook/index>`, which includes the following articles:
15591559

1560-
* :doc:`/bundles/DoctrineFixturesBundle/index`
15611560
* :doc:`/cookbook/doctrine/common_extensions`
15621561

15631562
.. _`Doctrine`: http://www.doctrine-project.org/

book/forms.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1114,7 +1114,7 @@ that lives inside the `Twig Bridge`_. Inside this file, you can see every block
11141114
needed to render a form and every default field type.
11151115

11161116
In PHP, the fragments are individual template files. By default they are located in
1117-
the `Resources/views/Form` directory of the framework bundle (`view on GitHub`_).
1117+
the ``Resources/views/Form`` directory of the framework bundle (`view on GitHub`_).
11181118

11191119
Each fragment name follows the same basic pattern and is broken up into two pieces,
11201120
separated by a single underscore character (``_``). A few examples are:

book/routing.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1018,7 +1018,7 @@ loaded from the new routing resource.
10181018
.. tip::
10191019

10201020
You can also define routes using annotations. See the
1021-
:doc:`FrameworkExtraBundle documentation</bundles/SensioFrameworkExtraBundle/annotations/routing>`
1021+
``@Routing`` documentation
10221022
to see how.
10231023

10241024
.. index::

bundles/index.rst

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

bundles/map.rst.inc

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

components/http_kernel/introduction.rst

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -285,9 +285,9 @@ on the event object that's passed to listeners on this event.
285285
the Symfony Framework, and many deal with collecting profiler data when
286286
the profiler is enabled.
287287

288-
One interesting listener comes from the :doc:`SensioFrameworkExtraBundle </bundles/SensioFrameworkExtraBundle/index>`,
288+
One interesting listener comes from the SensioFrameworkExtraBundle,
289289
which is packaged with the Symfony Standard Edition. This listener's
290-
:doc:`@ParamConverter</bundles/SensioFrameworkExtraBundle/annotations/converters>`
290+
``@ParamConverter``
291291
functionality allows you to pass a full object (e.g. a ``Post`` object)
292292
to your controller instead of a scalar value (e.g. an ``id`` parameter
293293
that was on your route). The listener - ``ParamConverterListener`` - uses
@@ -392,10 +392,9 @@ return a ``Response``.
392392
.. sidebar:: ``kernel.view`` in the Symfony Framework
393393

394394
There is no default listener inside the Symfony Framework for the ``kernel.view``
395-
event. However, one core bundle -
396-
:doc:`SensioFrameworkExtraBundle </bundles/SensioFrameworkExtraBundle/index>` -
395+
event. However, one core bundle - SensioFrameworkExtraBundle -
397396
*does* add a listener to this event. If your controller returns an array,
398-
and you place the :doc:`@Template</bundles/SensioFrameworkExtraBundle/annotations/view>`
397+
and you place the ``@Template``
399398
annotation above the controller, then this listener renders a template,
400399
passes the array you returned from your controller to that template,
401400
and creates a ``Response`` containing the returned content from that

cookbook/bundles/override.rst

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ is almost always the case), you can easily override controllers via bundle
3434
inheritance. For more information, see :doc:`/cookbook/bundles/inheritance`.
3535
If the controller is a service, see the next section on how to override it.
3636

37+
.. _override-services-configuration:
38+
3739
Services & Configuration
3840
------------------------
3941

@@ -107,7 +109,7 @@ Forms
107109

108110
In order to override a form type, it has to be registered as a service (meaning
109111
it is tagged as "form.type"). You can then override it as you would override any
110-
service as explained in `Services & Configuration`_. This, of course, will only
112+
service as explained in :ref:`override-services-configuration`. This, of course, will only
111113
work if the type is referred to by its alias rather than being instantiated,
112114
e.g.::
113115

@@ -128,8 +130,7 @@ Translations
128130
------------
129131

130132
Translations are not related to bundles, but to domains. That means that you
131-
can override the translations from any translation file, as long as it is in
132-
:ref:`the correct domain <translation-domains>`.
133+
can override the translations from any translation file, as long as it is in the correct domain.
133134

134135
.. caution::
135136

cookbook/controller/service.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,5 +61,4 @@ service, you need to specify your service as follows::
6161

6262
In this example, ``my_bundle.annot_controller`` should be the id of the
6363
``AnnotController`` instance defined in the service container. This is
64-
documented in the :doc:`/bundles/SensioFrameworkExtraBundle/annotations/routing`
65-
chapter.
64+
documented in the ``@Routing`` chapter.

cookbook/templating/PHP.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ below renders the ``index.html.php`` template::
5858
return $this->render('AcmeHelloBundle:Hello:index.html.php', array('name' => $name));
5959
}
6060

61-
You can also use the :doc:`/bundles/SensioFrameworkExtraBundle/annotations/view`
61+
You can also use the ``@Template``
6262
shortcut to render the default ``AcmeHelloBundle:Hello:index.html.php`` template::
6363

6464
// src/Acme/HelloBundle/Controller/HelloController.php

0 commit comments

Comments
 (0)