Skip to content

Commit 70d0f78

Browse files
committed
minor #8953 Clean up (carusogabriel)
This PR was squashed before being merged into the 4.0 branch (closes #8953). Discussion ---------- Clean up Following #8948, suggested by @xabbuh Commits ------- ce10e67 Clean up
2 parents 50f7268 + ce10e67 commit 70d0f78

File tree

10 files changed

+20
-23
lines changed

10 files changed

+20
-23
lines changed

components/http_kernel.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,6 @@ This implementation is explained more in the sidebar below::
234234
public function getController(Request $request);
235235
}
236236

237-
238237
Internally, the ``HttpKernel::handle()`` method first calls
239238
:method:`Symfony\\Component\\HttpKernel\\Controller\\ControllerResolverInterface::getController`
240239
on the controller resolver. This method is passed the ``Request`` and is responsible

components/var_dumper.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ DebugBundle and Twig Integration
8080
--------------------------------
8181

8282
The DebugBundle allows greater integration of this component into Symfony
83-
applications.
83+
applications.
8484

8585
Since generating (even debug) output in the controller or in the model
8686
of your application may just break it by e.g. sending HTTP headers or

create_framework/http_kernel_controller_resolver.rst

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ based on a Request object. All controller resolvers implement the following inte
5656
public function getController(Request $request);
5757
}
5858

59-
6059
The ``getController()`` method relies on the same convention as the one we
6160
have defined earlier: the ``_controller`` request attribute must contain the
6261
controller associated with the Request. Besides the built-in PHP callbacks,
@@ -100,7 +99,6 @@ following interface::
10099
public function getArguments(Request $request, $controller);
101100
}
102101

103-
104102
The ``indexAction()`` method needs the Request object as an argument.
105103
``getArguments()`` knows when to inject it properly if it is type-hinted
106104
correctly::

logging/monolog_console.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ The example above could then be rewritten as::
3939
use Symfony\Component\Console\Input\InputInterface;
4040
use Symfony\Component\Console\Output\OutputInterface;
4141
// ...
42-
42+
4343
class YourCommand extends Command
4444
{
4545
private $logger;

quick_tour/flex_recipes.rst

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ Thanks to Flex, after one command, you can start using Twig immediately:
7979
// ...
8080
8181
+ use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
82-
82+
8383
-class DefaultController
8484
+class DefaultController extends AbstractController
8585
{
@@ -216,16 +216,16 @@ me? List your routes by running:
216216
217217
.. code-block:: text
218218
219-
------------------------------ -------- -------------------------------------
220-
Name Method Path
221-
------------------------------ -------- -------------------------------------
222-
api_products_get_collection GET /api/products.{_format}
223-
api_products_post_collection POST /api/products.{_format}
224-
api_products_get_item GET /api/products/{id}.{_format}
225-
api_products_put_item PUT /api/products/{id}.{_format}
226-
api_products_delete_item DELETE /api/products/{id}.{_format}
219+
------------------------------ -------- -------------------------------------
220+
Name Method Path
221+
------------------------------ -------- -------------------------------------
222+
api_products_get_collection GET /api/products.{_format}
223+
api_products_post_collection POST /api/products.{_format}
224+
api_products_get_item GET /api/products/{id}.{_format}
225+
api_products_put_item PUT /api/products/{id}.{_format}
226+
api_products_delete_item DELETE /api/products/{id}.{_format}
227227
...
228-
------------------------------ -------- -------------------------------------
228+
------------------------------ -------- -------------------------------------
229229
230230
Easily Remove Recipes
231231
---------------------

quick_tour/the_architecture.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ difference is that it's done in the constructor:
113113
class GreetingGenerator
114114
{
115115
+ private $logger;
116-
+
116+
+
117117
+ public function __construct(LoggerInterface $logger)
118118
+ {
119119
+ $this->logger = $logger;

quick_tour/the_big_picture.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -149,21 +149,21 @@ Instead, add the route *right above* the controller method:
149149
150150
// src/Controller/DefaultController.php
151151
// ...
152-
152+
153153
+ use Symfony\Component\Routing\Annotation\Route;
154-
154+
155155
+ /**
156156
+ * @Route("/hello/{name}")
157157
+ */
158158
public function index($name)
159-
159+
160160
This works just like before! But by using annotations, the route and controller
161161
live right next to each other. Need another page? Just add another route and method
162162
in ``DefaultController``::
163163

164164
// src/Controller/DefaultController.php
165165
// ...
166-
166+
167167
/**
168168
* @Route("/simplicity")
169169
*/

routing.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ As your app grows, you'll eventually have a *lot* of routes! To see them all, ru
343343
.. code-block:: text
344344
345345
------------------------------ -------- -------------------------------------
346-
Name Method Path
346+
Name Method Path
347347
------------------------------ -------- -------------------------------------
348348
app_lucky_number ANY /lucky/number/{max}
349349
...

security/entity_provider.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Before you begin, first make sure you install the Security component:
4141
.. code-block:: terminal
4242
4343
$ composer require security
44-
44+
4545
For this entry, suppose that you already have a ``User`` entity
4646
with the following fields: ``id``, ``username``, ``password``,
4747
``email`` and ``isActive``::

setup/unstable_versions.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ execute the following command:
1616
1717
# Download the latest beta version
1818
$ composer create-project symfony/skeleton my_project "4.0.*" -s beta
19-
19+
2020
# Download the absolute latest commit
2121
$ composer create-project symfony/skeleton my_project "4.0.*" -s dev
2222

0 commit comments

Comments
 (0)