Use [] for array offsets

Author: thekid

src/main/php/rdbms/StatementFormatter.class.php

@@ -55,14 +55,14 @@ public function format($fmt, $args) {
       // If offset == length, it was the last token, so return
       if ($offset >= $length) return $statement;
 
-      if ('"' === $fmt{$offset} || "'" === $fmt{$offset}) {
+      if ('"' === $fmt[$offset] || "'" === $fmt[$offset]) {
 
         // Escape string literals (which use double quote characters inside for escaping)
-        $quote= $fmt{$offset};
+        $quote= $fmt[$offset];
         $strlen= $offset+ 1;
         do {
           $strlen+= strcspn($fmt, $quote, $strlen);
-          if ($strlen >= $length || $quote !== $fmt{$strlen+ 1}) break;
+          if ($strlen >= $length || $quote !== $fmt[$strlen + 1]) break;
           $strlen+= 2;
         } while (true);
 
@@ -71,39 +71,39 @@ public function format($fmt, $args) {
         }
 
         $statement.= $this->dialect->escapeString(
-          strtr(substr($fmt, $offset+ 1, $strlen- $offset- 1), 
+          strtr(substr($fmt, $offset + 1, $strlen- $offset- 1), 
           ['%%' => '%', $quote.$quote => $quote]
         ));
         $offset= $strlen+ 1;
         continue;
-      } else if (is_numeric($fmt{$offset+ 1})) {
+      } else if (is_numeric($fmt[$offset + 1])) {
 
         // Numeric argument type specifier, e.g. %1$s
         sscanf(substr($fmt, $offset), '%%%d$', $overrideOffset);
-        $type= $fmt{$offset+ strlen($overrideOffset)+ 2};
-        $offset+= strlen($overrideOffset)+ 3;
+        $type= $fmt[$offset+ strlen($overrideOffset) + 2];
+        $offset+= strlen($overrideOffset) + 3;
         if (!array_key_exists($overrideOffset- 1, $args)) {
-          throw new SQLStateException('Missing argument #'.($overrideOffset- 1).' @offset '.$offset);
+          throw new SQLStateException('Missing argument #'.($overrideOffset - 1).' @offset '.$offset);
         }
-        $argument= $args[$overrideOffset- 1];
-      } else if (false !== strpos($tokens, $fmt{$offset+ 1})) {
+        $argument= $args[$overrideOffset - 1];
+      } else if (false !== strpos($tokens, $fmt[$offset + 1])) {
 
         // Known tokens
-        $type= $fmt{$offset+ 1};
+        $type= $fmt[$offset+ 1];
         $offset+= 2;
         if (!array_key_exists($argumentOffset, $args)) {
           throw new SQLStateException('Missing argument #'.$argumentOffset.' @offset '.$offset);
         }
         $argument= $args[$argumentOffset];
         $argumentOffset++;
-      } else if ('%' == $fmt{$offset+ 1}) {
+      } else if ('%' == $fmt[$offset + 1]) {
 
         // Escape sign
         $statement.= '%';
         $offset+= 2;
         continue;
       } else {
-        throw new SQLStateException('Unknown token "'.$fmt{$offset+ 1}.'"');
+        throw new SQLStateException('Unknown token "'.$fmt[$offset + 1].'"');
       }
 
       $statement.= $this->prepare($type, $argument);

src/main/php/rdbms/mysqlx/MySqlxProtocol.class.php

@@ -195,7 +195,7 @@ protected function length($data, &$consumed, $ll= false) {
     if (!isset($data[$consumed])) {
       return 0;
     }
-    switch ($data{$consumed}) {
+    switch ($data[$consumed]) {
       case "\373": $consumed+= 1; return null;
       case "\374": $consumed+= 3; return ord($data[$o+ 1]) + ord($data[$o+ 2]) * 256;
       case "\375": $consumed+= 4; return ord($data[$o+ 1]) + ord($data[$o+ 2]) * 256 + ord($data[$o+ 3]) * 65536;
@@ -234,7 +234,7 @@ protected function lbin($data, $l, &$consumed) {
    * @return  string
    */
   protected function lstr($data, &$consumed) {
-    if ("\373" === $data{$consumed}) {
+    if ("\373" === $data[$consumed]) {
       $consumed++;
       return null;
     }
@@ -280,7 +280,7 @@ protected function field_40($f) {
     $field['length']= $this->lbin($f, 4, $consumed);
     $field['type']= $this->lbin($f, 2, $consumed);
     $field['flags']= $this->lbin($f, 2, $consumed);
-    $field['decimals']= ord($f{$consumed+ 1});
+    $field['decimals']= ord($f[$consumed + 1]);
     return $field;
   }
 
@@ -346,7 +346,7 @@ public function exec($sql) {
    */
   public function fetch($fields) {
     $r= $this->read();
-    if ("\376" === $r{0} && strlen($r) < 9) {
+    if ("\376" === $r[0] && strlen($r) < 9) {
       $this->pkt= 0;
       return null;
     }
@@ -370,7 +370,7 @@ public function cancel() {
     do {
       $r= $this->read();
       $i++;
-    } while (!("\376" === $r{0} && strlen($r) < 9));
+    } while (!("\376" === $r[0] && strlen($r) < 9));
     $this->pkt= 0;
     return $i;
   }
@@ -457,7 +457,7 @@ protected function read() {
     // DEBUG Console::$err->writeLine('R-> ', new Bytes($buf));
 
     // 0xFF indicates an error
-    if ("\377" !== $buf{0}) return $buf;
+    if ("\377" !== $buf[0]) return $buf;
 
     $this->pkt= 0;
     $sqlstate= '00000';