8000 Merge branch '5.0' · symfony/symfony-docs@7f0600e · GitHub
[go: up one dir, main page]

Skip to content

Commit 7f0600e

Browse files
committed
Merge branch '5.0'
* 5.0: Fix some paths
2 parents 329a514 + d4294e6 commit 7f0600e

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

routing.rst

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1153,7 +1153,7 @@ the common configuration using options when importing the routes.
11531153
11541154
# config/routes/annotations.yaml
11551155
controllers:
1156-
resource: '../src/Controller/'
1156+
resource: '../../src/Controller/'
11571157
type: annotation
11581158
# this is added to the beginning of all imported route URLs
11591159
prefix: '/blog'
@@ -1166,7 +1166,7 @@ the common configuration using options when importing the routes.
11661166
# Uncomment this option to make that URL "/blog" instead
11671167
# trailing_slash_on_root: false
11681168
# you can optionally exclude some files/subdirectories when loading annotations
1169-
# exclude: '../src/Controller/{DebugEmailController}.php'
1169+
# exclude: '../../src/Controller/{DebugEmailController}.php'
11701170
11711171
.. code-block:: xml
11721172
@@ -1182,18 +1182,18 @@ the common configuration using options when importing the routes.
11821182
the 'name-prefix' value is added to the beginning of all imported route names
11831183
the 'exclude' option defines the files or subdirectories ignored when loading annotations
11841184
-->
1185-
<import resource="../src/Controller/"
1185+
<import resource="../../src/Controller/"
11861186
type="annotation"
11871187
prefix="/blog"
11881188
name-prefix="blog_"
1189-
exclude="../src/Controller/{DebugEmailController}.php">
1189+
exclude="../../src/Controller/{DebugEmailController}.php">
11901190
<!-- these requirements are added to all imported routes -->
11911191
<requirement key="_locale">en|es|fr</requirement>
11921192
</import>
11931193
11941194
<!-- An imported route with an empty URL will become "/blog/"
11951195
Uncomment this option to make that URL "/blog" instead -->
1196-
<import resource="../src/Controller/" type="annotation"
1196+
<import resource="../../src/Controller/" type="annotation"
11971197
prefix="/blog"
11981198
trailing-slash-on-root="false">
11991199
<!-- ... -->
@@ -1208,7 +1208,7 @@ the common configuration using options when importing the routes.
12081208
return function (RoutingConfigurator $routes) {
12091209
// use the optional fifth argument of import() to exclude some files
12101210
// or subdirectories when loading annotations
1211-
$routes->import('../src/Controller/', 'annotation')
1211+
$routes->import('../../src/Controller/', 'annotation')
12121212
// this is added to the beginning of all imported route URLs
12131213
->prefix('/blog')
12141214
// An imported route with an empty URL will become "/blog/"
@@ -1716,7 +1716,7 @@ with a locale. This can be done by defining a different prefix for each locale
17161716
17171717
# config/routes/annotations.yaml
17181718
controllers:
1719-
resource: '../src/Controller/'
1719+
resource: '../../src/Controller/'
17201720
type: annotation
17211721
prefix:
17221722
en: '' # don't prefix URLs for English, the default locale
@@ -1731,7 +1731,7 @@ with a locale. This can be done by defining a different prefix for each locale
17311731
xsi:schemaLocation="http://symfony.com/schema/routing
17321732
https://symfony.com/schema/routing/routing-1.0.xsd">
17331733
1734-
<import resource="../src/Controller/" type="annotation">
1734+
<import resource="../../src/Controller/" type="annotation">
17351735
<!-- don't prefix URLs for English, the default locale -->
17361736
<prefix locale="en"></prefix>
17371737
<prefix locale="nl">/nl</prefix>
@@ -1744,7 +1744,7 @@ with a locale. This can be done by defining a different prefix for each locale
17441744
use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
17451745
17461746
return function (RoutingConfigurator $routes) {
1747-
$routes->import('../src/Controller/', 'annotation')
1747+
$routes->import('../../src/Controller/', 'annotation')
17481748
->prefix([
17491749
// don't prefix URLs for English, the default locale
17501750
'en' => '',
@@ -2135,7 +2135,7 @@ defined as annotations:
21352135
21362136
# config/routes/annotations.yaml
21372137
controllers:
2138-
resource: '../src/Controller/'
2138+
resource: '../../src/Controller/'
21392139
type: annotation
21402140
defaults:
21412141
schemes: [https]
@@ -2149,7 +2149,7 @@ defined as annotations:
21492149
xsi:schemaLocation="http://symfony.com/schema/routing
21502150
https://symfony.com/schema/routing/routing-1.0.xsd">
21512151
2152-
<import resource="../src/Controller/" type="annotation">
2152+
<import resource="../../src/Controller/" type="annotation">
21532153
<default key="schemes">HTTPS</default>
21542154
</import>
21552155
</routes>
@@ -2160,7 +2160,7 @@ defined as annotations:
21602160
use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
21612161
21622162
return function (RoutingConfigurator $routes) {
2163-
$routes->import('../src/Controller/', 'annotation')
2163+
$routes->import('../../src/Controller/', 'annotation')
21642164
->schemes(['https'])
21652165
;
21662166
};

0 commit comments

Comments
 (0)
10C9
0