ntentan / nibii

src/DataOperations.php

Doc Comments +3 added lines

@@ -237,6 +237,9 @@
         }
     }     
     
+    /**
+     * @param string $event
+     */
     private function runBehaviours($event, $args)
     {
         foreach($this->wrapper->getBehaviours() as $behaviour) {

Spacing +17 added lines, -17 removed lines

@@ -71,17 +71,17 @@ 
         }
         
         // Assign an empty array to force a validation error for empty models
-        if(empty($data)) {
+        if (empty($data)) {
             $data = [[]];
         }
 
         $this->adapter->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'];
                 $this->adapter->getDriver()->rollback();
@@ -89,7 +89,7 @@ 
             }
         }
         
-        if($succesful) {
+        if ($succesful) {
             //$this->assignValue($this->data, $data);
             $this->adapter->getDriver()->commit();
         } else {
@@ -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]);
@@ -178,11 +178,11 @@ 
             }
         );
 
-        if(!$validator->validate($data)) {
+        if (!$validator->validate($data)) {
             $valid = false;
         }
 
-        if($valid === false) {
+        if ($valid === false) {
             $valid = $validator->getInvalidFields();
         }
 
@@ -192,17 +192,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;
             }
         }
@@ -211,7 +211,7 @@ 
     
     private function assignValue(&$property, $value)
     {
-        if($this->hasMultipleData) {
+        if ($this->hasMultipleData) {
             $property = $value;
         } else {
             $property = $value[0];
@@ -230,7 +230,7 @@ 
     
     public function isItemDeletable($primaryKey, $data)
     {
-        if($this->isPrimaryKeySet($primaryKey, $data)) {
+        if ($this->isPrimaryKeySet($primaryKey, $data)) {
             return true;
         } else {
             return false;
@@ -239,7 +239,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];

Unused Use Statements +1 added lines, -1 removed lines

@@ -25,8 +25,8 @@
 
 namespace ntentan\nibii;
 
-use ntentan\utils\Utils;
 use ntentan\kaikai\Cache;
+use ntentan\utils\Utils;
 
 class RecordWrapper implements \ArrayAccess, \Countable, \Iterator
 {

src/FilterCompiler.php

Doc Comments +4 added lines

@@ -204,6 +204,10 @@
         return $return;
     }
 
+    /**
+     * @param integer $level
+     * @param string $opr
+     */
     private function parseRightExpression($level, $opr)
     {
         switch ($opr) {

Braces +1 added lines, -2 removed lines

@@ -271,8 +271,7 @@
             if(is_numeric($key))
             {
                 $rewritten["filter_bind_" . ($key + 1)] = $value;
-            }
-            else
+            } else
             {
                 $rewritten[$key] = $value;
             }

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

Doc Comments +6 added lines

@@ -45,6 +45,9 @@ 
         }
     }
     
+    /**
+     * @param RecordWrapper $instance
+     */
     public static function getModelTable($instance)
     {
         if(self::$tableResolver) {
@@ -68,6 +71,9 @@ 
         return $className;
     }
     
+    /**
+     * @param string $class
+     */
     public static function getModelName($class)
     {
         if(self::$modelResolver) {

Spacing +7 added lines, -7 removed lines

@@ -18,7 +18,7 @@ 
     {
         $arrayed = explode('\\', $className);
         $class = array_pop($arrayed);
-        if($arrayed[0] == '') {
+        if ($arrayed[0] == '') {
             array_shift($arrayed);
         }
         return ['class' => $class, 'namespace' => implode('\\', $arrayed)];
@@ -26,13 +26,13 @@ 
     
     public static function joinModels($classA, $classB)
     {
-        if(self::$modelJoiner) {
+        if (self::$modelJoiner) {
             $modelJoiner = self::$modelJoiner;
             return $modelJoiner($classA, $classB);
         } else {
             $classA = self::getClassFileDetails($classA);
             $classB = self::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 "
@@ -41,13 +41,13 @@ 
             }
             $classes = [$classA['class'], $classB['class']];
             sort($classes);
-            return "{$classA['namespace']}\\" . implode('', $classes);
+            return "{$classA['namespace']}\\".implode('', $classes);
         }
     }
     
     public static function getModelTable($instance)
     {
-        if(self::$tableResolver) {
+        if (self::$tableResolver) {
             $tableResolver = self::$tableResolver;
             return $tableResolver($instance);
         } else {
@@ -59,7 +59,7 @@ 
 
     public static function getClassName($model, $context = null)
     {
-        if(self::$classResolver !== null && $model[0] !== "\\") {
+        if (self::$classResolver !== null && $model[0] !== "\\") {
             $resolver = self::$classResolver;
             $className = $resolver($model, $context);
         } else {
@@ -70,7 +70,7 @@ 
     
     public static function getModelName($class)
     {
-        if(self::$modelResolver) {
+        if (self::$modelResolver) {
             $modelResolver = self::$modelResolver;
             return $modelResolver($class);
         } else {

src/Operations.php

Doc Comments +4 added lines

@@ -23,6 +23,10 @@
         'save'
     ];
     
+    /**
+     * @param RecordWrapper $wrapper
+     * @param DriverAdapter $adapter
+     */
     public function __construct($wrapper, $adapter)
     {
         $this->wrapper = $wrapper;

Spacing +5 added lines, -5 removed lines

@@ -14,9 +14,9 @@ 
     private $dataOperations;
     
     private $queryOperationMethods = [
-        'fetch',    'fetchFirst',   'filter',   'query',    'fields', 
-        'cover',    'limit',        'offset',   'filterBy', 'sortBy',
-        'delete',   'count',        'update'
+        'fetch', 'fetchFirst', 'filter', 'query', 'fields', 
+        'cover', 'limit', 'offset', 'filterBy', 'sortBy',
+        'delete', 'count', 'update'
     ];
     
     private $dataOperationMethods = [
@@ -35,9 +35,9 @@ 
     {
         if (array_search($name, $this->queryOperationMethods) !== false) {
             return call_user_func_array([$this->queryOperations, "do$name"], $arguments);
-        } else if (array_search($name, $this->dataOperationMethods) !== false){
+        } else if (array_search($name, $this->dataOperationMethods) !== false) {
             return call_user_func_array([$this->dataOperations, "do$name"], $arguments);
-        } else if($this->queryOperations->initDynamicMethod($name)) {
+        } else if ($this->queryOperations->initDynamicMethod($name)) {
             return $this->queryOperations->runDynamicMethod($arguments);
         } else {
             throw new NibiiException("Method {$name} not found");

src/QueryEngine.php

Doc Comments +18 added lines

@@ -6,11 +6,17 @@ 
 
     private $db;
 
+    /**
+     * @param \ntentan\atiaa\Driver $driver
+     */
     public function setDriver($driver)
     {
         $this->db = $driver;
     }
     
+    /**
+     * @param string $query
+     */
     private function filter($query)
     {
         return $query;
@@ -34,6 +40,9 @@ 
         );
     }
 
+    /**
+     * @return string
+     */
     public function getBulkUpdateQuery($data, $parameters)
     {
         $updateData = [];
@@ -74,6 +83,9 @@ 
         );
     }
 
+    /**
+     * @return string
+     */
     public function getSelectQuery($parameters)
     {
         return $this->filter(sprintf(
@@ -88,6 +100,9 @@ 
         );
     }
     
+    /**
+     * @return string
+     */
     public function getCountQuery($parameters)
     {
         return $this->filter(sprintf(
@@ -98,6 +113,9 @@ 
         );
     }
 
+    /**
+     * @return string
+     */
     public function getDeleteQuery($parameters)
     {
         return $this->filter(sprintf(

Spacing +8 added lines, -8 removed lines

@@ -29,15 +29,15 @@ 
         }
 
         return $this->filter(
-            "INSERT INTO " . $this->db->quoteIdentifier($model->getTable()) .
-            " (" . implode(", ", $quotedFields) . ") VALUES (" . implode(', ', $valueFields) . ")"
+            "INSERT INTO ".$this->db->quoteIdentifier($model->getTable()).
+            " (".implode(", ", $quotedFields).") VALUES (".implode(', ', $valueFields).")"
         );
     }
 
     public function getBulkUpdateQuery($data, $parameters)
     {
         $updateData = [];
-        foreach($data as $field => $value) {
+        foreach ($data as $field => $value) {
             $updateData[] = "{$this->db->quoteIdentifier($field)} = :$field";
         }
 
@@ -60,17 +60,17 @@ 
         foreach ($fields as $field) {
             $quotedField = $this->db->quoteIdentifier($field);
 
-            if(array_search($field, $primaryKey) !== false) {
+            if (array_search($field, $primaryKey) !== false) {
                 $conditions[] = "{$quotedField} = :{$field}";
             } else {
                 $valueFields[] = "{$quotedField} = :{$field}";
             }
         }
 
-        return $this->filter("UPDATE " .
-            $this->db->quoteIdentifier($model->getTable()) .
-            " SET " . implode(', ', $valueFields) .
-            " WHERE " . implode(' AND ', $conditions)
+        return $this->filter("UPDATE ".
+            $this->db->quoteIdentifier($model->getTable()).
+            " SET ".implode(', ', $valueFields).
+            " WHERE ".implode(' AND ', $conditions)
         );
     }
 

src/QueryParameters.php

Doc Comments +6 added lines, -1 removed lines

@@ -23,7 +23,6 @@ 
 
     /**
      *
-     * @param \ $model
      */
     public function __construct($wrapper)
     {
@@ -118,6 +117,9 @@ 
         $this->boundData += $values;
     }
 
+    /**
+     * @param boolean $firstOnly
+     */
     public function setFirstOnly($firstOnly)
     {
         $this->firstOnly = $firstOnly;
@@ -139,6 +141,9 @@ 
         $this->offset = $offset;
     }
     
+    /**
+     * @param string $field
+     */
     public function addSort($field, $direction = 'ASC')
     {
         $this->sorts[] = "$field $direction";

Indentation +3 added lines, -3 removed lines

@@ -92,10 +92,10 @@
         if ($numValues === 1) {
             $key = "filter_{$startIndex}";
             if($values[0] === null) {
-               $this->whereClause .= "{$field} is NULL";
+                $this->whereClause .= "{$field} is NULL";
             } else {
-               $this->whereClause .= "{$field} = :$key";
-               $this->boundData[$key] = reset($values);
+                $this->whereClause .= "{$field} = :$key";
+                $this->boundData[$key] = reset($values);
             }
         } else {
             $this->whereClause .= "{$field} IN (";

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

Doc Comments +4 added lines, -1 removed lines

@@ -123,7 +123,7 @@ 
 
     /**
      * @method
-     * @param type $name
+     * @param string $name
      * @param type $arguments
      * @return type
      */
@@ -157,6 +157,9 @@ 
         return $this->table;
     }
     
+    /**
+     * @param integer $depth
+     */
     private function expandArrayValue($array, $relationships, $depth, $index = null)
     {
         foreach($relationships as $name => $relationship) {

Unused Use Statements +1 added lines, -1 removed lines

@@ -25,8 +25,8 @@
 
 namespace ntentan\nibii;
 
-use ntentan\utils\Utils;
 use ntentan\kaikai\Cache;
+use ntentan\utils\Utils;
 
 class RecordWrapper implements \ArrayAccess, \Countable, \Iterator
 {

Spacing +16 added lines, -16 removed lines

@@ -52,7 +52,7 @@ 
                 return Nibii::getModelTable($this);
             }
         );
-        foreach($this->behaviours as $behaviour) {
+        foreach ($this->behaviours as $behaviour) {
             $behaviourInstance = $this->loadDependency($behaviour);
             $behaviourInstance->setModel($this);
         }
@@ -64,7 +64,7 @@ 
      */
     protected function getDataAdapter()
     {
-        if(!$this->adapter)
+        if (!$this->adapter)
         {
             $this->adapter = DriverAdapter::getDefaultInstance();
         }
@@ -78,7 +78,7 @@ 
     public function getDescription()
     {
         return Cache::read(
-            (new \ReflectionClass($this))->getName() . '::desc',
+            (new \ReflectionClass($this))->getName().'::desc',
             function() 
             {
                 return new ModelDescription($this);
@@ -98,7 +98,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;
@@ -153,7 +153,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;
@@ -163,9 +163,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 {
@@ -189,7 +189,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;
@@ -200,11 +200,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;
         }
         
@@ -219,7 +219,7 @@ 
     
     public function mergeData($data)
     {
-        foreach($data as $key => $value) {
+        foreach ($data as $key => $value) {
             $this->modelData[$key] = $value;
         }
         $this->dataSet = true;
@@ -252,7 +252,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;
@@ -303,13 +303,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/ModelDescription.php

Spacing +5 added lines, -5 removed lines

@@ -28,10 +28,10 @@ 
                 'default' => $details['default'],
                 'name' => $field
             ];
-            if(isset($details['default'])) {
+            if (isset($details['default'])) {
                 $this->fields[$field]['default'] = $details['default'];
             }
-            if(isset($details['length'])) {
+            if (isset($details['length'])) {
                 $this->fields[$field]['length'] = $details['length'];
             }
         }
@@ -39,7 +39,7 @@ 
         $this->appendConstraints($schema['primary_key'], $this->primaryKey, true);
         $this->appendConstraints($schema['unique_keys'], $this->uniqueKeys);
 
-        foreach($relationships as $type => $relations) {
+        foreach ($relationships as $type => $relations) {
             $this->createRelationships($type, $relations);
         }
 
@@ -61,7 +61,7 @@ 
 
     private function getRelationshipDetails($relationship)
     {
-        if(is_string($relationship))
+        if (is_string($relationship))
         {
             return [
                 'model' => $relationship,
@@ -81,7 +81,7 @@ 
 
     private function createRelationships($type, $relationships)
     {
-        foreach($relationships as $relationship)
+        foreach ($relationships as $relationship)
         {
             $relationship = $this->getRelationshipDetails($relationship);
             $class = "\\ntentan\\nibii\\relationships\\{$type}Relationship";

src/ModelValidator.php

Spacing +5 added lines, -5 removed lines

@@ -15,17 +15,17 @@ 
         $this->model = $model;
         $description = $model->getDescription();
 
-        if($description->getAutoPrimaryKey()) {
+        if ($description->getAutoPrimaryKey()) {
             $pk = $description->getPrimaryKey()[0];
         }
 
         $fields = $description->getFields();
-        foreach($fields as $field) {
+        foreach ($fields as $field) {
             $this->getFieldRules($rules, $field, $pk);
         }
         
         $unique = $description->getUniqueKeys();
-        foreach($unique as $constraints) {
+        foreach ($unique as $constraints) {
             $rules['unique'][] = [$constraints['fields']];
         }
         
@@ -39,10 +39,10 @@ 
 
     private function getFieldRules(&$rules, $field, $pk)
     {
-        if($field['required'] && $field['name'] != $pk && $field['default'] === null) {
+        if ($field['required'] && $field['name'] != $pk && $field['default'] === null) {
             $rules['required'][] = $field['name'];
         }
-        if($field['type'] === 'integer' || $field['type'] === 'double') {
+        if ($field['type'] === 'integer' || $field['type'] === 'double') {
             $rules['numeric'][] = $field['name'];
         }
     }