From 84af4793dff265c35603f6c53a1555ac27ee3971 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 8 Aug 2019 09:52:24 +0200 Subject: - update to 1.5.2 - add patch for PHP 7.4 from https://github.com/cweiske/jsonmapper/pull/131 --- 131.patch | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 131.patch (limited to '131.patch') diff --git a/131.patch b/131.patch new file mode 100644 index 0000000..5b173f6 --- /dev/null +++ b/131.patch @@ -0,0 +1,22 @@ +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