Asymptix / Framework

framework/app/View.php

Doc Comments +3 added lines

@@ -24,6 +24,9 @@
     private $_messages = array();
     private $_errors = array();
 
+    /**
+     * @param null|Route $tpl
+     */
     public function __construct($tpl) {
         if (!empty($tpl)) {
             if (is_string($tpl)) {

Spacing +2 added lines, -2 removed lines

@@ -56,7 +56,7 @@ 
                 $this->_tpl = $tpl;
             } elseif (Tools::isInstanceOf($tpl, new Route)) {
                 $this->_route = $tpl;
-                $this->_tpl = $this->_route->controller . "/" . $this->_route->controller . "_" . $this->_route->action;
+                $this->_tpl = $this->_route->controller."/".$this->_route->controller."_".$this->_route->action;
             } else {
                 throw new \Exception("Invalid view template");
             }
@@ -70,7 +70,7 @@ 
             throw new \Exception("View object was not initialized with template");
         }
 
-        require_once($path . $this->_tpl . $suffix);
+        require_once($path.$this->_tpl.$suffix);
     }
 
     public function setTpl($_tpl) {

framework/db/DBSelector.php

Doc Comments +3 added lines

@@ -42,6 +42,9 @@
      */
     private $dbObject = null;
 
+    /**
+     * @param string $className
+     */
     public function __construct($className) {
         if (is_object($className)) {
             $className = get_class($className);

Indentation +3 added lines, -3 removed lines

@@ -101,8 +101,8 @@ 
      */
     public function selectDBObject($debug = false) {
         $query = "SELECT * FROM " . $this->dbObject->getTableName()
-               . ($this->conditions != "" ? " WHERE " . $this->conditions : "")
-               . " LIMIT 1";
+                . ($this->conditions != "" ? " WHERE " . $this->conditions : "")
+                . " LIMIT 1";
 
         if (!$debug) {
             $stmt = DBCore::doSelectQuery($query);
@@ -183,7 +183,7 @@ 
      */
     public function selectDBObjects($debug = false) {
         $query = "SELECT" . ($this->unique ? " DISTINCT" : "")
-               . " * FROM " . $this->dbObject->getTableName();
+                . " * FROM " . $this->dbObject->getTableName();
 
         if ($this->conditions != "") {
             $query .= " WHERE " . $this->conditions;

Spacing +30 added lines, -30 removed lines

@@ -61,8 +61,8 @@ 
             $classNamespaceParts = explode("\\", $this->className);
             if ($className != $classNamespaceParts[count($classNamespaceParts) - 1]) {
                 throw new DBSelectorException(
-                    "Invalid DB object classname '" . $className . "' in method name. " .
-                    "Valid classname is '" . $this->className . "'"
+                    "Invalid DB object classname '".$className."' in method name. ".
+                    "Valid classname is '".$this->className."'"
                 );
             }
         }
@@ -100,8 +100,8 @@ 
      * @return DBObject
      */
     public function selectDBObject($debug = false) {
-        $query = "SELECT * FROM " . $this->dbObject->getTableName()
-               . ($this->conditions != "" ? " WHERE " . $this->conditions : "")
+        $query = "SELECT * FROM ".$this->dbObject->getTableName()
+               . ($this->conditions != "" ? " WHERE ".$this->conditions : "")
                . " LIMIT 1";
 
         if (!$debug) {
@@ -131,14 +131,14 @@ 
      * @return DBObject
      */
     public function selectDBObjectByField($fieldName, $fieldValue, $debug = false) {
-        $query = "SELECT * FROM " . $this->dbObject->getTableName() . " WHERE " . $fieldName . " = ?";
+        $query = "SELECT * FROM ".$this->dbObject->getTableName()." WHERE ".$fieldName." = ?";
 
         if ($this->conditions != "") {
-            $query .= " AND " . $this->conditions;
+            $query .= " AND ".$this->conditions;
         }
 
-        $query.= $this->getQueryOrderSQL();
-        $query.= " LIMIT 1";
+        $query .= $this->getQueryOrderSQL();
+        $query .= " LIMIT 1";
 
         $fieldType = DBField::getType($fieldValue);
         if (!$debug) {
@@ -182,15 +182,15 @@ 
      * @return array<DBObject>
      */
     public function selectDBObjects($debug = false) {
-        $query = "SELECT" . ($this->unique ? " DISTINCT" : "")
-               . " * FROM " . $this->dbObject->getTableName();
+        $query = "SELECT".($this->unique ? " DISTINCT" : "")
+               . " * FROM ".$this->dbObject->getTableName();
 
         if ($this->conditions != "") {
-            $query .= " WHERE " . $this->conditions;
+            $query .= " WHERE ".$this->conditions;
         }
 
-        $query.= $this->getQueryOrderSQL();
-        $query.= $this->getQueryLimitSQL();
+        $query .= $this->getQueryOrderSQL();
+        $query .= $this->getQueryLimitSQL();
 
         if (!$debug) {
             $stmt = DBCore::doSelectQuery($query);
@@ -219,15 +219,15 @@ 
      * @return array<DBObject>
      */
     public function selectDBObjectsByField($fieldName, $fieldValue, $debug = false) {
-        $query = "SELECT * FROM " . $this->dbObject->getTableName();
-        $query .= " WHERE " . $fieldName . " = ?";
+        $query = "SELECT * FROM ".$this->dbObject->getTableName();
+        $query .= " WHERE ".$fieldName." = ?";
 
         if ($this->conditions != "") {
-            $query .= " AND " . $this->conditions;
+            $query .= " AND ".$this->conditions;
         }
 
-        $query.= $this->getQueryOrderSQL();
-        $query.= $this->getQueryLimitSQL();
+        $query .= $this->getQueryOrderSQL();
+        $query .= $this->getQueryLimitSQL();
 
         $fieldType = DBField::getType($fieldValue);
         if (!$debug) {
@@ -253,10 +253,10 @@ 
      * @return int Number of records.
      */
     public function count() {
-        $query = "SELECT count(*) FROM " . $this->dbObject->getTableName();
+        $query = "SELECT count(*) FROM ".$this->dbObject->getTableName();
 
         if ($this->conditions != "") {
-            $query .= " WHERE " . $this->conditions;
+            $query .= " WHERE ".$this->conditions;
         }
 
         return DBCore::selectSingleValue($query);
@@ -268,10 +268,10 @@ 
      * @return int Number of records.
      */
     public function max() {
-        $query = "SELECT max(`" . $this->field . "`) FROM " . $this->dbObject->getTableName();
+        $query = "SELECT max(`".$this->field."`) FROM ".$this->dbObject->getTableName();
 
         if ($this->conditions != "") {
-            $query .= " WHERE " . $this->conditions;
+            $query .= " WHERE ".$this->conditions;
         }
 
         return DBCore::selectSingleValue($query);
@@ -283,10 +283,10 @@ 
      * @return int Number of records.
      */
     public function min() {
-        $query = "SELECT min(`" . $this->field . "`) FROM " . $this->dbObject->getTableName();
+        $query = "SELECT min(`".$this->field."`) FROM ".$this->dbObject->getTableName();
 
         if ($this->conditions != "") {
-            $query .= " WHERE " . $this->conditions;
+            $query .= " WHERE ".$this->conditions;
         }
 
         return DBCore::selectSingleValue($query);
@@ -299,10 +299,10 @@ 
      */
     private function getQueryOrderSQL() {
         if ($this->order != "") {
-            return (" ORDER BY " . $this->order);
+            return (" ORDER BY ".$this->order);
         }
 
-        return (" ORDER BY " . $this->dbObject->getIdFieldName() . " DESC");
+        return (" ORDER BY ".$this->dbObject->getIdFieldName()." DESC");
     }
 
     /**
@@ -313,10 +313,10 @@ 
     private function getQueryLimitSQL() {
         if ($this->count !== "all") {
             if ($this->offset > 0) {
-                return (" LIMIT " . $this->offset . "," . $this->count);
+                return (" LIMIT ".$this->offset.",".$this->count);
             }
 
-            return (" LIMIT " . $this->count);
+            return (" LIMIT ".$this->count);
         }
 
         return "";
@@ -365,7 +365,7 @@ 
         elseif (preg_match("#^selectAll([A-Z]{1}[[:alpha:]]+)s#", $methodName, $matches)) {
             $this->validateClassName(preg_replace("#ie$#", "y", $matches[1]));
 
-            $this->order = "`" . $this->dbObject->getIdFieldName() . "` DESC";
+            $this->order = "`".$this->dbObject->getIdFieldName()."` DESC";
             if (isset($methodParams[0])) {
                 $this->order = (string)$methodParams[0];
             }
@@ -412,7 +412,7 @@ 
             case ("get"):
                 return $this->getFieldValue($fieldName);
             default:
-                throw new DBSelectorException("No method with name '" . $methodName . "'");
+                throw new DBSelectorException("No method with name '".$methodName."'");
         }
     }
 }

framework/ui/UIComponent.php

Doc Comments +1 added lines, -1 removed lines

@@ -136,7 +136,7 @@
      * css($propertyName, $propertyValue) Set the value of a CSS property
      *
      * @param string $propertyName Name of a CSS property.
-     * @param mixed $propertyValue Value of a CSS property.
+     * @param string $propertyValue Value of a CSS property.
      *
      * @return Value of the CSS property or NULL if property is not exists.
      */

Spacing +2 added lines, -2 removed lines

@@ -112,7 +112,7 @@ 
             if (isset($this->$attributeName)) {
                 $this->$attributeName = $attributeValue;
             } else {
-                throw new \Exception("Wrong attribute '" . $attributeName . "' for " . get_class($this) . " component");
+                throw new \Exception("Wrong attribute '".$attributeName."' for ".get_class($this)." component");
             }
         }
     }
@@ -162,7 +162,7 @@ 
     public function getStyle() {
         $style = "";
         foreach ($this->style as $propertyName => $propertyValue) {
-            $style .= $propertyName . ":" . $propertyValue . ";";
+            $style .= $propertyName.":".$propertyValue.";";
         }
 
         return $style;

framework/db/DBCore.php

Indentation +1 added lines, -1 removed lines

@@ -598,7 +598,7 @@
     public static function deleteDBObject($dbObject) {
         if (!empty($dbObject) && is_object($dbObject)) {
             $query = "DELETE FROM " . $dbObject->getTableName() .
-                     " WHERE " . $dbObject->getIdFieldName() . " = ? LIMIT 1";
+                        " WHERE " . $dbObject->getIdFieldName() . " = ? LIMIT 1";
             if (Tools::isInteger($dbObject->getId())) {
                 $typesString = "i";
             } else {

Spacing +33 added lines, -33 removed lines

@@ -126,7 +126,7 @@ 
      */
     public function getConnection($connName) {
         if (!isset($this->connections[$connName])) {
-            throw new DBCoreException('Unknown connection: ' . $connName);
+            throw new DBCoreException('Unknown connection: '.$connName);
         }
 
         return $this->connections[$connName];
@@ -279,7 +279,7 @@ 
                 $resultSet[$field->table] = [];
             }
             $resultSet[$field->table][$field->name] = $fieldsCounter++;
-            $parameterName = "variable" . $fieldsCounter; //$field->name;
+            $parameterName = "variable".$fieldsCounter; //$field->name;
             $$parameterName = null;
             $parameters[] = &$$parameterName;
         }
@@ -410,7 +410,7 @@ 
      */
     public static function getTableFieldsList($tableName) {
         if (!empty($tableName)) {
-            $query = "SHOW FULL COLUMNS FROM " . $tableName;
+            $query = "SHOW FULL COLUMNS FROM ".$tableName;
             $stmt = self::doSelectQuery($query);
             if ($stmt !== false) {
                 $stmt->bind_result(
@@ -456,7 +456,7 @@ 
          || strpos($type, "datetime") === 0
          || strpos($type, "timestamp") === 0
          || strpos($type, "date") === 0) {
-            return ('"' . $value . '"');
+            return ('"'.$value.'"');
         } elseif (strpos($type, "int") === 0
          || strpos($type, "tinyint") === 0
          || strpos($type, "smallint") === 0
@@ -492,17 +492,17 @@ 
         $extra = trim($attributes['extra']);
         $comment = trim($attributes['comment']);
 
-        $fieldStr = "'" . $field . "' => ";
+        $fieldStr = "'".$field."' => ";
         if ($attributes['null'] === 'YES' && is_null($attributes['default'])) {
-            $fieldStr.= "null";
+            $fieldStr .= "null";
         } else {
-            $fieldStr.= self::getPrintableSQLValue($attributes['type'], $attributes['default']);
+            $fieldStr .= self::getPrintableSQLValue($attributes['type'], $attributes['default']);
         }
-        $fieldStr.= ", // " . $attributes['type'] .
-            ", " . (($attributes['null'] == "NO") ? "not null" : "null")
-            . ", default '" . $attributes['default'] . "'" .
-            ($extra ? ", " . $extra : "") .
-            ($comment ? " (" . $comment . ")" : "") . "\n";
+        $fieldStr .= ", // ".$attributes['type'].
+            ", ".(($attributes['null'] == "NO") ? "not null" : "null")
+            . ", default '".$attributes['default']."'".
+            ($extra ? ", ".$extra : "").
+            ($comment ? " (".$comment.")" : "")."\n";
 
         return $fieldStr;
     }
@@ -557,12 +557,12 @@ 
         $idFieldName = $dbObject->getIdFieldName();
 
         if (Tools::isInteger($fieldsList[$idFieldName])) {
-            $query = "INSERT " . ($ignore ? 'IGNORE' : 'INTO') . " " . $dbObject->getTableName() . "
+            $query = "INSERT ".($ignore ? 'IGNORE' : 'INTO')." ".$dbObject->getTableName()."
                           SET " . DBPreparedQuery::sqlQMValuesString($fieldsList, $idFieldName);
             $typesString = DBPreparedQuery::sqlTypesString($fieldsList, $idFieldName);
             $valuesList = self::createValuesList($fieldsList, $idFieldName);
         } else {
-            $query = "INSERT " . ($ignore ? 'IGNORE' : 'INTO') . " " . $dbObject->getTableName() . "
+            $query = "INSERT ".($ignore ? 'IGNORE' : 'INTO')." ".$dbObject->getTableName()."
                           SET " . DBPreparedQuery::sqlQMValuesString($fieldsList);
             $typesString = DBPreparedQuery::sqlTypesString($fieldsList);
             $valuesList = self::createValuesList($fieldsList);
@@ -591,15 +591,15 @@ 
         $fieldsList = $dbObject->getFieldsList();
         $idFieldName = $dbObject->getIdFieldName();
 
-        $query = "UPDATE " . $dbObject->getTableName() . "
-                  SET " . DBPreparedQuery::sqlQMValuesString($fieldsList, $idFieldName) . "
-                  WHERE " . $idFieldName . " = ?
+        $query = "UPDATE ".$dbObject->getTableName()."
+                  SET " . DBPreparedQuery::sqlQMValuesString($fieldsList, $idFieldName)."
+                  WHERE " . $idFieldName." = ?
                   LIMIT 1";
         $typesString = DBPreparedQuery::sqlTypesString($fieldsList, $idFieldName);
         if (Tools::isInteger($fieldsList[$idFieldName])) {
-            $typesString.= "i";
+            $typesString .= "i";
         } else {
-            $typesString.= "s";
+            $typesString .= "s";
         }
         $valuesList = self::createValuesList($fieldsList, $idFieldName);
         $valuesList[] = $dbObject->getId();
@@ -621,8 +621,8 @@ 
      */
     public static function deleteDBObject($dbObject) {
         if (!empty($dbObject) && is_object($dbObject)) {
-            $query = "DELETE FROM " . $dbObject->getTableName() .
-                     " WHERE " . $dbObject->getIdFieldName() . " = ? LIMIT 1";
+            $query = "DELETE FROM ".$dbObject->getTableName().
+                     " WHERE ".$dbObject->getIdFieldName()." = ? LIMIT 1";
             if (Tools::isInteger($dbObject->getId())) {
                 $typesString = "i";
             } else {
@@ -674,7 +674,7 @@ 
                 return null;
             }
         } elseif ($stmt->num_rows > 1) {
-            throw new DBCoreException("More than single record of '" . $className . "' entity selected");
+            throw new DBCoreException("More than single record of '".$className."' entity selected");
         }
 
         return null;
@@ -849,7 +849,7 @@ 
      */
     public static function __callStatic($methodName, $methodParams) {
         if (strrpos($methodName, "ies") == strlen($methodName) - 3) {
-            $methodName = substr($methodName, 0, strlen($methodName) - 3) . "ys";
+            $methodName = substr($methodName, 0, strlen($methodName) - 3)."ys";
         }
 
         /*
@@ -896,12 +896,12 @@ 
                 $dbObject = new $className();
 
                 if (!isInstanceOf($dbObject, $className)) {
-                    throw new DBCoreException("Class with name '" . $className . "' is not exists");
+                    throw new DBCoreException("Class with name '".$className."' is not exists");
                 }
 
-                $query = "DELETE FROM " . $dbObject->getTableName() . "
-                          WHERE " . $dbObject->getIdFieldName() . "
-                             IN (" . DBPreparedQuery::sqlQMString($itemsNumber) . ")";
+                $query = "DELETE FROM ".$dbObject->getTableName()."
+                          WHERE " . $dbObject->getIdFieldName()."
+                             IN (" . DBPreparedQuery::sqlQMString($itemsNumber).")";
 
                 return self::doUpdateQuery($query, $types, $idsList);
             }
@@ -914,7 +914,7 @@ 
          */
         if (preg_match("#delete([a-zA-Z]+)#", $methodName, $matches)) {
             return call_user_func(
-                [self::getInstance(), $methodName . "s"],
+                [self::getInstance(), $methodName."s"],
                 [$methodParams[0]]
             );
         }
@@ -925,7 +925,7 @@ 
         if (preg_match("#set([a-zA-Z]+)Activation#", $methodName, $matches)) {
             $className = $matches[1];
             if (strrpos($className, "ies") == strlen($className) - 3) {
-                $className = substr($className, 0, strlen($className) - 3) . "y";
+                $className = substr($className, 0, strlen($className) - 3)."y";
             } else {
                 $className = substr($className, 0, strlen($className) - 1);
             }
@@ -945,17 +945,17 @@ 
                 $dbObject = new $className();
 
                 if (!isInstanceOf($dbObject, $className)) {
-                    throw new DBCoreException("Class with name '" . $className . "' is not exists");
+                    throw new DBCoreException("Class with name '".$className."' is not exists");
                 }
 
-                $query = "UPDATE " . $dbObject->getTableName() . " SET `" . $activationFieldName . "` = '" . $activationValue . "'
-                          WHERE " . $dbObject->getIdFieldName() . " IN (" . DBPreparedQuery::sqlQMString($itemsNumber) . ")";
+                $query = "UPDATE ".$dbObject->getTableName()." SET `".$activationFieldName."` = '".$activationValue."'
+                          WHERE " . $dbObject->getIdFieldName()." IN (".DBPreparedQuery::sqlQMString($itemsNumber).")";
 
                 return self::doUpdateQuery($query, $types, $idsList);
             }
         }
 
-        throw new DBCoreException('No such method "' . $methodName . '"');
+        throw new DBCoreException('No such method "'.$methodName.'"');
     }
 
 }

framework/db/DBPreparedQuery.php

Indentation +2 added lines, -2 removed lines

@@ -139,9 +139,9 @@
             $typeByValue = DBField::getType($value);
             if ($typeByValue != 's') {
                 if ($type != $typeByValue && !(
-                       ($type == 'd' && $typeByValue == 'i') || // We can put integer as double
+                        ($type == 'd' && $typeByValue == 'i') || // We can put integer as double
                        ($type == 's' && $typeByValue == 'i') // We can put integer as string
-                   )
+                    )
                 ) {
                     throw new DBCoreException(
                         "Invalid query parameters types string ('" . $value .

Spacing +22 added lines, -22 removed lines

@@ -83,7 +83,7 @@ 
      */
     public function prepareConditions() {
         if (!empty($this->conditions)) {
-            $this->query.= " WHERE ";
+            $this->query .= " WHERE ";
             $this->sqlPushValues($this->conditions, " AND ");
         }
     }
@@ -93,14 +93,14 @@ 
      */
     public function prepareOrder() {
         if (!empty($this->order)) {
-            $this->query.= " ORDER BY";
+            $this->query .= " ORDER BY";
             if (is_array($this->order)) {
                 foreach ($this->order as $fieldName => $ord) {
-                    $this->query.= " " . $fieldName . " " . $ord . ",";
+                    $this->query .= " ".$fieldName." ".$ord.",";
                 }
                 $this->query = substr($this->query, 0, strlen($this->query) - 1);
             } elseif (is_string($this->order)) {
-                $this->query.= " " . $this->order;
+                $this->query .= " ".$this->order;
             }
         }
     }
@@ -113,13 +113,13 @@ 
     public function prepareLimit() {
         if (!is_null($this->limit)) {
             if (Tools::isInteger($this->limit)) {
-                $this->query.= " LIMIT " . $this->limit;
+                $this->query .= " LIMIT ".$this->limit;
                 $count = $this->limit;
             } elseif (is_array($this->limit) && count($this->limit) == 2) {
                 $offset = $this->limit[0];
                 $count = $this->limit[1];
                 if (Tools::isInteger($offset) && Tools::isInteger($count)) {
-                    $this->query.= " LIMIT " . $offset . ", " . $count;
+                    $this->query .= " LIMIT ".$offset.", ".$count;
                 } else {
                     throw new DBCoreException("Invalid LIMIT param in select() method.");
                 }
@@ -222,7 +222,7 @@ 
 
             if (!in_array($type, ['i', 'd', 's', 'b'])) {
                 throw new DBCoreException(
-                    "Invalid query parameters types string (type '" . $type .
+                    "Invalid query parameters types string (type '".$type.
                     "' is undefined, only 'i', 'd', 's' and 'b' types are acceptable)"
                 );
             }
@@ -235,8 +235,8 @@ 
                    )
                 ) {
                     throw new DBCoreException(
-                        "Invalid query parameters types string ('" . $value .
-                        "' is not '" . $type . "' type but '" . $typeByValue . "' detected)"
+                        "Invalid query parameters types string ('".$value.
+                        "' is not '".$type."' type but '".$typeByValue."' detected)"
                     );
                 }
             } else { // in case if we try send non-string parameters as a string value
@@ -244,21 +244,21 @@ 
                     case 'i':
                         if (!(Tools::isNumeric($value) && ((string)(int)$value === $value))) {
                             throw new DBCoreException(
-                                "Invalid query parameters types string ('" . $value . "' is not '" . $type . ")"
+                                "Invalid query parameters types string ('".$value."' is not '".$type.")"
                             );
                         }
                         break;
                     case 'd':
                         if (!Tools::isDoubleString($value)) {
                             throw new DBCoreException(
-                                "Invalid query parameters types string ('" . $value . "' is not '" . $type . ")"
+                                "Invalid query parameters types string ('".$value."' is not '".$type.")"
                             );
                         }
                         break;
                     case 'b':
                         if (!in_array(strtolower($value), ['true', 'false'])) {
                             throw new DBCoreException(
-                                "Invalid query parameters types string ('" . $value . "' is not '" . $type . ")"
+                                "Invalid query parameters types string ('".$value."' is not '".$type.")"
                             );
                         }
                         break;
@@ -290,7 +290,7 @@ 
         $chunks = [];
         foreach (array_keys($fieldsList) as $fieldName) {
             if ($fieldName != $idFieldName) {
-                $chunks[] = "`" . $fieldName . "` = ?";
+                $chunks[] = "`".$fieldName."` = ?";
             }
         }
 
@@ -309,7 +309,7 @@ 
         $chunks = [];
         foreach ($fieldsList as $fieldName => $fieldValue) {
             if ($fieldName != $idFieldName) {
-                $chunks[]= "`" . $fieldName . "` = '" . $fieldValue . "'";
+                $chunks[] = "`".$fieldName."` = '".$fieldValue."'";
             }
         }
 
@@ -333,11 +333,11 @@ 
         foreach ($fieldsList as $fieldName => $fieldValue) {
             if ($fieldName != $idFieldName) {
                 if (Tools::isDouble($fieldValue)) {
-                    $typesString.= "d";
+                    $typesString .= "d";
                 } elseif (Tools::isInteger($fieldValue)) {
-                    $typesString.= "i";
+                    $typesString .= "i";
                 } else {
-                    $typesString.= "s";
+                    $typesString .= "s";
                 }
             }
         }
@@ -358,7 +358,7 @@ 
         $type = DBField::castType($type);
         $typesString = "";
         while ($length > 0) {
-            $typesString.= $type;
+            $typesString .= $type;
             $length--;
         }
 
@@ -377,8 +377,8 @@ 
         foreach ($values as $fieldName => $fieldValue) {
             if (!is_array($fieldValue)) {
                 if (!is_null($fieldValue)) {
-                    $chunks[] = $fieldName . " = ?";
-                    $this->types.= DBField::getType($fieldValue);
+                    $chunks[] = $fieldName." = ?";
+                    $this->types .= DBField::getType($fieldValue);
                     $this->params[] = $fieldValue;
                 } else {
                     $chunks[] = $fieldName;
@@ -389,12 +389,12 @@ 
 
                 $chunks[] = $condition;
                 foreach ($localParams as $param) {
-                    $this->types.= DBField::getType($param);
+                    $this->types .= DBField::getType($param);
                     $this->params[] = $param;
                 }
             }
         }
-        $this->query.= implode($separator, $chunks);
+        $this->query .= implode($separator, $chunks);
     }
 
 }

framework/helpers/Naming.php

Spacing +1 added lines, -1 removed lines

@@ -149,7 +149,7 @@
                             break;
                         }
                         $array = &$array[$key];
-                    } elseif(isset($array[$key])) { // last element
+                    } elseif (isset($array[$key])) { // last element
                         unset($array[$key]);
                     }
                 }

framework/core/Messages.php

Spacing +1 added lines, -1 removed lines

@@ -132,7 +132,7 @@
      */
     public static function reorderMessages()
     {
-        uasort(self::$messages, function ($a, $b) {
+        uasort(self::$messages, function($a, $b) {
             return $a->type <= $b->type;
         });
     }

framework/mail/POP.php

Doc Comments +7 added lines, -5 removed lines

@@ -98,7 +98,8 @@ 
     /**
      * Delete message from POP server.
      *
-     * @return int $messageId Id of the message.
+     * @param integer $messageId
+     * @return string $messageId Id of the message.
      *
      * @return string Response string.
      */
@@ -111,7 +112,7 @@ 
     /**
      * Count messages in POP server.
      *
-     * @return type
+     * @return integer
      */
     public function countMessages() {
         fwrite($this->connection, "STAT\r\n");
@@ -124,7 +125,7 @@ 
     /**
      * Return message header.
      *
-     * @return int $messageNumber Number of the message.
+     * @return string $messageNumber Number of the message.
      *
      * @return string
      */
@@ -159,9 +160,10 @@ 
     /**
      * Return message by number.
      *
-     * @return int $messageNumber Number of the message
+     * @param integer $messageNumber
+     * @return false|string $messageNumber Number of the message
      *
-     * @return string
+     * @return false|string
      */
     public function getMessage($messageNumber) {
         fwrite($this->connection, "RETR $messageNumber\r\n");

Spacing +6 added lines, -6 removed lines

@@ -58,10 +58,10 @@ 
             fgets($sock, 1024);
 
             // Connection accepted
-            fwrite($sock, "USER " . $username . "\r\n");
+            fwrite($sock, "USER ".$username."\r\n");
             $userresponse = fgets($sock, 1024);
             if ($userresponse[0] == "+") { // User accepted
-                fwrite($sock, "PASS " . $password . "\r\n");
+                fwrite($sock, "PASS ".$password."\r\n");
                 $passresponse = fgets($sock, 1024);
                 if ($passresponse[0] != "+") { // Wrong password
                     $passresponse = str_replace("\r", "", str_replace("\n", "", $passresponse));
@@ -72,12 +72,12 @@ 
                 }
             } else { // Invalid username
                 throw new POPServerException(
-                    "Username '" . $username . "' not accepted.", 1
+                    "Username '".$username."' not accepted.", 1
                 );
             }
         } else {
             throw new POPServerException(
-                "Unable to Connect to " . $host . ". Network Problems could be responsible.", 2
+                "Unable to Connect to ".$host.". Network Problems could be responsible.", 2
             );
         }
         $this->connection = $sock;
@@ -357,8 +357,8 @@ 
         $ret = $L2 = $L3 = null;
         for ($i = 0; $i < $len; $i++) {
             if (isset($avar[$i]) && isset($avar[$i][0]) && isset($avar[$i][1]) && isset($avar[$i][2])) {
-                $L2 = $avar[$i][0] . $avar[$i][1];
-                $L3 = $avar[$i][0] . $avar[$i][1] . $avar[$i][2];
+                $L2 = $avar[$i][0].$avar[$i][1];
+                $L3 = $avar[$i][0].$avar[$i][1].$avar[$i][2];
                 if ($L2 != "  " && $L3 != "Rec" && $L2 != "") {
                     $avar2 = explode(":", $avar[$i]);
                     $temp = str_replace("$avar2[0]:", "", $avar[$i]);

framework/db/DBObject.php

Doc Comments +4 added lines, -4 removed lines

@@ -53,9 +53,9 @@ 
     /**
      * Sets primary key value.
      *
-     * @param mixed $recordId Key vaue.
+     * @param integer $recordId Key vaue.
      *
-     * @return bool Success flag.
+     * @return DBObject Success flag.
      * @throws DBCoreException If object has no field with such name.
      */
     public function setId($recordId) {
@@ -255,7 +255,7 @@ 
      * @param bool $ignore Ignore unique indexes or not.
      * @param bool Debug mode flag.
      *
-     * @return mixed Primary key value.
+     * @return integer Primary key value.
      * @throws DBCoreException If some database error occurred.
      */
     public function insert($ignore = false,  $debug = false) {
@@ -514,7 +514,7 @@ 
     /**
      * Deletes DB record for current DBObject.
      *
-     * @return mixed Number of affected rows (1 if some record was deleted,
+     * @return integer Number of affected rows (1 if some record was deleted,
      *            0 - if no) or FALSE if some error occurred.
      */
     public function delete() {

Spacing +12 added lines, -12 removed lines

@@ -88,9 +88,9 @@ 
      */
     public function saveActivationFlag() {
         return DBCore::doUpdateQuery(
-            "UPDATE " . static::TABLE_NAME . "
+            "UPDATE ".static::TABLE_NAME."
                 SET activation = ?
-             WHERE " . static::ID_FIELD_NAME . " = ?
+             WHERE " . static::ID_FIELD_NAME." = ?
              LIMIT 1",
             "ii",
             [$this->activation, $this->id]
@@ -154,9 +154,9 @@ 
      */
     public function saveRemovementFlag() {
         return DBCore::doUpdateQuery(
-            "UPDATE " . static::TABLE_NAME . "
+            "UPDATE ".static::TABLE_NAME."
                 SET removed = ?
-             WHERE " . static::ID_FIELD_NAME . " = ?
+             WHERE " . static::ID_FIELD_NAME." = ?
              LIMIT 1",
             "ii",
             [$this->removed, $this->id]
@@ -357,7 +357,7 @@ 
      */
     public static function _count($conditions = [], $debug = false) {
         $dbQuery = (new DBPreparedQuery())->prepare(
-            "SELECT COUNT(*) as 'val' FROM " . static::TABLE_NAME,
+            "SELECT COUNT(*) as 'val' FROM ".static::TABLE_NAME,
             $conditions
         );
 
@@ -378,7 +378,7 @@ 
      */
     public static function _max($field, $conditions = [], $debug = false) {
         $dbQuery = (new DBPreparedQuery())->prepare(
-            "SELECT MAX(`" . $field . "`) as 'val' FROM " . static::TABLE_NAME,
+            "SELECT MAX(`".$field."`) as 'val' FROM ".static::TABLE_NAME,
             $conditions
         );
 
@@ -399,7 +399,7 @@ 
      */
     public static function _min($field, $conditions = [], $debug = false) {
         $dbQuery = (new DBPreparedQuery())->prepare(
-            "SELECT MIN(`" . $field . "`) as 'val' FROM " . static::TABLE_NAME,
+            "SELECT MIN(`".$field."`) as 'val' FROM ".static::TABLE_NAME,
             $conditions
         );
 
@@ -485,14 +485,14 @@ 
     public function go($debug = false) {
         switch ($this->dbQuery->getType()) {
             case (DBQueryType::SELECT):
-                $this->dbQuery->query = "SELECT * FROM " . static::TABLE_NAME;
+                $this->dbQuery->query = "SELECT * FROM ".static::TABLE_NAME;
                 break;
             case (DBQueryType::UPDATE):
-                $this->dbQuery->query = "UPDATE " . static::TABLE_NAME . " SET ";
+                $this->dbQuery->query = "UPDATE ".static::TABLE_NAME." SET ";
                 $this->dbQuery->sqlPushValues($this->dbQuery->fields);
                 break;
             case (DBQueryType::DELETE):
-                $this->dbQuery->query = "DELETE FROM " . static::TABLE_NAME;
+                $this->dbQuery->query = "DELETE FROM ".static::TABLE_NAME;
                 break;
         }
 
@@ -502,7 +502,7 @@ 
         if ($this->isNewRecord()) {
             $this->dbQuery->prepareConditions();
         } else {
-            $this->dbQuery->query.= " WHERE ";
+            $this->dbQuery->query .= " WHERE ";
             $this->dbQuery->sqlPushValues([static::ID_FIELD_NAME => $this->id]);
         }
 
@@ -520,7 +520,7 @@ 
         if ($this->isNewRecord()) {
             $count = $this->dbQuery->prepareLimit();
         } else {
-            $this->dbQuery->query.= " LIMIT 1";
+            $this->dbQuery->query .= " LIMIT 1";
             $count = 1;
         }