diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '3.2'

Browse Source 
* 3.2:
  [FrameworkBundle][Console] JsonDescriptor: Respect original output
  [Process] Non ASCII characters disappearing during the escapeshellarg
This commit is contained in:
Nicolas Grekas 2017-02-03 13:16:22 +01:00
commit 23ba91272f
9 changed files with 36 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_arguments.json
View File

@ -7,12 +7,6 @@
"lazy": true,
"shared": true,
"abstract": true,
"file": null,
"factory_class": "Full\\Qualified\\FactoryClass",
"factory_method": "get",
"tags": [
],
"autowire": false,
"arguments": [
{
@ -71,7 +65,11 @@
},
"get"
]
]
],
"file": null,
"factory_class": "Full\\Qualified\\FactoryClass",
"factory_method": "get",
"tags": []
}
},
"aliases": {

4
src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.json
View File

@ -7,11 +7,11 @@
"lazy": true,
"shared": true,
"abstract": true,
"autowire": false,
"file": null,
"factory_class": "Full\\Qualified\\FactoryClass",
"factory_method": "get",
"tags": [],
"autowire": false
"tags": []
}
},
"aliases": {

14
src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.json
View File

@ -7,11 +7,11 @@
"lazy": true,
"shared": true,
"abstract": true,
"autowire": false,
"file": null,
"factory_class": "Full\\Qualified\\FactoryClass",
"factory_method": "get",
"tags": [],
"autowire": false
"tags": []
},
"definition_2": {
"class": "Full\\Qualified\\Class2",
@ -20,9 +20,13 @@
"lazy": false,
"shared": true,
"abstract": false,
"autowire": false,
"file": "\/path\/to\/file",
"factory_service": "factory.service",
"factory_method": "get",
"calls": [
"setMailer"
],
"tags": [
{
"name": "tag1",
@ -41,11 +45,7 @@
"name": "tag2",
"parameters": []
}
],
"calls": [
"setMailer"
],
"autowire": false
]
}
},
"aliases": {

10
src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.json
View File

@ -7,9 +7,13 @@
"lazy": false,
"shared": true,
"abstract": false,
"autowire": false,
"file": "\/path\/to\/file",
"factory_service": "factory.service",
"factory_method": "get",
"calls": [
"setMailer"
],
"tags": [
{
"name": "tag1",
@ -28,11 +32,7 @@
"name": "tag2",
"parameters": []
}
],
"calls": [
"setMailer"
],
"autowire": false
]
}
},
"aliases": [],

16
src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.json
View File

@ -7,13 +7,13 @@
"lazy": false,
"shared": true,
"abstract": false,
"autowire": false,
"file": "\/path\/to\/file",
"calls": [
"setMailer"
],
"factory_service": "factory.service",
"factory_method": "get",
"autowire": false
"calls": [
"setMailer"
]
}
],
"tag2": [
@ -24,13 +24,13 @@
"lazy": false,
"shared": true,
"abstract": false,
"autowire": false,
"file": "\/path\/to\/file",
"calls": [
"setMailer"
],
"factory_service": "factory.service",
"factory_method": "get",
"autowire": false
"calls": [
"setMailer"
]
}
]
}

4
src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.json
View File

@ -5,9 +5,9 @@
"lazy": true,
"shared": true,
"abstract": true,
"autowire": false,
"file": null,
"factory_class": "Full\\Qualified\\FactoryClass",
"factory_method": "get",
"tags": [],
"autowire": false
"tags": []
}

10
src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.json
View File

@ -5,9 +5,13 @@
"lazy": false,
"shared": true,
"abstract": false,
"autowire": false,
"file": "\/path\/to\/file",
"factory_service": "factory.service",
"factory_method": "get",
"calls": [
"setMailer"
],
"tags": [
{
"name": "tag1",
@ -26,9 +30,5 @@
"name": "tag2",
"parameters": []
}
],
"calls": [
"setMailer"
],
"autowire": false
]
}

2
src/Symfony/Component/Process/ProcessUtils.php
View File

@ -71,7 +71,7 @@ class ProcessUtils
return $escapedArgument;
}
return escapeshellarg($argument);
return "'".str_replace("'", "'\\''", $argument)."'";
}
/**

1
src/Symfony/Component/Process/Tests/ProcessUtilsTest.php
View File

@ -43,6 +43,7 @@ class ProcessUtilsTest extends \PHPUnit_Framework_TestCase
array("'<|>\" \"'\\''f'", '<|>" "\'f'),
array("''", ''),
array("'with\\trailingbs\\'", 'with\trailingbs\\'),
array("'withNonAsciiAccentLikeéÉèÈàÀöä'", 'withNonAsciiAccentLikeéÉèÈàÀöä'),
);
}
}