symfony
diff --git a/‎src/Symfony/Component/VarDumper/Cloner/Data.php
Lines changed: 5 additions & 5 deletions b/‎src/Symfony/Component/VarDumper/Cloner/Data.php
Lines changed: 5 additions & 5 deletions
diff --git a/‎src/Symfony/Component/VarDumper/Cloner/DumperInterface.php
Lines changed: 9 additions & 9 deletions b/‎src/Symfony/Component/VarDumper/Cloner/DumperInterface.php
Lines changed: 9 additions & 9 deletions
diff --git a/‎src/Symfony/Component/VarDumper/Dumper/AbstractDumper.php
Lines changed: 3 additions & 3 deletions b/‎src/Symfony/Component/VarDumper/Dumper/AbstractDumper.php
Lines changed: 3 additions & 3 deletions
@@ -61,7 +61,7 @@ public function getType()
     }
 
     /**
-     * @param bool $recursive Whether values should be resolved recursively or not
+     * @param array|bool $recursive Whether values should be resolved recursively or not
      *
      * @return string|int|float|bool|array|Data[]|null A native representation of the original value
      */
@@ -182,7 +182,7 @@ public function getRawData()
      *
      * @param int $maxDepth The max dumped depth level
      *
-     * @return self A clone of $this
+     * @return static
      */
     public function withMaxDepth($maxDepth)
     {
@@ -197,7 +197,7 @@ public function withMaxDepth($maxDepth)
      *
      * @param int $maxItemsPerDepth The max number of items dumped per depth level
      *
-     * @return self A clone of $this
+     * @return static
      */
     public function withMaxItemsPerDepth($maxItemsPerDepth)
     {
@@ -212,7 +212,7 @@ public function withMaxItemsPerDepth($maxItemsPerDepth)
      *
      * @param bool $useRefHandles False to hide global ref. handles
      *
-     * @return self A clone of $this
+     * @return static
      */
     public function withRefHandles($useRefHandles)
     {
@@ -227,7 +227,7 @@ public function withRefHandles($useRefHandles)
      *
      * @param string|int $key The key to seek to
      *
-     * @return self|null A clone of $this or null if the key is not set
+     * @return static|null Null if the key is not set
      */
     public function seek($key)
     {
 
@@ -40,21 +40,21 @@ public function dumpString(Cursor $cursor, $str, $bin, $cut);
     /**
      * Dumps while entering an hash.
      *
-     * @param Cursor $cursor   The Cursor position in the dump
-     * @param int    $type     A Cursor::HASH_* const for the type of hash
-     * @param string $class    The object class, resource type or array count
-     * @param bool   $hasChild When the dump of the hash has child item
+     * @param Cursor     $cursor   The Cursor position in the dump
+     * @param int        $type     A Cursor::HASH_* const for the type of hash
+     * @param string|int $class    The object class, resource type or array count
+     * @param bool       $hasChild When the dump of the hash has child item
      */
     public function enterHash(Cursor $cursor, $type, $class, $hasChild);
 
     /**
      * Dumps while leaving an hash.
      *
-     * @param Cursor $cursor   The Cursor position in the dump
-     * @param int    $type     A Cursor::HASH_* const for the type of hash
-     * @param string $class    The object class, resource type or array count
-     * @param bool   $hasChild When the dump of the hash has child item
-     * @param int    $cut      The number of items the hash has been cut by
+     * @param Cursor     $cursor   The Cursor position in the dump
+     * @param int        $type     A Cursor::HASH_* const for the type of hash
+     * @param string|int $class    The object class, resource type or array count
+     * @param bool       $hasChild When the dump of the hash has child item
+     * @param int        $cut      The number of items the hash has been cut by
      */
     public function leaveHash(Cursor $cursor, $type, $class, $hasChild, $cut);
 }
@@ -185,13 +185,13 @@ protected function echoLine($line, $depth, $indentPad)
     /**
      * Converts a non-UTF-8 string to UTF-8.
      *
-     * @param string $s The non-UTF-8 string to convert
+     * @param string|null $s The non-UTF-8 string to convert
      *
-     * @return string The string converted to UTF-8
+     * @return string|null The string converted to UTF-8
      */
     protected function utf8Encode($s)
     {
-        if (preg_match('//u', $s)) {
+        if (null === $s || preg_match('//u', $s)) {
             return $s;
         }
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public function getType()`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`/**`
`64`		`- * @param bool $recursive Whether values should be resolved recursively or not`
	`64`	`+ * @param array\|bool $recursive Whether values should be resolved recursively or not`
`65`	`65`	`*`
`66`	`66`	`* @return string\|int\|float\|bool\|array\|Data[]\|null A native representation of the original value`
`67`	`67`	`*/`
`@@ -182,7 +182,7 @@ public function getRawData()`
`182`	`182`	`*`
`183`	`183`	`* @param int $maxDepth The max dumped depth level`
`184`	`184`	`*`
`185`		`- * @return self A clone of $this`
	`185`	`+ * @return static`
`186`	`186`	`*/`
`187`	`187`	`public function withMaxDepth($maxDepth)`
`188`	`188`	`{`
`@@ -197,7 +197,7 @@ public function withMaxDepth($maxDepth)`
`197`	`197`	`*`
`198`	`198`	`* @param int $maxItemsPerDepth The max number of items dumped per depth level`
`199`	`199`	`*`
`200`		`- * @return self A clone of $this`
	`200`	`+ * @return static`
`201`	`201`	`*/`
`202`	`202`	`public function withMaxItemsPerDepth($maxItemsPerDepth)`
`203`	`203`	`{`
`@@ -212,7 +212,7 @@ public function withMaxItemsPerDepth($maxItemsPerDepth)`
`212`	`212`	`*`
`213`	`213`	`* @param bool $useRefHandles False to hide global ref. handles`
`214`	`214`	`*`
`215`		`- * @return self A clone of $this`
	`215`	`+ * @return static`
`216`	`216`	`*/`
`217`	`217`	`public function withRefHandles($useRefHandles)`
`218`	`218`	`{`
`@@ -227,7 +227,7 @@ public function withRefHandles($useRefHandles)`
`227`	`227`	`*`
`228`	`228`	`* @param string\|int $key The key to seek to`
`229`	`229`	`*`
`230`		`- * @return self\|null A clone of $this or null if the key is not set`
	`230`	`+ * @return static\|null Null if the key is not set`
`231`	`231`	`*/`
`232`	`232`	`public function seek($key)`
`233`	`233`	`{`
Original file line number	Diff line number	Diff line change
`@@ -185,13 +185,13 @@ protected function echoLine($line, $depth, $indentPad)`
`185`	`185`	`/**`
`186`	`186`	`* Converts a non-UTF-8 string to UTF-8.`
`187`	`187`	`*`
`188`		`- * @param string $s The non-UTF-8 string to convert`
	`188`	`+ * @param string\|null $s The non-UTF-8 string to convert`
`189`	`189`	`*`
`190`		`- * @return string The string converted to UTF-8`
	`190`	`+ * @return string\|null The string converted to UTF-8`
`191`	`191`	`*/`
`192`	`192`	`protected function utf8Encode($s)`
`193`	`193`	`{`
`194`		`- if (preg_match('//u', $s)) {`
	`194`	`+ if (null === $s \|\| preg_match('//u', $s)) {`
`195`	`195`	`return $s;`
`196`	`196`	`}`
`197`	`197`