Asymptix / Framework

framework/db/DBCore.php

Doc Comments +2 added lines, -3 removed lines

@@ -292,7 +292,6 @@ 
      * Return parameters from the statment with dynamic number of parameters.
      *
      * @param resource $stmt   Statement.
-     * @param array    $params Parameters.
      */
     public static function bindResults($stmt)
     {
@@ -495,7 +494,7 @@ 
      * Returns printable field description string for table fields list generator.
      *
      * @param string $field      Field name.
-     * @param array  $attributes List of field attributes.
+     * @param string  $attributes List of field attributes.
      *
      * @return string
      */
@@ -818,7 +817,7 @@ 
     /**
      * Executes SQL query with single record and value result and return this value.
      *
-     * @param mixed  $query  SQL query template string or DBPreparedQuery object
+     * @param string  $query  SQL query template string or DBPreparedQuery object
      *                       if single parameter.
      * @param string $types  Types string (ex: "isdb").
      * @param array  $params Parameters in the same order like types string.

Indentation +1 added lines, -1 removed lines

@@ -639,7 +639,7 @@
     {
         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 +30 added lines, -30 removed lines

@@ -115,7 +115,7 @@ 
     public function openConnection($connResource, $connName = null)
     {
         if ($connName !== null) {
-            $connName = (string) $connName;
+            $connName = (string)$connName;
             if (isset($this->connections[$connName])) {
                 throw new DBCoreException('You trying to save a connection with an existing name');
             }
@@ -139,7 +139,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];
@@ -304,7 +304,7 @@ 
                 $resultSet[$field->table] = [];
             }
             $resultSet[$field->table][$field->name] = $fieldsCounter++;
-            $parameterName = 'variable'.$fieldsCounter; //$field->name;
+            $parameterName = 'variable' . $fieldsCounter; //$field->name;
             $$parameterName = null;
             $parameters[] = &$$parameterName;
         }
@@ -420,7 +420,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(
@@ -467,7 +467,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
@@ -504,17 +504,17 @@ 
         $extra = trim($attributes['extra']);
         $comment = trim($attributes['comment']);
 
-        $fieldStr = "'".$field."' => ";
+        $fieldStr = "'" . $field . "' => ";
         if ($attributes['null'] === 'YES' && is_null($attributes['default'])) {
             $fieldStr .= 'null';
         } else {
             $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;
     }
@@ -572,12 +572,12 @@ 
         $idFieldName = $dbObject->getIdFieldName();
 
         if (Tools::isInteger($fieldsList[$idFieldName])) {
-            $query = 'INSERT INTO '.$dbObject->getTableName().'
+            $query = 'INSERT INTO ' . $dbObject->getTableName() . '
                           SET '.DBPreparedQuery::sqlQMValuesString($fieldsList, $idFieldName);
             $typesString = DBPreparedQuery::sqlTypesString($fieldsList, $idFieldName);
             $valuesList = self::createValuesList($fieldsList, $idFieldName);
         } else {
-            $query = 'INSERT INTO '.$dbObject->getTableName().'
+            $query = 'INSERT INTO ' . $dbObject->getTableName() . '
                           SET '.DBPreparedQuery::sqlQMValuesString($fieldsList);
             $typesString = DBPreparedQuery::sqlTypesString($fieldsList);
             $valuesList = self::createValuesList($fieldsList);
@@ -607,9 +607,9 @@ 
         $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])) {
@@ -638,8 +638,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 {
@@ -694,7 +694,7 @@ 
                 return;
             }
         } 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");
         }
     }
 
@@ -871,7 +871,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';
         }
 
         /*
@@ -918,12 +918,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);
             }
@@ -936,7 +936,7 @@ 
          */
         if (preg_match('#delete([a-zA-Z]+)#', $methodName, $matches)) {
             return call_user_func(
-                [self::getInstance(), $methodName.'s'],
+                [self::getInstance(), $methodName . 's'],
                 [$methodParams[0]]
             );
         }
@@ -947,7 +947,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);
             }
@@ -967,17 +967,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/DBObject.php

Doc Comments +3 added lines, -3 removed lines

@@ -58,11 +58,11 @@ 
     /**
      * Sets primary key value.
      *
-     * @param mixed $recordId Key vaue.
+     * @param integer $recordId Key vaue.
      *
      * @throws DBCoreException If object has no field with such name.
      *
-     * @return bool Success flag.
+     * @return DBObject Success flag.
      */
     public function setId($recordId)
     {
@@ -532,7 +532,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 +11 added lines, -11 removed lines

@@ -98,9 +98,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]
@@ -169,9 +169,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]
@@ -434,14 +434,14 @@ 
     {
         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;
         }
 
@@ -466,11 +466,11 @@ 
                 $this->dbQuery->query .= ' ORDER BY';
                 if (is_array($this->dbQuery->order)) {
                     foreach ($this->dbQuery->order as $fieldName => $ord) {
-                        $this->dbQuery->query .= ' '.$fieldName.' '.$ord.',';
+                        $this->dbQuery->query .= ' ' . $fieldName . ' ' . $ord . ',';
                     }
                     $this->dbQuery->query = substr($this->dbQuery->query, 0, strlen($this->dbQuery->query) - 1);
                 } elseif (is_string($this->dbQuery->order)) {
-                    $this->dbQuery->query .= ' '.$this->dbQuery->order;
+                    $this->dbQuery->query .= ' ' . $this->dbQuery->order;
                 }
             }
         }
@@ -482,13 +482,13 @@ 
         if ($this->isNewRecord()) {
             if (!is_null($this->dbQuery->limit)) {
                 if (Tools::isInteger($this->dbQuery->limit)) {
-                    $this->dbQuery->query .= ' LIMIT '.$this->dbQuery->limit;
+                    $this->dbQuery->query .= ' LIMIT ' . $this->dbQuery->limit;
                     $count = $this->dbQuery->limit;
                 } elseif (is_array($this->dbQuery->limit) && count($this->dbQuery->limit) == 2) {
                     $offset = $this->dbQuery->limit[0];
                     $count = $this->dbQuery->limit[1];
                     if (Tools::isInteger($offset) && Tools::isInteger($count)) {
-                        $this->dbQuery->query .= ' LIMIT '.$offset.', '.$count;
+                        $this->dbQuery->query .= ' LIMIT ' . $offset . ', ' . $count;
                     } else {
                         throw new DBCoreException('Invalid LIMIT param in select() method.');
                     }

framework/ui/UIComponent.php

Doc Comments +1 added lines, -1 removed lines

@@ -143,7 +143,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

@@ -117,7 +117,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');
             }
         }
     }
@@ -170,7 +170,7 @@ 
     {
         $style = '';
         foreach ($this->style as $propertyName => $propertyValue) {
-            $style .= $propertyName.':'.$propertyValue.';';
+            $style .= $propertyName . ':' . $propertyValue . ';';
         }
 
         return $style;

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 . "'.");
         }
     }
 
@@ -70,7 +70,7 @@ 
 {
     $underlinesReplaced = preg_replace_callback(
         '/_([a-zA-Z]{1})/',
-        function ($matches) {
+        function($matches) {
             return strtoupper($matches[1]);
         },
         $tableName

index.php

Spacing +4 added lines, -4 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 session_start();
-header('X-Powered-By: Asymptix PHP Framework, PHP/'.phpversion());
+header('X-Powered-By: Asymptix PHP Framework, PHP/' . phpversion());
 
 require_once 'modules/autoload.php';
 
@@ -39,7 +39,7 @@ 
  * Pagination
  */
 if (isset($_ARGS['pn'])) {
-    $_REQUEST['pn'] = (int) $_ARGS['pn'];
+    $_REQUEST['pn'] = (int)$_ARGS['pn'];
 }
 
 $_ROUTE = new Route($request);
@@ -68,9 +68,9 @@ 
 }
 
 if ($_ROUTE->isBackend) {
-    require_once 'controllers/backend/'.$_ROUTE->controller.'.php';
+    require_once 'controllers/backend/' . $_ROUTE->controller . '.php';
     require_once 'templates/backend/master.tpl.php';
 } else {
-    require_once 'controllers/frontend/'.$_ROUTE->controller.'.php';
+    require_once 'controllers/frontend/' . $_ROUTE->controller . '.php';
     require_once 'templates/frontend/master.tpl.php';
 }

modules/filter.php

Spacing +2 added lines, -2 removed lines

@@ -15,8 +15,8 @@
 use Asymptix\web\Request;
 
 // Set and Reset filter submit fields names may be changed.
-$setFilter = (bool) Request::getFieldValue('setFilter');
-$resetFilter = (bool) Request::getFieldValue('resetFilter');
+$setFilter = (bool)Request::getFieldValue('setFilter');
+$resetFilter = (bool)Request::getFieldValue('resetFilter');
 
 if (isset($_SESSION['_filter'])) {
     $_FILTER = unserialize($_SESSION['_filter']);

modules/dbconnection.php

Spacing +3 added lines, -3 removed lines

@@ -20,10 +20,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();
@@ -33,7 +33,7 @@ 
 }
 
 // Register a shutdown function which will close DB connection
-register_shutdown_function(function () {
+register_shutdown_function(function() {
     global $manager;
 
     $conns = $manager->getConnections();

modules/http.php

Spacing +6 added lines, -6 removed lines

@@ -24,16 +24,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();
     }
 }
@@ -125,13 +125,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/localization.php

Spacing +1 added lines, -1 removed lines

@@ -23,4 +23,4 @@
 $_LANG = Languages::getLanguage($_SESSION['lang']);
 $_SESSION['lang'] = $_LANG->code;
 
-require_once realpath(dirname(__FILE__)).'/../conf/langs/'.$_LANG->code.'.php';
+require_once realpath(dirname(__FILE__)) . '/../conf/langs/' . $_LANG->code . '.php';