Merge branch '2.7' into 2.8
* 2.7: format json fixtures apply rtrim
This commit is contained in:
commit
aef5008360
@ -1 +1,172 @@
|
||||
{"commands":[{"name":"help","usage":["help [--xml] [--format FORMAT] [--raw] [--] [<command_name>]"],"description":"Displays help for a command","help":"The <info>help<\/info> command displays help for a given command:\n\n <info>php app\/console help list<\/info>\n\nYou can also output the help in other formats by using the <comment>--format<\/comment> option:\n\n <info>php app\/console help --format=xml list<\/info>\n\nTo display the list of available commands, please use the <info>list<\/info> command.","definition":{"arguments":{"command_name":{"name":"command_name","is_required":false,"is_array":false,"description":"The command name","default":"help"}},"options":{"xml":{"name":"--xml","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output help as XML","default":false},"format":{"name":"--format","shortcut":"","accept_value":true,"is_value_required":true,"is_multiple":false,"description":"The output format (txt, xml, json, or md)","default":"txt"},"raw":{"name":"--raw","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output raw command help","default":false},"help":{"name":"--help","shortcut":"-h","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Display this help message","default":false},"quiet":{"name":"--quiet","shortcut":"-q","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Do not output any message","default":false},"verbose":{"name":"--verbose","shortcut":"-v|-vv|-vvv","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug","default":false},"version":{"name":"--version","shortcut":"-V","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Display this application version","default":false},"ansi":{"name":"--ansi","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Force ANSI output","default":false},"no-ansi":{"name":"--no-ansi","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Disable ANSI output","default":false},"no-interaction":{"name":"--no-interaction","shortcut":"-n","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Do not ask any interactive question","default":false}}}},{"name":"list","usage":["list [--xml] [--raw] [--format FORMAT] [--] [<namespace>]"],"description":"Lists commands","help":"The <info>list<\/info> command lists all commands:\n\n <info>php app\/console list<\/info>\n\nYou can also display the commands for a specific namespace:\n\n <info>php app\/console list test<\/info>\n\nYou can also output the information in other formats by using the <comment>--format<\/comment> option:\n\n <info>php app\/console list --format=xml<\/info>\n\nIt's also possible to get raw list of commands (useful for embedding command runner):\n\n <info>php app\/console list --raw<\/info>","definition":{"arguments":{"namespace":{"name":"namespace","is_required":false,"is_array":false,"description":"The namespace name","default":null}},"options":{"xml":{"name":"--xml","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output list as XML","default":false},"raw":{"name":"--raw","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output raw command list","default":false},"format":{"name":"--format","shortcut":"","accept_value":true,"is_value_required":true,"is_multiple":false,"description":"The output format (txt, xml, json, or md)","default":"txt"}}}}],"namespaces":[{"id":"_global","commands":["help","list"]}]}
|
||||
{
|
||||
"commands": [
|
||||
{
|
||||
"name": "help",
|
||||
"usage": [
|
||||
"help [--xml] [--format FORMAT] [--raw] [--] [<command_name>]"
|
||||
],
|
||||
"description": "Displays help for a command",
|
||||
"help": "The <info>help<\/info> command displays help for a given command:\n\n <info>php app\/console help list<\/info>\n\nYou can also output the help in other formats by using the <comment>--format<\/comment> option:\n\n <info>php app\/console help --format=xml list<\/info>\n\nTo display the list of available commands, please use the <info>list<\/info> command.",
|
||||
"definition": {
|
||||
"arguments": {
|
||||
"command_name": {
|
||||
"name": "command_name",
|
||||
"is_required": false,
|
||||
"is_array": false,
|
||||
"description": "The command name",
|
||||
"default": "help"
|
||||
}
|
||||
},
|
||||
"options": {
|
||||
"xml": {
|
||||
"name": "--xml",
|
||||
"shortcut": "",
|
||||
"accept_value": false,
|
||||
"is_value_required": false,
|
||||
"is_multiple": false,
|
||||
"description": "To output help as XML",
|
||||
"default": false
|
||||
},
|
||||
"format": {
|
||||
"name": "--format",
|
||||
"shortcut": "",
|
||||
"accept_value": true,
|
||||
"is_value_required": true,
|
||||
"is_multiple": false,
|
||||
"description": "The output format (txt, xml, json, or md)",
|
||||
"default": "txt"
|
||||
},
|
||||
"raw": {
|
||||
"name": "--raw",
|
||||
"shortcut": "",
|
||||
"accept_value": false,
|
||||
"is_value_required": false,
|
||||
"is_multiple": false,
|
||||
"description": "To output raw command help",
|
||||
"default": false
|
||||
},
|
||||
"help": {
|
||||
"name": "--help",
|
||||
"shortcut": "-h",
|
||||
"accept_value": false,
|
||||
"is_value_required": false,
|
||||
"is_multiple": false,
|
||||
"description": "Display this help message",
|
||||
"default": false
|
||||
},
|
||||
"quiet": {
|
||||
"name": "--quiet",
|
||||
"shortcut": "-q",
|
||||
"accept_value": false,
|
||||
"is_value_required": false,
|
||||
"is_multiple": false,
|
||||
"description": "Do not output any message",
|
||||
"default": false
|
||||
},
|
||||
"verbose": {
|
||||
"name": "--verbose",
|
||||
"shortcut": "-v|-vv|-vvv",
|
||||
"accept_value": false,
|
||||
"is_value_required": false,
|
||||
"is_multiple": false,
|
||||
"description": "Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug",
|
||||
"default": false
|
||||
},
|
||||
"version": {
|
||||
"name": "--version",
|
||||
"shortcut": "-V",
|
||||
"accept_value": false,
|
||||
"is_value_required": false,
|
||||
"is_multiple": false,
|
||||
"description": "Display this application version",
|
||||
"default": false
|
||||
},
|
||||
"ansi": {
|
||||
"name": "--ansi",
|
||||
"shortcut": "",
|
||||
"accept_value": false,
|
||||
"is_value_required": false,
|
||||
"is_multiple": false,
|
||||
"description": "Force ANSI output",
|
||||
"default": false
|
||||
},
|
||||
"no-ansi": {
|
||||
"name": "--no-ansi",
|
||||
"shortcut": "",
|
||||
"accept_value": false,
|
||||
"is_value_required": false,
|
||||
"is_multiple": false,
|
||||
"description": "Disable ANSI output",
|
||||
"default": false
|
||||
},
|
||||
"no-interaction": {
|
||||
"name": "--no-interaction",
|
||||
"shortcut": "-n",
|
||||
"accept_value": false,
|
||||
"is_value_required": false,
|
||||
"is_multiple": false,
|
||||
"description": "Do not ask any interactive question",
|
||||
"default": false
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "list",
|
||||
"usage": [
|
||||
"list [--xml] [--raw] [--format FORMAT] [--] [<namespace>]"
|
||||
],
|
||||
"description": "Lists commands",
|
||||
"help": "The <info>list<\/info> command lists all commands:\n\n <info>php app\/console list<\/info>\n\nYou can also display the commands for a specific namespace:\n\n <info>php app\/console list test<\/info>\n\nYou can also output the information in other formats by using the <comment>--format<\/comment> option:\n\n <info>php app\/console list --format=xml<\/info>\n\nIt's also possible to get raw list of commands (useful for embedding command runner):\n\n <info>php app\/console list --raw<\/info>",
|
||||
"definition": {
|
||||
"arguments": {
|
||||
"namespace": {
|
||||
"name": "namespace",
|
||||
"is_required": false,
|
||||
"is_array": false,
|
||||
"description": "The namespace name",
|
||||
"default": null
|
||||
}
|
||||
},
|
||||
"options": {
|
||||
"xml": {
|
||||
"name": "--xml",
|
||||
"shortcut": "",
|
||||
"accept_value": false,
|
||||
"is_value_required": false,
|
||||
"is_multiple": false,
|
||||
"description": "To output list as XML",
|
||||
"default": false
|
||||
},
|
||||
"raw": {
|
||||
"name": "--raw",
|
||||
"shortcut": "",
|
||||
"accept_value": false,
|
||||
"is_value_required": false,
|
||||
"is_multiple": false,
|
||||
"description": "To output raw command list",
|
||||
"default": false
|
||||
},
|
||||
"format": {
|
||||
"name": "--format",
|
||||
"shortcut": "",
|
||||
"accept_value": true,
|
||||
"is_value_required": true,
|
||||
"is_multiple": false,
|
||||
"description": "The output format (txt, xml, json, or md)",
|
||||
"default": "txt"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
],
|
||||
"namespaces": [
|
||||
{
|
||||
"id": "_global",
|
||||
"commands": [
|
||||
"help",
|
||||
"list"
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
|
File diff suppressed because one or more lines are too long
@ -1 +1,14 @@
|
||||
{"name":"descriptor:command1","usage":["descriptor:command1", "alias1", "alias2"],"description":"command 1 description","help":"command 1 help","definition":{"arguments":[],"options":[]}}
|
||||
{
|
||||
"name": "descriptor:command1",
|
||||
"usage": [
|
||||
"descriptor:command1",
|
||||
"alias1",
|
||||
"alias2"
|
||||
],
|
||||
"description": "command 1 description",
|
||||
"help": "command 1 help",
|
||||
"definition": {
|
||||
"arguments": [],
|
||||
"options": []
|
||||
}
|
||||
}
|
||||
|
@ -1 +1,32 @@
|
||||
{"name":"descriptor:command2","usage":["descriptor:command2 [-o|--option_name] [--] <argument_name>", "descriptor:command2 -o|--option_name <argument_name>", "descriptor:command2 <argument_name>"],"description":"command 2 description","help":"command 2 help","definition":{"arguments":{"argument_name":{"name":"argument_name","is_required":true,"is_array":false,"description":"","default":null}},"options":{"option_name":{"name":"--option_name","shortcut":"-o","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"","default":false}}}}
|
||||
{
|
||||
"name": "descriptor:command2",
|
||||
"usage": [
|
||||
"descriptor:command2 [-o|--option_name] [--] <argument_name>",
|
||||
"descriptor:command2 -o|--option_name <argument_name>",
|
||||
"descriptor:command2 <argument_name>"
|
||||
],
|
||||
"description": "command 2 description",
|
||||
"help": "command 2 help",
|
||||
"definition": {
|
||||
"arguments": {
|
||||
"argument_name": {
|
||||
"name": "argument_name",
|
||||
"is_required": true,
|
||||
"is_array": false,
|
||||
"description": "",
|
||||
"default": null
|
||||
}
|
||||
},
|
||||
"options": {
|
||||
"option_name": {
|
||||
"name": "--option_name",
|
||||
"shortcut": "-o",
|
||||
"accept_value": false,
|
||||
"is_value_required": false,
|
||||
"is_multiple": false,
|
||||
"description": "",
|
||||
"default": false
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -1 +1,7 @@
|
||||
{"name":"argument_name","is_required":true,"is_array":false,"description":"","default":null}
|
||||
{
|
||||
"name": "argument_name",
|
||||
"is_required": true,
|
||||
"is_array": false,
|
||||
"description": "",
|
||||
"default": null
|
||||
}
|
||||
|
@ -1 +1,7 @@
|
||||
{"name":"argument_name","is_required":false,"is_array":true,"description":"argument description","default":[]}
|
||||
{
|
||||
"name": "argument_name",
|
||||
"is_required": false,
|
||||
"is_array": true,
|
||||
"description": "argument description",
|
||||
"default": []
|
||||
}
|
||||
|
@ -1 +1,7 @@
|
||||
{"name":"argument_name","is_required":false,"is_array":false,"description":"argument description","default":"default_value"}
|
||||
{
|
||||
"name": "argument_name",
|
||||
"is_required": false,
|
||||
"is_array": false,
|
||||
"description": "argument description",
|
||||
"default": "default_value"
|
||||
}
|
||||
|
@ -1 +1,7 @@
|
||||
{"name":"argument_name","is_required":true,"is_array":false,"description":"multiline argument description","default":null}
|
||||
{
|
||||
"name": "argument_name",
|
||||
"is_required": true,
|
||||
"is_array": false,
|
||||
"description": "multiline argument description",
|
||||
"default": null
|
||||
}
|
||||
|
@ -1 +1,4 @@
|
||||
{"arguments":[],"options":[]}
|
||||
{
|
||||
"arguments": [],
|
||||
"options": []
|
||||
}
|
||||
|
@ -1 +1,12 @@
|
||||
{"arguments":{"argument_name":{"name":"argument_name","is_required":true,"is_array":false,"description":"","default":null}},"options":[]}
|
||||
{
|
||||
"arguments": {
|
||||
"argument_name": {
|
||||
"name": "argument_name",
|
||||
"is_required": true,
|
||||
"is_array": false,
|
||||
"description": "",
|
||||
"default": null
|
||||
}
|
||||
},
|
||||
"options": []
|
||||
}
|
||||
|
@ -1 +1,14 @@
|
||||
{"arguments":[],"options":{"option_name":{"name":"--option_name","shortcut":"-o","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"","default":false}}}
|
||||
{
|
||||
"arguments": [],
|
||||
"options": {
|
||||
"option_name": {
|
||||
"name": "--option_name",
|
||||
"shortcut": "-o",
|
||||
"accept_value": false,
|
||||
"is_value_required": false,
|
||||
"is_multiple": false,
|
||||
"description": "",
|
||||
"default": false
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -1 +1,22 @@
|
||||
{"arguments":{"argument_name":{"name":"argument_name","is_required":true,"is_array":false,"description":"","default":null}},"options":{"option_name":{"name":"--option_name","shortcut":"-o","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"","default":false}}}
|
||||
{
|
||||
"arguments": {
|
||||
"argument_name": {
|
||||
"name": "argument_name",
|
||||
"is_required": true,
|
||||
"is_array": false,
|
||||
"description": "",
|
||||
"default": null
|
||||
}
|
||||
},
|
||||
"options": {
|
||||
"option_name": {
|
||||
"name": "--option_name",
|
||||
"shortcut": "-o",
|
||||
"accept_value": false,
|
||||
"is_value_required": false,
|
||||
"is_multiple": false,
|
||||
"description": "",
|
||||
"default": false
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -1 +1,9 @@
|
||||
{"name":"--option_name","shortcut":"-o","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"","default":false}
|
||||
{
|
||||
"name": "--option_name",
|
||||
"shortcut": "-o",
|
||||
"accept_value": false,
|
||||
"is_value_required": false,
|
||||
"is_multiple": false,
|
||||
"description": "",
|
||||
"default": false
|
||||
}
|
||||
|
@ -1 +1,9 @@
|
||||
{"name":"--option_name","shortcut":"-o","accept_value":true,"is_value_required":false,"is_multiple":false,"description":"option description","default":"default_value"}
|
||||
{
|
||||
"name": "--option_name",
|
||||
"shortcut": "-o",
|
||||
"accept_value": true,
|
||||
"is_value_required": false,
|
||||
"is_multiple": false,
|
||||
"description": "option description",
|
||||
"default": "default_value"
|
||||
}
|
||||
|
@ -1 +1,9 @@
|
||||
{"name":"--option_name","shortcut":"-o","accept_value":true,"is_value_required":true,"is_multiple":false,"description":"option description","default":null}
|
||||
{
|
||||
"name": "--option_name",
|
||||
"shortcut": "-o",
|
||||
"accept_value": true,
|
||||
"is_value_required": true,
|
||||
"is_multiple": false,
|
||||
"description": "option description",
|
||||
"default": null
|
||||
}
|
||||
|
@ -1 +1,9 @@
|
||||
{"name":"--option_name","shortcut":"-o","accept_value":true,"is_value_required":false,"is_multiple":true,"description":"option description","default":[]}
|
||||
{
|
||||
"name": "--option_name",
|
||||
"shortcut": "-o",
|
||||
"accept_value": true,
|
||||
"is_value_required": false,
|
||||
"is_multiple": true,
|
||||
"description": "option description",
|
||||
"default": []
|
||||
}
|
||||
|
@ -1 +1,9 @@
|
||||
{"name":"--option_name","shortcut":"-o","accept_value":true,"is_value_required":true,"is_multiple":false,"description":"multiline option description","default":null}
|
||||
{
|
||||
"name": "--option_name",
|
||||
"shortcut": "-o",
|
||||
"accept_value": true,
|
||||
"is_value_required": true,
|
||||
"is_multiple": false,
|
||||
"description": "multiline option description",
|
||||
"default": null
|
||||
}
|
||||
|
@ -1 +1,9 @@
|
||||
{"name":"--option_name","shortcut":"-o|-O","accept_value":true,"is_value_required":true,"is_multiple":false,"description":"option with multiple shortcuts","default":null}
|
||||
{
|
||||
"name": "--option_name",
|
||||
"shortcut": "-o|-O",
|
||||
"accept_value": true,
|
||||
"is_value_required": true,
|
||||
"is_multiple": false,
|
||||
"description": "option with multiple shortcuts",
|
||||
"default": null
|
||||
}
|
||||
|
@ -35,6 +35,7 @@ class ExcludeDirectoryFilterIterator extends FilterIterator implements \Recursiv
|
||||
$this->isRecursive = $iterator instanceof \RecursiveIterator;
|
||||
$patterns = array();
|
||||
foreach ($directories as $directory) {
|
||||
$directory = rtrim($directory, '/');
|
||||
if (!$this->isRecursive || false !== strpos($directory, '/')) {
|
||||
$patterns[] = preg_quote($directory, '#');
|
||||
} else {
|
||||
@ -51,7 +52,7 @@ class ExcludeDirectoryFilterIterator extends FilterIterator implements \Recursiv
|
||||
/**
|
||||
* Filters the iterator values.
|
||||
*
|
||||
* @return bool true if the value should be kept, false otherwise
|
||||
* @return bool True if the value should be kept, false otherwise
|
||||
*/
|
||||
public function accept()
|
||||
{
|
||||
|
@ -58,9 +58,23 @@ class ExcludeDirectoryFilterIteratorTest extends RealIteratorTestCase
|
||||
'foo bar',
|
||||
);
|
||||
|
||||
$toto = array(
|
||||
'.bar',
|
||||
'.foo',
|
||||
'.foo/.bar',
|
||||
'.foo/bar',
|
||||
'.git',
|
||||
'test.py',
|
||||
'foo',
|
||||
'foo/bar.tmp',
|
||||
'test.php',
|
||||
'foo bar',
|
||||
);
|
||||
|
||||
return array(
|
||||
array(array('foo'), $this->toAbsolute($foo)),
|
||||
array(array('fo'), $this->toAbsolute($fo)),
|
||||
array(array('toto/'), $this->toAbsolute($toto)),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user