Asymptix / Framework

framework/db/DBTimedObject.php

Spacing +4 added lines, -4 removed lines

@@ -66,11 +66,11 @@ 
         $this->changeUpdateTime();
 
         return DBCore::doUpdateQuery(
-            "UPDATE " . static::TABLE_NAME . "
+            "UPDATE ".static::TABLE_NAME."
                 SET activation = ?,
                     update_time = ?,
                     update_user_id = ?
-             WHERE " . static::ID_FIELD_NAME . " = ?
+             WHERE " . static::ID_FIELD_NAME." = ?
              LIMIT 1",
             "isii",
             [$this->activation, $this->updateTime, $this->updateUserId, $this->id]
@@ -87,11 +87,11 @@ 
         $this->changeUpdateTime();
 
         return DBCore::doUpdateQuery(
-            "UPDATE " . static::TABLE_NAME . "
+            "UPDATE ".static::TABLE_NAME."
                 SET removed = ?,
                     update_time = ?,
                     update_user_id = ?
-             WHERE " . static::ID_FIELD_NAME . " = ?
+             WHERE " . static::ID_FIELD_NAME." = ?
              LIMIT 1",
             "isii",
             [$this->removed, $this->updateTime, $this->updateUserId, $this->id]

framework/db/DBField.php

Spacing +3 added lines, -3 removed lines

@@ -45,7 +45,7 @@ 
      */
     public function __construct($type = "", $name = "", $value = null) {
         if (!(bool)preg_match("#^[a-zA-Z][a-zA-Z0-9_]*$#", $name)) {
-            throw new DBFieldException("Can't create DBField object: invalid field name '" . $name . "'");
+            throw new DBFieldException("Can't create DBField object: invalid field name '".$name."'");
         }
         $this->name = $name;
 
@@ -133,7 +133,7 @@ 
             return "s";
         } else {
             throw new DBFieldTypeException(
-                "Can't detect field value type for value '" . (string)$fieldValue . "'"
+                "Can't detect field value type for value '".(string)$fieldValue."'"
             );
         }
     }
@@ -180,7 +180,7 @@ 
                 return $value;
             case ("s"):
                 if (!in_array($value, ['NOW()'])) {
-                    return "'" . $value . "'";
+                    return "'".$value."'";
                 } else {
                     return $value;
                 }

framework/db/DBQueryCondition.php

Spacing +18 added lines, -18 removed lines

@@ -85,11 +85,11 @@ 
                 case ("!="):
                     $this->value = DBField::castValue($this->field->type, $value);
 
-                    $this->sqlCondition = "`" . $field->name . "` "
-                                        . $this->type . " "
+                    $this->sqlCondition = "`".$field->name."` "
+                                        . $this->type." "
                                         . DBField::sqlValue($this->field->type, $value);
 
-                    $this->preparedCondition = "`" . $field->name . "` " . $this->type . " ?";
+                    $this->preparedCondition = "`".$field->name."` ".$this->type." ?";
                     $this->preparedTypes = $this->field->type;
                     $this->preparedData = [DBField::sqlValue($this->field->type, $value)];
                     break;
@@ -100,17 +100,17 @@ 
                     if ($this->field->type != "s") {
                         throw new DBQueryConditionException("Field type is not a string");
                     }
-                    $this->sqlCondition = "`" . $field->name . "` "
-                                        . $this->type . " "
+                    $this->sqlCondition = "`".$field->name."` "
+                                        . $this->type." "
                                         . DBField::sqlValue($this->field->type, $value);
 
-                    $this->preparedCondition = "`" . $field->name . "` " . $this->type . " ?";
+                    $this->preparedCondition = "`".$field->name."` ".$this->type." ?";
                     $this->preparedTypes = $this->field->type;
                     $this->preparedData = [DBField::sqlValue($this->field->type, $value)];
                     break;
                 case ("IN"):
                 case ("NOT IN"):
-                    if (is_array($value) &&  !empty($value)) {
+                    if (is_array($value) && !empty($value)) {
                         $dataList = [];
                         foreach ($value as $dataItem) {
                             $dataList[] = DBField::sqlValue($this->field->type, $dataItem);
@@ -120,7 +120,7 @@ 
                         if ($count > 0) {
                             $qmStr = "?";
                             $tStr = $this->field->type;
-                            for ($i = 1; $i < $count; $i ++) {
+                            for ($i = 1; $i < $count; $i++) {
                                 $qmStr .= ", ?";
                                 $tStr .= $this->field->type;
                             }
@@ -130,11 +130,11 @@ 
                             return;
                         }
 
-                        $this->sqlCondition = "`" . $field->name . "` "
+                        $this->sqlCondition = "`".$field->name."` "
                                             . $this->type
-                                            . " (" . implode(", ", $dataList) . ")";
+                                            . " (".implode(", ", $dataList).")";
 
-                        $this->preparedCondition = "`" . $field->name . "` " . $this->type . " (" . $qmStr . ")";
+                        $this->preparedCondition = "`".$field->name."` ".$this->type." (".$qmStr.")";
                         $this->preparedTypes = $tStr;
                         $this->preparedData = $dataList;
                     } else {
@@ -145,10 +145,10 @@ 
                     if (is_array($value) && count($value) == 2 && isset($value[0]) && isset($value[1])) {
                         $from = DBField::sqlValue($this->field->type, $value[0]);
                         $to = DBField::sqlValue($this->field->type, $value[1]);
-                        $this->sqlCondition = "`" . $field->name . "` BETWEEN " . $from . " AND " . $to;
+                        $this->sqlCondition = "`".$field->name."` BETWEEN ".$from." AND ".$to;
 
-                        $this->preparedCondition = "`" . $field->name . "` BETWEEN ? AND ?";
-                        $this->preparedTypes = $this->field->type . $this->field->type;
+                        $this->preparedCondition = "`".$field->name."` BETWEEN ? AND ?";
+                        $this->preparedTypes = $this->field->type.$this->field->type;
                         $this->preparedData = [$from, $to];
                     } else {
                         throw new DBQueryConditionException("Invalid data for 'BETWEEN' condition");
@@ -166,7 +166,7 @@ 
                 case ("!="):
                 case ("LIKE"):
                 case ("NOT LIKE"):
-                    $this->sqlCondition = "`" . $field1->name . "` " . $this->type . " `" . $field2->name . "`";
+                    $this->sqlCondition = "`".$field1->name."` ".$this->type." `".$field2->name."`";
                     break;
                 case ("IN"):
                 case ("NOT IN"):
@@ -199,7 +199,7 @@ 
                 }
 
                 foreach ($queryCondition as $operation => $conditions) {
-                    $cond .= " " . $operator . self::getSQLCondition($conditions, $operation);
+                    $cond .= " ".$operator.self::getSQLCondition($conditions, $operation);
                 }
 
                 $cond .= ")";
@@ -216,7 +216,7 @@ 
                     );
                 }
             } elseif (Tools::isInstanceOf($queryCondition, "\Asymptix\db\DBQueryCondition")) {
-                return (" " . $queryCondition->sqlCondition);
+                return (" ".$queryCondition->sqlCondition);
             }
 
             return "";
@@ -279,7 +279,7 @@ 
         if (isset($conditionTypes[$conditionType])) {
             return $conditionTypes[$conditionType];
         }
-        throw new DBQueryConditionException("Invalid SQL condition type '" . $conditionType . "'");
+        throw new DBQueryConditionException("Invalid SQL condition type '".$conditionType."'");
     }
 }
 

framework/db/DBQuery.php

Spacing +8 added lines, -8 removed lines

@@ -72,7 +72,7 @@ 
         if (DBQueryType::isValidQueryType($type)) {
             $this->type = $type;
         } else {
-            throw new DBCoreException("Invalid SQL query type '" . $type . "'");
+            throw new DBCoreException("Invalid SQL query type '".$type."'");
         }
     }
 
@@ -124,7 +124,7 @@ 
         OutputStream::start();
         if (!empty($query)) {
             if (empty($types) && empty($params)) {
-                OutputStream::message(OutputStream::MSG_INFO, "Q: " . $query);
+                OutputStream::message(OutputStream::MSG_INFO, "Q: ".$query);
             } else {
                 if (strlen($types) === count($params)) {
                     $query = preg_replace('/\s+/', ' ', $query);
@@ -134,17 +134,17 @@ 
                     for ($i = 0; $i < strlen($types); $i++) {
                         $query = preg_replace("/\?/", DBField::sqlValue($types[$i], $params[$i]), $query, 1);
 
-                        $paramsStr[] = $types[$i] . ": " . DBField::sqlValue($types[$i], $params[$i]);
+                        $paramsStr[] = $types[$i].": ".DBField::sqlValue($types[$i], $params[$i]);
                     }
 
-                    OutputStream::message(OutputStream::MSG_INFO, "Q: " . $query);
-                    OutputStream::message(OutputStream::MSG_INFO, "P: " . $preparedQuery);
+                    OutputStream::message(OutputStream::MSG_INFO, "Q: ".$query);
+                    OutputStream::message(OutputStream::MSG_INFO, "P: ".$preparedQuery);
 
-                    OutputStream::message(OutputStream::MSG_INFO, "A: [" . implode(", ", $paramsStr) . "]");
+                    OutputStream::message(OutputStream::MSG_INFO, "A: [".implode(", ", $paramsStr)."]");
                 } else {
                     OutputStream::message(OutputStream::MSG_ERROR, "Number of types is not equal parameters number.");
-                    OutputStream::message(OutputStream::MSG_INFO, "T: " . $types);
-                    OutputStream::message(OutputStream::MSG_INFO, "A: [" . implode(", ", $params) . "]");
+                    OutputStream::message(OutputStream::MSG_INFO, "T: ".$types);
+                    OutputStream::message(OutputStream::MSG_INFO, "A: [".implode(", ", $params)."]");
                 }
             }
         } else {

framework/core/Errors.php

Spacing +2 added lines, -2 removed lines

@@ -31,9 +31,9 @@
      */
     public static function displayError($errorMessage, $fieldName = null) {
         if (!is_null($fieldName)) {
-            return ('<label for="' . $fieldName . '" class="form-error">' . $errorMessage . '</label>');
+            return ('<label for="'.$fieldName.'" class="form-error">'.$errorMessage.'</label>');
         } else {
-            return ('<span class="label label-danger pull-right form-error">' . $errorMessage . '</span>');
+            return ('<span class="label label-danger pull-right form-error">'.$errorMessage.'</span>');
         }
     }
 

framework/core/OutputStream.php

Spacing +4 added lines, -4 removed lines

@@ -54,7 +54,7 @@ 
      * @param string $str String to output.
      */
     public static function line($str = "") {
-        self::output($str . "\n");
+        self::output($str."\n");
     }
 
     /**
@@ -75,7 +75,7 @@ 
             $str = str_replace("{{time}}", date($format, $time), $str);
             self::line($str);
         } else {
-            self::line(date($format, $time) . " " . $str);
+            self::line(date($format, $time)." ".$str);
         }
     }
 
@@ -91,11 +91,11 @@ 
      */
     public static function message($msgType, $str, $format = "\[Y-m-d H:i:s\]", $time = null) {
         if (strpos($str, "{{time}}") === false) {
-            $str = "{{time}} " . $str;
+            $str = "{{time}} ".$str;
         }
 
         self::log(
-            '<b><font color="' . $msgType . '">' . $str . '</font></b>',
+            '<b><font color="'.$msgType.'">'.$str.'</font></b>',
             $format,
             $time
         );

framework/core/Route.php

Spacing +7 added lines, -7 removed lines

@@ -96,17 +96,17 @@ 
      * @return string URL.
      */
     public function getUrl($action, $id = null, $getParams = []) {
-        $url = $this->controller . "/";
+        $url = $this->controller."/";
         if (!is_null($id)) {
-            $url.= $action . "/" . $id;
+            $url .= $action."/".$id;
         } else {
-            $url.= $action;
+            $url .= $action;
         }
 
         if (!empty($getParams)) {
-            $url.= "?";
+            $url .= "?";
             foreach ($getParams as $key => $value) {
-                $url.= $key . "=" . $value;
+                $url .= $key."=".$value;
             }
         }
 
@@ -119,9 +119,9 @@ 
      * @return string
      */
     public function tplPath() {
-        $path = $this->controller . "/" . $this->controller;
+        $path = $this->controller."/".$this->controller;
         if (!empty($this->action)) {
-            $path.= "_" . $this->action;
+            $path .= "_".$this->action;
         }
 
         return $path;

framework/core/Validator.php

Spacing +2 added lines, -2 removed lines

@@ -217,8 +217,8 @@
             return "";
         }
 
-        if (!self::validateRegexp($url, "#^" . $protocol . "://.+#")) {
-            $url = $protocol . "://" . $url;
+        if (!self::validateRegexp($url, "#^".$protocol."://.+#")) {
+            $url = $protocol."://".$url;
         }
         $url = preg_replace("#/{3,}#", "//", $url);
 

framework/core/Object.php

Spacing +6 added lines, -6 removed lines

@@ -46,7 +46,7 @@ 
                     } else {
                         $fieldValue = $newValue;
                     }
-                    $count ++;
+                    $count++;
                 } elseif (!empty($this->fieldsAliases)) { // look up for the field aliases
                     $fieldAliases = array_keys($this->fieldsAliases, $fieldName);
                     if (!empty($fieldAliases)) {
@@ -58,7 +58,7 @@ 
                                 } else {
                                     $fieldValue = $newValue;
                                 }
-                                $count ++;
+                                $count++;
 
                                 break;
                             }
@@ -92,7 +92,7 @@ 
 
             return $this;
         } else {
-            throw new \Exception("Object '" . get_class($this) . "' hasn't field '" . $fieldName . "'");
+            throw new \Exception("Object '".get_class($this)."' hasn't field '".$fieldName."'");
         }
     }
 
@@ -133,7 +133,7 @@ 
         if (isset($this->fieldsList[$fieldName])) {
             return $this->fieldsList[$fieldName];
         } else {
-            throw new \Exception("Object '" . get_class($this) . "' hasn't field '" . $fieldName . "'");
+            throw new \Exception("Object '".get_class($this)."' hasn't field '".$fieldName."'");
         }
     }
 
@@ -211,7 +211,7 @@ 
      * @return mixed The return value of the callback, or FALSE on error.
      */
     public function __set($fieldName, $fieldValue) {
-        return call_user_func_array([$this, "set" . ucfirst($fieldName)], [$fieldValue]);
+        return call_user_func_array([$this, "set".ucfirst($fieldName)], [$fieldValue]);
     }
 
     /**
@@ -222,7 +222,7 @@ 
      * @return mixed The return value of the callback, or FALSE on error.
      */
     public function __get($fieldName) {
-        return call_user_func_array([$this, "get" . ucfirst($fieldName)], []);
+        return call_user_func_array([$this, "get".ucfirst($fieldName)], []);
     }
 
 }