ntentan / nibii

src/relationships/ManyHaveManyRelationship.php

Spacing +8 added lines, -8 removed lines

@@ -46,7 +46,7 @@ 
             ->filterBy($this->options['junction_local_key'], $data[$this->options['local_key']])
             ->fetch();
         $foreignKeys = [];
-        foreach($filter->toArray() as $foreignItem) {
+        foreach ($filter->toArray() as $foreignItem) {
             $foreignKeys[] = $foreignItem[$this->options['junction_foreign_key']];
         }
         $query = (new \ntentan\nibii\QueryParameters($this->getModelInstance()))
@@ -56,7 +56,7 @@ 
 
     public function runSetup()
     {
-        if(isset($this->options['through'])) {
+        if (isset($this->options['through'])) {
             $junctionModelName = $this->options['through'];
         } else {
             $junctionModelName = Nibii::joinModels($this->setupName, $this->options['model']);
@@ -64,22 +64,22 @@ 
         $this->options['junction_model'] = $junctionModelName;
         
         $foreignModel = Nibii::load($this->options['model']);
-        if($this->options['foreign_key'] == null) {
+        if ($this->options['foreign_key'] == null) {
             $this->options['foreign_key'] = $foreignModel->getDescription()->getPrimaryKey()[0];
         } 
         
-        if($this->options['local_key'] == null) {
+        if ($this->options['local_key'] == null) {
             $this->options['local_key'] = $this->setupPrimaryKey[0];
         }
         
-        if(!isset($this->options['junction_local_key'])) {
+        if (!isset($this->options['junction_local_key'])) {
             $this->options['junction_local_key'] = 
-                Text::singularize($this->setupTable) . '_id';
+                Text::singularize($this->setupTable).'_id';
         }
         
-        if(!isset($this->options['junction_foreign_key'])) {
+        if (!isset($this->options['junction_foreign_key'])) {
             $this->options['junction_foreign_key'] = 
-                Text::singularize($foreignModel->getTable()) . '_id';
+                Text::singularize($foreignModel->getTable()).'_id';
         }
     }
 }

src/relationships/BelongsToRelationship.php

Spacing +3 added lines, -3 removed lines

@@ -45,11 +45,11 @@
     public function runSetup()
     {
         $model = (new \ReflectionClass(Nibii::getClassName($this->options['model'], self::BELONGS_TO)))->newInstance();
-        if($this->options['foreign_key'] == null) {
+        if ($this->options['foreign_key'] == null) {
             $this->options['foreign_key'] = $model->getDescription()->getPrimaryKey()[0];
         }
-        if($this->options['local_key'] == null) {
-            $this->options['local_key'] = Text::singularize($model->getTable()) . '_id';
+        if ($this->options['local_key'] == null) {
+            $this->options['local_key'] = Text::singularize($model->getTable()).'_id';
         }
     }
 }

src/relationships/HasManyRelationship.php

Spacing +3 added lines, -3 removed lines

@@ -42,10 +42,10 @@
 
     public function runSetup()
     {
-        if($this->options['foreign_key'] == null) {
-            $this->options['foreign_key'] = Text::singularize($this->setupTable) . '_id';
+        if ($this->options['foreign_key'] == null) {
+            $this->options['foreign_key'] = Text::singularize($this->setupTable).'_id';
         }
-        if($this->options['local_key'] == null) {
+        if ($this->options['local_key'] == null) {
             $this->options['local_key'] = $this->setupPrimaryKey[0];
         }
     }

src/QueryParameters.php

Spacing +3 added lines, -3 removed lines

@@ -80,7 +80,7 @@ 
     
     public function getSorts()
     {
-        return count($this->sorts) ? " ORDER BY " . implode(", ", $this->sorts) : null;
+        return count($this->sorts) ? " ORDER BY ".implode(", ", $this->sorts) : null;
     }
 
     public function addFilter($field, $values = [])
@@ -91,7 +91,7 @@ 
 
         if ($numValues === 1) {
             $key = "filter_{$startIndex}";
-            if($values[0] === null) {
+            if ($values[0] === null) {
                $this->whereClause .= "{$field} is NULL";
             } else {
                $this->whereClause .= "{$field} = :$key";
@@ -101,7 +101,7 @@ 
             $this->whereClause .= "{$field} IN (";
             $comma = '';
             for ($i = 0; $i < $numValues; $i++) {
-                $key = "filter_" . ($startIndex + $i);
+                $key = "filter_".($startIndex + $i);
                 $this->whereClause .= "$comma:$key";
                 $this->boundData[$key] = $values[$i];
                 $comma = ' ,';

src/validations/UniqueValidation.php

Spacing +5 added lines, -5 removed lines

@@ -45,19 +45,19 @@ 
     public function run($field, $data)
     {
         $test = [];
-        foreach($field['name'] as $name) {
+        foreach ($field['name'] as $name) {
             $test[$name] = isset($data[$name]) ? $data[$name] : null;
         }
         
-        if($this->mode == \ntentan\nibii\DataOperations::MODE_UPDATE) {
+        if ($this->mode == \ntentan\nibii\DataOperations::MODE_UPDATE) {
             $primaryKeyFields = $this->model->getDescription()->getPrimaryKey();
             $keys = [];
-            foreach($primaryKeyFields as $name) {
+            foreach ($primaryKeyFields as $name) {
                 $keys[$name] = $data[$name];
             }
             $testItem = $this->model->createNew()->fetchFirst($test);
             $intersection = array_intersect($testItem->toArray(), $keys);
-            if(!empty($intersection)) {
+            if (!empty($intersection)) {
                 return true;
             }                   
         } else {
@@ -67,7 +67,7 @@ 
         return $this->evaluateResult(
             $field, 
             $testItem->count() === 0,
-            "The value of " . implode(', ', $field['name']) . " must be unique"
+            "The value of ".implode(', ', $field['name'])." must be unique"
         );        
     }
 }

src/FilterCompiler.php

Spacing +9 added lines, -9 removed lines

@@ -60,7 +60,7 @@ 
         $this->getToken();
         $expression = $this->parseExpression();
         if ($this->token !== false) {
-            throw new FilterCompilerException("Unexpected '" . $this->token . "' in filter [$filter]");
+            throw new FilterCompilerException("Unexpected '".$this->token."' in filter [$filter]");
         }
         $parsed = $this->renderExpression($expression);
         return $parsed;
@@ -69,7 +69,7 @@ 
     private function renderExpression($expression)
     {
         if (is_array($expression)) {
-            $expression = $this->renderExpression($expression['left']) . " {$expression['opr']} " . $this->renderExpression($expression['right']);
+            $expression = $this->renderExpression($expression['left'])." {$expression['opr']} ".$this->renderExpression($expression['right']);
         }
         return $expression;
     }
@@ -80,7 +80,7 @@ 
             $tokens = [$tokens];
         }
         if (array_search($this->lookahead, $tokens) === false) {
-            throw new FilterCompilerException("Expected " . implode(' or ', $tokens) . " but found " . $this->lookahead);
+            throw new FilterCompilerException("Expected ".implode(' or ', $tokens)." but found ".$this->lookahead);
         }
     }
 
@@ -172,7 +172,7 @@ 
 
     private function returnPositionTag()
     {
-        return ":filter_bind_" . (++$this->numPositions);
+        return ":filter_bind_".(++$this->numPositions);
     }
 
     private function parseObracket()
@@ -195,7 +195,7 @@ 
             'obracket' => 'parseObracket'
         ];
 
-        if(isset($methods[$this->lookahead])) {
+        if (isset($methods[$this->lookahead])) {
             $method = $methods[$this->lookahead];
             $return = $this->$method();
         }
@@ -254,7 +254,7 @@ 
         }
 
         if ($this->token === false && strlen($this->filter) > 0) {
-            throw new FilterCompilerException("Unexpected character [" . $this->filter[0] . "] begining " . $this->filter . ".");
+            throw new FilterCompilerException("Unexpected character [".$this->filter[0]."] begining ".$this->filter.".");
         }
     }
 
@@ -267,10 +267,10 @@ 
 
     public function rewriteBoundData($data) {
         $rewritten = [];
-        foreach($data as $key => $value) {
-            if(is_numeric($key))
+        foreach ($data as $key => $value) {
+            if (is_numeric($key))
             {
-                $rewritten["filter_bind_" . ($key + 1)] = $value;
+                $rewritten["filter_bind_".($key + 1)] = $value;
             }
             else
             {

src/RecordWrapper.php

Spacing +16 added lines, -16 removed lines

@@ -49,7 +49,7 @@ 
     {
         $this->table = Nibii::getModelTable($this);
         $this->adapter = $adapter;
-        foreach($this->behaviours as $behaviour) {
+        foreach ($this->behaviours as $behaviour) {
             $behaviourInstance = $this->getComponentInstance($behaviour);
             $behaviourInstance->setModel($this);
         }
@@ -76,7 +76,7 @@ 
     public function getDescription()
     {
         return Cache::read(
-            (new \ReflectionClass($this))->getName() . '::desc',
+            (new \ReflectionClass($this))->getName().'::desc',
             function() 
             {
                 return new ModelDescription($this);
@@ -96,7 +96,7 @@ 
     private function retrieveItem($key)
     {
         $relationships = $this->getDescription()->getRelationships();
-        if(isset($relationships[$key])) {
+        if (isset($relationships[$key])) {
             return $this->fetchRelatedFields($relationships[$key]);
         } else {
             return isset($this->modelData[$key]) ? $this->modelData[$key] : null;
@@ -121,7 +121,7 @@ 
      */
     public function __call($name, $arguments)
     {
-        if($this->dynamicOperations === null) {
+        if ($this->dynamicOperations === null) {
             $this->dynamicOperations = new Operations($this, InjectionContainer::singleton(DriverAdapter::class));
         }
         return $this->dynamicOperations->perform($name, $arguments);
@@ -150,7 +150,7 @@ 
     
     private function expandArrayValue($array, $relationships, $depth, $index = null)
     {
-        foreach($relationships as $name => $relationship) {
+        foreach ($relationships as $name => $relationship) {
             $array[$name] = $this->fetchRelatedFields($relationship, $index)->toArray($depth);
         }
         return $array;
@@ -160,9 +160,9 @@ 
     {
         $relationships = $this->getDescription()->getRelationships();
         $array = $this->modelData;
-        if($depth > 0) {
-            if($this->hasMultipleData()) {
-                foreach($array as $i => $value) {
+        if ($depth > 0) {
+            if ($this->hasMultipleData()) {
+                foreach ($array as $i => $value) {
                     $array[$i] = $this->expandArrayValue($value, $relationships, $depth - 1, $i);
                 }
             } else {
@@ -186,7 +186,7 @@ 
 
     private function hasMultipleData()
     {
-        if(count($this->modelData) > 0) {
+        if (count($this->modelData) > 0) {
             return is_numeric(array_keys($this->modelData)[0]);
         } else {
             return false;
@@ -197,11 +197,11 @@ 
     {
         $data = [];
                 
-        if(count($this->modelData) == 0) {
+        if (count($this->modelData) == 0) {
             $data = $this->modelData;
-        } else if($this->hasMultipleData()) {
+        } else if ($this->hasMultipleData()) {
             $data = $this->modelData;
-        } else if(count($this->modelData) > 0) {
+        } else if (count($this->modelData) > 0) {
             $data[] = $this->modelData;
         }
         
@@ -216,7 +216,7 @@ 
     
     public function mergeData($data)
     {
-        foreach($data as $key => $value) {
+        foreach ($data as $key => $value) {
             $this->modelData[$key] = $value;
         }
         $this->dataSet = true;
@@ -249,7 +249,7 @@ 
 
     private function wrap($offset)
     {
-        if(isset($this->modelData[$offset])) {
+        if (isset($this->modelData[$offset])) {
             $newInstance = $this->createNew();
             $newInstance->setData($this->modelData[$offset]);
             return $newInstance;
@@ -300,13 +300,13 @@ 
 
     private function fetchRelatedFields($relationship, $index = null)
     {
-        if($index === null) {
+        if ($index === null) {
             $data = $this->modelData;
         } else {
             $data = $this->modelData[$index];
         }
         $model = $relationship->getModelInstance();
-        if(empty($data)) {
+        if (empty($data)) {
             return $model;
         } else {
             return $model->fetch($relationship->getQuery($data));

src/DataOperations.php

Spacing +18 added lines, -18 removed lines

@@ -72,17 +72,17 @@ 
         }
         
         // Assign an empty array to force a validation error for empty models
-        if(empty($data)) {
+        if (empty($data)) {
             $data = [[]];
         }
 
         Db::getDriver()->beginTransaction();
 
-        foreach($data as $i => $datum) {
+        foreach ($data as $i => $datum) {
             $status = $this->saveRecord($datum, $primaryKey);
             $data[$i] = $datum;
             
-            if(!$status['success']) {
+            if (!$status['success']) {
                 $succesful = false;
                 $invalidFields[$i] = $status['invalid_fields'];
                 Db::getDriver()->rollback();
@@ -90,7 +90,7 @@ 
             }
         }
         
-        if($succesful) {
+        if ($succesful) {
             Db::getDriver()->commit();
         } else {
             $this->assignValue($this->invalidFields, $invalidFields);
@@ -123,7 +123,7 @@ 
         $this->wrapper->setData($record);
 
         // Run preUpdate or preSave callbacks on models and behaviours
-        if($pkSet) {
+        if ($pkSet) {
             $this->wrapper->preUpdateCallback();
             $record = $this->wrapper->getData();
             $record = reset($record) === false ? [] : reset($record);
@@ -142,7 +142,7 @@ 
         );
 
         // Exit if data is invalid
-        if($validity !== true) {
+        if ($validity !== true) {
             $status['invalid_fields'] = $validity;
             $status['success'] = false;
             return $status;
@@ -152,7 +152,7 @@ 
         $this->wrapper->setData($record);
 
         // Update or save the data and run post callbacks
-        if($pkSet) {
+        if ($pkSet) {
             $this->adapter->update($record);
             $this->wrapper->postUpdateCallback();
             $this->runBehaviours('postUpdateCallback', [$record]);
@@ -177,15 +177,15 @@ 
             ['model' => $this->wrapper, 'mode' => $mode]
         );
 
-        if(!$validator->validate($data)) {
+        if (!$validator->validate($data)) {
             $valid = false;
         }
         
-        if($valid) {
+        if ($valid) {
             $valid = $this->wrapper->onValidate();
         }
 
-        if($valid === false) {
+        if ($valid === false) {
             $valid = $validator->getInvalidFields();
         }
 
@@ -195,17 +195,17 @@ 
 
     private function isPrimaryKeySet($primaryKey, $data)
     {
-        if(is_string($primaryKey)) {
-            if(isset($data[$primaryKey]))
+        if (is_string($primaryKey)) {
+            if (isset($data[$primaryKey]))
             {
                 return true;
             }
         }
-        foreach($primaryKey as $keyField) {
-            if(!isset($data[$keyField])) {
+        foreach ($primaryKey as $keyField) {
+            if (!isset($data[$keyField])) {
                 break;
             }
-            if($data[$keyField] !== '' && $data[$keyField] !== null) {
+            if ($data[$keyField] !== '' && $data[$keyField] !== null) {
                 return true;
             }
         }
@@ -214,7 +214,7 @@ 
     
     private function assignValue(&$property, $value)
     {
-        if($this->hasMultipleData) {
+        if ($this->hasMultipleData) {
             $property = $value;
         } else {
             $property = $value[0];
@@ -233,7 +233,7 @@ 
     
     public function isItemDeletable($primaryKey, $data)
     {
-        if($this->isPrimaryKeySet($primaryKey, $data)) {
+        if ($this->isPrimaryKeySet($primaryKey, $data)) {
             return true;
         } else {
             return false;
@@ -242,7 +242,7 @@ 
     
     private function runBehaviours($event, $args)
     {
-        foreach($this->wrapper->getBehaviours() as $behaviour) {
+        foreach ($this->wrapper->getBehaviours() as $behaviour) {
             $args[0] = call_user_func_array([$behaviour, $event], $args);
         }
         return $args[0];

src/Resolver.php

Spacing +5 added lines, -5 removed lines

@@ -31,7 +31,7 @@ 
     {
         $arrayed = explode('\\', $className);
         $class = array_pop($arrayed);
-        if($arrayed[0] == '') {
+        if ($arrayed[0] == '') {
             array_shift($arrayed);
         }
         return ['class' => $class, 'namespace' => implode('\\', $arrayed)];
@@ -41,7 +41,7 @@ 
     {
         $classA = $this->getClassFileDetails($classA);
         $classB = $this->getClassFileDetails($classB);
-        if($classA['namespace'] != $classB['namespace']) {
+        if ($classA['namespace'] != $classB['namespace']) {
             throw new NibiiException(
                 "Cannot automatically join two classes of different "
                     . "namespaces. Please provide a model joiner or "
@@ -50,7 +50,7 @@ 
         }
         $classes = [$classA['class'], $classB['class']];
         sort($classes);
-        return "{$classA['namespace']}\\" . implode('', $classes);        
+        return "{$classA['namespace']}\\".implode('', $classes);        
     }
 
     public function getTableName($instance)
@@ -63,8 +63,8 @@ 
     public static function getDriverAdapterClassName()
     {
         $driver = Config::get('ntentan:db.driver', false);
-        if($driver) {
-            return __NAMESPACE__ . '\adapters\\' . Text::ucamelize(Config::get('ntentan:db.driver')) . 'Adapter';
+        if ($driver) {
+            return __NAMESPACE__.'\adapters\\'.Text::ucamelize(Config::get('ntentan:db.driver')).'Adapter';
         } 
         throw new NibiiException("Please specify a driver");
     }