Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 80138ca

Browse filesBrowse files
weaverryanweaverryan
committed
Merge branch '3.4'
* 3.4: Updating more types, and basically rewriting the alias article More updating for types typo
2 parents 4283d7a + 34b1478 commit 80138ca
Copy full SHA for 80138ca
Expand file treeCollapse file tree

27 files changed

+704
-1395
lines changed

‎_build/redirection_map

Copy file name to clipboardExpand all lines: _build/redirection_map
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -335,3 +335,4 @@
335335
/testing/simulating_authentication /testing/http_authentication
336336
/components/dependency_injection/autowiring /service_container/autowiring
337337
/event_dispatcher/class_extension /event_dispatcher
338+
/security/target_path /security

‎routing/custom_route_loader.rst

Copy file name to clipboardExpand all lines: routing/custom_route_loader.rst
+7-4Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,9 @@ Now define a service for the ``ExtraLoader``:
145145
146146
# app/config/services.yml
147147
services:
148-
app.routing_loader:
149-
class: AppBundle\Routing\ExtraLoader
148+
# ...
149+
150+
AppBundle\Routing\ExtraLoader:
150151
tags: [routing.loader]
151152
152153
.. code-block:: xml
@@ -157,7 +158,9 @@ Now define a service for the ``ExtraLoader``:
157158
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
158159
159160
<services>
160-
<service id="app.routing_loader" class="AppBundle\Routing\ExtraLoader">
161+
<!-- ... -->
162+
163+
<service id="AppBundle\Routing\ExtraLoader">
161164
<tag name="routing.loader" />
162165
</service>
163166
</services>
@@ -168,7 +171,7 @@ Now define a service for the ``ExtraLoader``:
168171
use AppBundle\Routing\ExtraLoader;
169172
170173
$container
171-
->register('app.routing_loader', ExtraLoader::class)
174+
->autowire(ExtraLoader::class)
172175
->addTag('routing.loader')
173176
;
174177

‎routing/hostname_pattern.rst

Copy file name to clipboardExpand all lines: routing/hostname_pattern.rst
+38-38Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ You can also match on the HTTP *host* of the incoming request.
1010

1111
.. code-block:: php-annotations
1212
13-
// src/Acme/DemoBundle/Controller/MainController.php
14-
namespace Acme\DemoBundle\Controller;
13+
// src/AppBundle/Controller/MainController.php
14+
namespace AppBundle\Controller;
1515
1616
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
1717
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
@@ -40,11 +40,11 @@ You can also match on the HTTP *host* of the incoming request.
4040
mobile_homepage:
4141
path: /
4242
host: m.example.com
43-
defaults: { _controller: AcmeDemoBundle:Main:mobileHomepage }
43+
defaults: { _controller: AppBundle:Main:mobileHomepage }
4444
4545
homepage:
4646
path: /
47-
defaults: { _controller: AcmeDemoBundle:Main:homepage }
47+
defaults: { _controller: AppBundle:Main:homepage }
4848
4949
.. code-block:: xml
5050
@@ -55,11 +55,11 @@ You can also match on the HTTP *host* of the incoming request.
5555
http://symfony.com/schema/routing/routing-1.0.xsd">
5656
5757
<route id="mobile_homepage" path="/" host="m.example.com">
58-
<default key="_controller">AcmeDemoBundle:Main:mobileHomepage</default>
58+
<default key="_controller">AppBundle:Main:mobileHomepage</default>
5959
</route>
6060
6161
<route id="homepage" path="/">
62-
<default key="_controller">AcmeDemoBundle:Main:homepage</default>
62+
<default key="_controller">AppBundle:Main:homepage</default>
6363
</route>
6464
</routes>
6565
@@ -70,11 +70,11 @@ You can also match on the HTTP *host* of the incoming request.
7070
7171
$collection = new RouteCollection();
7272
$collection->add('mobile_homepage', new Route('/', array(
73-
'_controller' => 'AcmeDemoBundle:Main:mobileHomepage',
73+
'_controller' => 'AppBundle:Main:mobileHomepage',
7474
), array(), array(), 'm.example.com'));
7575
7676
$collection->add('homepage', new Route('/', array(
77-
'_controller' => 'AcmeDemoBundle:Main:homepage',
77+
'_controller' => 'AppBundle:Main:homepage',
7878
)));
7979
8080
return $collection;
@@ -92,8 +92,8 @@ you can use placeholders in your hostname:
9292

9393
.. code-block:: php-annotations
9494
95-
// src/Acme/DemoBundle/Controller/MainController.php
96-
namespace Acme\DemoBundle\Controller;
95+
// src/AppBundle/Controller/MainController.php
96+
namespace AppBundle\Controller;
9797
9898
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
9999
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
@@ -122,11 +122,11 @@ you can use placeholders in your hostname:
122122
projects_homepage:
123123
path: /
124124
host: "{project_name}.example.com"
125-
defaults: { _controller: AcmeDemoBundle:Main:projectsHomepage }
125+
defaults: { _controller: AppBundle:Main:projectsHomepage }
126126
127127
homepage:
128128
path: /
129-
defaults: { _controller: AcmeDemoBundle:Main:homepage }
129+
defaults: { _controller: AppBundle:Main:homepage }
130130
131131
.. code-block:: xml
132132
@@ -137,11 +137,11 @@ you can use placeholders in your hostname:
137137
http://symfony.com/schema/routing/routing-1.0.xsd">
138138
139139
<route id="projects_homepage" path="/" host="{project_name}.example.com">
140-
<default key="_controller">AcmeDemoBundle:Main:projectsHomepage</default>
140+
<default key="_controller">AppBundle:Main:projectsHomepage</default>
141141
</route>
142142
143143
<route id="homepage" path="/">
144-
<default key="_controller">AcmeDemoBundle:Main:homepage</default>
144+
<default key="_controller">AppBundle:Main:homepage</default>
145145
</route>
146146
</routes>
147147
@@ -152,11 +152,11 @@ you can use placeholders in your hostname:
152152
153153
$collection = new RouteCollection();
154154
$collection->add('project_homepage', new Route('/', array(
155-
'_controller' => 'AcmeDemoBundle:Main:projectsHomepage',
155+
'_controller' => 'AppBundle:Main:projectsHomepage',
156156
), array(), array(), '{project_name}.example.com'));
157157
158158
$collection->add('homepage', new Route('/', array(
159-
'_controller' => 'AcmeDemoBundle:Main:homepage',
159+
'_controller' => 'AppBundle:Main:homepage',
160160
)));
161161
162162
return $collection;
@@ -169,8 +169,8 @@ instance, if you want to match both ``m.example.com`` and
169169

170170
.. code-block:: php-annotations
171171
172-
// src/Acme/DemoBundle/Controller/MainController.php
173-
namespace Acme\DemoBundle\Controller;
172+
// src/AppBundle/Controller/MainController.php
173+
namespace AppBundle\Controller;
174174
175175
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
176176
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
@@ -206,14 +206,14 @@ instance, if you want to match both ``m.example.com`` and
206206
path: /
207207
host: "{subdomain}.example.com"
208208
defaults:
209-
_controller: AcmeDemoBundle:Main:mobileHomepage
209+
_controller: AppBundle:Main:mobileHomepage
210210
subdomain: m
211211
requirements:
212212
subdomain: m|mobile
213213
214214
homepage:
215215
path: /
216-
defaults: { _controller: AcmeDemoBundle:Main:homepage }
216+
defaults: { _controller: AppBundle:Main:homepage }
217217
218218
.. code-block:: xml
219219
@@ -224,13 +224,13 @@ instance, if you want to match both ``m.example.com`` and
224224
http://symfony.com/schema/routing/routing-1.0.xsd">
225225
226226
<route id="mobile_homepage" path="/" host="{subdomain}.example.com">
227-
<default key="_controller">AcmeDemoBundle:Main:mobileHomepage</default>
227+
<default key="_controller">AppBundle:Main:mobileHomepage</default>
228228
<default key="subdomain">m</default>
229229
<requirement key="subdomain">m|mobile</requirement>
230230
</route>
231231
232232
<route id="homepage" path="/">
233-
<default key="_controller">AcmeDemoBundle:Main:homepage</default>
233+
<default key="_controller">AppBundle:Main:homepage</default>
234234
</route>
235235
</routes>
236236
@@ -241,14 +241,14 @@ instance, if you want to match both ``m.example.com`` and
241241
242242
$collection = new RouteCollection();
243243
$collection->add('mobile_homepage', new Route('/', array(
244-
'_controller' => 'AcmeDemoBundle:Main:mobileHomepage',
244+
'_controller' => 'AppBundle:Main:mobileHomepage',
245245
'subdomain' => 'm',
246246
), array(
247247
'subdomain' => 'm|mobile',
248248
), array(), '{subdomain}.example.com'));
249249
250250
$collection->add('homepage', new Route('/', array(
251-
'_controller' => 'AcmeDemoBundle:Main:homepage',
251+
'_controller' => 'AppBundle:Main:homepage',
252252
)));
253253
254254
return $collection;
@@ -262,8 +262,8 @@ instance, if you want to match both ``m.example.com`` and
262262

263263
.. code-block:: php-annotations
264264
265-
// src/Acme/DemoBundle/Controller/MainController.php
266-
namespace Acme\DemoBundle\Controller;
265+
// src/AppBundle/Controller/MainController.php
266+
namespace AppBundle\Controller;
267267
268268
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
269269
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
@@ -299,14 +299,14 @@ instance, if you want to match both ``m.example.com`` and
299299
path: /
300300
host: "m.{domain}"
301301
defaults:
302-
_controller: AcmeDemoBundle:Main:mobileHomepage
302+
_controller: AppBundle:Main:mobileHomepage
303303
domain: '%domain%'
304304
requirements:
305305
domain: '%domain%'
306306
307307
homepage:
308308
path: /
309-
defaults: { _controller: AcmeDemoBundle:Main:homepage }
309+
defaults: { _controller: AppBundle:Main:homepage }
310310
311311
.. code-block:: xml
312312
@@ -317,13 +317,13 @@ instance, if you want to match both ``m.example.com`` and
317317
http://symfony.com/schema/routing/routing-1.0.xsd">
318318
319319
<route id="mobile_homepage" path="/" host="m.{domain}">
320-
<default key="_controller">AcmeDemoBundle:Main:mobileHomepage</default>
320+
<default key="_controller">AppBundle:Main:mobileHomepage</default>
321321
<default key="domain">%domain%</default>
322322
<requirement key="domain">%domain%</requirement>
323323
</route>
324324
325325
<route id="homepage" path="/">
326-
<default key="_controller">AcmeDemoBundle:Main:homepage</default>
326+
<default key="_controller">AppBundle:Main:homepage</default>
327327
</route>
328328
</routes>
329329
@@ -334,14 +334,14 @@ instance, if you want to match both ``m.example.com`` and
334334
335335
$collection = new RouteCollection();
336336
$collection->add('mobile_homepage', new Route('/', array(
337-
'_controller' => 'AcmeDemoBundle:Main:mobileHomepage',
337+
'_controller' => 'AppBundle:Main:mobileHomepage',
338338
'domain' => '%domain%',
339339
), array(
340340
'domain' => '%domain%',
341341
), array(), 'm.{domain}'));
342342
343343
$collection->add('homepage', new Route('/', array(
344-
'_controller' => 'AcmeDemoBundle:Main:homepage',
344+
'_controller' => 'AppBundle:Main:homepage',
345345
)));
346346
347347
return $collection;
@@ -363,8 +363,8 @@ You can also set the host option on imported routes:
363363

364364
.. code-block:: php-annotations
365365
366-
// src/Acme/HelloBundle/Controller/MainController.php
367-
namespace Acme\HelloBundle\Controller;
366+
// src/AppBundle/Controller/MainController.php
367+
namespace AppBundle\Controller;
368368
369369
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
370370
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
@@ -379,8 +379,8 @@ You can also set the host option on imported routes:
379379
380380
.. code-block:: yaml
381381
382-
acme_hello:
383-
resource: '@AcmeHelloBundle/Resources/config/routing.yml'
382+
app_hello:
383+
resource: '@AppBundle/Resources/config/routing.yml'
384384
host: "hello.example.com"
385385
386386
.. code-block:: xml
@@ -391,12 +391,12 @@ You can also set the host option on imported routes:
391391
xsi:schemaLocation="http://symfony.com/schema/routing
392392
http://symfony.com/schema/routing/routing-1.0.xsd">
393393
394-
<import resource="@AcmeHelloBundle/Resources/config/routing.xml" host="hello.example.com" />
394+
<import resource="@AppBundle/Resources/config/routing.xml" host="hello.example.com" />
395395
</routes>
396396
397397
.. code-block:: php
398398
399-
$collection = $loader->import("@AcmeHelloBundle/Resources/config/routing.php");
399+
$collection = $loader->import("@AppBundle/Resources/config/routing.php");
400400
$collection->setHost('hello.example.com');
401401
402402
return $collection;

‎security.rst

Copy file name to clipboardExpand all lines: security.rst
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1289,7 +1289,6 @@ Authentication (Identifying/Logging in the User)
12891289
security/api_key_authentication
12901290
security/custom_authentication_provider
12911291
security/pre_authenticated
1292-
security/target_path
12931292
security/csrf_in_login_form
12941293
security/named_encoders
12951294
security/multiple_user_providers

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.