o2system / database

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

Spacing +8 added lines, -8 removed lines

@@ -71,7 +71,7 @@ 
      */

     public function &__get($property)

     {

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

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

     }

 

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

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

     {

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

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

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

                 if (is_array($value)) {

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

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

                 } else {

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

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

                 }

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

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

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

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

             } else {

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

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

             }

         }

 

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

     {

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

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

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

         }

     }

 

src/NoSql/Datastructures/QueryStatement.php

Spacing +3 added lines, -3 removed lines

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

     public function addFilter($field, $value)

     {

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

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

 

         return $this;

     }

@@ -231,7 +231,7 @@ 
      */

     public function addOption($option, $value)

     {

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

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

 

         return $this;

     }

@@ -361,7 +361,7 @@ 
      */

     public function setError($errorCode, $errorMessage)

     {

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

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

 

         return $this;

     }

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.php

Spacing +16 added lines, -16 removed lines

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

         }

     }

 

@@ -113,8 +113,8 @@ 
     {

         $this->seek(0);

 

-        if($this->count()) {

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

+        if ($this->count()) {

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

         }

 

         return new Row();

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

         }

 

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

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

             $this->position = $position;

         }

     }

@@ -181,8 +181,8 @@ 
     {

         $this->seek($this->count() - 1);

 

-        if($this->count()) {

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

+        if ($this->count()) {

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

         }

 

         return new Row();

@@ -203,8 +203,8 @@ 
     {

         $this->seek($this->position);

 

-        if($this->count()) {

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

+        if ($this->count()) {

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

         }

 

         return new Row();

@@ -273,8 +273,8 @@ 
      */

     public function valid()

     {

-        if($this->count()) {

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

+        if ($this->count()) {

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

         }

 

         return false;

@@ -345,7 +345,7 @@ 
      */

     public function offsetExists($offset)

     {

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

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

     }

 

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

@@ -366,8 +366,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;

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

     {

         if ($value instanceof Row) {

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

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

         }

     }

 

@@ -417,8 +417,8 @@ 
      */

     public function offsetUnset($offset)

     {

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

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

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

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

         }

     }