Skip to content

Commit af374dc

Browse files
committed
Fixing broken references throughout the docs
1 parent 813db9d commit af374dc

12 files changed

+53
-45
lines changed

book/http_fundamentals.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@ regardless of how your project is developed. To name a few:
459459
* `Form`_ - A full-featured and flexible framework for creating forms and
460460
handing form submissions;
461461

462-
* `Validation`_ A system for creating rules about data and then validating
462+
* `Validator`_ A system for creating rules about data and then validating
463463
whether or not user-submitted data follows those rules;
464464

465465
* `ClassLoader`_ An autoloading library that allows PHP classes to be used
@@ -509,7 +509,7 @@ sensible defaults. For more advanced users, the sky is the limit.
509509
.. _`HttpFoundation`: https://github.com/symfony/HttpFoundation
510510
.. _`Routing`: https://github.com/symfony/Routing
511511
.. _`Form`: https://github.com/symfony/Form
512-
.. _`Validation`: https://github.com/symfony/Validation
512+
.. _`Validator`: https://github.com/symfony/Validator
513513
.. _`ClassLoader`: https://github.com/symfony/ClassLoader
514514
.. _`Templating`: https://github.com/symfony/Templating
515515
.. _`Security`: https://github.com/symfony/Security

book/internals.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ on top of the previous one.
2323

2424
Autoloading is not managed by the framework directly; it's done
2525
independently with the help of the
26-
:class:`Symfony\\Component\\HttpFoundation\\UniversalClassLoader` class
26+
:class:`Symfony\\Component\\ClassLoader\\UniversalClassLoader` class
2727
and the ``src/autoload.php`` file. Read the :doc:`dedicated chapter
2828
</cookbook/tools/autoloader>` for more information.
2929

@@ -117,8 +117,8 @@ name (a "class::method" string, like
117117
.. tip::
118118

119119
The default implementation uses the
120-
:class:`Symfony\\Bundle\\FrameworkBundle\\RequestListener` to define the
121-
``_controller`` Request attribute (see :ref:`kernel-core_request`).
120+
:class:`Symfony\\Bundle\\FrameworkBundle\\EventListener\\RouterListener`
121+
to define the ``_controller`` Request attribute (see :ref:`kernel-core_request`).
122122

123123
The
124124
:method:`Symfony\\Component\\HttpKernel\\Controller\\ControllerResolverInterface::getArguments`
@@ -250,7 +250,7 @@ the event. In this case, all other listeners won't be called.
250250

251251
This event is used by ``FrameworkBundle`` to populate the ``_controller``
252252
``Request`` attribute, via the
253-
:class:`Symfony\\Bundle\\FrameworkBundle\\RequestListener`. RequestListener
253+
:class:`Symfony\\Bundle\\FrameworkBundle\\EventListener\\RouterListener`. RequestListener
254254
uses a :class:`Symfony\\Component\\Routing\\RouterInterface` object to match
255255
the ``Request`` and determine the Controller name (stored in the
256256
``_controller`` ``Request`` attribute).
@@ -328,7 +328,7 @@ The purpose of this event is to allow other systems to modify or replace the
328328
329329
The ``FrameworkBundle`` registers several listeners:
330330

331-
* :class:`Symfony\\Component\\HttpKernel\\Profiler\\EventListener\\ProfilerListener`:
331+
* :class:`Symfony\\Component\\HttpKernel\\EventListener\\ProfilerListener`:
332332
collects data for the current request;
333333

334334
* :class:`Symfony\\Bundle\\WebProfilerBundle\\EventListener\\WebDebugToolbarListener`:
@@ -352,7 +352,7 @@ The ``FrameworkBundle`` registers several listeners:
352352
*Event Class*: :class:`Symfony\\Component\\HttpKernel\\Event\\GetResponseForExceptionEvent`
353353

354354
``FrameworkBundle`` registers a
355-
:class:`Symfony\\Bundle\\FrameworkBundle\\Controller\\ExceptionListener` that
355+
:class:`Symfony\\Component\\HttpKernel\\EventListener\\ExceptionListener` that
356356
forwards the ``Request`` to a given Controller (the value of the
357357
``exception_listener.controller`` parameter -- must be in the
358358
``class::method`` notation).

book/page_creation.rst

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,9 @@ page in this case).
229229

230230
Congratulations! After creating only a route and a controller, you already
231231
have a fully-functional page! If you've setup everything correctly, your
232-
application should greet you::
232+
application should greet you:
233+
234+
.. code-block:: text
233235
234236
http://localhost/app_dev.php/hello/Ryan
235237
@@ -413,18 +415,22 @@ use a Kernel class, ``AppKernel``, to bootstrap the application.
413415

414416
.. tip::
415417

416-
Having a front controller means different and more flexible URLs than
417-
are used in a typical flat PHP application. When using a front controller,
418-
URLs are formatted in the following way:
418+
Having a front controller means different and more flexible URLs than
419+
are used in a typical flat PHP application. When using a front controller,
420+
URLs are formatted in the following way:
421+
422+
.. code-block:: text
419423
420-
http://localhost/app.php/hello/Ryan
424+
http://localhost/app.php/hello/Ryan
421425
422-
The front controller, ``app.php``, is executed and the URI ``/hello/Ryan``
423-
is routed internally using the routing configuration. By using Apache
424-
``mod_rewrite`` rules, you can force the ``app.php`` file to be executed without
425-
needing to specify it in the URL::
426+
The front controller, ``app.php``, is executed and the URI ``/hello/Ryan``
427+
is routed internally using the routing configuration. By using Apache
428+
``mod_rewrite`` rules, you can force the ``app.php`` file to be executed without
429+
needing to specify it in the URL:
430+
431+
.. code-block:: text
426432
427-
http://localhost/hello/Ryan
433+
http://localhost/hello/Ryan
428434
429435
Though front controllers are essential in handling every request, you'll
430436
rarely need to modify or even think about them. We'll mention them again
@@ -783,12 +789,16 @@ A Symfony2 project generally begins with three environments (``dev``, ``test``
783789
and ``prod``), though creating new environments is easy. You can view your
784790
application in different environments simply by changing the front controller
785791
in your browser. To see the application in the ``dev`` environment, access
786-
the application via the development front controller::
792+
the application via the development front controller:
793+
794+
.. code-block:: text
787795
788796
http://localhost/app_dev.php/hello/Ryan
789797
790798
If you'd like to see how your application will behave in the production environment,
791-
call the ``prod`` front controller instead::
799+
call the ``prod`` front controller instead:
800+
801+
.. code-block:: text
792802
793803
http://localhost/app.php/hello/Ryan
794804

book/security.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -706,7 +706,7 @@ For each incoming request, Symfony2 tries to find a matching access control
706706
rule (the first one wins). If the user isn't authenticated yet, the authentication
707707
process is initiated (i.e. the user is given a chance to login). However,
708708
if the user *is* authenticated but doesn't have the required role, an
709-
:class:`Symfony\\Component\Security\\Core\\Exception\\AccessDeniedException`
709+
:class:`Symfony\\Component\\Security\\Core\\Exception\\AccessDeniedException`
710710
exception is thrown, which you can handle and turn into a nice "access denied"
711711
error page for the user. See :doc:`/cookbook/controller/error_pages` for
712712
more information.

cookbook/form/twig_form_customization.rst

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ What are Form Themes?
5555

5656
When any part of a form is rendered - field labels, errors, ``input`` text fields,
5757
``select`` tags, etc - Symfony uses the markup from a base Twig template file
58-
that ships with Symfony. This template, `div_layout.html.twig`_, contains
58+
that ships with Symfony. This template, `form_div_layout.html.twig`_, contains
5959
Twig blocks that define each and every part of a form that can be rendered.
6060
This template represents the default form "theme" and in the next section,
6161
you'll learn how to import your own set of customized form blocks (i.e. themes).
@@ -69,7 +69,7 @@ For example, when the widget of a ``text`` type field is rendered, an ``input``
6969

7070
<input type="text" id="form_name" name="form[name]" required="required" value="foo" />
7171

72-
Internally, Symfony uses the ``text_widget`` block from the `div_layout.html.twig`_
72+
Internally, Symfony uses the ``text_widget`` block from the `form_div_layout.html.twig`_
7373
template to render the field. This is because the field type is ``text`` and
7474
you're rendering its ``widget`` (as opposed to its ``label`` or ``errors``).
7575
The default implementation of the ``text_widget`` block looks like this:
@@ -82,7 +82,7 @@ The default implementation of the ``text_widget`` block looks like this:
8282
{% endblock text_widget %}
8383
8484
As you can see, this block itself renders another block - ``field_widget``
85-
that lives in `div_layout.html.twig`_:
85+
that lives in `form_div_layout.html.twig`_:
8686

8787
.. code-block:: html+jinja
8888

@@ -91,7 +91,7 @@ that lives in `div_layout.html.twig`_:
9191
<input type="{{ type }}" {{ block('attributes') }} value="{{ value }}" />
9292
{% endblock field_widget %}
9393

94-
The point is, the blocks inside `div_layout.html.twig`_ dictate the HTML
94+
The point is, the blocks inside `form_div_layout.html.twig`_ dictate the HTML
9595
output of each part of a form. To customize form output, you just need to
9696
identify and override the correct block. When any number of these form block
9797
customizations are put into a template, that template is known as a from "theme".
@@ -221,7 +221,7 @@ Referencing Base Form Blocks
221221
----------------------------
222222

223223
So far, to override a particular form block, the best method is to copy
224-
the default block from `div_layout.html.twig`_, paste it into a different template,
224+
the default block from `form_div_layout.html.twig`_, paste it into a different template,
225225
and the customize it. In many cases, you can avoid doing this by referencing
226226
the base block when customizing it.
227227

@@ -236,9 +236,9 @@ the form:
236236

237237
.. code-block:: jinja
238238
239-
{% use 'div_layout.html.twig' with text_widget as base_text_widget %}
239+
{% use 'form_div_layout.html.twig' with text_widget as base_text_widget %}
240240
241-
Now, when the blocks from `div_layout.html.twig`_ are imported, the ``text_widget``
241+
Now, when the blocks from `form_div_layout.html.twig`_ are imported, the ``text_widget``
242242
block is called ``base_text_widget``. This means that when you redefine the
243243
``text_widget`` block, you can reference the default markup via ``base_text_widget``:
244244

@@ -260,7 +260,7 @@ the base block by using the ``parent()`` Twig function:
260260

261261
{# src/Acme/DemoBundle/Resources/views/Form/fields.html.twig #}
262262

263-
{% extends 'div_layout.html.twig' %}
263+
{% extends 'form_div_layout.html.twig' %}
264264

265265
{% block text_widget %}
266266
<div class="text_widget">
@@ -285,7 +285,7 @@ template and then importing it inside your application configuration:
285285
twig:
286286
form:
287287
resources:
288-
- 'div_layout.html.twig'
288+
- 'form_div_layout.html.twig'
289289
- 'AcmeStoreBundle:Form:fields.html.twig'
290290
# ...
291291
@@ -294,7 +294,7 @@ template and then importing it inside your application configuration:
294294
<!-- app/config/config.xml -->
295295
<twig:config ...>
296296
<twig:form>
297-
<resource>div_layout.html.twig</resource>
297+
<resource>form_div_layout.html.twig</resource>
298298
<resource>AcmeStoreBundle:Form:fields.html.twig</resource>
299299
</twig:form>
300300
<!-- ... -->
@@ -305,7 +305,7 @@ template and then importing it inside your application configuration:
305305
// app/config/config.php
306306
$container->loadFromExtension('twig', array(
307307
'form' => array('resources' => array(
308-
'div_layout.html.twig',
308+
'form_div_layout.html.twig',
309309
'AcmeStoreBundle:Form:fields.html.twig',
310310
))
311311
// ...
@@ -507,7 +507,7 @@ form, modify the ``use`` tag and add the following:
507507

508508
.. code-block:: html+jinja
509509

510-
{% use 'div_layout.html.twig' with field_label as base_field_label %}
510+
{% use 'form_div_layout.html.twig' with field_label as base_field_label %}
511511

512512
{% block field_label %}
513513
{{ block('base_field_label') }}
@@ -522,7 +522,7 @@ following:
522522

523523
.. code-block:: html+jinja
524524

525-
{% extends 'div_layout.html.twig' %}
525+
{% extends 'form_div_layout.html.twig' %}
526526

527527
{% block field_label %}
528528
{{ parent() }}
@@ -545,7 +545,7 @@ form, modify the ``use`` tag and add the following:
545545

546546
.. code-block:: html+jinja
547547

548-
{% use 'div_layout.html.twig' with field_widget as base_field_widget %}
548+
{% use 'form_div_layout.html.twig' with field_widget as base_field_widget %}
549549

550550
{% block field_widget %}
551551
{{ block('base_field_widget') }}
@@ -560,7 +560,7 @@ following:
560560

561561
.. code-block:: html+jinja
562562

563-
{% extends 'div_layout.html.twig' %}
563+
{% extends 'form_div_layout.html.twig' %}
564564

565565
{% block field_widget %}
566566
{{ parent() }}
@@ -579,4 +579,4 @@ To render a help message below a field, pass in a ``help`` variable:
579579
.. tip::
580580
See :ref:`cookbook-form-twig-two-methods` for how to apply this customization.
581581

582-
.. _`div_layout.html.twig`: https://github.com/symfony/symfony/blob/master/src/Symfony/Bridge/Twig/Resources/views/Form/div_layout.html.twig
582+
.. _`form_div_layout.html.twig`: https://github.com/symfony/symfony/blob/master/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig

cookbook/logging/monolog.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ your controller::
3939
.. tip::
4040

4141
Using only the methods of the
42-
:class:`Symfony\Component\HttpKernel\Log\LoggerInterface` interface
42+
:class:`Symfony\\Component\\HttpKernel\\Log\\LoggerInterface` interface
4343
allows to change the logger implementation without changing your code.
4444

4545
Using several handlers

cookbook/performance/bootstrap_files.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ file since there will be less files to monitor for changes. Of course if this
2626
feature is disabled in the byte code cache (e.g. ``apc.stat=0`` in APC), there
2727
is no longer a reason to use a bootstrap file.
2828

29-
.. _`bootstrap file`: https://github.com/symfony/symfony-standard/blob/master/bin/build_bootstrap
29+
.. _`bootstrap file`: https://github.com/sensio/SensioDistributionBundle/blob/master/Resources/bin/build_bootstrap.php

reference/forms/types/datetime.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ data can be a ``DateTime`` object, a string, a timestamp or an array.
2828
+----------------------+-----------------------------------------------------------------------------+
2929
| Parent type | :doc:`form</reference/forms/types/form>` |
3030
+----------------------+-----------------------------------------------------------------------------+
31-
| Class | :class:`Symfony\\Component\\Form\\Extension\\Core\\Type\\DatetimeType` |
31+
| Class | :class:`Symfony\\Component\\Form\\Extension\\Core\\Type\\DateTimeType` |
3232
+----------------------+-----------------------------------------------------------------------------+
3333

3434
Options

reference/forms/types/entity.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ objects from the database.
2727
+----------------------+------------------------------------------------------------------+
2828
| Parent type | :doc:`choice</reference/forms/types/choice>` |
2929
+----------------------+------------------------------------------------------------------+
30-
| Class | :class:`Symfony\Bridge\Doctrine\Form\Type\\EntityType` |
30+
| Class | :class:`Symfony\\Bridge\\Doctrine\\Form\\Type\\EntityType` |
3131
+----------------------+------------------------------------------------------------------+
3232

3333
Basic Usage

reference/forms/types/integer.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Options
3333
* ``rounding_mode`` [type: integer, default: ``IntegerToLocalizedStringTransformer::ROUND_DOWN``]
3434
By default, if the user enters a non-integer number, it will be rounded
3535
down. There are several other rounding methods, and each is a constant
36-
on the :class:`Symfony\\Component\\Form\\DataTransformer\\IntegerToLocalizedStringTransformer`:
36+
on the :class:`Symfony\\Component\\Form\\Extension\\Core\\DataTransformer\\IntegerToLocalizedStringTransformer`:
3737

3838
* ``IntegerToLocalizedStringTransformer::ROUND_DOWN``
3939
Rounding mode to round towards zero.

reference/forms/types/number.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Options
3737
* ``rounding_mode`` [type: integer, default: ``IntegerToLocalizedStringTransformer::ROUND_DOWN``]
3838
If a submitted number needs to be rounded (based on the ``precision``
3939
option), you have several configurable options for that rounding. Each
40-
option is a constant on the :class:`Symfony\\Component\\Form\\DataTransformer\\IntegerToLocalizedStringTransformer`:
40+
option is a constant on the :class:`Symfony\\Component\\Form\\Extension\\Core\\DataTransformer\\IntegerToLocalizedStringTransformer`:
4141

4242
* ``IntegerToLocalizedStringTransformer::ROUND_DOWN``
4343
Rounding mode to round towards zero.

reference/forms/types/timezone.rst

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
timezone Field Type
55
===================
66

7-
See :class:`Symfony\\Component\\Form\\Type\\TimezoneType`.
8-
97
The ``timezone`` type is a subset of the ``ChoiceType`` that allows the user
108
to select from all possible timezones.
119

0 commit comments

Comments
 (0)