Skip to content

Commit e49526e

Browse files
xabbuhxabbuh
committed
Merge branch '4.0'
* 4.0: Clean up Clean up Clean up Fix not existing secret parameter
2 parents e98f0a1 + 70d0f78 commit e49526e

25 files changed

+33
-44
lines changed

‎components/asset.rst

+4-4
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ any versioning::
6666
// Absolute path
6767
echo $package->getUrl('/image.png');
6868
// result: /image.png
69-
69+
7070
// Relative path
7171
echo $package->getUrl('image.png');
7272
// result: image.png
@@ -113,7 +113,7 @@ suffix to any asset path::
113113
// Absolute path
114114
echo $package->getUrl('/image.png');
115115
// result: /image.png?v1
116-
116+
117117
// Relative path
118118
echo $package->getUrl('image.png');
119119
// result: image.png?v1
@@ -132,7 +132,7 @@ string as the second argument of the ``StaticVersionStrategy`` constructor::
132132

133133
echo $package->getUrl('/image.png');
134134
// result: /v1/image.png
135-
135+
136136
echo $package->getUrl('image.png');
137137
// result: v1/image.png
138138

@@ -183,7 +183,7 @@ that path over and over again::
183183

184184
echo $package->getUrl('logo.png');
185185
// result: /static/images/logo.png?v1
186-
186+
187187
// Base path is ignored when using absolute paths
188188
echo $package->getUrl('/logo.png');
189189
// result: /logo.png?v1

‎components/cache/psr6_psr16_adapters.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ this use-case::
4444

4545
// a PSR-6 cache that uses your cache internally!
4646
$psr6Cache = new SimpleCacheAdapter($psr16Cache);
47-
47+
4848
// now use this wherever you want
4949
$githubApiClient = new GitHubApiClient($psr6Cache);
5050

@@ -81,6 +81,6 @@ this use-case::
8181

8282
// a PSR-16 cache that uses your cache internally!
8383
$psr16Cache = new Psr6Cache($psr6Cache);
84-
84+
8585
// now use this wherever you want
8686
$githubApiClient = new GitHubApiClient($psr16Cache);

‎components/filesystem.rst

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ The Filesystem Component
66

77
The Filesystem component provides basic utilities for the filesystem.
88

9-
109
Installation
1110
------------
1211

‎components/http_kernel.rst

-1
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/lock.rst

-1
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,6 @@ Locks are created and managed in ``Stores``, which are classes that implement
143143
:class:`Symfony\\Component\\Lock\\StoreInterface`. The component includes the
144144
following built-in store types:
145145

146-
147146
============================================ ====== ======== ========
148147
Store Scope Blocking Expiring
149148
============================================ ====== ======== ========

‎components/phpunit_bridge.rst

-1
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,6 @@ Consider the following example::
493493
}
494494
}
495495

496-
497496
The ``FooTest::test`` method executes every single line of code of both ``Foo``
498497
and ``Bar`` classes, but ``Bar`` is not truly tested. The ``CoverageListener``
499498
aims to fix this behavior by adding the appropriate `@covers`_ annotation on

‎components/routing.rst

-1
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,6 @@ routes with UTF-8 characters:
417417
418418
return $collection;
419419
420-
421420
In this route, the ``utf8`` option set to ``true`` makes Symfony consider the
422421
``.`` requirement to match any UTF-8 characters instead of just a single
423422
byte character. This means that so the following URLs would match:

‎components/serializer.rst

-1
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,6 @@ an exception when additional attributes are passed::
166166
'allow_extra_attributes' => false,
167167
));
168168

169-
170169
Deserializing in an Existing Object
171170
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
172171

‎components/var_dumper.rst

+1-1
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

‎console.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ as a service, you can use normal dependency injection. Imagine you have a
186186
public function __construct(UserManager $userManager)
187187
{
188188
$this->userManager = $userManager;
189-
189+
190190
parent::__construct();
191191
}
192192

‎create_framework/event_dispatcher.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ the registration of a listener for the ``response`` event::
138138

139139
$response->setContent($response->getContent().'GA CODE');
140140
});
141-
141+
142142
$controllerResolver = new ControllerResolver();
143143
$argumentResolver = new ArgumentResolver();
144144

‎create_framework/http_kernel_controller_resolver.rst

-2
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::

‎frontend/encore/babel.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Need to extend the Babel configuration further? The easiest way is via
1515
1616
Encore
1717
// ...
18-
18+
1919
// first, install any presets you want to use (e.g. yarn add babel-preset-es2017)
2020
// then, modify the default Babel configuration
2121
.configureBabel(function(babelConfig) {

‎frontend/encore/custom-loaders-plugins.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ to use the `IgnorePlugin`_ (see `moment/moment#2373`_):
5252
5353
// webpack.config.js
5454
+ var webpack = require('webpack');
55-
55+
5656
Encore
5757
// ...
5858

‎logging/monolog_console.rst

+1-1
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

+10-10
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

+1-1
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

+4-4
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
*/

‎reference/configuration/doctrine.rst

-1
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,6 @@ Full Default Configuration
272272
</doctrine:config>
273273
</container>
274274
275-
276275
.. index::
277276
single: Configuration; Doctrine DBAL
278277
single: Doctrine; DBAL configuration

‎routing.rst

+1-1
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

+1-1
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``::

‎security/remember_me.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ the session lasts using a cookie with the ``remember_me`` firewall option:
2222
main:
2323
# ...
2424
remember_me:
25-
secret: '%secret%'
25+
secret: '%kernel.secret%'
2626
lifetime: 604800 # 1 week in seconds
2727
path: /
2828
# by default, the feature is enabled by checking a
@@ -48,7 +48,7 @@ the session lasts using a cookie with the ``remember_me`` firewall option:
4848
4949
<!-- 604800 is 1 week in seconds -->
5050
<remember-me
51-
secret="%secret%"
51+
secret="%kernel.secret%"
5252
lifetime="604800"
5353
path="/" />
5454
<!-- by default, the feature is enabled by checking a checkbox
@@ -68,7 +68,7 @@ the session lasts using a cookie with the ``remember_me`` firewall option:
6868
'main' => array(
6969
// ...
7070
'remember_me' => array(
71-
'secret' => '%secret%',
71+
'secret' => '%kernel.secret%',
7272
'lifetime' => 604800, // 1 week in seconds
7373
'path' => '/',
7474
// by default, the feature is enabled by checking a

‎service_container.rst

-1
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,6 @@ But, you can control this and pass in a different logger:
592592
</services>
593593
</container>
594594
595-
596595
.. code-block:: php
597596
598597
// config/services.php

‎setup/unstable_versions.rst

+1-1
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

‎workflow/usage.rst

-1
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,6 @@ See example to make sure no blog post without title is moved to "review"::
359359
}
360360
}
361361

362-
363362
Event Methods
364363
~~~~~~~~~~~~~
365364

0 commit comments

Comments
 (0)