From b057939a96e81d216030a8ee7c21bca05ade62dc Mon Sep 17 00:00:00 2001 From: Thomas Janssen Date: Thu, 30 Nov 2023 15:25:01 +0100 Subject: [PATCH] Code tweaks --- src/AngryBytes/DomainObject.php | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/AngryBytes/DomainObject.php b/src/AngryBytes/DomainObject.php index b61d01c..b03e721 100644 --- a/src/AngryBytes/DomainObject.php +++ b/src/AngryBytes/DomainObject.php @@ -2,6 +2,8 @@ namespace AngryBytes; +use InvalidArgumentException; + /** * DomainObject * @@ -144,10 +146,7 @@ public function getPropertyValueAsSimple(string $property) */ public function propertyIsTraversable(string $property): bool { - return is_array($this->$property) - || $this->$property instanceof \Traversable - || $this->$property instanceof \stdClass - ; + return is_iterable($this->$property) || $this->$property instanceof \stdClass; } /** @@ -162,7 +161,7 @@ public function __get(string $name) // Make sure there's a getter if (!method_exists($this, $function)) { - throw new \InvalidArgumentException( + throw new InvalidArgumentException( 'No getter for "' . $name . '" in "' . get_class($this) . '"' ); } @@ -180,7 +179,7 @@ public function __set(string $name, mixed $value): void // Make sure there's a getter if (!method_exists($this, $function)) { - throw new \InvalidArgumentException('No setter for "' . $name . '"'); + throw new InvalidArgumentException('No setter for "' . $name . '"'); } $this->$function($value); @@ -213,7 +212,7 @@ private function getGetters(): array $getters = []; foreach ($reflection->getMethods(\ReflectionMethod::IS_PUBLIC) as $method) { // Only methods starting with "get" make the cut - if (substr($method->getName(), 0, 3) !== 'get') { + if (!str_starts_with($method->getName(), 'get')) { continue; }