From 9baefd5045deb8be817d4aa3f2cf5823ea14a1ff Mon Sep 17 00:00:00 2001 From: roxblnfk Date: Wed, 31 Jan 2024 17:50:28 +0400 Subject: [PATCH] Cleanup --- src/Mapper/Proxy/Hydrator/ClassPropertiesExtractor.php | 10 ++++------ src/Mapper/Proxy/Hydrator/PropertyMap.php | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/Mapper/Proxy/Hydrator/ClassPropertiesExtractor.php b/src/Mapper/Proxy/Hydrator/ClassPropertiesExtractor.php index 78608411d..dc9336a8c 100644 --- a/src/Mapper/Proxy/Hydrator/ClassPropertiesExtractor.php +++ b/src/Mapper/Proxy/Hydrator/ClassPropertiesExtractor.php @@ -62,13 +62,11 @@ private function findAllInstanceProperties(?ReflectionClass $class = null): arra return []; } - return array_merge( - $this->findAllInstanceProperties($class->getParentClass() ?: null), // of course PHP is shit. - array_filter( + return \array_merge( + $this->findAllInstanceProperties($class->getParentClass() ?: null), + \array_filter( $class->getProperties(), - static function (ReflectionProperty $property): bool { - return !$property->isStatic(); - } + static fn(ReflectionProperty $property): bool => !$property->isStatic() ) ); } diff --git a/src/Mapper/Proxy/Hydrator/PropertyMap.php b/src/Mapper/Proxy/Hydrator/PropertyMap.php index e67e2c54e..c4797e659 100644 --- a/src/Mapper/Proxy/Hydrator/PropertyMap.php +++ b/src/Mapper/Proxy/Hydrator/PropertyMap.php @@ -25,7 +25,7 @@ public function isPublicProperty(string $name): bool public function getPropertyClass(string $name): ?string { foreach ($this->properties as $class => $properties) { - if (in_array($name, $properties, true)) { + if (\in_array($name, $properties, true)) { return $class; } }