@@ -98,7 +98,7 @@ |
||
| 98 | 98 | |
| 99 | 99 | // check validator |
| 100 | 100 | if (!is_callable($validator)) { |
| 101 | - throw new Exception('Validator for field ' . $options['id'] . ' is not callable'); |
|
| 101 | + throw new Exception('Validator for field '.$options['id'].' is not callable'); |
|
| 102 | 102 | } |
| 103 | 103 | |
| 104 | 104 | |
@@ -11,7 +11,7 @@ |
||
| 11 | 11 | throw new \Exception(json_last_error_msg()); |
| 12 | 12 | } |
| 13 | 13 | header('Content-type: application/javascript; charset=utf-8', true); |
| 14 | - echo 'var data = ' . $JSON; |
|
| 14 | + echo 'var data = '.$JSON; |
|
| 15 | 15 | } |
| 16 | 16 | |
| 17 | 17 | public static function translateAndRespond($data) |
@@ -84,8 +84,8 @@ |
||
| 84 | 84 | |
| 85 | 85 | |
| 86 | 86 | /** |
| 87 | - * @var array $validators Validation checks |
|
| 88 | - */ |
|
| 87 | + * @var array $validators Validation checks |
|
| 88 | + */ |
|
| 89 | 89 | public static $validators = []; |
| 90 | 90 | |
| 91 | 91 | /** |
@@ -737,7 +737,7 @@ discard block |
||
| 737 | 737 | |
| 738 | 738 | // create new or update existing |
| 739 | 739 | if ($this->_isPhantom) { |
| 740 | - DB::nonQuery((new Insert())->setTable(static::$tableName)->set($set), null, [static::class,'handleException']); |
|
| 740 | + DB::nonQuery((new Insert())->setTable(static::$tableName)->set($set), null, [static::class, 'handleException']); |
|
| 741 | 741 | $primaryKey = $this->getPrimaryKey(); |
| 742 | 742 | $insertID = DB::insertID(); |
| 743 | 743 | $fields = static::getClassFields(); |
@@ -750,8 +750,8 @@ discard block |
||
| 750 | 750 | $this->_isNew = true; |
| 751 | 751 | } elseif (count($set)) { |
| 752 | 752 | DB::nonQuery((new Update())->setTable(static::$tableName)->set($set)->where( |
| 753 | - sprintf('`%s` = %u', static::_cn($this->getPrimaryKey()), (string)$this->getPrimaryKeyValue()) |
|
| 754 | - ), null, [static::class,'handleException']); |
|
| 753 | + sprintf('`%s` = %u', static::_cn($this->getPrimaryKey()), (string) $this->getPrimaryKeyValue()) |
|
| 754 | + ), null, [static::class, 'handleException']); |
|
| 755 | 755 | |
| 756 | 756 | $this->_isUpdated = true; |
| 757 | 757 | } |
@@ -783,11 +783,11 @@ discard block |
||
| 783 | 783 | $recordValues = $this->_prepareRecordValues(); |
| 784 | 784 | $set = static::_mapValuesToSet($recordValues); |
| 785 | 785 | |
| 786 | - DB::nonQuery((new Insert())->setTable(static::getHistoryTable())->set($set), null, [static::class,'handleException']); |
|
| 786 | + DB::nonQuery((new Insert())->setTable(static::getHistoryTable())->set($set), null, [static::class, 'handleException']); |
|
| 787 | 787 | } |
| 788 | 788 | } |
| 789 | 789 | |
| 790 | - return static::delete((string)$this->getPrimaryKeyValue()); |
|
| 790 | + return static::delete((string) $this->getPrimaryKeyValue()); |
|
| 791 | 791 | } |
| 792 | 792 | |
| 793 | 793 | /** |
@@ -798,7 +798,7 @@ discard block |
||
| 798 | 798 | */ |
| 799 | 799 | public static function delete($id): bool |
| 800 | 800 | { |
| 801 | - DB::nonQuery((new Delete())->setTable(static::$tableName)->where(sprintf('`%s` = %u', static::_cn(static::$primaryKey ? static::$primaryKey : 'ID'), $id)), null, [static::class,'handleException']); |
|
| 801 | + DB::nonQuery((new Delete())->setTable(static::$tableName)->where(sprintf('`%s` = %u', static::_cn(static::$primaryKey ? static::$primaryKey : 'ID'), $id)), null, [static::class, 'handleException']); |
|
| 802 | 802 | |
| 803 | 803 | return DB::affectedRows() > 0; |
| 804 | 804 | } |
@@ -851,7 +851,7 @@ discard block |
||
| 851 | 851 | { |
| 852 | 852 | static::init(); |
| 853 | 853 | if (!static::fieldExists($field)) { |
| 854 | - throw new Exception('getColumnName called on nonexisting column: ' . get_called_class().'->'.$field); |
|
| 854 | + throw new Exception('getColumnName called on nonexisting column: '.get_called_class().'->'.$field); |
|
| 855 | 855 | } |
| 856 | 856 | |
| 857 | 857 | return static::$_classFields[get_called_class()][$field]['columnName']; |
@@ -1018,7 +1018,7 @@ discard block |
||
| 1018 | 1018 | // clear buffer (required for the next query to work without running fetchAll first |
| 1019 | 1019 | $Statement->closeCursor(); |
| 1020 | 1020 | |
| 1021 | - return $Connection->query((string)$query); // now the query should finish with no error |
|
| 1021 | + return $Connection->query((string) $query); // now the query should finish with no error |
|
| 1022 | 1022 | } else { |
| 1023 | 1023 | return DB::handleException($e, $query, $queryLog); |
| 1024 | 1024 | } |
@@ -1117,8 +1117,8 @@ discard block |
||
| 1117 | 1117 | |
| 1118 | 1118 | // skip these because they are built in |
| 1119 | 1119 | if (in_array($property->getName(), [ |
| 1120 | - '_classFields','_classRelationships','_classBeforeSave','_classAfterSave','_fieldsDefined','_relationshipsDefined','_eventsDefined','_record','_validator' |
|
| 1121 | - ,'_validationErrors','_isDirty','_isValid','_convertedValues','_originalValues','_isPhantom','_wasPhantom','_isNew','_isUpdated','_relatedObjects' |
|
| 1120 | + '_classFields', '_classRelationships', '_classBeforeSave', '_classAfterSave', '_fieldsDefined', '_relationshipsDefined', '_eventsDefined', '_record', '_validator' |
|
| 1121 | + ,'_validationErrors', '_isDirty', '_isValid', '_convertedValues', '_originalValues', '_isPhantom', '_wasPhantom', '_isNew', '_isUpdated', '_relatedObjects' |
|
| 1122 | 1122 | ])) { |
| 1123 | 1123 | continue; |
| 1124 | 1124 | } |
@@ -1248,7 +1248,7 @@ discard block |
||
| 1248 | 1248 | private function applyNewValue($type, $field, $value) |
| 1249 | 1249 | { |
| 1250 | 1250 | if (!isset($this->_convertedValues[$field])) { |
| 1251 | - if (is_null($value) && !in_array($type, ['set','list'])) { |
|
| 1251 | + if (is_null($value) && !in_array($type, ['set', 'list'])) { |
|
| 1252 | 1252 | unset($this->_convertedValues[$field]); |
| 1253 | 1253 | return null; |
| 1254 | 1254 | } |
@@ -1521,7 +1521,7 @@ discard block |
||
| 1521 | 1521 | foreach ($order as $key => $value) { |
| 1522 | 1522 | if (is_string($key)) { |
| 1523 | 1523 | $columnName = static::_cn($key); |
| 1524 | - $direction = strtoupper($value)=='DESC' ? 'DESC' : 'ASC'; |
|
| 1524 | + $direction = strtoupper($value) == 'DESC' ? 'DESC' : 'ASC'; |
|
| 1525 | 1525 | } else { |
| 1526 | 1526 | $columnName = static::_cn($value); |
| 1527 | 1527 | $direction = 'ASC'; |
@@ -32,8 +32,8 @@ discard block |
||
| 32 | 32 | public static function escape($str) |
| 33 | 33 | { |
| 34 | 34 | return str_replace( |
| 35 | - ["\\", "\x00", "\n", "\r", "'", '"', "\x1a"], |
|
| 36 | - ["\\\\","\\0","\\n", "\\r", "\'", '\"', "\\Z"], |
|
| 35 | + ["\\", "\x00", "\n", "\r", "'", '"', "\x1a"], |
|
| 36 | + ["\\\\", "\\0", "\\n", "\\r", "\'", '\"', "\\Z"], |
|
| 37 | 37 | $str |
| 38 | 38 | ); |
| 39 | 39 | } |
@@ -210,10 +210,10 @@ discard block |
||
| 210 | 210 | return 'year'; |
| 211 | 211 | |
| 212 | 212 | case 'enum': |
| 213 | - return sprintf('enum("%s")', join('","', array_map([static::class,'escape'], $field['values']))); |
|
| 213 | + return sprintf('enum("%s")', join('","', array_map([static::class, 'escape'], $field['values']))); |
|
| 214 | 214 | |
| 215 | 215 | case 'set': |
| 216 | - return sprintf('set("%s")', join('","', array_map([static::class,'escape'], $field['values']))); |
|
| 216 | + return sprintf('set("%s")', join('","', array_map([static::class, 'escape'], $field['values']))); |
|
| 217 | 217 | |
| 218 | 218 | default: |
| 219 | 219 | throw new Exception("getSQLType: unhandled type $field[type]"); |
@@ -113,7 +113,7 @@ |
||
| 113 | 113 | $Session->setFields($sessionData); |
| 114 | 114 | if (function_exists('fastcgi_finish_request')) { |
| 115 | 115 | // @codeCoverageIgnoreStart |
| 116 | - register_shutdown_function(function ($Session) { |
|
| 116 | + register_shutdown_function(function($Session) { |
|
| 117 | 117 | $Session->save(); |
| 118 | 118 | }, $Session); |
| 119 | 119 | // @codeCoverageIgnoreEnd |
@@ -153,7 +153,7 @@ |
||
| 153 | 153 | // save a copy to history table |
| 154 | 154 | $recordValues = $this->_prepareRecordValues(); |
| 155 | 155 | $set = static::_mapValuesToSet($recordValues); |
| 156 | - DB::nonQuery((new Insert())->setTable(static::getHistoryTable())->set($set), null, [static::class,'handleError']); |
|
| 156 | + DB::nonQuery((new Insert())->setTable(static::getHistoryTable())->set($set), null, [static::class, 'handleError']); |
|
| 157 | 157 | } |
| 158 | 158 | } |
| 159 | 159 | } |
@@ -51,7 +51,7 @@ |
||
| 51 | 51 | |
| 52 | 52 | public function __toString(): string |
| 53 | 53 | { |
| 54 | - $expression = ($this->calcFoundRows ? 'SQL_CALC_FOUND_ROWS ' : '') . $this->expression; |
|
| 54 | + $expression = ($this->calcFoundRows ? 'SQL_CALC_FOUND_ROWS ' : '').$this->expression; |
|
| 55 | 55 | |
| 56 | 56 | if (isset($this->tableAlias)) { |
| 57 | 57 | $from = sprintf('`%s` AS `%s`', $this->table, $this->tableAlias); |
@@ -10,6 +10,6 @@ |
||
| 10 | 10 | use Divergence\App as App; |
| 11 | 11 | |
| 12 | 12 | return [ |
| 13 | - 'debug' => file_exists(App::$App->ApplicationPath . '/.debug'), |
|
| 14 | - 'environment' => (file_exists(App::$App->ApplicationPath . '/.dev') ? 'dev' : 'production'), |
|
| 13 | + 'debug' => file_exists(App::$App->ApplicationPath.'/.debug'), |
|
| 14 | + 'environment' => (file_exists(App::$App->ApplicationPath.'/.dev') ? 'dev' : 'production'), |
|
| 15 | 15 | ]; |
@@ -100,7 +100,7 @@ discard block |
||
| 100 | 100 | * @param string $label |
| 101 | 101 | * @return void |
| 102 | 102 | */ |
| 103 | - public static function setConnection(string $label=null) |
|
| 103 | + public static function setConnection(string $label = null) |
|
| 104 | 104 | { |
| 105 | 105 | if ($label === null && static::$currentConnection === null) { |
| 106 | 106 | static::$currentConnection = static::getDefaultLabel(); |
@@ -133,7 +133,7 @@ discard block |
||
| 133 | 133 | * @uses static::$Timezone |
| 134 | 134 | * @uses PDO |
| 135 | 135 | */ |
| 136 | - public static function getConnection($label=null) |
|
| 136 | + public static function getConnection($label = null) |
|
| 137 | 137 | { |
| 138 | 138 | if ($label === null) { |
| 139 | 139 | if (static::$currentConnection === null) { |
@@ -152,10 +152,10 @@ discard block |
||
| 152 | 152 | |
| 153 | 153 | if (isset($config['socket'])) { |
| 154 | 154 | // socket connection |
| 155 | - $DSN = 'mysql:unix_socket=' . $config['socket'] . ';dbname=' . $config['database']; |
|
| 155 | + $DSN = 'mysql:unix_socket='.$config['socket'].';dbname='.$config['database']; |
|
| 156 | 156 | } else { |
| 157 | 157 | // tcp connection |
| 158 | - $DSN = 'mysql:host=' . $config['host'] . ';port=' . $config['port'] .';dbname=' . $config['database']; |
|
| 158 | + $DSN = 'mysql:host='.$config['host'].';port='.$config['port'].';dbname='.$config['database']; |
|
| 159 | 159 | } |
| 160 | 160 | |
| 161 | 161 | try { |
@@ -186,7 +186,7 @@ discard block |
||
| 186 | 186 | { |
| 187 | 187 | if (is_string($data)) { |
| 188 | 188 | $data = static::getConnection()->quote($data); |
| 189 | - $data = substr($data, 1, strlen($data)-2); |
|
| 189 | + $data = substr($data, 1, strlen($data) - 2); |
|
| 190 | 190 | return $data; |
| 191 | 191 | } elseif (is_array($data)) { |
| 192 | 192 | foreach ($data as $key=>$string) { |
@@ -511,7 +511,7 @@ discard block |
||
| 511 | 511 | $error = static::getConnection()->errorInfo(); |
| 512 | 512 | $message = $error[2]; |
| 513 | 513 | |
| 514 | - if (App::$App->Config['environment']=='dev') { |
|
| 514 | + if (App::$App->Config['environment'] == 'dev') { |
|
| 515 | 515 | /** @var \Whoops\Handler\PrettyPageHandler */ |
| 516 | 516 | $Handler = \Divergence\App::$App->whoops->popHandler(); |
| 517 | 517 | |
@@ -555,7 +555,7 @@ discard block |
||
| 555 | 555 | */ |
| 556 | 556 | protected static function startQueryLog($query) |
| 557 | 557 | { |
| 558 | - if (App::$App->Config['environment']!='dev') { |
|
| 558 | + if (App::$App->Config['environment'] != 'dev') { |
|
| 559 | 559 | return false; |
| 560 | 560 | } |
| 561 | 561 | |