Fix PHP 7.4 deprecation: array/string curly braces access

jfcherng · jfcherng · commit 49af2f4cae6f · 2019-09-04T17:45:43.000+08:00
Signed-off-by: Jack Cherng &lt;jfcherng@gmail.com&gt;
diff --git a/PEAR/Command/Channels.php b/PEAR/Command/Channels.php
@@ -673,7 +673,7 @@ function doAlias($command, $options, $params)
             return $this->raiseError('No channel alias specified');
         }
 
-        if (count($params) !== 2 || (!empty($params[1]) && $params[1]{0} == '-')) {
+        if (count($params) !== 2 || (!empty($params[1]) && $params[1][0] == '-')) {
             return $this->raiseError(
                 'Invalid format, correct is: channel-alias channel alias');
         }
diff --git a/PEAR/Command/Common.php b/PEAR/Command/Common.php
@@ -146,7 +146,7 @@ function getGetoptArgs($command, &$short_args, &$long_args)
         foreach ($this->commands[$command]['options'] as $option => $info) {
             $larg = $sarg = '';
             if (isset($info['arg'])) {
-                if ($info['arg']{0} == '(') {
+                if ($info['arg'][0] == '(') {
                     $larg = '==';
                     $sarg = '::';
                     $arg = substr($info['arg'], 1, -1);
diff --git a/PEAR/DependencyDB.php b/PEAR/DependencyDB.php
@@ -174,7 +174,7 @@ function assertDepsDB()
             $this->rebuildDB();
         }
 
-        if ($depdb['_version']{0} > $this->_version[0]) {
+        if ($depdb['_version'][0] > $this->_version[0]) {
             return PEAR::raiseError('Dependency database is version ' .
                 $depdb['_version'] . ', and we are version ' .
                 $this->_version . ', cannot continue');
diff --git a/PEAR/Installer.php b/PEAR/Installer.php
@@ -225,7 +225,7 @@ function _installFile($file, $atts, $tmp_path, $options)
                 $os = new OS_Guess();
             }
 
-            if (strlen($atts['platform']) && $atts['platform']{0} == '!') {
+            if (strlen($atts['platform']) && $atts['platform'][0] == '!') {
                 $negate   = true;
                 $platform = substr($atts['platform'], 1);
             } else {
diff --git a/PEAR/PackageFile/Generator/v1.php b/PEAR/PackageFile/Generator/v1.php
@@ -889,13 +889,13 @@ function _convertRelease2_0(&$release, $package)
                 }
                 //o <install as=..> tags for <file name=... platform=!... install-as=..>
                 if (isset($package['platform'][$file]) &&
-                      $package['platform'][$file]{0} == '!') {
+                      $package['platform'][$file][0] == '!') {
                     $generic[] = $file;
                     continue;
                 }
                 //o <ignore> tags for <file name=... platform=... install-as=..>
                 if (isset($package['platform'][$file]) &&
-                      $package['platform'][$file]{0} != '!') {
+                      $package['platform'][$file][0] != '!') {
                     $genericIgnore[] = $file;
                     continue;
                 }
@@ -959,7 +959,7 @@ function _convertRelease2_0(&$release, $package)
                         //  <file name=... platform=!other platform install-as=..>
                         if (isset($package['platform'][$file]) &&
                               $package['platform'][$file] != "!$os" &&
-                              $package['platform'][$file]{0} == '!') {
+                              $package['platform'][$file][0] == '!') {
                             $release[$releaseNum]['filelist']['install'][] =
                                 array(
                                     'attribs' => array(
@@ -984,7 +984,7 @@ function _convertRelease2_0(&$release, $package)
                         //o <ignore> tags for
                         //  <file name=... platform=other platform install-as=..>
                         if (isset($package['platform'][$file]) &&
-                              $package['platform'][$file]{0} != '!' &&
+                              $package['platform'][$file][0] != '!' &&
                               $package['platform'][$file] != $os) {
                             $release[$releaseNum]['filelist']['ignore'][] =
                                 array(
diff --git a/PEAR/PackageFile/v2/Validator.php b/PEAR/PackageFile/v2/Validator.php
@@ -1080,8 +1080,8 @@ function _validateFilelist($list = false, $allowignore = false, $dirs = '')
             foreach ($list['file'] as $i => $file)
             {
                 if (isset($file['attribs']) && isset($file['attribs']['name'])) {
-                    if ($file['attribs']['name']{0} == '.' &&
-                          $file['attribs']['name']{1} == '/') {
+                    if ($file['attribs']['name'][0] == '.' &&
+                          $file['attribs']['name'][1] == '/') {
                         // name is something like "./doc/whatever.txt"
                         $this->_invalidFileName($file['attribs']['name'], $dirname);
                     }
diff --git a/PEAR/Registry.php b/PEAR/Registry.php
@@ -2204,7 +2204,7 @@ function parsePackageName($param, $defaultchannel = 'pear.php.net')
             }
             if (!isset($components['scheme'])) {
                 if (strpos($components['path'], '/') !== false) {
-                    if ($components['path']{0} == '/') {
+                    if ($components['path'][0] == '/') {
                         return PEAR::raiseError('parsePackageName(): this is not ' .
                             'a package name, it begins with "/" in "' . $param . '"',
                             'invalid', null, null, $param);
diff --git a/PEAR/Validate.php b/PEAR/Validate.php
@@ -287,7 +287,7 @@ function validateVersion()
                 }
                 if (!$this->_packagexml->getExtends()) {
                     if ($versioncomponents[0] == '1') {
-                        if ($versioncomponents[2]{0} == '0') {
+                        if ($versioncomponents[2][0] == '0') {
                             if ($versioncomponents[2] == '0') {
                                 // version 1.*.0000
                                 $this->_addWarning('version',
@@ -339,7 +339,7 @@ function validateVersion()
                         return true;
                     }
                     if ($versioncomponents[0] == $majver) {
-                        if ($versioncomponents[2]{0} == '0') {
+                        if ($versioncomponents[2][0] == '0') {
                             if ($versioncomponents[2] == '0') {
                                 // version 2.*.0000
                                 $this->_addWarning('version',
diff --git a/System.php b/System.php
@@ -265,7 +265,7 @@ public static function mkDir($args)
             } elseif ($opt[0] == 'm') {
                 // if the mode is clearly an octal number (starts with 0)
                 // convert it to decimal
-                if (strlen($opt[1]) && $opt[1]{0} == '0') {
+                if (strlen($opt[1]) && $opt[1][0] == '0') {
                     $opt[1] = octdec($opt[1]);
                 } else {
                     // convert to int
diff --git a/make-gopear-phar.php b/make-gopear-phar.php
@@ -40,7 +40,7 @@ function replaceVersion($contents, $path)
 
 $packages = array();
 foreach ($dp as $entry) {
-    if ($entry{0} == '.' || !in_array(substr($entry, -4), array('.tar'))) {
+    if ($entry[0] == '.' || !in_array(substr($entry, -4), array('.tar'))) {
         continue;
     }
 
diff --git a/make-installpear-nozlib-phar.php b/make-installpear-nozlib-phar.php
@@ -40,7 +40,7 @@ function replaceVersion($contents, $path)
 
 $packages = array();
 foreach ($dp as $entry) {
-    if ($entry{0} == '.' || !in_array(substr($entry, -4), array('.tar'))) {
+    if ($entry[0] == '.' || !in_array(substr($entry, -4), array('.tar'))) {
         continue;
     }
 
diff --git a/make-pear-bundle.php b/make-pear-bundle.php
@@ -31,11 +31,11 @@ function extract_file_from_tarball($pkg, $filename, $dest_dir) /* {{{ */
 			break;
 		$checksum = 0;
 		for ($i = 0; $i < 148; $i++)
-			$checksum += ord($hdr_data{$i});
+			$checksum += ord($hdr_data[$i]);
 		for ($i = 148; $i < 156; $i++)
 			$checksum += 32;
 		for ($i = 156; $i < 512; $i++)
-			$checksum += ord($hdr_data{$i});
+			$checksum += ord($hdr_data[$i]);
 
 		$hdr = unpack("a100filename/a8mode/a8uid/a8gid/a12size/a12mtime/a8checksum/a1typeflag/a100link/a6magic/a2version/a32uname/a32gname/a8devmajor/a8devminor", $hdr_data);
 

Original file line number	Diff line number	Diff line change
`@@ -673,7 +673,7 @@ function doAlias($command, $options, $params)`
`673`	`673`	`return $this->raiseError('No channel alias specified');`
`674`	`674`	`}`
`675`	`675`
`676`		`- if (count($params) !== 2 \|\| (!empty($params[1]) && $params[1]{0} == '-')) {`
	`676`	`+ if (count($params) !== 2 \|\| (!empty($params[1]) && $params[1][0] == '-')) {`
`677`	`677`	`return $this->raiseError(`
`678`	`678`	`'Invalid format, correct is: channel-alias channel alias');`
`679`	`679`	`}`
Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ function assertDepsDB()`
`174`	`174`	`$this->rebuildDB();`
`175`	`175`	`}`
`176`	`176`
`177`		`- if ($depdb['_version']{0} > $this->_version[0]) {`
	`177`	`+ if ($depdb['_version'][0] > $this->_version[0]) {`
`178`	`178`	`return PEAR::raiseError('Dependency database is version ' .`
`179`	`179`	`$depdb['_version'] . ', and we are version ' .`
`180`	`180`	`$this->_version . ', cannot continue');`
Original file line number	Diff line number	Diff line change
`@@ -225,7 +225,7 @@ function _installFile($file, $atts, $tmp_path, $options)`
`225`	`225`	`$os = new OS_Guess();`
`226`	`226`	`}`
`227`	`227`
`228`		`- if (strlen($atts['platform']) && $atts['platform']{0} == '!') {`
	`228`	`+ if (strlen($atts['platform']) && $atts['platform'][0] == '!') {`
`229`	`229`	`$negate = true;`
`230`	`230`	`$platform = substr($atts['platform'], 1);`
`231`	`231`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -1080,8 +1080,8 @@ function _validateFilelist($list = false, $allowignore = false, $dirs = '')`
`1080`	`1080`	`foreach ($list['file'] as $i => $file)`
`1081`	`1081`	`{`
`1082`	`1082`	`if (isset($file['attribs']) && isset($file['attribs']['name'])) {`
`1083`		`- if ($file['attribs']['name']{0} == '.' &&`
`1084`		`- $file['attribs']['name']{1} == '/') {`
	`1083`	`+ if ($file['attribs']['name'][0] == '.' &&`
	`1084`	`+ $file['attribs']['name'][1] == '/') {`
`1085`	`1085`	`// name is something like "./doc/whatever.txt"`
`1086`	`1086`	`$this->_invalidFileName($file['attribs']['name'], $dirname);`
`1087`	`1087`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2204,7 +2204,7 @@ function parsePackageName($param, $defaultchannel = 'pear.php.net')`
`2204`	`2204`	`}`
`2205`	`2205`	`if (!isset($components['scheme'])) {`
`2206`	`2206`	`if (strpos($components['path'], '/') !== false) {`
`2207`		`- if ($components['path']{0} == '/') {`
	`2207`	`+ if ($components['path'][0] == '/') {`
`2208`	`2208`	`return PEAR::raiseError('parsePackageName(): this is not ' .`
`2209`	`2209`	`'a package name, it begins with "/" in "' . $param . '"',`
`2210`	`2210`	`'invalid', null, null, $param);`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ function replaceVersion($contents, $path)`
`40`	`40`
`41`	`41`	`$packages = array();`
`42`	`42`	`foreach ($dp as $entry) {`
`43`		`- if ($entry{0} == '.' \|\| !in_array(substr($entry, -4), array('.tar'))) {`
	`43`	`+ if ($entry[0] == '.' \|\| !in_array(substr($entry, -4), array('.tar'))) {`
`44`	`44`	`continue;`
`45`	`45`	`}`
`46`	`46`