Skip to content

Commit 8a72426

Browse files
committed
Merge branch '3.4' into 4.3
* 3.4: [Filesystem] [Serializer] fixes English grammar typo [Monolog Bridge] Fixed accessing static property as non static. Improve Symfony description [Validator] Add Japanese translation Remove some unused methods parameters Avoid empty \"If-Modified-Since\" header in validation request [Validator] ConstraintValidatorTestCase: add missing return value to mocked validate method calls
2 parents ec0a2f4 + 0d61117 commit 8a72426

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Console/Descriptor/JsonDescriptor.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ protected function describeEventDispatcherListeners(EventDispatcherInterface $ev
167167
*/
168168
protected function describeCallable($callable, array $options = [])
169169
{
170-
$this->writeData($this->getCallableData($callable, $options), $options);
170+
$this->writeData($this->getCallableData($callable), $options);
171171
}
172172

173173
/**
@@ -315,7 +315,7 @@ private function getEventDispatcherListenersData(EventDispatcherInterface $event
315315
return $data;
316316
}
317317

318-
private function getCallableData($callable, array $options = []): array
318+
private function getCallableData($callable): array
319319
{
320320
$data = [];
321321

0 commit comments

Comments
 (0)