Completed
Push — master ( 9fa01f...c95cc6 )
by Dmytro
03:42
created
framework/app/View.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -24,6 +24,9 @@
 block discarded – undo
24 24
     private $_messages = array();
25 25
     private $_errors = array();
26 26
 
27
+    /**
28
+     * @param null|Route $tpl
29
+     */
27 30
     public function __construct($tpl) {
28 31
         if (!empty($tpl)) {
29 32
             if (is_string($tpl)) {
Please login to merge, or discard this patch.
framework/db/DBSelector.php 3 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -42,6 +42,9 @@
 block discarded – undo
42 42
      */
43 43
     private $dbObject = null;
44 44
 
45
+    /**
46
+     * @param string $className
47
+     */
45 48
     public function __construct($className) {
46 49
         if (is_object($className)) {
47 50
             $className = get_class($className);
Please login to merge, or discard this patch.
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -101,8 +101,8 @@  discard block
 block discarded – undo
101 101
      */
102 102
     public function selectDBObject($debug = false) {
103 103
         $query = "SELECT * FROM " . $this->dbObject->getTableName()
104
-               . ($this->conditions != "" ? " WHERE " . $this->conditions : "")
105
-               . " LIMIT 1";
104
+                . ($this->conditions != "" ? " WHERE " . $this->conditions : "")
105
+                . " LIMIT 1";
106 106
 
107 107
         if (!$debug) {
108 108
             $stmt = DBCore::doSelectQuery($query);
@@ -183,7 +183,7 @@  discard block
 block discarded – undo
183 183
      */
184 184
     public function selectDBObjects($debug = false) {
185 185
         $query = "SELECT" . ($this->unique ? " DISTINCT" : "")
186
-               . " * FROM " . $this->dbObject->getTableName();
186
+                . " * FROM " . $this->dbObject->getTableName();
187 187
 
188 188
         if ($this->conditions != "") {
189 189
             $query .= " WHERE " . $this->conditions;
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -137,8 +137,8 @@  discard block
 block discarded – undo
137 137
             $query .= " AND " . $this->conditions;
138 138
         }
139 139
 
140
-        $query.= $this->getQueryOrderSQL();
141
-        $query.= " LIMIT 1";
140
+        $query .= $this->getQueryOrderSQL();
141
+        $query .= " LIMIT 1";
142 142
 
143 143
         $fieldType = DBField::getType($fieldValue);
144 144
         if (!$debug) {
@@ -189,8 +189,8 @@  discard block
 block discarded – undo
189 189
             $query .= " WHERE " . $this->conditions;
190 190
         }
191 191
 
192
-        $query.= $this->getQueryOrderSQL();
193
-        $query.= $this->getQueryLimitSQL();
192
+        $query .= $this->getQueryOrderSQL();
193
+        $query .= $this->getQueryLimitSQL();
194 194
 
195 195
         if (!$debug) {
196 196
             $stmt = DBCore::doSelectQuery($query);
@@ -226,8 +226,8 @@  discard block
 block discarded – undo
226 226
             $query .= " AND " . $this->conditions;
227 227
         }
228 228
 
229
-        $query.= $this->getQueryOrderSQL();
230
-        $query.= $this->getQueryLimitSQL();
229
+        $query .= $this->getQueryOrderSQL();
230
+        $query .= $this->getQueryLimitSQL();
231 231
 
232 232
         $fieldType = DBField::getType($fieldValue);
233 233
         if (!$debug) {
Please login to merge, or discard this patch.
framework/ui/UIComponent.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -136,7 +136,7 @@
 block discarded – undo
136 136
      * css($propertyName, $propertyValue) Set the value of a CSS property
137 137
      *
138 138
      * @param string $propertyName Name of a CSS property.
139
-     * @param mixed $propertyValue Value of a CSS property.
139
+     * @param string $propertyValue Value of a CSS property.
140 140
      *
141 141
      * @return Value of the CSS property or NULL if property is not exists.
142 142
      */
Please login to merge, or discard this patch.
framework/db/DBObject.php 2 patches
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -414,11 +414,11 @@  discard block
 block discarded – undo
414 414
          */
415 415
         if ($this->isNewRecord()) {
416 416
             if (!empty($this->dbQuery->conditions)) {
417
-                $this->dbQuery->query.= " WHERE ";
417
+                $this->dbQuery->query .= " WHERE ";
418 418
                 $this->dbQuery->sqlPushValues($this->dbQuery->conditions, " AND ");
419 419
             }
420 420
         } else {
421
-            $this->dbQuery->query.= " WHERE ";
421
+            $this->dbQuery->query .= " WHERE ";
422 422
             $this->dbQuery->sqlPushValues([static::ID_FIELD_NAME => $this->id]);
423 423
         }
424 424
 
@@ -427,14 +427,14 @@  discard block
 block discarded – undo
427 427
          */
428 428
         if ($this->isNewRecord()) {
429 429
             if (!empty($this->dbQuery->order)) {
430
-                $this->dbQuery->query.= " ORDER BY";
430
+                $this->dbQuery->query .= " ORDER BY";
431 431
                 if (is_array($this->dbQuery->order)) {
432 432
                     foreach ($this->dbQuery->order as $fieldName => $ord) {
433
-                        $this->dbQuery->query.= " " . $fieldName . " " . $ord . ",";
433
+                        $this->dbQuery->query .= " " . $fieldName . " " . $ord . ",";
434 434
                     }
435 435
                     $this->dbQuery->query = substr($this->dbQuery->query, 0, strlen($this->dbQuery->query) - 1);
436 436
                 } elseif (is_string($this->dbQuery->order)) {
437
-                    $this->dbQuery->query.= " " . $this->dbQuery->order;
437
+                    $this->dbQuery->query .= " " . $this->dbQuery->order;
438 438
                 }
439 439
             }
440 440
         }
@@ -446,13 +446,13 @@  discard block
 block discarded – undo
446 446
         if ($this->isNewRecord()) {
447 447
             if (!is_null($this->dbQuery->limit)) {
448 448
                 if (Tools::isInteger($this->dbQuery->limit)) {
449
-                    $this->dbQuery->query.= " LIMIT " . $this->dbQuery->limit;
449
+                    $this->dbQuery->query .= " LIMIT " . $this->dbQuery->limit;
450 450
                     $count = $this->dbQuery->limit;
451 451
                 } elseif (is_array($this->dbQuery->limit) && count($this->dbQuery->limit) == 2) {
452 452
                     $offset = $this->dbQuery->limit[0];
453 453
                     $count = $this->dbQuery->limit[1];
454 454
                     if (Tools::isInteger($offset) && Tools::isInteger($count)) {
455
-                        $this->dbQuery->query.= " LIMIT " . $offset . ", " . $count;
455
+                        $this->dbQuery->query .= " LIMIT " . $offset . ", " . $count;
456 456
                     } else {
457 457
                         throw new DBCoreException("Invalid LIMIT param in select() method.");
458 458
                     }
@@ -461,7 +461,7 @@  discard block
 block discarded – undo
461 461
                 }
462 462
             }
463 463
         } else {
464
-            $this->dbQuery->query.= " LIMIT 1";
464
+            $this->dbQuery->query .= " LIMIT 1";
465 465
             $count = 1;
466 466
         }
467 467
 
Please login to merge, or discard this patch.
Doc Comments   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -53,9 +53,9 @@  discard block
 block discarded – undo
53 53
     /**
54 54
      * Sets primary key value.
55 55
      *
56
-     * @param mixed $recordId Key vaue.
56
+     * @param integer $recordId Key vaue.
57 57
      *
58
-     * @return bool Success flag.
58
+     * @return DBObject Success flag.
59 59
      * @throws DBCoreException If object has no field with such name.
60 60
      */
61 61
     public function setId($recordId) {
@@ -255,7 +255,7 @@  discard block
 block discarded – undo
255 255
      * @param bool $ignore Ignore unique indexes or not.
256 256
      * @param bool Debug mode flag.
257 257
      *
258
-     * @return mixed Primary key value.
258
+     * @return integer Primary key value.
259 259
      * @throws DBCoreException If some database error occurred.
260 260
      */
261 261
     public function insert($ignore = false,  $debug = false) {
@@ -514,7 +514,7 @@  discard block
 block discarded – undo
514 514
     /**
515 515
      * Deletes DB record for current DBObject.
516 516
      *
517
-     * @return mixed Number of affected rows (1 if some record was deleted,
517
+     * @return integer Number of affected rows (1 if some record was deleted,
518 518
      *            0 - if no) or FALSE if some error occurred.
519 519
      */
520 520
     public function delete() {
Please login to merge, or discard this patch.
framework/db/DBQueryCondition.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
106 106
                     break;
107 107
                 case ("IN"):
108 108
                 case ("NOT IN"):
109
-                    if (is_array($value) &&  !empty($value)) {
109
+                    if (is_array($value) && !empty($value)) {
110 110
                         $dataList = [];
111 111
                         foreach ($value as $dataItem) {
112 112
                             $dataList[] = DBField::sqlValue($this->field->type, $dataItem);
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
                         if ($count > 0) {
117 117
                             $qmStr = "?";
118 118
                             $tStr = $this->field->type;
119
-                            for ($i = 1; $i < $count; $i ++) {
119
+                            for ($i = 1; $i < $count; $i++) {
120 120
                                 $qmStr .= ", ?";
121 121
                                 $tStr .= $this->field->type;
122 122
                             }
Please login to merge, or discard this patch.
framework/db/DBCore.php 3 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -598,7 +598,7 @@
 block discarded – undo
598 598
     public static function deleteDBObject($dbObject) {
599 599
         if (!empty($dbObject) && is_object($dbObject)) {
600 600
             $query = "DELETE FROM " . $dbObject->getTableName() .
601
-                     " WHERE " . $dbObject->getIdFieldName() . " = ? LIMIT 1";
601
+                        " WHERE " . $dbObject->getIdFieldName() . " = ? LIMIT 1";
602 602
             if (Tools::isInteger($dbObject->getId())) {
603 603
                 $typesString = "i";
604 604
             } else {
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -481,11 +481,11 @@  discard block
 block discarded – undo
481 481
 
482 482
         $fieldStr = "'" . $field . "' => ";
483 483
         if ($attributes['null'] === 'YES' && is_null($attributes['default'])) {
484
-            $fieldStr.= "null";
484
+            $fieldStr .= "null";
485 485
         } else {
486
-            $fieldStr.= self::getPrintableSQLValue($attributes['type'], $attributes['default']);
486
+            $fieldStr .= self::getPrintableSQLValue($attributes['type'], $attributes['default']);
487 487
         }
488
-        $fieldStr.= ", // " . $attributes['type'] .
488
+        $fieldStr .= ", // " . $attributes['type'] .
489 489
             ", " . (($attributes['null'] == "NO") ? "not null" : "null")
490 490
             . ", default '" . $attributes['default'] . "'" .
491 491
             ($extra ? ", " . $extra : "") .
@@ -583,9 +583,9 @@  discard block
 block discarded – undo
583 583
                   LIMIT 1";
584 584
         $typesString = DBPreparedQuery::sqlTypesString($fieldsList, $idFieldName);
585 585
         if (Tools::isInteger($fieldsList[$idFieldName])) {
586
-            $typesString.= "i";
586
+            $typesString .= "i";
587 587
         } else {
588
-            $typesString.= "s";
588
+            $typesString .= "s";
589 589
         }
590 590
         $valuesList = self::createValuesList($fieldsList, $idFieldName);
591 591
         $valuesList[] = $dbObject->getId();
Please login to merge, or discard this patch.
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -269,7 +269,6 @@
 block discarded – undo
269 269
      * Return parameters from the statment with dynamic number of parameters.
270 270
      *
271 271
      * @param resource $stmt Statement.
272
-     * @param array $params Parameters.
273 272
      */
274 273
     public static function bindResults($stmt) {
275 274
         $resultSet = [];
Please login to merge, or discard this patch.
framework/db/DBPreparedQuery.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -139,9 +139,9 @@
 block discarded – undo
139 139
             $typeByValue = DBField::getType($value);
140 140
             if ($typeByValue != 's') {
141 141
                 if ($type != $typeByValue && !(
142
-                       ($type == 'd' && $typeByValue == 'i') || // We can put integer as double
142
+                        ($type == 'd' && $typeByValue == 'i') || // We can put integer as double
143 143
                        ($type == 's' && $typeByValue == 'i') // We can put integer as string
144
-                   )
144
+                    )
145 145
                 ) {
146 146
                     throw new DBCoreException(
147 147
                         "Invalid query parameters types string ('" . $value .
Please login to merge, or discard this patch.
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
83 83
      */
84 84
     public function prepareConditions() {
85 85
         if (!empty($this->conditions)) {
86
-            $this->query.= " WHERE ";
86
+            $this->query .= " WHERE ";
87 87
             $this->sqlPushValues($this->conditions, " AND ");
88 88
         }
89 89
     }
@@ -93,14 +93,14 @@  discard block
 block discarded – undo
93 93
      */
94 94
     public function prepareOrder() {
95 95
         if (!empty($this->order)) {
96
-            $this->query.= " ORDER BY";
96
+            $this->query .= " ORDER BY";
97 97
             if (is_array($this->order)) {
98 98
                 foreach ($this->order as $fieldName => $ord) {
99
-                    $this->query.= " " . $fieldName . " " . $ord . ",";
99
+                    $this->query .= " " . $fieldName . " " . $ord . ",";
100 100
                 }
101 101
                 $this->query = substr($this->query, 0, strlen($this->query) - 1);
102 102
             } elseif (is_string($this->order)) {
103
-                $this->query.= " " . $this->order;
103
+                $this->query .= " " . $this->order;
104 104
             }
105 105
         }
106 106
     }
@@ -113,13 +113,13 @@  discard block
 block discarded – undo
113 113
     public function prepareLimit() {
114 114
         if (!is_null($this->limit)) {
115 115
             if (Tools::isInteger($this->limit)) {
116
-                $this->query.= " LIMIT " . $this->limit;
116
+                $this->query .= " LIMIT " . $this->limit;
117 117
                 $count = $this->limit;
118 118
             } elseif (is_array($this->limit) && count($this->limit) == 2) {
119 119
                 $offset = $this->limit[0];
120 120
                 $count = $this->limit[1];
121 121
                 if (Tools::isInteger($offset) && Tools::isInteger($count)) {
122
-                    $this->query.= " LIMIT " . $offset . ", " . $count;
122
+                    $this->query .= " LIMIT " . $offset . ", " . $count;
123 123
                 } else {
124 124
                     throw new DBCoreException("Invalid LIMIT param in select() method.");
125 125
                 }
@@ -309,7 +309,7 @@  discard block
 block discarded – undo
309 309
         $chunks = [];
310 310
         foreach ($fieldsList as $fieldName => $fieldValue) {
311 311
             if ($fieldName != $idFieldName) {
312
-                $chunks[]= "`" . $fieldName . "` = '" . $fieldValue . "'";
312
+                $chunks[] = "`" . $fieldName . "` = '" . $fieldValue . "'";
313 313
             }
314 314
         }
315 315
 
@@ -333,11 +333,11 @@  discard block
 block discarded – undo
333 333
         foreach ($fieldsList as $fieldName => $fieldValue) {
334 334
             if ($fieldName != $idFieldName) {
335 335
                 if (Tools::isDouble($fieldValue)) {
336
-                    $typesString.= "d";
336
+                    $typesString .= "d";
337 337
                 } elseif (Tools::isInteger($fieldValue)) {
338
-                    $typesString.= "i";
338
+                    $typesString .= "i";
339 339
                 } else {
340
-                    $typesString.= "s";
340
+                    $typesString .= "s";
341 341
                 }
342 342
             }
343 343
         }
@@ -358,7 +358,7 @@  discard block
 block discarded – undo
358 358
         $type = DBField::castType($type);
359 359
         $typesString = "";
360 360
         while ($length > 0) {
361
-            $typesString.= $type;
361
+            $typesString .= $type;
362 362
             $length--;
363 363
         }
364 364
 
@@ -378,7 +378,7 @@  discard block
 block discarded – undo
378 378
             if (!is_array($fieldValue)) {
379 379
                 if (!is_null($fieldValue)) {
380 380
                     $chunks[] = $fieldName . " = ?";
381
-                    $this->types.= DBField::getType($fieldValue);
381
+                    $this->types .= DBField::getType($fieldValue);
382 382
                     $this->params[] = $fieldValue;
383 383
                 } else {
384 384
                     $chunks[] = $fieldName;
@@ -389,12 +389,12 @@  discard block
 block discarded – undo
389 389
 
390 390
                 $chunks[] = $condition;
391 391
                 foreach ($localParams as $param) {
392
-                    $this->types.= DBField::getType($param);
392
+                    $this->types .= DBField::getType($param);
393 393
                     $this->params[] = $param;
394 394
                 }
395 395
             }
396 396
         }
397
-        $this->query.= implode($separator, $chunks);
397
+        $this->query .= implode($separator, $chunks);
398 398
     }
399 399
 
400 400
 }
Please login to merge, or discard this patch.
framework/helpers/Naming.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -149,7 +149,7 @@
 block discarded – undo
149 149
                             break;
150 150
                         }
151 151
                         $array = &$array[$key];
152
-                    } elseif(isset($array[$key])) { // last element
152
+                    } elseif (isset($array[$key])) { // last element
153 153
                         unset($array[$key]);
154 154
                     }
155 155
                 }
Please login to merge, or discard this patch.
framework/mail/Email.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -89,11 +89,11 @@
 block discarded – undo
89 89
      */
90 90
     protected function sendMail($email, $subject, $message, $format = self::FORMAT_TEXT, $replyTo = "") {
91 91
         $headers = "From: " . $this->fromName . " <" . $this->fromEmail . ">\r\n";
92
-        $headers.= "Reply-To: " . $replyTo . "\r\n";
92
+        $headers .= "Reply-To: " . $replyTo . "\r\n";
93 93
 
94 94
         if ($format == self::FORMAT_HTML) {
95
-            $headers.= "MIME-Version: 1.0\r\n";
96
-            $headers.= "Content-type: text/html; charset=utf-8\r\n";
95
+            $headers .= "MIME-Version: 1.0\r\n";
96
+            $headers .= "Content-type: text/html; charset=utf-8\r\n";
97 97
         }
98 98
 
99 99
         /**
Please login to merge, or discard this patch.