Skip to content

Commit 4cbf007

Browse files
Merge branch '4.3' into 4.4
* 4.3: cs fix Partially Revert "Remove trailing space in all markdown files" [Intl] Explicit check Fix getMaxFilesize() returning zero [DI] fix docblocks in Container* Fixed markdown file [TwigBridge] Replaced plain doc block copies with inheritdoc. [DomCrawler] Fixed CHANGELOG markup [Intl] Cleanup unused language aliases entry
2 parents 6f11b35 + a51dd70 commit 4cbf007

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

ContainerBuilder.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1074,7 +1074,7 @@ public function findDefinition($id)
10741074
/**
10751075
* Creates a service for a service definition.
10761076
*
1077-
* @return object The service described by the service definition
1077+
* @return mixed The service described by the service definition
10781078
*
10791079
* @throws RuntimeException When the factory definition is incomplete
10801080
* @throws RuntimeException When the service is a synthetic service
@@ -1639,7 +1639,7 @@ private function callMethod($service, array $call, array &$inlineServices)
16391639
/**
16401640
* Shares a given service in the container.
16411641
*
1642-
* @param object $service
1642+
* @param mixed $service
16431643
*/
16441644
private function shareService(Definition $definition, $service, ?string $id, array &$inlineServices)
16451645
{

ContainerInterface.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ interface ContainerInterface extends PsrContainerInterface
3333
/**
3434
* Sets a service.
3535
*
36-
* @param string $id The service identifier
37-
* @param object $service The service instance
36+
* @param string $id The service identifier
37+
* @param object|null $service The service instance
3838
*/
3939
public function set($id, $service);
4040

@@ -44,7 +44,7 @@ public function set($id, $service);
4444
* @param string $id The service identifier
4545
* @param int $invalidBehavior The behavior when the service does not exist
4646
*
47-
* @return object The associated service
47+
* @return object|null The associated service
4848
*
4949
* @throws ServiceCircularReferenceException When a circular reference is detected
5050
* @throws ServiceNotFoundException When the service is not defined

0 commit comments

Comments
 (0)