Asymptix / Framework

framework/app/View.php

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) {

Doc Comments +3 added lines

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

framework/tools/logging/LogDBObject.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
             $time = time();
         }
 
-        $query = "INSERT INTO " . self::TABLE_NAME . " (type, message, count, last_seen) VALUES (?, ?, 1, ?)
+        $query = "INSERT INTO ".self::TABLE_NAME." (type, message, count, last_seen) VALUES (?, ?, 1, ?)
                   ON DUPLICATE KEY UPDATE count = count + 1, last_seen = ?";
         try {
             return DBCore::doUpdateQuery($query, "ssss", [

framework/web/Http.php

Spacing +24 added lines, -24 removed lines

@@ -27,16 +27,16 @@ 
     public static function http_redirect($url, $params = [], $session = false) {
         $paramsString = "";
         foreach ($params as $key => $value) {
-            $paramsString.= "&" . $key . "=" . $value;
+            $paramsString .= "&".$key."=".$value;
         }
         if ($session) {
-            $paramsString.= "&" . session_name() . "=" . session_id();
+            $paramsString .= "&".session_name()."=".session_id();
         }
         $paramsString = substr($paramsString, 1);
         if ($paramsString) {
-            $paramsString = "?" . $paramsString;
+            $paramsString = "?".$paramsString;
         }
-        header("Location: " . $url . $paramsString);
+        header("Location: ".$url.$paramsString);
         exit();
     }
 
@@ -68,9 +68,9 @@ 
                 }
             }
             if (function_exists("http_redirect")) {
-                http_redirect("http://" . $_SERVER['SERVER_NAME'] . "/" . $url);
+                http_redirect("http://".$_SERVER['SERVER_NAME']."/".$url);
             } else {
-                self::http_redirect("http://" . $_SERVER['SERVER_NAME'] . "/" . $url);
+                self::http_redirect("http://".$_SERVER['SERVER_NAME']."/".$url);
             }
         }
     }
@@ -131,24 +131,24 @@ 
             $urlParts['path'] = '/';
         }
 
-        $sock = fsockopen($urlParts['host'], (isset($urlParts['port']) ? (int) $urlParts['port'] : 80), $errno, $errstr, 30);
+        $sock = fsockopen($urlParts['host'], (isset($urlParts['port']) ? (int)$urlParts['port'] : 80), $errno, $errstr, 30);
         if (!$sock) {
             throw new HttpException("$errstr ($errno)");
         }
 
-        $request = "HEAD " . $urlParts['path'] . (isset($urlParts['query']) ? '?' . $urlParts['query'] : '') . " HTTP/1.1\r\n";
-        $request.= 'Host: ' . $urlParts['host'] . "\r\n";
-        $request.= "Connection: Close\r\n\r\n";
+        $request = "HEAD ".$urlParts['path'].(isset($urlParts['query']) ? '?'.$urlParts['query'] : '')." HTTP/1.1\r\n";
+        $request .= 'Host: '.$urlParts['host']."\r\n";
+        $request .= "Connection: Close\r\n\r\n";
         fwrite($sock, $request);
         $response = '';
         while (!feof($sock)) {
-            $response.= fread($sock, 8192);
+            $response .= fread($sock, 8192);
         }
         fclose($sock);
 
         if (preg_match('/^Location: (.+?)$/m', $response, $matches)) {
             if (substr($matches[1], 0, 1) == "/") {
-                return $urlParts['scheme'] . "://" . $urlParts['host'] . trim($matches[1]);
+                return $urlParts['scheme']."://".$urlParts['host'].trim($matches[1]);
             }
 
             return trim($matches[1]);
@@ -208,7 +208,7 @@ 
             if (is_array($val)) {
                 $val = implode(',', $val);
             }
-            $postParams[] = $key . '=' . urlencode($val);
+            $postParams[] = $key.'='.urlencode($val);
         }
         $postString = implode('&', $postParams);
 
@@ -220,29 +220,29 @@ 
 
         // Data goes in the path for a GET request
         if ($type == self::GET) {
-            $parts['path'].= '?' . $postString;
+            $parts['path'] .= '?'.$postString;
         }
 
-        $request = "$type " . $parts['path'] . " HTTP/1.1\r\n";
-        $request.= "Host: " . $parts['host'] . "\r\n";
+        $request = "$type ".$parts['path']." HTTP/1.1\r\n";
+        $request .= "Host: ".$parts['host']."\r\n";
 
         if ($type == self::POST) {
-            $request.= "Content-Type: application/x-www-form-urlencoded\r\n";
-            $request.= "Content-Length: " . strlen($postString) . "\r\n";
+            $request .= "Content-Type: application/x-www-form-urlencoded\r\n";
+            $request .= "Content-Length: ".strlen($postString)."\r\n";
         }
-        $request.= "Connection: Close\r\n";
-        $request.= "\r\n";
+        $request .= "Connection: Close\r\n";
+        $request .= "\r\n";
 
         // Data goes in the request body for a POST request
         if ($type == self::POST && isset($postString)) {
-            $request.= $postString;
+            $request .= $postString;
         }
 
         fwrite($sock, $request);
 
         $response = "";
         while (!feof($sock) && $result = fgets($sock)) {
-            $response.= $result;
+            $response .= $result;
         }
 
         fclose($sock);
@@ -282,7 +282,7 @@ 
                 header('HTTP/1.0 404 Not Found', true, 404);
                 break;
             default:
-                throw new HttpException("Invalid HTTP status code '" . $code . "'");
+                throw new HttpException("Invalid HTTP status code '".$code."'");
         }
         if (!is_null($path)) {
             include($path);
@@ -308,7 +308,7 @@ 
 
             return self::forceHttpStatus($code, $path);
         }
-        throw new HttpException("Invalid HTTP class method '" . $name . "'");
+        throw new HttpException("Invalid HTTP class method '".$name."'");
     }
 
 }

framework/web/Browser.php

Spacing +1 added lines, -1 removed lines

@@ -112,7 +112,7 @@
          * Detect browser version number
          */
         $identifiers[] = $browserShortName;
-        self::$pattern = '#(?<browser>' . implode('|', $identifiers) .
+        self::$pattern = '#(?<browser>'.implode('|', $identifiers).
                 ')[/ ]+(?<version>[0-9.|a-zA-Z.]*)#';
         if (!preg_match_all(self::$pattern, $userAgent, $matches)) {
             // we have no matching number just continue

framework/web/Request.php

Spacing +2 added lines, -2 removed lines

@@ -210,7 +210,7 @@ 
         if (isset($_FIELDS[$fieldName])) {
             $_FIELDS[$fieldName] = $fieldValue;
         } else {
-            throw new \Exception("No field '" . $fieldName . "' in global fields list.");
+            throw new \Exception("No field '".$fieldName."' in global fields list.");
         }
     }
 
@@ -248,7 +248,7 @@ 
                     $_FIELDS[$fieldName] = (bool)$_FIELDS[$fieldName];
             }
         } else {
-            throw new \Exception("No field '" . $fieldName . "' in global fields list.");
+            throw new \Exception("No field '".$fieldName."' in global fields list.");
         }
     }
 

framework/db/DBQueryType.php

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
             $type = strtoupper($chunks[0]);
 
             if (!self::isValidQueryType($type)) {
-                throw new DBQueryTypeException("Invalid SQL query type '" . $type . "'");
+                throw new DBQueryTypeException("Invalid SQL query type '".$type."'");
             }
 
             return $type;

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."'");
     }
 }