Merge branch 'hotfix/171' into develop

Forward port #171
zendframework · Aug 29, 2019 · b2a1295 · b2a1295
2 parents 8a1826a + b4e2b1b
commit b2a1295
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -45,6 +45,10 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
+- [#171](https://github.com/zendframework/zend-code/pull/171) changes
+  curly braces in array and string offset access to square brackets
+  in order to prevent issues under the upcoming PHP 7.4 release.
+
 - [#164](https://github.com/zendframework/zend-code/pull/164) fixes indentation in multi-level arrays generated by `ValueGenerator`.
 
 ## 3.3.1 - 2018-08-13

diff --git a/src/NameInformation.php b/src/NameInformation.php
@@ -141,11 +141,11 @@ public function getUses()
      */
     public function resolveName($name)
     {
-        if ($this->namespace && ! $this->uses && strlen($name) > 0 && $name{0} != '\\') {
+        if ($this->namespace && ! $this->uses && strlen($name) > 0 && $name[0] != '\\') {
             return $this->namespace . '\\' . $name;
         }
 
-        if (! $this->uses || strlen($name) <= 0 || $name{0} == '\\') {
+        if (! $this->uses || strlen($name) <= 0 || $name[0] == '\\') {
             return ltrim($name, '\\');
         }
 

diff --git a/src/Scanner/Util.php b/src/Scanner/Util.php
@@ -48,13 +48,13 @@ public static function resolveImports(&$value, $key = null, stdClass $data = nul
             ));
         }
 
-        if ($data->namespace && ! $data->uses && strlen($value) > 0 && $value{0} != '\\') {
+        if ($data->namespace && ! $data->uses && strlen($value) > 0 && $value[0] != '\\') {
             $value = $data->namespace . '\\' . $value;
 
             return;
         }
 
-        if (! $data->uses || strlen($value) <= 0 || $value{0} == '\\') {
+        if (! $data->uses || strlen($value) <= 0 || $value[0] == '\\') {
             $value = ltrim($value, '\\');
 
             return;

diff --git a/test/Generator/FileGeneratorTest.php b/test/Generator/FileGeneratorTest.php
@@ -184,7 +184,7 @@ public function testFileLineEndingsAreAlwaysLineFeed()
 
         $targetLength = strlen('require_once \'SampleClass.php\';');
         self::assertEquals($targetLength, strlen($lines[2]));
-        self::assertEquals(';', $lines[2]{$targetLength - 1});
+        self::assertEquals(';', $lines[2][$targetLength - 1]);
     }
 
     /**