8000 Merge branch '2.7' into 2.8 · symfony/symfony@aef5008 · GitHub
[go: up one dir, main page]

Skip to content

Commit aef5008

Browse files
committed
Merge branch '2.7' into 2.8
* 2.7: format json fixtures apply rtrim
2 parents b049d09 + da6c664 commit aef5008

20 files changed

+722
-19
lines changed
Lines changed: 172 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,172 @@
1-
{"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"]}]}
1+
{
2+
"commands": [
3+
{
4+
"name": "help",
5+
"usage": [
6+
"help [--xml] [--format FORMAT] [--raw] [--] [<command_name>]"
7+
],
8+
"description": "Displays help for a command",
9+
"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.",
10+
"definition": {
11+
"arguments": {
12+
"command_name": {
13+
"name": "command_name",
14+
"is_required": false,
15+
"is_array": false,
16+
"description": "The command name",
17+
"default": "help"
18+
}
19+
},
20+
"options": {
21+
"xml": {
22+
"name": "--xml",
23+
"shortcut": "",
24+
"accept_value": false,
25+
"is_value_required": false,
26+
"is_multiple": false,
27+
"description": "To output help as XML",
28+
"default": false
29+
},
30+
"format": {
31+
"name": "--format",
32+
"shortcut": "",
33+
"accept_value": true,
34+
"is_value_required": true,
35+
"is_multiple": false,
36+
"description": "The output format (txt, xml, json, or md)",
37+
"default": "txt"
38+
},
39+
"raw": {
40+
"name": "--raw",
41+
"shortcut": "",
42+
"accept_value": false,
43+
"is_value_required": false,
44+
"is_multiple": false,
45+
"description": "To output raw command help",
46+
"default": false
47+
},
48+
"help": {
49+
"name": "--help",
50+
"shortcut": "-h",
51+
"accept_value": false,
52+
"is_value_required": false,
53+
"is_multiple": false,
54+
"description": "Display this help message",
55+
"default": false
56+
},
57+
"quiet": {
58+
"name": "--quiet",
59+
"shortcut": "-q",
60+
"accept_value": false,
61+
"is_value_required": false,
62+
"is_multiple": false,
63+
"description": "Do not output any message",
64+
"default": false
65+
},
66+
"verbose": {
67+
"name": "--verbose",
68+
"shortcut": "-v|-vv|-vvv",
69+
"accept_value": false,
70+
F438 "is_value_required": false,
71+
"is_multiple": false,
72+
"description": "Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug",
73+
"default": false
74+
},
75+
"version": {
76+
"name": "--version",
77+
"shortcut": "-V",
78+
"accept_value": false,
79+
"is_value_required": false,
80+
"is_multiple": false,
81+
"description": "Display this application version",
82+
"default": false
83+
},
84+
"ansi": {
85+
"name": "--ansi",
86+
"shortcut": "",
87+
"accept_value": false,
88+
"is_value_required": false,
89+
"is_multiple": false,
90+
"description": "Force ANSI output",
91+
"default": false
92+
},
93+
"no-ansi": {
94+
"name": "--no-ansi",
95+
"shortcut": "",
96+
"accept_value": false,
97+
"is_value_required": false,
98+
"is_multiple": false,
99+
"description": "Disable ANSI output",
100+
"default": false
101+
},
102+
"no-interaction": {
103+
"name": "--no-interaction",
104+
"shortcut": "-n",
105+
"accept_value": false,
106+
"is_value_required": false,
107+
"is_multiple": false,
108+
"description": "Do not ask any interactive question",
109+
"default": false
110+
}
111+
}
112+
}
113+
},
114+
{
115+
"name": "list",
116+
"usage": [
117+
"list [--xml] [--raw] [--format FORMAT] [--] [<namespace>]"
118+
],
119+
"description": "Lists commands",
120+
"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>",
121+
"definition": {
122+
"arguments": {
123+
"namespace": {
124+
"name": "namespace",
125+
"is_required": false,
126+
"is_array": false,
127+
"description": "The namespace name",
128+
"default": null
129+
}
130+
},
131+
"options": {
132+
"xml": {
133+
"name": "--xml",
134+
"shortcut": "",
135+
"accept_value": false,
136+
"is_value_required": false,
137+
"is_multiple": false,
138+
"description": "To output list as XML",
139+
"default": false
140+
},
141+
"raw": {
142+
"name": "--raw",
143+
"shortcut": "",
144+
"accept_value": false,
145+
"is_value_required": false,
146+
"is_multiple": false,
147+
"description": "To output raw command list",
148+
"default": false
149+
},
150+
"format": {
151+
"name": "--format",
152+
"shortcut": "",
153+
"accept_value": true,
154+
"is_value_required": true,
155+
"is_multiple": false,
156+
"description": "The output format (txt, xml, json, or md)",
157+
"default": "txt"
158+
}
159+
}
160+
}
161+
}
162+
],
163+
"namespaces": [
164+
{
165+
"id": "_global",
166+
"commands": [
167+
"help",
168+
"list"
169+
]
170+
}
171+
]
172+
}

0 commit comments

Comments
 (0)
0