8000 Merge branch '2.8' into 3.2 · symfony/symfony@aa46df1 · GitHub
[go: up one dir, main page]
Skip to content

Commit aa46df1

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '2.8' into 3.2
* 2.8: [FrameworkBundle] Update console fixtures after #22217
2 parents ff286d6 + 200b45e commit aa46df1

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_1.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
| Requirements | name: [a-z]+ |
1212
| Class | Symfony\Component\Routing\Route |
1313
| Defaults | name: Joseph |
14-
| Options | compiler_class: Symfony\Component\Routing\RouteCompiler |
15-
| | opt1: val1 |
16-
| | opt2: val2 |
14+
| Options | compiler_class: Symfony\Component\Routing\RouteCompiler |
15+
| | opt1: val1 |
16+
| | opt2: val2 |
1717
+--------------+---------------------------------------------------------+

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_2.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
| Requirements | NO CUSTOM |
1212
| Class | Symfony\Component\Routing\Route |
1313
| Defaults | NONE |
14-
| Options | compiler_class: Symfony\Component\Routing\RouteCompiler |
15-
| | opt1: val1 |
16-
| | opt2: val2 |
14+
| Options | compiler_class: Symfony\Component\Routing\RouteCompiler |
15+
| | opt1: val1 |
16+
| | opt2: val2 |
1717
+--------------+---------------------------------------------------------+

‎src/Symfony/Bundle/FrameworkBundle/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"require-dev": {
3737
"symfony/asset": "~2.8|~3.0",
3838
"symfony/browser-kit": "~2.8|~3.0",
39-
"symfony/console": "~2.8.8|~3.0.8|~3.1.2|~3.2",
39+
"symfony/console": "~2.8.19|^3.2.7",
4040
" 4430 ;symfony/css-selector": "~2.8|~3.0",
4141
"symfony/dom-crawler": "~2.8|~3.0",
4242
"symfony/polyfill-intl-icu": "~1.0",

0 commit comments

Comments
 (0)
0