o2system / database

src/autoload.php

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
  * @param $className

  */

 spl_autoload_register(

-    function ($className) {

+    function($className) {

         if (strpos($className, 'O2System\Database\\') === false) {

             return;

         }

src/NoSql/Abstracts/AbstractConnection.php

Spacing +13 added lines, -13 removed lines

@@ -228,9 +228,9 @@ 
         // No connection resource? Check if there is a failover else throw an error

         if ( ! $this->handle) {

             // Check if there is a failover set

-            if ( ! empty($this->config[ 'failover' ]) && is_array($this->config[ 'failover' ])) {

+            if ( ! empty($this->config['failover']) && is_array($this->config['failover'])) {

                 // Go over all the failovers

-                foreach ($this->config[ 'failover' ] as $failover) {

+                foreach ($this->config['failover'] as $failover) {

 

                     // Try to connect

                     $this->platformConnectHandler($failover = new Config($failover));

@@ -301,11 +301,11 @@ 
      */

     public function getPlatformInfo()

     {

-        if (isset($this->queriesResultCache[ 'platformInfo' ])) {

-            return $this->queriesResultCache[ 'platformInfo' ];

+        if (isset($this->queriesResultCache['platformInfo'])) {

+            return $this->queriesResultCache['platformInfo'];

         }

 

-        return $this->queriesResultCache[ 'platformInfo' ] = $this->platformGetPlatformInfoHandler();

+        return $this->queriesResultCache['platformInfo'] = $this->platformGetPlatformInfoHandler();

     }

 

     // ------------------------------------------------------------------------

@@ -473,11 +473,11 @@ 
      */

     final public function hasDatabase($databaseName)

     {

-        if (empty($this->queriesResultCache[ 'databaseNames' ])) {

+        if (empty($this->queriesResultCache['databaseNames'])) {

             $this->getDatabases();

         }

 

-        return (bool)in_array($databaseName, $this->queriesResultCache[ 'databaseNames' ]);

+        return (bool)in_array($databaseName, $this->queriesResultCache['databaseNames']);

     }

 

     //--------------------------------------------------------------------

@@ -505,11 +505,11 @@ 
      */

     public function hasCollection($collection)

     {

-        if (empty($this->queriesResultCache[ 'collectionNames' ])) {

+        if (empty($this->queriesResultCache['collectionNames'])) {

             $this->getCollections();

         }

 

-        return (bool)in_array($collection, $this->queriesResultCache[ 'collectionNames' ]);

+        return (bool)in_array($collection, $this->queriesResultCache['collectionNames']);

     }

 

     // ------------------------------------------------------------------------

@@ -537,11 +537,11 @@ 
      */

     public function hasKey($key, $collection)

     {

-        if (empty($this->queriesResultCache[ 'collectionKeys' ][ $collection ])) {

+        if (empty($this->queriesResultCache['collectionKeys'][$collection])) {

             $this->getKeys($collection);

         }

 

-        return (bool)in_array($key, $this->queriesResultCache[ 'collectionKeys' ][ $collection ]);

+        return (bool)in_array($key, $this->queriesResultCache['collectionKeys'][$collection]);

     }

 

     // ------------------------------------------------------------------------

@@ -572,11 +572,11 @@ 
      */

     public function hasIndex($index, $collection)

     {

-        if (empty($this->queriesResultCache[ 'collectionIndexes' ][ $collection ])) {

+        if (empty($this->queriesResultCache['collectionIndexes'][$collection])) {

             $this->getIndexes($collection);

         }

 

-        return (bool)in_array($index, $this->queriesResultCache[ 'collectionIndexes' ][ $collection ]);

+        return (bool)in_array($index, $this->queriesResultCache['collectionIndexes'][$collection]);

     }

 

     // ------------------------------------------------------------------------

src/DataObjects/Result/Row.php

Spacing +9 added lines, -9 removed lines

@@ -214,7 +214,7 @@ 
         if ( ! preg_match('/^([adObis]):/', $string, $matches)) {

             return false;

         }

-        switch ($matches[ 1 ]) {

+        switch ($matches[1]) {

             case 'a' :

             case 'O' :

             case 's' :

@@ -249,11 +249,11 @@ 
 

         foreach ($fields as $fieldName => $fieldValue) {

             if ($this->isJSON($fieldValue)) {

-                $fields[ $fieldName ] = new Columns\DataJSON(json_decode($fieldValue, true));

+                $fields[$fieldName] = new Columns\DataJSON(json_decode($fieldValue, true));

             } elseif ($this->isSerialized($fieldValue)) {

-                $fields[ $fieldName ] = new Columns\DataSerialize(unserialize($fieldValue));

+                $fields[$fieldName] = new Columns\DataSerialize(unserialize($fieldValue));

             } else {

-                $fields[ $fieldName ] = $fieldValue;

+                $fields[$fieldName] = $fieldValue;

             }

         }

 

@@ -323,9 +323,9 @@ 
      */

     public function offsetGet($offset)

     {

-        if (isset($this->columns[ $offset ])) {

+        if (isset($this->columns[$offset])) {

 

-            $data = $this->columns[ $offset ];

+            $data = $this->columns[$offset];

 

             if ($this->isJSON($data)) {

                 return new Columns\DataJSON(json_decode($data, true));

@@ -360,7 +360,7 @@ 
      */

     public function offsetSet($offset, $value)

     {

-        $this->columns[ $offset ] = $value;

+        $this->columns[$offset] = $value;

     }

 

     // ------------------------------------------------------------------------

@@ -401,7 +401,7 @@ 
      */

     public function offsetExists($offset)

     {

-        return isset($this->columns[ $offset ]);

+        return isset($this->columns[$offset]);

     }

 

     // ------------------------------------------------------------------------

@@ -422,7 +422,7 @@ 
      */

     public function offsetUnset($field)

     {

-        unset($this->columns[ $field ]);

+        unset($this->columns[$field]);

     }

 

     // ------------------------------------------------------------------------

src/Sql/Drivers/Sqlite/QueryBuilder.php

Spacing +2 added lines, -2 removed lines

@@ -139,11 +139,11 @@
         $columns = [];

 

         foreach ($values as $key => $value) {

-            $ids[] = $value[ $index ];

+            $ids[] = $value[$index];

 

             foreach (array_keys($value) as $field) {

                 if ($field !== $index) {

-                    $columns[ $field ][] = 'WHEN ' . $index . ' = ' . $value[ $index ] . ' THEN ' . $value[ $field ];

+                    $columns[$field][] = 'WHEN ' . $index . ' = ' . $value[$index] . ' THEN ' . $value[$field];

                 }

             }

         }

src/Connections.php

Spacing +3 added lines, -3 removed lines

@@ -48,14 +48,14 @@ 
 

     public function &loadConnection($connectionOffset)

     {

-        $loadConnection[ $connectionOffset ] = false;

+        $loadConnection[$connectionOffset] = false;

 

         if ( ! $this->exists($connectionOffset) and $this->config->offsetExists($connectionOffset)) {

 

             $connectionConfig = $this->config->offsetGet($connectionOffset);

 

             if (is_array($connectionConfig)) {

-                new DataStructures\Config($this->config[ $connectionOffset ]);

+                new DataStructures\Config($this->config[$connectionOffset]);

             }

 

             $this->createConnection($connectionOffset, $connectionConfig);

@@ -90,7 +90,7 @@ 
         ];

 

         if (array_key_exists($connectionConfig->driver, $driverMaps)) {

-            if (class_exists($driverClassName = $driverMaps[ $connectionConfig->driver ])) {

+            if (class_exists($driverClassName = $driverMaps[$connectionConfig->driver])) {

                 $driverInstance = new $driverClassName($connectionConfig);

                 $this->register($driverInstance, $connectionOffset);

             }

src/DataStructures/Config.php

Spacing +2 added lines, -2 removed lines

@@ -29,9 +29,9 @@
      */

     public function __construct(array $config)

     {

-        if (isset($config[ 'default' ])) {

+        if (isset($config['default'])) {

             foreach ($config as $poolOffset => $poolConfig) {

-                $config[ $poolOffset ] = new self($poolConfig);

+                $config[$poolOffset] = new self($poolConfig);

             }

         }

 

src/DataObjects/Result/Info.php

Spacing +2 added lines, -2 removed lines

@@ -42,8 +42,8 @@
             'pages'  => 0,

         ], $total));

 

-        if (isset($total[ 'limit' ])) {

-            $this->limit = $total[ 'limit' ];

+        if (isset($total['limit'])) {

+            $this->limit = $total['limit'];

         }

 

         $this->setLimit($this->limit);

src/DataObjects/Result.php

Spacing +12 added lines, -12 removed lines

@@ -85,7 +85,7 @@ 
         $this->rows = new \SplFixedArray($this->numRows);

 

         foreach ($rows as $key => $row) {

-            $this->rows[ $key ] = new Result\Row($row);

+            $this->rows[$key] = new Result\Row($row);

         }

     }

 

@@ -110,7 +110,7 @@ 
         $this->seek(0);

 

         if ($this->count()) {

-            return $this->rows[ $this->position ];

+            return $this->rows[$this->position];

         }

 

         return new Row();

@@ -140,7 +140,7 @@ 
             $position = $this->count();

         }

 

-        if (isset($this->rows[ $position ])) {

+        if (isset($this->rows[$position])) {

             $this->position = $position;

         }

     }

@@ -178,7 +178,7 @@ 
         $this->seek($this->count() - 1);

 

         if ($this->count()) {

-            return $this->rows[ $this->position ];

+            return $this->rows[$this->position];

         }

 

         return new Row();

@@ -200,7 +200,7 @@ 
         $this->seek($this->position);

 

         if ($this->count()) {

-            return $this->rows[ $this->position ];

+            return $this->rows[$this->position];

         }

 

         return new Row();

@@ -270,7 +270,7 @@ 
     public function valid()

     {

         if ($this->count()) {

-            return isset($this->rows[ $this->position ]);

+            return isset($this->rows[$this->position]);

         }

 

         return false;

@@ -341,7 +341,7 @@ 
      */

     public function offsetExists($offset)

     {

-        return (bool)isset($this->rows[ $offset ]);

+        return (bool)isset($this->rows[$offset]);

     }

 

     // ------------------------------------------------------------------------

@@ -362,8 +362,8 @@ 
      */

     public function offsetGet($offset)

     {

-        if (isset($this->rows[ $offset ])) {

-            return $this->rows[ $offset ];

+        if (isset($this->rows[$offset])) {

+            return $this->rows[$offset];

         }

 

         return false;

@@ -391,7 +391,7 @@ 
     public function offsetSet($offset, $value)

     {

         if ($value instanceof Row) {

-            $this->rows[ $offset ] = $value;

+            $this->rows[$offset] = $value;

         }

     }

 

@@ -413,8 +413,8 @@ 
      */

     public function offsetUnset($offset)

     {

-        if (isset($this->rows[ $offset ])) {

-            unset($this->rows[ $offset ]);

+        if (isset($this->rows[$offset])) {

+            unset($this->rows[$offset]);

         }

     }

 

src/Sql/Abstracts/AbstractConnection.php

Spacing +64 added lines, -64 removed lines

@@ -265,9 +265,9 @@ 
         // No connection resource? Check if there is a failover else throw an error

         if ( ! $this->handle) {

             // Check if there is a failover set

-            if ( ! empty($this->config[ 'failover' ]) && is_array($this->config[ 'failover' ])) {

+            if ( ! empty($this->config['failover']) && is_array($this->config['failover'])) {

                 // Go over all the failovers

-                foreach ($this->config[ 'failover' ] as $failover) {

+                foreach ($this->config['failover'] as $failover) {

 

                     // Try to connect

                     $this->platformConnectHandler($failover = new Config($failover));

@@ -338,11 +338,11 @@ 
      */

     public function getPlatformInfo()

     {

-        if (isset($this->queriesResultCache[ 'platformInfo' ])) {

-            return $this->queriesResultCache[ 'platformInfo' ];

+        if (isset($this->queriesResultCache['platformInfo'])) {

+            return $this->queriesResultCache['platformInfo'];

         }

 

-        return $this->queriesResultCache[ 'platformInfo' ] = $this->platformGetPlatformInfoHandler();

+        return $this->queriesResultCache['platformInfo'] = $this->platformGetPlatformInfoHandler();

     }

 

     //--------------------------------------------------------------------

@@ -528,11 +528,11 @@ 
      */

     final public function hasDatabase($databaseName)

     {

-        if (empty($this->queriesResultCache[ 'databaseNames' ])) {

+        if (empty($this->queriesResultCache['databaseNames'])) {

             $this->getDatabases();

         }

 

-        return (bool)in_array($databaseName, $this->queriesResultCache[ 'databaseNames' ]);

+        return (bool)in_array($databaseName, $this->queriesResultCache['databaseNames']);

     }

 

     //--------------------------------------------------------------------

@@ -558,7 +558,7 @@ 
      */

     final public function setTablePrefix($tablePrefix)

     {

-        return $this->config[ 'tablePrefix' ] = $tablePrefix;

+        return $this->config['tablePrefix'] = $tablePrefix;

     }

 

     // ------------------------------------------------------------------------

@@ -577,11 +577,11 @@ 
     {

         $table = $this->prefixTable($table);

 

-        if (empty($this->queriesResultCache[ 'tableNames' ])) {

+        if (empty($this->queriesResultCache['tableNames'])) {

             $this->getTables();

         }

 

-        return (bool)in_array($table, $this->queriesResultCache[ 'tableNames' ]);

+        return (bool)in_array($table, $this->queriesResultCache['tableNames']);

     }

 

     // ------------------------------------------------------------------------

@@ -595,7 +595,7 @@ 
      */

     final public function prefixTable($tableName)

     {

-        $tablePrefix = $this->config[ 'tablePrefix' ];

+        $tablePrefix = $this->config['tablePrefix'];

 

         if (empty($tablePrefix)) {

             return $tableName;

@@ -635,11 +635,11 @@ 
     {

         $table = $this->prefixTable($table);

 

-        if (empty($this->queriesResultCache[ 'tableColumns' ][ $table ])) {

+        if (empty($this->queriesResultCache['tableColumns'][$table])) {

             $this->getColumns($table);

         }

 

-        return (bool)isset($this->queriesResultCache[ 'tableColumns' ][ $table ][ $column ]);

+        return (bool)isset($this->queriesResultCache['tableColumns'][$table][$column]);

     }

 

     // ------------------------------------------------------------------------

@@ -684,7 +684,7 @@ 
         $queryStatement->setLastInsertId($this->getLastInsertId());

 

         if ( ! array_key_exists($queryStatement->getKey(), $this->queriesCache)) {

-            $this->queriesCache[ $queryStatement->getKey() ] = $queryStatement;

+            $this->queriesCache[$queryStatement->getKey()] = $queryStatement;

         }

 

         if ($queryStatement->hasErrors()) {

@@ -851,7 +851,7 @@ 
         $queryStatement->addHit(1);

 

         if ( ! array_key_exists($queryStatement->getKey(), $this->queriesCache)) {

-            $this->queriesCache[ $queryStatement->getKey() ] = $queryStatement;

+            $this->queriesCache[$queryStatement->getKey()] = $queryStatement;

         }

 

         if ($queryStatement->hasErrors()) {

@@ -891,8 +891,8 @@ 
     {

         $hasSqlBinders = strpos($sqlStatement, ':') !== false;

 

-        if (empty($binds) || empty($this->config[ 'bindMarker' ]) ||

-            (strpos($sqlStatement, $this->config[ 'bindMarker' ]) === false &&

+        if (empty($binds) || empty($this->config['bindMarker']) ||

+            (strpos($sqlStatement, $this->config['bindMarker']) === false &&

                 $hasSqlBinders === false)

         ) {

             return $sqlStatement;

@@ -913,7 +913,7 @@ 
         }

 

         // We'll need marker length later

-        $markerLength = strlen($this->config[ 'bindMarker' ]);

+        $markerLength = strlen($this->config['bindMarker']);

 

         if ($hasSqlBinders) {

             $sqlStatement = $this->replaceNamedBinds($sqlStatement, $sqlBinds);

@@ -953,7 +953,7 @@ 
             } elseif (strpos($bindReplace, ' AND ') !== false) {

                 $escapedValue = $bindReplace;

             } else {

-                $escapedValue = preg_quote(trim($escapedValue, $this->config[ 'escapeCharacter' ]));

+                $escapedValue = preg_quote(trim($escapedValue, $this->config['escapeCharacter']));

             }

 

             if (preg_match("/\(.+?\)/", $bindSearch)) {

@@ -1018,7 +1018,7 @@ 
     {

         if (is_array($string)) {

             foreach ($string as $key => $value) {

-                $string[ $key ] = $this->escapeString($value, $like);

+                $string[$key] = $this->escapeString($value, $like);

             }

 

             return $string;

@@ -1029,11 +1029,11 @@ 
         // escape LIKE condition wildcards

         if ($like === true) {

             $string = str_replace(

-                [$this->config[ 'likeEscapeCharacter' ], '%', '_'],

+                [$this->config['likeEscapeCharacter'], '%', '_'],

                 [

-                    $this->config[ 'likeEscapeCharacter' ] . $this->config[ 'likeEscapeCharacter' ],

-                    $this->config[ 'likeEscapeCharacter' ] . '%',

-                    $this->config[ 'likeEscapeCharacter' ] . '_',

+                    $this->config['likeEscapeCharacter'] . $this->config['likeEscapeCharacter'],

+                    $this->config['likeEscapeCharacter'] . '%',

+                    $this->config['likeEscapeCharacter'] . '_',

                 ],

                 $string

             );

@@ -1080,10 +1080,10 @@ 
         // Make sure not to replace a chunk inside a string that happens to match the bind marker

         if ($chunk = preg_match_all("/'[^']*'/i", $sqlStatement, $matches)) {

             $chunk = preg_match_all(

-                '/' . preg_quote($this->config[ 'bindMarker' ], '/') . '/i',

+                '/' . preg_quote($this->config['bindMarker'], '/') . '/i',

                 str_replace(

-                    $matches[ 0 ],

-                    str_replace($this->config[ 'bindMarker' ], str_repeat(' ', $markerLength), $matches[ 0 ]),

+                    $matches[0],

+                    str_replace($this->config['bindMarker'], str_repeat(' ', $markerLength), $matches[0]),

                     $sqlStatement,

                     $chunk

                 ),

@@ -1098,7 +1098,7 @@ 
         } // Number of binds must match bindMarkers in the string.

         else {

             if (($chunk = preg_match_all(

-                    '/' . preg_quote($this->config[ 'bindMarker' ], '/') . '/i',

+                    '/' . preg_quote($this->config['bindMarker'], '/') . '/i',

                     $sqlStatement,

                     $matches,

                     PREG_OFFSET_CAPTURE

@@ -1110,11 +1110,11 @@ 
 

         do {

             $chunk--;

-            $escapedValue = $this->escape($sqlBinds[ $chunk ]);

+            $escapedValue = $this->escape($sqlBinds[$chunk]);

             if (is_array($escapedValue)) {

                 $escapedValue = '(' . implode(',', $escapedValue) . ')';

             }

-            $sqlStatement = substr_replace($sqlStatement, $escapedValue, $matches[ 0 ][ $chunk ][ 1 ], $markerLength);

+            $sqlStatement = substr_replace($sqlStatement, $escapedValue, $matches[0][$chunk][1], $markerLength);

         } while ($chunk !== 0);

 

         return $sqlStatement;

@@ -1298,7 +1298,7 @@ 
         if (is_array($item)) {

             $escapedArray = [];

             foreach ($item as $key => $value) {

-                $escapedArray[ $this->protectIdentifiers($key) ] = $this->protectIdentifiers(

+                $escapedArray[$this->protectIdentifiers($key)] = $this->protectIdentifiers(

                     $value,

                     $prefixSingle,

                     $protectIdentifiers,

@@ -1356,11 +1356,11 @@ 
             //

             // NOTE: The ! empty() condition prevents this method

             //       from breaking when Query Builder isn't enabled.

-            if ( ! empty($aliasedTables) AND in_array($parts[ 0 ], $aliasedTables)) {

+            if ( ! empty($aliasedTables) AND in_array($parts[0], $aliasedTables)) {

                 if ($protectIdentifiers === true) {

                     foreach ($parts as $key => $val) {

-                        if ( ! in_array($val, $this->config[ 'reservedIdentifiers' ])) {

-                            $parts[ $key ] = $this->escapeIdentifiers($val);

+                        if ( ! in_array($val, $this->config['reservedIdentifiers'])) {

+                            $parts[$key] = $this->escapeIdentifiers($val);

                         }

                     }

 

@@ -1375,12 +1375,12 @@ 
                 // We now add the table prefix based on some logic.

                 // Do we have 4 segments (hostname.database.table.column)?

                 // If so, we add the table prefix to the column name in the 3rd segment.

-                if (isset($parts[ 3 ])) {

+                if (isset($parts[3])) {

                     $i = 2;

                 }

                 // Do we have 3 segments (database.table.column)?

                 // If so, we add the table prefix to the column name in 2nd position

-                elseif (isset($parts[ 2 ])) {

+                elseif (isset($parts[2])) {

                     $i = 1;

                 }

                 // Do we have 2 segments (table.column)?

@@ -1396,15 +1396,15 @@ 
                 }

 

                 // Verify table prefix and replace if necessary

-                if ($this->swapTablePrefix !== '' && strpos($parts[ $i ], $this->swapTablePrefix) === 0) {

-                    $parts[ $i ] = preg_replace(

+                if ($this->swapTablePrefix !== '' && strpos($parts[$i], $this->swapTablePrefix) === 0) {

+                    $parts[$i] = preg_replace(

                         '/^' . $this->swapTablePrefix . '(\S+?)/',

                         $this->config->tablePrefix . '\\1',

-                        $parts[ $i ]

+                        $parts[$i]

                     );

                 } // We only add the table prefix if it does not already exist

-                elseif (strpos($parts[ $i ], $this->config->tablePrefix) !== 0) {

-                    $parts[ $i ] = $this->config->tablePrefix . $parts[ $i ];

+                elseif (strpos($parts[$i], $this->config->tablePrefix) !== 0) {

+                    $parts[$i] = $this->config->tablePrefix . $parts[$i];

                 }

 

                 // Put the parts back together

@@ -1421,7 +1421,7 @@ 
         // In some cases, especially 'from', we end up running through

         // protect_identifiers twice. This algorithm won't work when

         // it contains the escapeChar so strip it out.

-        $item = trim($item, $this->config[ 'escapeCharacter' ]);

+        $item = trim($item, $this->config['escapeCharacter']);

 

         // Is there a table prefix? If not, no need to insert it

         if ($this->config->tablePrefix !== '') {

@@ -1438,7 +1438,7 @@ 
             }

         }

 

-        if ($protectIdentifiers === true && ! in_array($item, $this->config[ 'reservedIdentifiers' ])) {

+        if ($protectIdentifiers === true && ! in_array($item, $this->config['reservedIdentifiers'])) {

             $item = $this->escapeIdentifiers($item);

         }

 

@@ -1460,22 +1460,22 @@ 
      */

     final public function escapeIdentifiers($item)

     {

-        if ($this->config[ 'escapeCharacter' ] === '' OR empty($item) OR in_array(

+        if ($this->config['escapeCharacter'] === '' OR empty($item) OR in_array(

                 $item,

-                $this->config[ 'reservedIdentifiers' ]

+                $this->config['reservedIdentifiers']

             )

         ) {

             return $item;

         } elseif (is_array($item)) {

             foreach ($item as $key => $value) {

-                $item[ $key ] = $this->escapeIdentifiers($value);

+                $item[$key] = $this->escapeIdentifiers($value);

             }

 

             return $item;

         } // Avoid breaking functions and literal values inside queries

         elseif (ctype_digit(

                 $item

-            ) OR $item[ 0 ] === "'" OR ($this->config[ 'escapeCharacter' ] !== '"' && $item[ 0 ] === '"') OR

+            ) OR $item[0] === "'" OR ($this->config['escapeCharacter'] !== '"' && $item[0] === '"') OR

             strpos($item, '(') !== false

         ) {

             return $item;

@@ -1484,31 +1484,31 @@ 
         static $pregEscapeCharacters = [];

 

         if (empty($pregEscapeCharacters)) {

-            if (is_array($this->config[ 'escapeCharacter' ])) {

+            if (is_array($this->config['escapeCharacter'])) {

                 $pregEscapeCharacters = [

-                    preg_quote($this->config[ 'escapeCharacter' ][ 0 ], '/'),

-                    preg_quote($this->config[ 'escapeCharacter' ][ 1 ], '/'),

-                    $this->config[ 'escapeCharacter' ][ 0 ],

-                    $this->config[ 'escapeCharacter' ][ 1 ],

+                    preg_quote($this->config['escapeCharacter'][0], '/'),

+                    preg_quote($this->config['escapeCharacter'][1], '/'),

+                    $this->config['escapeCharacter'][0],

+                    $this->config['escapeCharacter'][1],

                 ];

             } else {

-                $pregEscapeCharacters[ 0 ]

-                    = $pregEscapeCharacters[ 1 ] = preg_quote($this->config[ 'escapeCharacter' ], '/');

-                $pregEscapeCharacters[ 2 ] = $pregEscapeCharacters[ 3 ] = $this->config[ 'escapeCharacter' ];

+                $pregEscapeCharacters[0]

+                    = $pregEscapeCharacters[1] = preg_quote($this->config['escapeCharacter'], '/');

+                $pregEscapeCharacters[2] = $pregEscapeCharacters[3] = $this->config['escapeCharacter'];

             }

         }

 

-        foreach ($this->config[ 'reservedIdentifiers' ] as $id) {

+        foreach ($this->config['reservedIdentifiers'] as $id) {

             if (strpos($item, '.' . $id) !== false) {

                 return preg_replace(

                     '/'

-                    . $pregEscapeCharacters[ 0 ]

+                    . $pregEscapeCharacters[0]

                     . '?([^'

-                    . $pregEscapeCharacters[ 1 ]

+                    . $pregEscapeCharacters[1]

                     . '\.]+)'

-                    . $pregEscapeCharacters[ 1 ]

+                    . $pregEscapeCharacters[1]

                     . '?\./i',

-                    $pregEscapeCharacters[ 2 ] . '$1' . $pregEscapeCharacters[ 3 ] . '.',

+                    $pregEscapeCharacters[2] . '$1' . $pregEscapeCharacters[3] . '.',

                     $item

                 );

             }

@@ -1516,13 +1516,13 @@ 
 

         return preg_replace(

             '/'

-            . $pregEscapeCharacters[ 0 ]

+            . $pregEscapeCharacters[0]

             . '?([^'

-            . $pregEscapeCharacters[ 1 ]

+            . $pregEscapeCharacters[1]

             . '\.]+)'

-            . $pregEscapeCharacters[ 1 ]

+            . $pregEscapeCharacters[1]

             . '?(\.)?/i',

-            $pregEscapeCharacters[ 2 ] . '$1' . $pregEscapeCharacters[ 3 ] . '$2',

+            $pregEscapeCharacters[2] . '$1' . $pregEscapeCharacters[3] . '$2',

             $item

         );

     }