o2system / database

src/NoSql/Drivers/MongoDb/QueryBuilder.php

Spacing +3 added lines, -3 removed lines

@@ -118,7 +118,7 @@ 
 

             if ($field === '_id') {

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

-                    $values[ $key ] = new \MongoDb\BSON\ObjectID($value);

+                    $values[$key] = new \MongoDb\BSON\ObjectID($value);

                 }

             }

 

@@ -188,7 +188,7 @@ 
             $builderCache->store('from', $collection);

             $builderCache->store('where', ['_id' => $document->_id]);

             $document = $document->getArrayCopy();

-            unset($document[ '_id' ]);

+            unset($document['_id']);

 

             $builderCache->store('sets', array_merge($document, $sets));

 

@@ -229,7 +229,7 @@ 
                 $document = $this->get()->first();

                 $documentIds[] = $document->_id;

                 $document = $document->getArrayCopy();

-                unset($document[ '_id' ]);

+                unset($document['_id']);

 

                 $documents[] = array_merge($document, $sets);

             }

src/NoSql/Drivers/MongoDb/Connection.php

Spacing +37 added lines, -37 removed lines

@@ -100,17 +100,17 @@ 
         $cursor->setTypeMap(['root' => 'array', 'document' => 'array']);

         $result = current($cursor->toArray());

 

-        $this->queriesResultCache[ 'databaseNames' ] = [];

+        $this->queriesResultCache['databaseNames'] = [];

 

-        if ( ! empty($result[ 'databases' ])) {

-            foreach ($result[ 'databases' ] as $database) {

-                if ( ! in_array($database[ 'name' ], ['admin', 'local'])) {

-                    $this->queriesResultCache[ 'databaseNames' ][] = $database[ 'name' ];

+        if ( ! empty($result['databases'])) {

+            foreach ($result['databases'] as $database) {

+                if ( ! in_array($database['name'], ['admin', 'local'])) {

+                    $this->queriesResultCache['databaseNames'][] = $database['name'];

                 }

             }

         }

 

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

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

     }

 

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

@@ -130,15 +130,15 @@ 
 

         $result = new \IteratorIterator($cursor);

 

-        $this->queriesResultCache[ 'collectionNames' ] = [];

+        $this->queriesResultCache['collectionNames'] = [];

 

         foreach ($result as $collection) {

-            if ($collection[ 'type' ] === 'collection') {

-                $this->queriesResultCache[ 'collectionNames' ][] = $collection[ 'name' ];

+            if ($collection['type'] === 'collection') {

+                $this->queriesResultCache['collectionNames'][] = $collection['name'];

             }

         }

 

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

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

     }

 

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

@@ -158,13 +158,13 @@ 
 

         $result = current($cursor->toArray());

 

-        $this->queriesResultCache[ 'collectionKeys' ][ $collection ] = [];

+        $this->queriesResultCache['collectionKeys'][$collection] = [];

 

         foreach (get_object_vars($result) as $key => $value) {

-            $this->queriesResultCache[ 'collectionKeys' ][ $collection ][] = $key;

+            $this->queriesResultCache['collectionKeys'][$collection][] = $key;

         }

 

-        return $this->queriesResultCache[ 'collectionKeys' ][ $collection ];

+        return $this->queriesResultCache['collectionKeys'][$collection];

     }

 

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

@@ -185,13 +185,13 @@ 
 

         $result = new \IteratorIterator($cursor);

 

-        $this->queriesResultCache[ 'collectionIndexes' ][ $collection ] = [];

+        $this->queriesResultCache['collectionIndexes'][$collection] = [];

 

         foreach ($result as $index) {

-            $this->queriesResultCache[ 'collectionIndexes' ][ $collection ][] = $index[ 'name' ];

+            $this->queriesResultCache['collectionIndexes'][$collection][] = $index['name'];

         }

 

-        return $this->queriesResultCache[ 'collectionIndexes' ][ $collection ];

+        return $this->queriesResultCache['collectionIndexes'][$collection];

     }

 

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

@@ -234,9 +234,9 @@ 
     protected function platformGetPlatformInfoHandler()

     {

         $metadata = $this->server->getInfo();

-        $metadata[ 'latency' ] = $this->server->getLatency();

-        $metadata[ 'type' ] = $this->server->getType();

-        $metadata[ 'tags' ] = $this->server->getTags();

+        $metadata['latency'] = $this->server->getLatency();

+        $metadata['type'] = $this->server->getType();

+        $metadata['tags'] = $this->server->getTags();

 

         return new SplArrayObject([

             'name'     => $this->getPlatform(),

@@ -297,10 +297,10 @@ 
     {

         $this->parseQueryStatement($statement);

 

-        if (isset($options[ 'method' ])) {

+        if (isset($options['method'])) {

 

-            $method = $options[ 'method' ];

-            unset($options[ 'method' ]);

+            $method = $options['method'];

+            unset($options['method']);

 

             $options = array_merge(['safe' => true, 'ordered' => true], $options);

             $bulk = new \MongoDb\Driver\BulkWrite($options);

@@ -384,7 +384,7 @@ 
             $projection = [];

 

             foreach ($builderCache->select as $field) {

-                $projection[ $field ] = 1;

+                $projection[$field] = 1;

             }

 

             $statement->addOption('projection', $projection);

@@ -394,9 +394,9 @@ 
         if (count($builderCache->whereIn)) {

             foreach ($builderCache->whereIn as $field => $clause) {

                 if (count($builderCache->orWhereIn)) {

-                    $builderCache->orWhere[ $field ] = ['$in' => $clause];

+                    $builderCache->orWhere[$field] = ['$in' => $clause];

                 } else {

-                    $builderCache->where[ $field ] = ['$in' => $clause];

+                    $builderCache->where[$field] = ['$in' => $clause];

                 }

             }

         }

@@ -404,44 +404,44 @@ 
         // Filter Where Not In

         if (count($builderCache->whereNotIn)) {

             foreach ($builderCache->whereNotIn as $field => $clause) {

-                $builderCache->where[ $field ] = ['$nin' => $clause];

+                $builderCache->where[$field] = ['$nin' => $clause];

             }

         }

 

         // Filter Or Where In

         if (count($builderCache->orWhereIn)) {

             foreach ($builderCache->orWhereIn as $field => $clause) {

-                $builderCache->orWhere[ $field ] = ['$in' => $clause];

+                $builderCache->orWhere[$field] = ['$in' => $clause];

             }

         }

 

         // Filter Or Where Not In

         if (count($builderCache->orWhereNotIn)) {

             foreach ($builderCache->orWhereNotIn as $field => $clause) {

-                $builderCache->orWhere[ $field ] = ['$nin' => $clause];

+                $builderCache->orWhere[$field] = ['$nin' => $clause];

             }

         }

 

         // Filter Where Between

         if (count($builderCache->between)) {

             foreach ($builderCache->between as $field => $clause) {

-                $builderCache->where[ $field ] = ['$gte' => $clause[ 'start' ], '$lte' => $clause[ 'end' ]];

+                $builderCache->where[$field] = ['$gte' => $clause['start'], '$lte' => $clause['end']];

             }

         }

 

         // Filter Or Where Between

         if (count($builderCache->orBetween)) {

             foreach ($builderCache->orBetween as $field => $clause) {

-                $builderCache->orWhere[ $field ] = ['$gte' => $clause[ 'start' ], '$lte' => $clause[ 'end' ]];

+                $builderCache->orWhere[$field] = ['$gte' => $clause['start'], '$lte' => $clause['end']];

             }

         }

 

         // Filter Where Not Between

         if (count($builderCache->notBetween)) {

             foreach ($builderCache->notBetween as $field => $clause) {

-                $builderCache->where[ $field ][ '$not' ] = [

-                    '$gte' => $clause[ 'start' ],

-                    '$lte' => $clause[ 'end' ],

+                $builderCache->where[$field]['$not'] = [

+                    '$gte' => $clause['start'],

+                    '$lte' => $clause['end'],

                 ];

             }

         }

@@ -449,9 +449,9 @@ 
         // Filter Or Where Not Between

         if (count($builderCache->orNotBetween)) {

             foreach ($builderCache->orNotBetween as $field => $clause) {

-                $builderCache->orWhere[ $field ][ '$not' ] = [

-                    '$gte' => $clause[ 'start' ],

-                    '$lte' => $clause[ 'end' ],

+                $builderCache->orWhere[$field]['$not'] = [

+                    '$gte' => $clause['start'],

+                    '$lte' => $clause['end'],

                 ];

             }

         }

@@ -489,7 +489,7 @@ 
             $sort = [];

             foreach ($builderCache->orderBy as $field => $direction) {

                 $direction = $direction === 'ASC' ? 1 : -1;

-                $sort[ $field ] = $direction;

+                $sort[$field] = $direction;

             }

 

             $statement->addOption('sort', $sort);

src/NoSql/DataStructures/Query/BuilderCache.php

Spacing +8 added lines, -8 removed lines

@@ -80,7 +80,7 @@ 
      */

     public function &__get($property)

     {

-        return $this->vars[ $property ];

+        return $this->vars[$property];

     }

 

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

@@ -96,16 +96,16 @@ 
     public function store($index, $value)

     {

         if (array_key_exists($index, $this->vars)) {

-            if (is_array($this->vars[ $index ])) {

+            if (is_array($this->vars[$index])) {

                 if (is_array($value)) {

-                    $this->vars[ $index ] = array_merge($this->vars[ $index ], $value);

+                    $this->vars[$index] = array_merge($this->vars[$index], $value);

                 } else {

-                    array_push($this->vars[ $index ], $value);

+                    array_push($this->vars[$index], $value);

                 }

-            } elseif (is_bool($this->vars[ $index ])) {

-                $this->vars[ $index ] = (bool)$value;

+            } elseif (is_bool($this->vars[$index])) {

+                $this->vars[$index] = (bool)$value;

             } else {

-                $this->vars[ $index ] = $value;

+                $this->vars[$index] = $value;

             }

         }

 

@@ -213,7 +213,7 @@ 
     protected function resetRun(array $cacheKeys)

     {

         foreach ($cacheKeys as $cacheKey => $cacheDefaultValue) {

-            $this->vars[ $cacheKey ] = $cacheDefaultValue;

+            $this->vars[$cacheKey] = $cacheDefaultValue;

         }

     }

 

src/NoSql/DataStructures/Query/Statement.php

Spacing +2 added lines, -2 removed lines

@@ -182,7 +182,7 @@ 
      */

     public function addFilter($field, $value)

     {

-        $this->filter[ $field ] = $value;

+        $this->filter[$field] = $value;

 

         return $this;

     }

@@ -233,7 +233,7 @@ 
      */

     public function addOption($option, $value)

     {

-        $this->options[ $option ] = $value;

+        $this->options[$option] = $value;

 

         return $this;

     }

src/Sql/Abstracts/AbstractForge.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
      */
     public function __construct(AbstractConnection &$conn)
     {
-        $this->conn =& $conn;
+        $this->conn = & $conn;
     }
 
     // ------------------------------------------------------------------------

src/Sql/Drivers/Sqlite/Connection.php

Spacing +14 added lines, -14 removed lines

@@ -123,9 +123,9 @@ 
      */

     public function getDatabases()

     {

-        $this->queriesResultCache[ 'databaseNames' ][] = pathinfo($this->database, PATHINFO_FILENAME);

+        $this->queriesResultCache['databaseNames'][] = pathinfo($this->database, PATHINFO_FILENAME);

 

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

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

     }

 

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

@@ -143,12 +143,12 @@ 
      */

     public function getTables($prefixLimit = false)

     {

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

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

 

             $sqlStatement = 'SELECT "NAME" FROM "SQLITE_MASTER" WHERE "TYPE" = \'table\'';

 

-            if ($prefixLimit !== false && $this->config[ 'tablePrefix' ] !== '') {

-                $sqlStatement .= ' AND "NAME" LIKE \'' . $this->escapeLikeString($this->config[ 'tablePrefix' ]) . "%' ";

+            if ($prefixLimit !== false && $this->config['tablePrefix'] !== '') {

+                $sqlStatement .= ' AND "NAME" LIKE \'' . $this->escapeLikeString($this->config['tablePrefix']) . "%' ";

             }

 

             $result = $this->query($sqlStatement);

@@ -157,9 +157,9 @@ 
                 foreach ($result as $row) {

                     // Do we know from which column to get the table name?

                     if ( ! isset($key)) {

-                        if (isset($row[ 'table_name' ])) {

+                        if (isset($row['table_name'])) {

                             $key = 'table_name';

-                        } elseif (isset($row[ 'TABLE_NAME' ])) {

+                        } elseif (isset($row['TABLE_NAME'])) {

                             $key = 'TABLE_NAME';

                         } else {

                             /* We have no other choice but to just get the first element's key.

@@ -172,12 +172,12 @@ 
                         }

                     }

 

-                    $this->queriesResultCache[ 'tableNames' ][] = $row->offsetGet($key);

+                    $this->queriesResultCache['tableNames'][] = $row->offsetGet($key);

                 }

             }

         }

 

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

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

     }

 

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

@@ -195,24 +195,24 @@ 
     {

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

 

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

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

             $result = $this->query('PRAGMA TABLE_INFO(' . $this->protectIdentifiers($table, true, null, false) . ')');

 

             if ($result->count()) {

                 foreach ($result as $row) {

                     // Do we know from where to get the column's name?

                     if ( ! isset($key)) {

-                        if (isset($row[ 'name' ])) {

+                        if (isset($row['name'])) {

                             $key = 'name';

                         }

                     }

 

-                    $this->queriesResultCache[ 'tableColumns' ][ $table ][ $row->offsetGet($key) ] = $row;

+                    $this->queriesResultCache['tableColumns'][$table][$row->offsetGet($key)] = $row;

                 }

             }

         }

 

-        return $this->queriesResultCache[ 'tableColumns' ][ $table ];

+        return $this->queriesResultCache['tableColumns'][$table];

     }

 

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

@@ -331,7 +331,7 @@ 
         if (false !== ($result = $this->handle->query($statement->getSqlFinalStatement()))) {

             $i = 0;

             while ($row = $result->fetchArray(SQLITE3_ASSOC)) {

-                $rows[ $i ] = $row;

+                $rows[$i] = $row;

                 $i++;

             }

         } else {

src/DataObjects/Result.php

Spacing +2 added lines, -2 removed lines

@@ -49,7 +49,7 @@ 
 

         parent::__construct($this->info->num_rows);

 

-        foreach($rows as $offset => $row) {

+        foreach ($rows as $offset => $row) {

             $this->offsetSet($offset, $row);

         }

     }

@@ -188,7 +188,7 @@ 
      */

     public function offsetSet($offset, $value)

     {

-        if(is_array($value)) {

+        if (is_array($value)) {

             parent::offsetSet($offset, new Row($value));

         } else {

             parent::offsetSet($offset, $value);

src/DataObjects/Result/Row.php

Spacing +13 added lines, -13 removed lines

@@ -69,19 +69,19 @@ 
                     str_replace('record_create_', '', $name),

                     $value

                 );

-                unset($columns[ $name ]);

+                unset($columns[$name]);

             } elseif (strpos($name, 'record_update') !== false) {

                 $this->record->create->offsetSet(

                     str_replace('record_update_', '', $name),

                     $value

                 );

-                unset($columns[ $name ]);

+                unset($columns[$name]);

             } elseif (strpos($name, 'record') !== false) {

                 $this->record->offsetSet(

                     str_replace('record_', '', $name),

                     $value

                 );

-                unset($columns[ $name ]);

+                unset($columns[$name]);

             }

         }

 

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

             return false;

         }

-        switch ($matches[ 1 ]) {

+        switch ($matches[1]) {

             case 'a' :

             case 'O' :

             case 's' :

@@ -282,11 +282,11 @@ 
 

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

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

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

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

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

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

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

             } else {

-                $fields[ $fieldName ] = $fieldValue;

+                $fields[$fieldName] = $fieldValue;

             }

         }

 

@@ -356,9 +356,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 Row\Columns\DataJSON(json_decode($data, true));

@@ -367,7 +367,7 @@ 
             } else {

                 return $data;

             }

-        } elseif(strpos($offset, 'record') !== false) {

+        } elseif (strpos($offset, 'record') !== false) {

             switch ($offset) {

                 case 'record':

                     return $this->record;

@@ -438,7 +438,7 @@ 
      */

     public function offsetSet($offset, $value)

     {

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

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

     }

 

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

@@ -479,7 +479,7 @@ 
      */

     public function offsetExists($offset)

     {

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

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

     }

 

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

@@ -500,7 +500,7 @@ 
      */

     public function offsetUnset($field)

     {

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

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

     }

 

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

src/Sql/Drivers/MySql/QueryBuilder.php

Spacing +3 added lines, -3 removed lines

@@ -198,11 +198,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];

                 }

             }

         }

@@ -273,7 +273,7 @@ 
 

         if ($this->isSubQuery) {

             return $sqlStatement;

-        } elseif(strpos($sqlStatement, 'COUNT') !== false) {

+        } elseif (strpos($sqlStatement, 'COUNT') !== false) {

             return $sqlStatement;

         }