From 17f49c6686f6b62f7306523948f125638c17b1cb Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 19 Aug 2019 14:11:12 +0200 Subject: - update to 1.6.0 - drop patch merged upstream --- 131.patch | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 131.patch (limited to '131.patch') diff --git a/131.patch b/131.patch deleted file mode 100644 index 5b173f6..0000000 --- a/131.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 6cdf7da6d2ff3affa0bc3fbf5517278abc23b3b8 Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Thu, 8 Aug 2019 09:48:05 +0200 -Subject: [PATCH] fix Trying to access array offset on value of type null - ---- - src/JsonMapper.php | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/JsonMapper.php b/src/JsonMapper.php -index 2056ead..2bf1daf 100644 ---- a/src/JsonMapper.php -+++ b/src/JsonMapper.php -@@ -592,7 +592,7 @@ protected function getMappedType($type, $jvalue = null) - { - if (isset($this->classMap[$type])) { - $target = $this->classMap[$type]; -- } else if ($type !== '' && $type[0] == '\\' -+ } else if (is_string($type) && $type !== '' && $type[0] == '\\' - && isset($this->classMap[substr($type, 1)]) - ) { - $target = $this->classMap[substr($type, 1)]; -- cgit