Skip to content

Commit

Permalink
Fix dependency and class incompatibilities
Browse files Browse the repository at this point in the history
Signed-off-by: tux-rampage <[email protected]>
tux-rampage committed Nov 20, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
1 parent 2a3f5ff commit d4c6245
Showing 3 changed files with 671 additions and 519 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -44,7 +44,7 @@
"phpbench/phpbench": "^1.2.7",
"phpunit/phpunit": "^9.5.26",
"psalm/plugin-phpunit": "^0.18.0",
"squizlabs/php_codesniffer": "^3.7.1",
"squizlabs/php_codesniffer": "^3.10",
"vimeo/psalm": "^5.0"
},
"conflict": {
1,182 changes: 668 additions & 514 deletions composer.lock

Large diffs are not rendered by default.

6 changes: 2 additions & 4 deletions src/Container/ServiceManager/AutowireFactory.php
Original file line number Diff line number Diff line change
@@ -26,9 +26,8 @@ public function __construct(?GenericAutowireFactory $factory = null)
* Check creatability of the requested name
*
* @param string $requestedName
* @return bool
*/
public function canCreate(ContainerInterface $container, $requestedName)
public function canCreate(ContainerInterface $container, $requestedName): bool
{
return $this->factory->canCreate($container, $requestedName);
}
@@ -38,9 +37,8 @@ public function canCreate(ContainerInterface $container, $requestedName)
*
* @psalm-suppress RedundantCastGivenDocblockType
* @param string $requestedName
* @return object
*/
public function __invoke(ContainerInterface $container, $requestedName, ?array $options = null)
public function __invoke(ContainerInterface $container, $requestedName, ?array $options = null): object
{
return $this->factory->create($container, (string) $requestedName, $options);
}

0 comments on commit d4c6245

Please sign in to comment.