Skip to content

Fixes done automatically by the docbot #5862

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
merged 1 commit into from
Nov 9, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
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
2 changes: 1 addition & 1 deletion create_framework/dependency-injection.rst
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ them. Objects will be created on-demand when you access them from the
container or when the container needs them to create other objects.

For instance, to create the router listener, we tell Symfony that its class
name is ``Symfony\Component\HttpKernel\EventListener\RouterListener``, and
name is ``Symfony\Component\HttpKernel\EventListener\RouterListener`` and
that its constructor takes a matcher object (``new Reference('matcher')``). As
you can see, each object is referenced by a name, a string that uniquely
identifies each object. The name allows us to get an object and to reference
Expand Down
2 changes: 1 addition & 1 deletion create_framework/event-dispatcher.rst
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ event (``response``); the event name must be the same as the one used in the
``dispatch()`` call.

In the listener, we add the Google Analytics code only if the response is not
a redirection, if the requested format is HTML, and if the response content
a redirection, if the requested format is HTML and if the response content
type is HTML (these conditions demonstrate the ease of manipulating the
Request and Response data from your code).

Expand Down
2 changes: 1 addition & 1 deletion create_framework/front-controller.rst
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ And for the "Goodbye" page::

We have indeed moved most of the shared code into a central place, but it does
not feel like a good abstraction, does it? We still have the ``send()`` method
for all pages, our pages do not look like templates, and we are still not able
for all pages, our pages do not look like templates and we are still not able
to test this code properly.

Moreover, adding a new page means that we need to create a new PHP script,
Expand Down
2 changes: 1 addition & 1 deletion create_framework/http-foundation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ the wheel.
I've almost forgot to talk about one added benefit: using the HttpFoundation
component is the start of better interoperability between all frameworks and
applications using it (like `Symfony`_, `Drupal 8`_, `phpBB 4`_, `ezPublish
5`_, `Laravel`_, `Silex`_, and `more`_).
5`_, `Laravel`_, `Silex`_ and `more`_).

.. _`Twig`: http://twig.sensiolabs.org/
.. _`HTTP specification`: http://tools.ietf.org/wg/httpbis/
Expand Down
2 changes: 1 addition & 1 deletion create_framework/http-kernel-httpkernel-class.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ There should be an easier way, right?

Enter the ``HttpKernel`` class. Instead of solving the same problem over and
over again and instead of reinventing the wheel each time, the ``HttpKernel``
class is a generic, extensible, and flexible implementation of
class is a generic, extensible and flexible implementation of
``HttpKernelInterface``.

This class is very similar to the framework class we have written so far: it
Expand Down
2 changes: 1 addition & 1 deletion create_framework/routing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ of default values for route attributes (``array('name' => 'World')``).
:doc:`Routing component documentation </components/routing/introduction>` to
learn more about its many features like URL generation, attribute
requirements, HTTP method enforcements, loaders for YAML or XML files,
dumpers to PHP or Apache rewrite rules for enhanced performance, and much
dumpers to PHP or Apache rewrite rules for enhanced performance and much
more.

Based on the information stored in the ``RouteCollection`` instance, a
Expand Down
2 changes: 1 addition & 1 deletion create_framework/separation-of-concerns.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class. It would bring us better *reusability* and easier testing to name just
a few benefits.

If you have a closer look at the code, ``front.php`` has one input, the
Request, and one output, the Response. Our framework class will follow this
Request and one output, the Response. Our framework class will follow this
simple principle: the logic is about creating the Response associated with a
Request.

Expand Down
2 changes: 1 addition & 1 deletion create_framework/templating.rst
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ rendered::

As ``render_template`` is used as an argument to the PHP ``call_user_func()``
function, we can replace it with any valid PHP `callbacks`_. This allows us to
use a function, an anonymous function, or a method of a class as a
use a function, an anonymous function or a method of a class as a
controller... your choice.

As a convention, for each route, the associated controller is configured via
Expand Down