Asymptix / Framework

generators/beans_generator.php

Spacing +8 added lines, -8 removed lines

@@ -15,7 +15,7 @@ 
 OutputStream::start();
 
 if (!file_exists(RESULTS_PATH) || is_file(RESULTS_PATH)) {
-    OutputStream::msg(OutputStream::MSG_ERROR, "Destination directory '" . RESULTS_PATH . "' doesn't exists.");
+    OutputStream::msg(OutputStream::MSG_ERROR, "Destination directory '".RESULTS_PATH."' doesn't exists.");
     OutputStream::close();
     exit();
 }
@@ -26,9 +26,9 @@ 
 if ($stmt !== false) {
     $tpl = file_get_contents(CLASS_TPL);
     while ($resultSet = DBCore::bindResults($stmt)) {
-        $tableName = $resultSet['TABLE_NAMES']['Tables_in_' . conf\Config::getDBConfigParam('DBNAME')];
+        $tableName = $resultSet['TABLE_NAMES']['Tables_in_'.conf\Config::getDBConfigParam('DBNAME')];
 
-        OutputStream::msg(OutputStream::MSG_INFO, "Reading structure for table '" . $tableName . "'...");
+        OutputStream::msg(OutputStream::MSG_INFO, "Reading structure for table '".$tableName."'...");
 
         $idFieldName = 'id';
         $fieldsListStr = "";
@@ -38,7 +38,7 @@ 
                 if ($attributes['key'] === 'PRI') {
                     $idFieldName = $field;
                 }
-                $fieldsListStr.= "        " . DBCore::getPrintableFieldString($field, $attributes);
+                $fieldsListStr .= "        ".DBCore::getPrintableFieldString($field, $attributes);
             }
             $fieldsListStr = substr($fieldsListStr, 0, strlen($fieldsListStr) - 1);
 
@@ -52,11 +52,11 @@ 
                 date("Y"), AUTHOR, EMAIL
             ), $tpl);
 
-            file_put_contents(RESULTS_PATH . $className . ".php", $content);
+            file_put_contents(RESULTS_PATH.$className.".php", $content);
 
-            OutputStream::msg(OutputStream::MSG_SUCCESS, "Class '" . RESULTS_PATH . $className . ".php' generated.");
+            OutputStream::msg(OutputStream::MSG_SUCCESS, "Class '".RESULTS_PATH.$className.".php' generated.");
         } else {
-            OutputStream::msg(OutputStream::MSG_ERROR, "Can't read structure for table '" . $tableName . "'.");
+            OutputStream::msg(OutputStream::MSG_ERROR, "Can't read structure for table '".$tableName."'.");
         }
     }
 
@@ -69,7 +69,7 @@ 
 function getClassName($tableName) {
     $underlinesReplaced = preg_replace_callback(
         "/_([a-zA-Z]{1})/",
-        function ($matches) {
+        function($matches) {
             return strtoupper($matches[1]);
         },
         $tableName

modules/dbconnection.php

Spacing +2 added lines, -2 removed lines

@@ -19,10 +19,10 @@
         Config::getDBConfigParam('USER'), Config::getDBConfigParam('PASSWORD'),
         Config::getDBConfigParam('DBNAME'));
 if ($mysqli->connect_error) {
-    die('Connect Error (' . $mysqli->connect_errno . ') ' . $mysqli->connect_error);
+    die('Connect Error ('.$mysqli->connect_errno.') '.$mysqli->connect_error);
 } else {
     if (!$mysqli->set_charset(Config::getDBConfigParam('DB_CHARSET'))) {
-        printf("Error loading character set " . Config::getDBConfigParam('DB_CHARSET') . ": %s\n", $mysqli->error);
+        printf("Error loading character set ".Config::getDBConfigParam('DB_CHARSET').": %s\n", $mysqli->error);
     }
 
     $manager = DBCore::getInstance();

modules/http.php

Spacing +6 added lines, -6 removed lines

@@ -22,16 +22,16 @@ 
     function http_redirect($url, $params = array(), $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();
     }
 
@@ -122,13 +122,13 @@ 
                 case 505: $text = 'HTTP Version not supported';
                     break;
                 default:
-                    exit('Unknown http status code "' . htmlentities($code) . '"');
+                    exit('Unknown http status code "'.htmlentities($code).'"');
                     break;
             }
 
             $protocol = (isset($_SERVER['SERVER_PROTOCOL']) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0');
 
-            header($protocol . ' ' . $code . ' ' . $text);
+            header($protocol.' '.$code.' '.$text);
 
             $GLOBALS['http_response_code'] = $code;
         } else {

modules/autoload.php

Spacing +6 added lines, -6 removed lines

@@ -13,19 +13,19 @@
 
 $deepness = substr_count($_SERVER['SCRIPT_NAME'], "/") - 1;
 
-$_PATH = $deepness>0 ? implode("", array_fill(0, $deepness, "../")) : "./";
+$_PATH = $deepness > 0 ? implode("", array_fill(0, $deepness, "../")) : "./";
 
-require_once($_PATH . "vendor/autoload.php");
-spl_autoload_register(function ($className) {
+require_once($_PATH."vendor/autoload.php");
+spl_autoload_register(function($className) {
     global $_PATH;
 
     $path = explode("\\", $className);
     if (in_array($path[0], array("conf"))) {
-        $includePath = $_PATH . str_replace("\\", "/", $className . ".php");
+        $includePath = $_PATH.str_replace("\\", "/", $className.".php");
     } else {
-        $includePath = $_PATH . "classes/" . str_replace("\\", "/", $className . ".php");
+        $includePath = $_PATH."classes/".str_replace("\\", "/", $className.".php");
     }
     require_once($includePath);
 });
 
-require_once($_PATH . "modules/error_log.php");
\ No newline at end of file
+require_once($_PATH."modules/error_log.php");
\ No newline at end of file

modules/localization.php

Spacing +1 added lines, -1 removed lines

@@ -22,4 +22,4 @@
 $_LANG = Languages::getLanguage($_SESSION['lang']);
 $_SESSION['lang'] = $_LANG->code;
 
-require_once(realpath(dirname(__FILE__)) . "/../conf/langs/" . $_LANG->code . ".php");
\ No newline at end of file
+require_once(realpath(dirname(__FILE__))."/../conf/langs/".$_LANG->code.".php");
\ No newline at end of file

framework/db/DBObject.php

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;
         }
 

Doc Comments +3 added lines, -3 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) {

framework/db/DBCore.php

Spacing +22 added lines, -22 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";
 
             $typesString = "s";
             if (Tools::isInteger($dbObject->getId())) {
@@ -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;

Indentation +1 added lines, -1 removed lines

@@ -621,7 +621,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";
 
             $typesString = "s";
             if (Tools::isInteger($dbObject->getId())) {

framework/core/Messages.php

Spacing +1 added lines, -1 removed lines

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

framework/core/Validator.php

Spacing +3 added lines, -3 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);
 
@@ -264,7 +264,7 @@ 
 
         return self::validateRegexp(
             $value,
-            "<^(?#Protocol)(?:(?:ht|f)tp(?:s?)\:\/\/|~/|/)?(?#Username:Password)(?:\w+:\w+@)?(?#Subdomains)(?:(?:[-\w]+\.)+(?#TopLevel Domains)(?:" . implode("|", $topLevelDomainsList) . "|[a-z]{2}))(?#Port)(?::[\d]{1,5})?(?#Directories)(?:(?:(?:/(?:[-\w~!$+|.,=]|%[a-f\d]{2})+)+|/)+|\?|#)?(?#Query)(?:(?:\?(?:[-\w~!$+|.,*:]|%[a-f\d{2}])+=(?:[-\w~!$+|.,*:=]|%[a-f\d]{2})*)(?:&(?:[-\w~!$+|.,*:]|%[a-f\d{2}])+=(?:[-\w~!$+|.,*:=]|%[a-f\d]{2})*)*)*(?#Anchor)(?:#(?:[-\w~!$+|.,*:=]|%[a-f\d]{2})*)?$>"
+            "<^(?#Protocol)(?:(?:ht|f)tp(?:s?)\:\/\/|~/|/)?(?#Username:Password)(?:\w+:\w+@)?(?#Subdomains)(?:(?:[-\w]+\.)+(?#TopLevel Domains)(?:".implode("|", $topLevelDomainsList)."|[a-z]{2}))(?#Port)(?::[\d]{1,5})?(?#Directories)(?:(?:(?:/(?:[-\w~!$+|.,=]|%[a-f\d]{2})+)+|/)+|\?|#)?(?#Query)(?:(?:\?(?:[-\w~!$+|.,*:]|%[a-f\d{2}])+=(?:[-\w~!$+|.,*:=]|%[a-f\d]{2})*)(?:&(?:[-\w~!$+|.,*:]|%[a-f\d{2}])+=(?:[-\w~!$+|.,*:=]|%[a-f\d]{2})*)*)*(?#Anchor)(?:#(?:[-\w~!$+|.,*:=]|%[a-f\d]{2})*)?$>"
         );
     }