|null $currentOffset
* @psalm-mutation-free
*/
protected function callAtPath($path, $callable, &$currentOffset = null)
@@ -7487,8 +7496,8 @@ protected function callAtPath($path, $callable, &$currentOffset = null)
/**
* Extracts the value of the given property or method from the object.
*
- * @param static $object
- * The object to extract the value from.
+ * @param mixed $object
+ * The Arrayy instance, object, or other value from which to extract the property or method value.
* @param string $keyOrPropertyOrMethod
* The property or method for which the
* value should be extracted.
@@ -7498,11 +7507,10 @@ protected function callAtPath($path, $callable, &$currentOffset = null)
* @return mixed
* The value extracted from the specified property or method.
*
- * @phpstan-param self $object
*/
- final protected function extractValue(self $object, string $keyOrPropertyOrMethod)
+ final protected function extractValue($object, string $keyOrPropertyOrMethod)
{
- if (isset($object[$keyOrPropertyOrMethod])) {
+ if ($object instanceof self && isset($object[$keyOrPropertyOrMethod])) {
$return = $object->get($keyOrPropertyOrMethod);
if ($return instanceof self) {
@@ -7512,11 +7520,12 @@ final protected function extractValue(self $object, string $keyOrPropertyOrMetho
return $return;
}
- if (\property_exists($object, $keyOrPropertyOrMethod)) {
+ // only use properties / methods that are accessible (and initialized) from here
+ if (\is_object($object) && \array_key_exists($keyOrPropertyOrMethod, \get_object_vars($object))) {
return $object->{$keyOrPropertyOrMethod};
}
- if (\method_exists($object, $keyOrPropertyOrMethod)) {
+ if (\is_object($object) && \is_callable([$object, $keyOrPropertyOrMethod])) {
return $object->{$keyOrPropertyOrMethod}();
}
@@ -8019,7 +8028,7 @@ protected function internalGetArray(&$data)
/**
* Internal mechanics of remove method.
*
- * @param float|int|string $key
+ * @param float|int|string|null $key
*
* @return bool
*/
@@ -8049,6 +8058,14 @@ protected function internalRemove($key): bool
$key = \array_shift($path);
}
+ if ($key === null) {
+ return false;
+ }
+
+ if (\is_float($key)) {
+ return false;
+ }
+
unset($this->array[$key]);
return true;
@@ -8063,7 +8080,7 @@ protected function internalRemove($key): bool
*
* @return bool
*
- * @phpstan-param TKey|null $key
+ * @phpstan-param array-key|null $key
* @phpstan-param T $value
*/
protected function internalSet(
diff --git a/src/Collection/AbstractCollection.php b/src/Collection/AbstractCollection.php
index 58fbcd1..2d7b222 100644
--- a/src/Collection/AbstractCollection.php
+++ b/src/Collection/AbstractCollection.php
@@ -317,10 +317,12 @@ public static function createFromJsonMapper(string $json)
if (\is_array($jsonObject)) {
foreach ($jsonObject as $jsonObjectSingle) {
$collectionData = $mapper->map($jsonObjectSingle, $type);
+ /** @phpstan-var T $collectionData */
$return->add($collectionData);
}
} else {
$collectionData = $mapper->map($jsonObject, $type);
+ /** @phpstan-var T $collectionData */
$return->add($collectionData);
}
} else {
diff --git a/src/Create.php b/src/Create.php
index 9241591..45d15fb 100644
--- a/src/Create.php
+++ b/src/Create.php
@@ -17,7 +17,10 @@
*/
function create($data): Arrayy
{
- return new Arrayy($data);
+ /** @var Arrayy> $array */
+ $array = new Arrayy($data);
+
+ return $array;
}
}
diff --git a/src/Mapper/Json.php b/src/Mapper/Json.php
index a5724e0..755d773 100644
--- a/src/Mapper/Json.php
+++ b/src/Mapper/Json.php
@@ -19,7 +19,7 @@ final class Json
* Override class names that JsonMapper uses to create objects.
* Useful when your setter methods accept abstract classes or interfaces.
*
- * @var array
+ * @var array
*/
public $classMap = [];
@@ -33,7 +33,7 @@ final class Json
* 2. Name of the unknown JSON property
* 3. JSON value of the property
*
- * @var callable
+ * @var null|callable(object, string, mixed): void
*/
public $undefinedPropertyHandler;
@@ -41,14 +41,14 @@ final class Json
* Runtime cache for inspected classes. This is particularly effective if
* mapArray() is called with a large number of objects
*
- * @var array property inspection result cache
+ * @var array> property inspection result cache
*/
private $arInspectedClasses = [];
/**
* Map data all data in $json into the given $object instance.
*
- * @param object|iterable $json
+ * @param object|iterable $json
* JSON object structure from json_decode()
* @param object|string $object
* Object to map $json data into
@@ -58,7 +58,8 @@ final class Json
*
* @see mapArray()
*
- * @template TObject
+ * @template TObject of object
+ * @phpstan-param object|iterable $json
* @phpstan-param TObject|class-string $object
* Object to map $json data into.
* @phpstan-return TObject
@@ -79,6 +80,11 @@ public function map($json, $object)
$strClassName = \get_class($object);
$rc = new \ReflectionClass($object);
$strNs = $rc->getNamespaceName();
+
+ if (\is_object($json) && !($json instanceof \Traversable)) {
+ $json = \get_object_vars($json);
+ }
+
foreach ($json as $key => $jsonValue) {
$key = $this->getSafeName($key);
@@ -96,8 +102,7 @@ public function map($json, $object)
if (!$hasProperty) {
if (\is_callable($this->undefinedPropertyHandler)) {
- \call_user_func(
- $this->undefinedPropertyHandler,
+ ($this->undefinedPropertyHandler)(
$object,
$key,
$jsonValue
@@ -111,7 +116,7 @@ public function map($json, $object)
continue;
}
- if ($this->isNullable($type)) {
+ if ($type !== null && $this->isNullable($type)) {
if ($jsonValue === null) {
$this->setProperty($object, $accessor, null);
@@ -247,7 +252,7 @@ public function map($json, $object)
/**
* Map an array
*
- * @param array $json JSON array structure from json_decode()
+ * @param array $json JSON array structure from json_decode()
* @param mixed $array Array or ArrayObject that gets filled with
* data from $json
* @param string|null $class Class name for children objects.
@@ -261,6 +266,8 @@ public function map($json, $object)
* @pslam-param null|class-string $class
*
* @return mixed Mapped $array is returned
+ *
+ * @phpstan-param array $json
*/
public function mapArray($json, $array, $class = null, $parent_key = '')
{
@@ -301,8 +308,12 @@ public function mapArray($json, $array, $class = null, $parent_key = '')
)
&&
\count($typesTmp->getTypes()) === 1
+ &&
+ \class_exists($typesTmp->getTypes()[0])
) {
- $array[$key] = $this->map($jsonValue, $typesTmp->getTypes()[0]);
+ /** @var class-string