Avoid to call not accessible toString() methods

rgrassian · Jan 6, 2020 · 8283fb9 · 8283fb9
1 parent ed4c577
commit 8283fb9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/Model/ModelManager.php b/src/Model/ModelManager.php
@@ -640,12 +640,12 @@ private function getValueFromType($value, Type $type, string $fieldType, Abstrac
             return (string) $type->convertToPHPValue($value, $platform);
         }
 
-        // some libraries may have `toString` implementation
-        if (method_exists($value, 'toString')) {
+        // some libraries may have `toString()` implementation
+        if (\is_callable([$value, 'toString'])) {
             return $value->toString();
         }
 
-        // final fallback to magic __toString which it may throw an exception in 7.4
+        // final fallback to magic `__toString()` which may throw an exception in 7.4
         if (method_exists($value, '__toString')) {
             return $value->__toString();
         }

diff --git a/tests/Model/ModelManagerTest.php b/tests/Model/ModelManagerTest.php
@@ -75,7 +75,7 @@ public static function setUpBeforeClass(): void
         }
     }
 
-    public function valueObjectDataProvider()
+    public function valueObjectDataProvider(): array
     {
         return [
             'value object with toString implementation' => [ValueObjectWithToStringImpl::class],
@@ -86,7 +86,7 @@ public function valueObjectDataProvider()
     /**
      * @dataProvider valueObjectDataProvider
      */
-    public function testGetIdentifierValuesWhenIdentifierIsValueObjectWithToStringMethod($vbClassName)
+    public function testGetIdentifierValuesWhenIdentifierIsValueObjectWithToStringMethod(string $vbClassName): void
     {
         $entity = new UuidBinaryEntity(new $vbClassName('a7ef873a-e7b5-11e9-81b4-2a2ae2dbcce4'));