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/NoSql/Drivers/MongoDb/Connection.php

Spacing +37 added lines, -37 removed lines

@@ -101,17 +101,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'];

     }

 

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

@@ -131,15 +131,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'];

     }

 

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

@@ -159,13 +159,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];

     }

 

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

@@ -186,13 +186,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];

     }

 

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

@@ -235,9 +235,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(),

@@ -298,10 +298,10 @@ 
     {

         $this->parseQueryStatement($queryStatement);

 

-        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);

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

 

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

-                $projection[ $field ] = 1;

+                $projection[$field] = 1;

             }

 

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

@@ -395,9 +395,9 @@ 
         if (count($queryBuilderCache->whereIn)) {

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

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

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

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

                 } else {

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

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

                 }

             }

         }

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

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

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

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

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

             }

         }

 

         // Filter Or Where In

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

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

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

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

             }

         }

 

         // Filter Or Where Not In

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

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

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

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

             }

         }

 

         // Filter Where Between

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

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

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

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

             }

         }

 

         // Filter Or Where Between

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

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

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

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

             }

         }

 

         // Filter Where Not Between

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

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

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

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

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

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

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

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

                 ];

             }

         }

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

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

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

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

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

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

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

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

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

                 ];

             }

         }

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

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

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

-                $sort[ $field ] = $direction;

+                $sort[$field] = $direction;

             }

 

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

src/NoSql/Drivers/MongoDb/QueryBuilder.php

Spacing +3 added lines, -3 removed lines

@@ -120,7 +120,7 @@ 
 

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

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

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

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

                 }

             }

 

@@ -187,7 +187,7 @@ 
             $newQueryBuilderCache->store('from', $collection);

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

             $document = $document->getArrayCopy();

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

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

 

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

 

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

                 $documentIds[] = $document->_id;

                 $document = $document->getArrayCopy();

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

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

 

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

             }

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/Datastructures/QueryStatement.php

Spacing +1 added lines, -1 removed lines

@@ -203,7 +203,7 @@
      */

     public function setError($errorCode, $errorMessage)

     {

-        $this->error[ $errorCode ] = $errorMessage;

+        $this->error[$errorCode] = $errorMessage;

 

         return $this;

     }

src/Sql/Drivers/Sqlite/Connection.php

Spacing +14 added lines, -14 removed lines

@@ -125,9 +125,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'];

     }

 

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

@@ -144,12 +144,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);

@@ -158,9 +158,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.

@@ -173,12 +173,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];

     }

 

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

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

             $i = 0;

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

-                $rows[ $i ] = $row;

+                $rows[$i] = $row;

                 $i++;

             }

         } else {

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/NoSql/Datastructures/QueryStatement.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;

     }