10000 Merge branch '3.2' · symfony/symfony@23ba912 · GitHub
[go: up one dir, main page]
Skip to content

Commit 23ba912

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '3.2'
* 3.2: [FrameworkBundle][Console] JsonDescriptor: Respect original output [Process] Non ASCII characters disappearing during the escapeshellarg
2 parents a46e691 + d5a9532 commit 23ba912

File tree

9 files changed

+36
-37
lines changed

9 files changed

+36
-37
lines changed

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,6 @@
77
"lazy": true,
88
"shared": true,
99
"abstract": true,
10-
"file": null,
11-
"factory_class": "Full\\Qualified\\FactoryClass",
12-
"factory_method": "get",
13-
"tags": [
14-
15-
],
1610
"autowire": false,
1711
"arguments": [
1812
{
@@ -71,7 +65,11 @@
7165
},
7266
"get"
7367
]
74-
]
68+
],
69+
"file": null,
70+
"factory_class": "Full\\Qualified\\FactoryClass",
71+
"factory_method": "get",
72+
"tags": []
7573
}
7674
},
7775
"aliases": {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
"lazy": true,
88
"shared": true,
99
"abstract": true,
10+
"autowire": false,
1011
"file": null,
1112
"factory_class": "Full\\Qualified\\FactoryClass",
1213
"factory_method": "get",
13-
"tags": [],
14-
"autowire": false
14+
"tags": []
1515
}
1616
},
1717
"aliases": {

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

Lines changed: 7 additions & 7 deletions
"shared": true,
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
"lazy": true,
88
99
"abstract": true,
10+
"autowire": false,
1011
"file": null,
1112
"factory_class": "Full\\Qualified\\FactoryClass",
1213
"factory_method": "get",
13-
"tags": [],
14-
"autowire": false
14+
"tags": []
1515
},
1616
"definition_2": {
1717
"class": "Full\\Qualified\\Class2",
@@ -20,9 +20,13 @@
2020
"lazy": false,
2121
"shared": true,
2222
"abstract": false,
23+
"autowire": false,
2324
"file": "\/path\/to\/file",
2425
"factory_service": "factory.service",
2526
"factory_method": "get",
27+
"calls": [
28+
"setMailer"
29+
],
2630
"tags": [
2731
{
2832
"name": "tag1",
@@ -41,11 +45,7 @@
4145
"name": "tag2",
4246
"parameters": []
4347
}
44-
],
45-
"calls": [
46-
"setMailer"
47-
],
48-
"autowire": false
48+
]
4949
}
5050
},
5151
"aliases": {

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,13 @@
77
"lazy": false,
88
"shared": true,
99
"abstract": false,
10+
"autowire": false,
1011
"file": "\/path\/to\/file",
1112
"factory_service": "factory.service",
1213
"factory_method": "get",
14+
"calls": [
15+
"setMailer"
16+
],
1317
"tags": [
1418
{
1519
"name": "tag1",
@@ -28,11 +32,7 @@
2832
"name": "tag2",
2933
"parameters": []
3034
}
31-
],
32-
"calls": [
33-
"setMailer"
34-
],
35-
"autowire": false
35+
]
3636
}
3737
},
3838
"aliases": [],

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
"lazy": false,
88
"shared": true,
99
"abstract": false,
10+
"autowire": false,
1011
"file": "\/path\/to\/file",
11-
"calls": [
12-
"setMailer"
13-
],
1412
"factory_service": "factory.service",
1513
"factory_method": "get",
16-
"autowire": false
14+
"calls": [
15+
"setMailer"
16+
]
1717
}
1818
],
1919
"tag2": [
@@ -24,13 +24,13 @@
2424
"lazy": false,
2525
"shared": true,
2626
"abstract": false,
27+
"autowire": false,
2728
"file": "\/path\/to\/file",
28-
"calls": [
29-
"setMailer"
30-
],
3129
"factory_service": "factory.service",
3230
"factory_method": "get",
33-
"autowire": false
31+
"calls": [
32+
"setMailer"
33+
]
3434
}
3535
]
3636
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
"lazy": true,
66
"shared": true,
77
"abstract": true,
8+
"autowire": false,
89
"file": null,
910
"factory_class": "Full\\Qualified\\FactoryClass",
1011
"factory_method": "get",
11-
"tags": [],
12-
"autowire": false
12+
"tags": []
1313
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,13 @@
55
"lazy": false,
66
"shared": true,
77
"abstract": false,
8+
"autowire": false,
89
"file": "\/path\/to\/file",
910
"factory_service": "factory.service",
1011
"factory_method": "get",
12+
"calls": [
13+
"setMailer"
14+
],
1115
"tags": [
1216
{
1317
"name": "tag1",
@@ -26,9 +30,5 @@
2630
"name": "tag2",
2731
"parameters": []
2832
}
29-
],
30-
"calls": [
31-
"setMailer"
32-
],
33-
"autowire": false
33+
]
3434
}

‎src/Symfony/Component/Process/ProcessUtils.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public static function escapeArgument($argument)
7171
return $escapedArgument;
7272
}
7373

74-
return escapeshellarg($argument);
74+
return "'".str_replace("'", "'\\''", $argument)."'";
7575
}
7676

7777
/**

‎src/Symfony/Component/Process/Tests/ProcessUtilsTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ public function dataArguments()
4343
array("'<|>\" \"'\\''f'", '<|>" "\'f'),
4444
array("''", ''),
4545
array("'with\\trailingbs\\'", 'with\trailingbs\\'),
46+
array("'withNonAsciiAccentLikeéÉèÈàÀöä'", 'withNonAsciiAccentLikeéÉèÈàÀöä'),
4647
);
4748
}
4849
}

0 commit comments

Comments
 (0)
0