8000 Merge branch '4.4' into 5.0 · symfony/symfony@ac2c8f2 · GitHub
[go: up one dir, main page]
Skip to content

Commit ac2c8f2

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '4.4' into 5.0
* 4.4: (34 commits) Add test for tagged iterator with numeric index Fix container lint command when a synthetic service is used in combination with the expression language [Validator][Range] Fix typos [SecurityBundle] Minor fix in LDAP config tree builder [HttpClient] fix requests to hosts that idn_to_ascii() cannot handle [FrameworkBundle] remove redundant PHPDoc in console Descriptor and subclass [Mime] remove phpdoc mentioning Utf8AddressEncoder Add missing phpdoc Remove int return type from FlattenException::getCode [Yaml] fix dumping strings containing CRs [DI] Fix XmlFileLoader bad error message [Form] Handle false as empty value on expanded choices [Messenger] Add ext-redis min version req to tests Tweak message improve PlaintextPasswordEncoder docBlock summary [Validator] Add two missing translations for the Arabic (ar) locale Use some PHP 5.4 constants unconditionally Add new packages on the link script [DI] fix dumping errored definitions [DI] ignore extra tags added by autoconfiguration in PriorityTaggedServiceTrait ...
2 parents 99bb71b + b913b86 commit ac2c8f2

File tree

48 files changed

+634
-370
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+634
-370
lines changed

‎CONTRIBUTORS.md

Lines changed: 114 additions & 64 deletions
Large diffs are not rendered by default.

‎link

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ if (!is_dir("$pathToProject/vendor/symfony")) {
3838
$sfPackages = array('symfony/symfony' => __DIR__);
3939

4040
$filesystem = new Filesystem();
41-
$braces = array('Bundle', 'Bridge', 'Component', 'Component/Security', 'Contracts');
41+
$braces = array('Bundle', 'Bridge', 'Component', 'Component/Security', 'Component/Mailer/Bridge', 'Component/Messenger/Bridge', 'Component/Notifier/Bridge', 'Contracts');
4242
$directories = array_merge(...array_values(array_map(function ($part) {
4343
return glob(__DIR__.'/src/Symfony/'.$part.'/*', GLOB_ONLYDIR | GLOB_NOSORT);
4444
}, $braces)));

‎src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -94,24 +94,12 @@ protected function write(string $content, bool $decorated = false)
9494
$this->output->write($content, false, $decorated ? OutputInterface::OUTPUT_NORMAL : OutputInterface::OUTPUT_RAW);
9595
}
9696

97-
/**
98-
* Describes an InputArgument instance.
99-
*/
10097
abstract protected function describeRouteCollection(RouteCollection $routes, array $options = []);
10198

102-
/**
103-
* Describes an InputOption instance.
104-
*/
10599
abstract protected function describeRoute(Route $route, array $options = []);
106100

107-
/**
108-
* Describes container parameters.
109-
*/
110101
abstract protected function describeContainerParameters(ParameterBag $parameters, array $options = []);
111102

112-
/**
113-
* Describes container tags.
114-
*/
115103
abstract protected function describeContainerTags(ContainerBuilder $builder, array $options = []);
116104

117105
/**
@@ -132,24 +120,12 @@ abstract protected function describeContainerService($service, array $options =
132120
*/
133121
abstract protected function describeContainerServices(ContainerBuilder $builder, array $options = []);
134122

135-
/**
136-
* Describes a service definition.
137-
*/
138123
abstract protected function describeContainerDefinition(Definition $definition, array $options = []);
139124

140-
/**
141-
* Describes a service alias.
142-
*/
143125
abstract protected function describeContainerAlias(Alias $alias, array $options = [], ContainerBuilder $builder = null);
144126

145-
/**
146-
* Describes a container parameter.
147-
*/
148127
abstract protected function describeContainerParameter($parameter, array $options = []);
149128

150-
/**
151-
* Describes container environment variables.
152-
*/
153129
abstract protected function describeContainerEnvVars(array $envs, array $options = []);
154130

155131
/**
@@ -305,9 +281,6 @@ protected function sortByPriority(array $tag): array
305281
return $tag;
306282
}
307283

308-
/**
309-
* Gets class description from a docblock.
310-
*/
311284
public static function getClassDescription(string $class, string &$resolvedClass = null): string
312285
{
313286
$resolvedClass = $class;

‎src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@
3030
*/
3131
class JsonDescriptor extends Descriptor
3232
{
33-
/**
34-
* {@inheritdoc}
35-
*/
3633
protected function describeRouteCollection(RouteCollection $routes, array $options = [])
3734
{
3835
$data = [];
@@ -43,25 +40,16 @@ protected function describeRouteCollection(RouteCollection $routes, array $optio
4340
$this->writeData($data, $options);
4441
}
4542

46-
/**
47-
* {@inheritdoc}
48-
*/
4943
protected function describeRoute(Route $route, array $options = [])
5044
{
5145
$this->writeData($this->getRouteData($route), $options);
5246
}
5347

54-
/**
55-
* {@inheritdoc}
56-
*/
5748
protected function describeContainerParameters(ParameterBag $parameters, array $options = [])
5849
{
5950
$this->writeData($this->sortParameters($parameters), $options);
6051
}
6152

62-
/**
63-
* {@inheritdoc}
64-
*/
6553
protected function describeContainerTags(ContainerBuilder $builder, array $options = [])
6654
{
6755
$showHidden = isset($options['show_hidden']) && $options['show_hidden'];
@@ -77,9 +65,6 @@ protected function describeContainerTags(ContainerBuilder $builder, array $optio
7765
$this->writeData($data, $options);
7866
}
7967

80-
/**
81-
* {@inheritdoc}
82-
*/
8368
protected function describeContainerService($service, array $options = [], ContainerBuilder $builder = null)
8469
{
8570
if (!isset($options['id'])) {
@@ -95,9 +80,6 @@ protected function describeContainerService($service, array $options = [], Conta
9580
}
9681
}
9782

98-
/**
99-
* {@inheritdoc}
100-
*/
10183
protected function describeContainerServices(ContainerBuilder $builder, array $options = [])
10284
{
10385
$serviceIds = isset($options['tag']) && $options['tag']
@@ -131,17 +113,11 @@ protected function describeContainerServices(ContainerBuilder $builder, array $o
131113
$this->writeData($data, $options);
132114
}
133115

134-
/**
135-
* {@inheritdoc}
136-
*/
137116
protected function describeContainerDefinition(Definition $definition, array $options = [])
138117
{
139118
$this->writeData($this->getContainerDefinitionData($definition, isset($options['omit_tags']) && $options['omit_tags'], isset($options['show_arguments']) && $options['show_arguments']), $options);
140119
}
141120

142-
/**
143-
* {@inheritdoc}
144-
*/
145121
protected function describeContainerAlias(Alias $alias, array $options = [], ContainerBuilder $builder = null)
146122
{
147123
if (!$builder) {
@@ -156,43 +132,28 @@ protected function describeContainerAlias(Alias $alias, array $options = [], Con
156132
);
157133
}
158134

159-
/**
160-
* {@inheritdoc}
161-
*/
162135
protected function describeEventDispatcherListeners(EventDispatcherInterface $eventDispatcher, array $options = [])
163136
{
164137
$this->writeData($this->getEventDispatcherListenersData($eventDispatcher, \array_key_exists('event', $options) ? $options['event'] : null), $options);
165138
}
166139

167-
/**
168-
* {@inheritdoc}
169-
*/
170140
protected function describeCallable($callable, array $options = [])
171141
{
172142
$this->writeData($this->getCallableData($callable), $options);
173143
}
174144

175-
/**
176-
* {@inheritdoc}
177-
*/
178145
protected function describeContainerParameter($parameter, array $options = [])
179146
{
180147
$key = isset($options['parameter']) ? $options['parameter'] : '';
181148

182149
$this->writeData([$key => $parameter], $options);
183150
}
184151

185-
/**
186-
* {@inheritdoc}
187-
*/
188152
protected function describeContainerEnvVars(array $envs, array $options = [])
189153
{
190154
throw new LogicException('Using the JSON format to debug environment variables is not supported.');
191155
}
192156

193-
/**
194-
* Writes data as json.
195-
*/
196157
private function writeData(array $data, array $options)
197158
{
198159
$flags = isset($options['json_encoding']) ? $options['json_encoding'] : 0;

‎src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@
2828
*/
2929
class MarkdownDescriptor extends Descriptor
3030
{
31-
/**
32-
* {@inheritdoc}
33-
*/
3431
protected function describeRouteCollection(RouteCollection $routes, array $options = [])
3532
{
3633
$first = true;
@@ -45,9 +42,6 @@ protected function describeRouteCollection(RouteCollection $routes, array $optio
4542
$this->write("\n");
4643
}
4744

48-
/**
49-
* {@inheritdoc}
50-
*/
5145
protected function describeRoute(Route $route, array $options = [])
5246
{
5347
$output = '- Path: '.$route->getPath()
@@ -71,9 +65,6 @@ protected function describeRoute(Route $route, array $options = [])
7165
$this->write("\n");
7266
}
7367

74-
/**
75-
* {@inheritdoc}
76-
*/
7768
protected function describeContainerParameters(ParameterBag $parameters, array $options = [])
7869
{
7970
$this->write("Container parameters\n====================\n");
@@ -82,9 +73,6 @@ protected function describeContainerParameters(ParameterBag $parameters, array $
8273
}
8374
}
8475

85-
/**
86-
* {@inheritdoc}
87-
*/
8876
protected function describeContainerTags(ContainerBuilder $builder, array $options = [])
8977
{
9078
$showHidden = isset($options['show_hidden']) && $options['show_hidden'];
@@ -99,9 +87,6 @@ protected function describeContainerTags(ContainerBuilder $builder, array $optio
9987
}
10088
}
10189

102-
/**
103-
* {@inheritdoc}
104-
*/
10590
protected function describeContainerService($service, array $options = [], ContainerBuilder $builder = null)
10691
{
10792
if (!isset($options['id'])) {
@@ -119,9 +104,6 @@ protected function describeContainerService($service, array $options = [], Conta
119104
}
120105
}
121106

122-
/**
123-
* {@inheritdoc}
124-
*/
125107
protected function describeContainerServices(ContainerBuilder $builder, array $options = [])
126108
{
127109
$showHidden = isset($options['show_hidden']) && $options['show_hidden'];
@@ -183,9 +165,6 @@ protected function describeContainerServices(ContainerBuilder $builder, array $o
183165
}
184166
}
185167

186-
/**
187-
* {@inheritdoc}
188-
*/
189168
protected function describeContainerDefinition(Definition $definition, array $options = [])
190169
{
191170
$output = '';
@@ -246,9 +225,6 @@ protected function describeContainerDefinition(Definition $definition, array $op
246225
$this->write(isset($options['id']) ? sprintf("### %s\n\n%s\n", $options['id'], $output) : $output);
247226
}
248227

249-
/**
250-
* {@inheritdoc}
251-
*/
252228
protected function describeContainerAlias(Alias $alias, array $options = [], ContainerBuilder $builder = null)
253229
{
254230
$output = '- Service: `'.$alias.'`'
@@ -270,25 +246,16 @@ protected function describeContainerAlias(Alias $alias, array $options = [], Con
270246
$this->describeContainerDefinition($builder->getDefinition((string) $alias), array_merge($options, ['id' => (string) $alias]));
271247
}
272248

273-
/**
274-
* {@inheritdoc}
275-
*/
276249
protected function describeContainerParameter($parameter, array $options = [])
277250
{
278251
$this->write(isset($options['parameter']) ? sprintf("%s\n%s\n\n%s", $options['parameter'], str_repeat('=', \strlen($options['parameter'])), $this->formatParameter($parameter)) : $parameter);
279252
}
280253

281-
/**
282-
* {@inheritdoc}
283-
*/
284254
protected function describeContainerEnvVars(array $envs, array $options = [])
285255
{
286256
throw new LogicException('Using the markdown format to debug environment variables is not supported.');
287257
}
288258

289-
/**
290-
* {@inheritdoc}
291-
*/
292259
protected function describeEventDispatcherListeners(EventDispatcherInterface $eventDispatcher, array $options = [])
293260
{
294261
$event = \array_key_exists('event', $options) ? $options['event'] : null;
@@ -322,9 +289,6 @@ protected function describeEventDispatcherListeners(EventDispatcherInterface $ev
322289
}
323290
}
324291

325-
/**
326-
* {@inheritdoc}
327-
*/
328292
protected function describeCallable($callable, array $options = [])
329293
{
330294
$string = '';

0 commit comments

Comments
 (0)
0