Skip to content

Commit 4887c34

Browse files
Merge branch '5.2' into 5.x
* 5.2: [ErrorHandler] Fix error caused by `include` + open_basedir [FrameworkBundle] Make the TestBrowserToken interchangeable with other tokens [Console] ProgressBar clears too many lines on update [FrameworkBundle] Exclude unreadable files when executing About command [Bridge\Twig] Add 'form-control-range' for range input type Be explicit about transparent background color of links in toolbar [Translation] fix test case name [Cache] Fix wrong namespace in test [DependencyInjection] Fix return type
2 parents 5df5097 + 898a4bb commit 4887c34

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

Service/ServiceSubscriberInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ interface ServiceSubscriberInterface
4747
* * ['?Psr\Log\LoggerInterface'] is a shortcut for
4848
* * ['Psr\Log\LoggerInterface' => '?Psr\Log\LoggerInterface']
4949
*
50-
* @return array The required service types, optionally keyed by service names
50+
* @return string[] The required service types, optionally keyed by service names
5151
*/
5252
public static function getSubscribedServices();
5353
}

Service/ServiceSubscriberTrait.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ trait ServiceSubscriberTrait
2424
/** @var ContainerInterface */
2525
protected $container;
2626

27+
/**
28+
* {@inheritdoc}
29+
*/
2730
public static function getSubscribedServices(): array
2831
{
2932
static $services;

0 commit comments

Comments
 (0)