Asymptix / Framework

framework/web/Request.php

Spacing +4 added lines, -4 removed lines

@@ -224,7 +224,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.");
         }
     }
 
@@ -261,10 +261,10 @@ 
                 case 'boolean':
                 case 'bool':
                 case 'b':
-                    $_FIELDS[$fieldName] = (bool) $_FIELDS[$fieldName];
+                    $_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.");
         }
     }
 
@@ -281,7 +281,7 @@ 
         global $_FIELDS;
 
         foreach ($fieldNames as $fieldName) {
-            $_FIELDS[$fieldName] = (int) (bool) self::getFieldValue($fieldName);
+            $_FIELDS[$fieldName] = (int)(bool)self::getFieldValue($fieldName);
         }
     }
 

framework/web/Browser.php

Spacing +2 added lines, -2 removed lines

@@ -118,7 +118,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
@@ -140,7 +140,7 @@ 
 
         // New IE version detection
         if (isset($matches['browser'][0]) && $matches['browser'][0] == 'Trident') {
-            $browserVersion = sprintf('%.1f', (int) $browserVersion + 4);
+            $browserVersion = sprintf('%.1f', (int)$browserVersion + 4);
         }
 
         // check if we have a number

framework/web/Http.php

Spacing +19 added lines, -19 removed lines

@@ -30,16 +30,16 @@ 
     {
         $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();
     }
 
@@ -72,9 +72,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);
             }
         }
     }
@@ -130,13 +130,13 @@ 
             $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 = '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 = '';
@@ -147,7 +147,7 @@ 
 
         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]);
@@ -212,27 +212,27 @@ 
             if (is_array($val)) {
                 $val = implode(',', $val);
             }
-            $postParams[] = $key.'='.urlencode($val);
+            $postParams[] = $key . '=' . urlencode($val);
         }
         $postString = implode('&', $postParams);
 
         $parts = parse_url($url);
 
-        $port = isset($parts['port']) ? (int) $parts['port'] : 80;
+        $port = isset($parts['port']) ? (int)$parts['port'] : 80;
 
         $sock = fsockopen($parts['host'], $port, $errno, $errstr, $timeout);
 
         // 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-Length: ' . strlen($postString) . "\r\n";
         }
         $request .= "Connection: Close\r\n";
         $request .= "\r\n";
@@ -287,7 +287,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;
@@ -310,12 +310,12 @@ 
     public static function __callStatic($name, $arguments)
     {
         if (substr($name, 0, 5) === 'force') {
-            $code = (int) substr($name, 5);
+            $code = (int)substr($name, 5);
             $path = isset($arguments[0]) ? $arguments[0] : null;
 
             return self::forceHttpStatus($code, $path);
         }
-        throw new HttpException("Invalid HTTP class method '".$name."'");
+        throw new HttpException("Invalid HTTP class method '" . $name . "'");
     }
 }
 

framework/localization/Language.php

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
         if (isset($this->titles[$code])) {
             return $this->titles[$code];
         } else {
-            throw new Exception("Invalid language code '".$code."'");
+            throw new Exception("Invalid language code '" . $code . "'");
         }
     }
 }

framework/db/DBQueryType.php

Spacing +1 added lines, -1 removed lines

@@ -68,7 +68,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/DBQueryCondition.php

Spacing +14 added lines, -14 removed lines

@@ -89,9 +89,9 @@ 
                 case '!=':
                     $this->value = DBField::castValue($this->field->type, $value);
 
-                    $this->sqlCondition = '`'.$field->name.'` '.$this->type.' '.DBField::sqlValue($this->field->type, $value);
+                    $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;
@@ -102,15 +102,15 @@ 
                     if ($this->field->type != 's') {
                         throw new DBQueryConditionException('Field type is not a string');
                     }
-                    $this->sqlCondition = '`'.$field->name.'` '.$this->type.' '.DBField::sqlValue($this->field->type, $value);
+                    $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);
@@ -130,9 +130,9 @@ 
                             return;
                         }
 
-                        $this->sqlCondition = '`'.$field->name.'` '.$this->type.' ('.implode(', ', $dataList).')';
+                        $this->sqlCondition = '`' . $field->name . '` ' . $this->type . ' (' . implode(', ', $dataList) . ')';
 
-                        $this->preparedCondition = '`'.$field->name.'` '.$this->type.' ('.$qmStr.')';
+                        $this->preparedCondition = '`' . $field->name . '` ' . $this->type . ' (' . $qmStr . ')';
                         $this->preparedTypes = $tStr;
                         $this->preparedData = $dataList;
                     } else {
@@ -143,10 +143,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");
@@ -164,7 +164,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':
@@ -198,7 +198,7 @@ 
                 }
 
                 foreach ($queryCondition as $operation => $conditions) {
-                    $cond .= ' '.$operator.self::getSQLCondition($conditions, $operation);
+                    $cond .= ' ' . $operator . self::getSQLCondition($conditions, $operation);
                 }
 
                 $cond .= ')';
@@ -215,7 +215,7 @@ 
                     );
                 }
             } elseif (Tools::isInstanceOf($queryCondition, "\Asymptix\db\DBQueryCondition")) {
-                return ' '.$queryCondition->sqlCondition;
+                return ' ' . $queryCondition->sqlCondition;
             }
 
             return '';
@@ -280,7 +280,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/DBField.php

Spacing +12 added lines, -12 removed lines

@@ -48,8 +48,8 @@ 
      */
     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."'");
+        if (!(bool)preg_match('#^[a-zA-Z][a-zA-Z0-9_]*$#', $name)) {
+            throw new DBFieldException("Can't create DBField object: invalid field name '" . $name . "'");
         }
         $this->name = $name;
 
@@ -68,16 +68,16 @@ 
             if (!is_null($value)) {
                 switch ($this->type) {
                     case 'i':
-                        $this->value = (int) $value;
+                        $this->value = (int)$value;
                         break;
                     case 'd':
-                        $this->value = (float) $value;
+                        $this->value = (float)$value;
                         break;
                     case 's':
-                        $this->value = (string) $value;
+                        $this->value = (string)$value;
                         break;
                     case 'b':
-                        $this->value = (bool) $value;
+                        $this->value = (bool)$value;
                         break;
                 }
             }
@@ -141,7 +141,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 . "'"
             );
         }
     }
@@ -160,13 +160,13 @@ 
     {
         switch (self::castType($type)) {
             case 'i':
-                return (int) $value;
+                return (int)$value;
             case 'd':
-                return (float) $value;
+                return (float)$value;
             case 's':
-                return (string) $value;
+                return (string)$value;
             case 'b':
-                return (bool) $value;
+                return (bool)$value;
         }
 
         throw new DBFieldTypeException('Invalid SQL type');
@@ -192,7 +192,7 @@ 
                 return $value;
             case 's':
                 if (!in_array($value, ['NOW()'])) {
-                    return "'".$value."'";
+                    return "'" . $value . "'";
                 } else {
                     return $value;
                 }

framework/db/DBSelector.php

Indentation +2 added lines, -2 removed lines

@@ -112,7 +112,7 @@ 
     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);
@@ -411,7 +411,7 @@ 
             return $this->selectDBObject();
         }
 
-       /*
+        /*
         * Try to call parent method __call() with same params by default
         */
         $method = substr($methodName, 0, 3);

Spacing +24 added lines, -24 removed lines

@@ -66,8 +66,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 . "'"
                 );
             }
         }
@@ -111,8 +111,8 @@ 
      */
     public function selectDBObject($debug = false)
     {
-        $query = 'SELECT * FROM '.$this->dbObject->getTableName().
-                  ($this->conditions != '' ? ' WHERE '.$this->conditions : '').' LIMIT 1';
+        $query = 'SELECT * FROM ' . $this->dbObject->getTableName() .
+                  ($this->conditions != '' ? ' WHERE ' . $this->conditions : '') . ' LIMIT 1';
 
         if (!$debug) {
             $stmt = DBCore::doSelectQuery($query);
@@ -140,10 +140,10 @@ 
      */
     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();
@@ -191,10 +191,10 @@ 
      */
     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();
@@ -228,11 +228,11 @@ 
      */
     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();
@@ -263,10 +263,10 @@ 
      */
     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);
@@ -279,10 +279,10 @@ 
      */
     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);
@@ -295,10 +295,10 @@ 
      */
     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);
@@ -312,10 +312,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';
     }
 
     /**
@@ -327,10 +327,10 @@ 
     {
         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 '';
@@ -380,9 +380,9 @@ 
         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];
+                $this->order = (string)$methodParams[0];
             }
 
             $dbObjects = $this->selectDBObjects();
@@ -425,7 +425,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/db/DBPreparedQuery.php

Spacing +10 added lines, -10 removed lines

@@ -140,7 +140,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)"
                 );
             }
@@ -153,30 +153,30 @@ 
                    )
                 ) {
                     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
                 switch ($type) {
                     case 'i':
-                        if (!(Tools::isNumeric($value) && ((string) (int) $value === $value))) {
+                        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;
@@ -210,7 +210,7 @@ 
         $chunks = [];
         foreach (array_keys($fieldsList) as $fieldName) {
             if ($fieldName != $idFieldName) {
-                $chunks[] = '`'.$fieldName.'` = ?';
+                $chunks[] = '`' . $fieldName . '` = ?';
             }
         }
 
@@ -230,7 +230,7 @@ 
         $chunks = [];
         foreach ($fieldsList as $fieldName => $fieldValue) {
             if ($fieldName != $idFieldName) {
-                $chunks[] = '`'.$fieldName."` = '".$fieldValue."'";
+                $chunks[] = '`' . $fieldName . "` = '" . $fieldValue . "'";
             }
         }
 
@@ -303,7 +303,7 @@ 
         foreach ($values as $fieldName => $fieldValue) {
             if (!is_array($fieldValue)) {
                 if (!is_null($fieldValue)) {
-                    $chunks[] = $fieldName.' = ?';
+                    $chunks[] = $fieldName . ' = ?';
                     $this->types .= DBField::getType($fieldValue);
                     $this->params[] = $fieldValue;
                 } else {