Merge branch 'fix/172' into develop

michalbundyra · michalbundyra · commit f60a882c16bb · 2019-10-05T23:57:14.000+01:00
Close #172
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -26,7 +26,7 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#172](https://github.com/zendframework/zend-code/pull/172) fixes PHP 7.4 compatibility.
 
 ## 3.3.2 - 2019-08-31
 
diff --git a/src/Scanner/ClassScanner.php b/src/Scanner/ClassScanner.php
@@ -912,13 +912,13 @@ protected function scan()
             if (is_string($token)) {
                 $tokenType    = null;
                 $tokenContent = $token;
-                $tokenLine    = $tokenLine + substr_count(
-                    $lastTokenArray[1],
+                $tokenLine   += substr_count(
+                    $lastTokenArray[1] ?? '',
                     "\n"
                 ); // adjust token line by last known newline count
             } else {
                 $lastTokenArray = $token;
-                list($tokenType, $tokenContent, $tokenLine) = $token;
+                [$tokenType, $tokenContent, $tokenLine] = $token;
             }
 
             return $tokenIndex;
diff --git a/src/Scanner/MethodScanner.php b/src/Scanner/MethodScanner.php
@@ -451,12 +451,13 @@ protected function scan()
             if (is_string($token)) {
                 $tokenType    = null;
                 $tokenContent = $token;
-                $tokenLine    = $tokenLine + substr_count(
-                    $lastTokenArray[1],
+                $tokenLine   += substr_count(
+                    $lastTokenArray[1] ?? '',
                     "\n"
                 ); // adjust token line by last known newline count
             } else {
-                list($tokenType, $tokenContent, $tokenLine) = $token;
+                $lastTokenArray = $token;
+                [$tokenType, $tokenContent, $tokenLine] = $token;
             }
 
             return $tokenIndex;
