Skip to content

Commit 99062a6

Browse files
authored
Removed useless method call() from callable function. (#5029)
1 parent a30bdb6 commit 99062a6

File tree

4 files changed

+6
-13
lines changed

4 files changed

+6
-13
lines changed

src/Aop/PropertyHandlerTrait.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ protected function __handle(string $currentClassName, string $targetClassName, a
8585
foreach ($propertyMetadata as $annotationName => $annotation) {
8686
if ($callbacks = PropertyHandlerManager::get($annotationName)) {
8787
foreach ($callbacks as $callback) {
88-
call($callback, [$this, $currentClassName, $targetClassName, $propertyName, $annotation]);
88+
$callback($this, $currentClassName, $targetClassName, $propertyName, $annotation);
8989
}
9090
$handled[] = $propertyName;
9191
}

src/Definition/FactoryDefinition.php

+2-5
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class FactoryDefinition implements DefinitionInterface
2020
* @param callable|string $factory
2121
* @param array $parameters
2222
*/
23-
public function __construct(private string $name, private $factory, private array $parameters = [])
23+
public function __construct(private string $name, private mixed $factory, private array $parameters = [])
2424
{
2525
}
2626

@@ -40,10 +40,7 @@ public function setName(string $name): self
4040
return $this;
4141
}
4242

43-
/**
44-
* @return callable|string
45-
*/
46-
public function getFactory()
43+
public function getFactory(): callable|string
4744
{
4845
return $this->factory;
4946
}

src/MetadataCacheCollector.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public function serialize(): string
3535
$metadata = [];
3636
foreach ($this->collectors as $collector) {
3737
if (is_string($collector) && method_exists($collector, 'serialize')) {
38-
$metadata[$collector] = call([$collector, 'serialize']);
38+
$metadata[$collector] = $collector::serialize();
3939
}
4040
}
4141

@@ -48,7 +48,7 @@ public function unserialize($serialized): void
4848
$collectors = [];
4949
foreach ($metadatas as $collector => $metadata) {
5050
if (method_exists($collector, 'deserialize')) {
51-
call([$collector, 'deserialize'], [$metadata]);
51+
$collector::deserialize($metadata);
5252
$collectors[] = $collector;
5353
}
5454
}

src/Resolver/FactoryResolver.php

+1-5
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,8 @@ public function resolve(DefinitionInterface $definition, array $parameters = [])
4141
}
4242
if (is_string($callable)) {
4343
$callable = $this->container->get($callable);
44-
$object = $callable($this->container);
45-
} else {
46-
$object = call($callable, [$this->container]);
4744
}
48-
49-
return $object;
45+
return $callable($this->container);
5046
} catch (NotCallableException $e) {
5147
// Custom error message to help debugging
5248
if (is_string($callable) && class_exists($callable) && method_exists($callable, '__invoke')) {

0 commit comments

Comments
 (0)