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

Commit 0a6d3c6

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '2.7' into 2.8
* 2.7: Add HEADER_FORWARDED to setTrustedHeaderName docs Fix phpDoc typo [FrameworkBundle][Console] JsonDescriptor: Respect original output Enable dump() in autoload-dev
2 parents 6316f34 + 3ee1aa0 commit 0a6d3c6

File tree

12 files changed

+17
-37
lines changed

12 files changed

+17
-37
lines changed

‎composer.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,9 @@
110110
"**/Tests/"
111111
]
112112
},
113+
"autoload-dev": {
114+
"files": [ "src/Symfony/Component/VarDumper/Resources/functions/dump.php" ]
115+
},
113116
"minimum-stability": "dev",
114117
"extra": {
115118
"branch-alias": {

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@
1212
"file": null,
1313
"factory_class": "Full\\Qualified\\FactoryClass",
1414
"factory_method": "get",
15-
"tags": [
16-
17-
],
15+
"tags": [],
1816
"autowire": false,
1917
"autowiring_types": []
2018
}

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.json

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@
1212
"file": null,
1313
"factory_class": "Full\\Qualified\\FactoryClass",
1414
"factory_method": "get",
15-
"tags": [
16-
17-
],
15+
"tags": [],
1816
"autowire": false,
1917
"autowiring_types": []
2018
},
@@ -46,9 +44,7 @@
4644
},
4745
{
4846
"name": "tag2",
49-
"parameters": [
50-
51-
]
47+
"parameters": []
5248
}
5349
],
5450
"autowire": false,

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.json

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,13 @@
2828
},
2929
{
3030
"name": "tag2",
31-
"parameters": [
32-
33-
]
31+
"parameters": []
3432
}
3533
],
3634
"autowire": false,
3735
"autowiring_types": []
3836
}
3937
},
40-
"aliases": [
41-
42-
],
43-
"services": [
44-
45-
]
38+
"aliases": [],
39+
"services": []
4640
}

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@
1010
"file": null,
1111
"factory_class": "Full\\Qualified\\FactoryClass",
1212
"factory_method": "get",
13-
"tags": [
14-
15-
],
13+
"tags": [],
1614
"autowire": false,
1715
"autowiring_types": []
1816
}

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@
2626
},
2727
{
2828
"name": "tag2",
29-
"parameters": [
30-
31-
]
29+
"parameters": []
3230
}
3331
],
3432
"autowire": false,

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_1.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@
1010
"file": null,
1111
"factory_class": "Full\\Qualified\\FactoryClass",
1212
"factory_method": "get",
13-
"tags": [
14-
15-
],
13+
"tags": [],
1614
"autowire": false,
1715
"autowiring_types": []
1816
}

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_2.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@
2626
},
2727
{
2828
"name": "tag2",
29-
"parameters": [
30-
31-
]
29+
"parameters": []
3230
}
3331
],
3432
"autowire": false,

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
"scheme": "http|https",
77
"method": "PUT|POST",
88
"class": "Symfony\\Component\\Routing\\Route",
9-
"defaults": [
10-
11-
],
9+
"defaults": [],
1210
"requirements": "NO CUSTOM",
1311
"options": {
1412
"compiler_class": "Symfony\\Component\\Routing\\RouteCompiler",

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_collection_1.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@
2727
"scheme": "http|https",
2828
"method": "PUT|POST",
2929
"class": "Symfony\\Component\\Routing\\Route",
30-
"defaults": [
31-
32-
],
30+
"defaults": [],
3331
"requirements": "NO CUSTOM",
3432
"options": {
3533
"compiler_class": "Symfony\\Component\\Routing\\RouteCompiler",

‎src/Symfony/Component/HttpFoundation/Request.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -596,6 +596,7 @@ public static function getTrustedHosts()
596596
* * Request::HEADER_CLIENT_HOST: defaults to X-Forwarded-Host (see getHost())
597597
* * Request::HEADER_CLIENT_PORT: defaults to X-Forwarded-Port (see getPort())
598598
* * Request::HEADER_CLIENT_PROTO: defaults to X-Forwarded-Proto (see getScheme() and isSecure())
599+
* * Request::HEADER_FORWARDED: defaults to Forwarded (see RFC 7239)
599600
*
600601
* Setting an empty value allows to disable the trusted header for the given key.
601602
*

‎src/Symfony/Component/PropertyAccess/PropertyAccess.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public static function createPropertyAccessor()
3131
/**
3232
* Creates a property accessor builder.
3333
*
34-
* @return PropertyAccessor
34+
* @return PropertyAccessorBuilder
3535
*/
3636
public static function createPropertyAccessorBuilder()
3737
{

0 commit comments

Comments
 (0)
0