Fix wrong phpdoc typehints based off PHPStan level 5 suggestions

src/JsonMapper.php

@@ -26,7 +26,7 @@ class JsonMapper
      * PSR-3 compatible logger object
      *
      * @link http://www.php-fig.org/psr/psr-3/
-     * @var  object
+     * @var  \Psr\Log\LoggerInterface|null
      * @see  setLogger()
      */
     protected $logger;
@@ -142,7 +142,12 @@ class JsonMapper
      * @param object|class-string $object Object to map $json data into
      *
      * @return mixed Mapped object is returned.
-     * @see    mapArray()
+     *
+     * @template       T
+     * @phpstan-param  class-string<T>|T $object
+     * @phpstan-return T
+     *
+     * @see mapArray()
      */
     public function map($json, $object)
     {
@@ -355,10 +360,10 @@ public function map($json, $object)
     /**
      * Convert a type name to a fully namespaced type name.
      *
-     * @param string $type  Type name (simple type or class name)
-     * @param string $strNs Base namespace that gets prepended to the type name
+     * @param string|null $type  Type name (simple type or class name)
+     * @param string      $strNs Base namespace that gets prepended to the type name
      *
-     * @return string Fully-qualified type name with namespace
+     * @return string|null Fully-qualified type name with namespace
      */
     protected function getFullNamespace($type, $strNs)
     {
@@ -377,8 +382,8 @@ protected function getFullNamespace($type, $strNs)
     /**
      * Check required properties exist in json
      *
-     * @param array  $providedProperties array with json properties
-     * @param object $rc                 Reflection class to check
+     * @param array           $providedProperties array with json properties
+     * @param ReflectionClass $rc                 Reflection class to check
      *
      * @throws JsonMapper_Exception
      *
@@ -720,10 +725,10 @@ protected function createInstance(
      * Get the mapped class/type name for this class.
      * Returns the incoming classname if not mapped.
      *
-     * @param string $type   Type name to map
-     * @param mixed  $jvalue Constructor parameter (the json value)
+     * @param string|null $type   Type name to map
+     * @param mixed       $jvalue Constructor parameter (the json value)
      *
-     * @return string The mapped type/class name
+     * @return string|null The mapped type/class name
      */
     protected function getMappedType($type, $jvalue = null)
     {
@@ -856,9 +861,9 @@ protected function isNullable($type)
     /**
      * Remove the 'null' section of a type
      *
-     * @param string $type type name from the phpdoc param
+     * @param string|null $type type name from the phpdoc param
      *
-     * @return string The new type value
+     * @return string|null The new type value
      */
     protected function removeNullable($type)
     {
@@ -931,7 +936,7 @@ protected static function parseAnnotations($docblock)
      * @param string $message Text to log
      * @param array  $context Additional information
      *
-     * @return null
+     * @return void
      */
     protected function log($level, $message, array $context = array())
     {
@@ -943,9 +948,9 @@ protected function log($level, $message, array $context = array())
     /**
      * Sets a logger instance on the object
      *
-     * @param LoggerInterface $logger PSR-3 compatible logger object
+     * @param \Psr\Log\LoggerInterface $logger PSR-3 compatible logger object
      *
-     * @return null
+     * @return void
      */
     public function setLogger($logger)
     {