diff --git a/rector.php b/rector.php index d13b0835b..96ae6c421 100644 --- a/rector.php +++ b/rector.php @@ -8,7 +8,6 @@ use Rector\DeadCode\Rector\Property\RemoveUnusedPrivatePropertyRector; use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodRector; use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPromotedPropertyRector; -use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPublicMethodParameterRector; use Rector\DeadCode\Rector\ClassMethod\RemoveUselessParamTagRector; use Rector\DeadCode\Rector\ClassMethod\RemoveUselessReturnTagRector; use Rector\DeadCode\Rector\If_\RemoveAlwaysTrueIfConditionRector; @@ -48,6 +47,7 @@ __DIR__ . '/src/Prototype/src/NodeVisitors/LocateProperties.php', __DIR__ . '/src/Prototype/src/NodeVisitors/RemoveTrait.php', __DIR__ . '/src/Logger/src/ListenerRegistry.php', + __DIR__ . '/src/Stempler/src/Transform/Merge/ExtendsParent.php', ], RemoveExtraParametersRector::class => [ __DIR__ . '/src/Boot/src/BootloadManager/AbstractBootloadManager.php', @@ -58,8 +58,6 @@ // to be enabled later after upgrade to 1.2.4 merged // to easier to review - RemoveAlwaysTrueIfConditionRector::class, - RemoveUnusedPublicMethodParameterRector::class, RemoveEmptyClassMethodRector::class, RemoveUnusedPromotedPropertyRector::class, RemoveUselessParamTagRector::class, diff --git a/src/Filters/src/Attribute/NestedArray.php b/src/Filters/src/Attribute/NestedArray.php index 3127df142..c764713f2 100644 --- a/src/Filters/src/Attribute/NestedArray.php +++ b/src/Filters/src/Attribute/NestedArray.php @@ -44,7 +44,7 @@ public function getValue(InputInterface $input, \ReflectionProperty $property): return $this->input->getValue($input, $property); } - public function getSchema(\ReflectionProperty $property): array + public function getSchema(): array { if ($this->prefix) { return [$this->class, $this->prefix]; diff --git a/src/Filters/src/Attribute/NestedFilter.php b/src/Filters/src/Attribute/NestedFilter.php index e4f7c24b0..0497f2833 100644 --- a/src/Filters/src/Attribute/NestedFilter.php +++ b/src/Filters/src/Attribute/NestedFilter.php @@ -32,7 +32,7 @@ public function __construct( ) { } - public function getSchema(\ReflectionProperty $property): string|array + public function getSchema(): string|array { if ($this->prefix) { return [$this->class, $this->prefix]; diff --git a/src/Filters/src/Model/Schema/AttributeMapper.php b/src/Filters/src/Model/Schema/AttributeMapper.php index 27958e7b1..3258e6d6c 100644 --- a/src/Filters/src/Model/Schema/AttributeMapper.php +++ b/src/Filters/src/Model/Schema/AttributeMapper.php @@ -73,7 +73,7 @@ public function map(FilterInterface $filter, InputInterface $input): array } } - $schema[$property->getName()] = $attribute->getSchema($property); + $schema[$property->getName()] = $attribute->getSchema(); } elseif ($attribute instanceof NestedArray) { $values = $attribute->getValue($input, $property); $propertyValues = []; diff --git a/src/Streams/src/StreamWrapper.php b/src/Streams/src/StreamWrapper.php index bbaa0545c..2827a7688 100644 --- a/src/Streams/src/StreamWrapper.php +++ b/src/Streams/src/StreamWrapper.php @@ -53,7 +53,7 @@ public function stream_eof(): bool /** * Open pre-mocked StreamInterface by it's unique uri. */ - public function stream_open(string $path, string $mode, int $options, ?string &$opened_path): bool + public function stream_open(string $path, string $mode): bool { if (!isset(self::$uris[$path])) { return false;