@@ -1158,7 +1158,7 @@ discard block |
||
| 1158 | 1158 | * to be overridden in case you want to do something different with the ID of your objects outside |
| 1159 | 1159 | * of the standard 11 digit OID sequence used internally in Alpha. |
| 1160 | 1160 | * |
| 1161 | - * @return int 11 digit zero-padded OID value. |
|
| 1161 | + * @return string 11 digit zero-padded OID value. |
|
| 1162 | 1162 | * |
| 1163 | 1163 | * @since 1.0 |
| 1164 | 1164 | */ |
@@ -1175,7 +1175,7 @@ discard block |
||
| 1175 | 1175 | * Gets the OID for the object in zero-padded format (same as getID()). This version is final so cannot |
| 1176 | 1176 | * be overridden. |
| 1177 | 1177 | * |
| 1178 | - * @return int 11 digit zero-padded OID value. |
|
| 1178 | + * @return string 11 digit zero-padded OID value. |
|
| 1179 | 1179 | * |
| 1180 | 1180 | * @since 1.0 |
| 1181 | 1181 | */ |
@@ -67,7 +67,7 @@ |
||
| 67 | 67 | * A static method that attempts to return a ActiveRecordProviderInterface instance |
| 68 | 68 | * based on the name of the provider class supplied. |
| 69 | 69 | * |
| 70 | - * @param $providerName The fully-qualified class name of the provider class. |
|
| 70 | + * @param string $providerName The fully-qualified class name of the provider class. |
|
| 71 | 71 | * @param $Record The (optional) active record instance to pass to the persistance provider for mapping. |
| 72 | 72 | * |
| 73 | 73 | * @throws \Alpha\Exception\IllegalArguementException |
@@ -60,6 +60,7 @@ discard block |
||
| 60 | 60 | * Disconnects the current database connection if one exists (self::$connection is set). |
| 61 | 61 | * |
| 62 | 62 | * @since 1.1 |
| 63 | + * @return void |
|
| 63 | 64 | */ |
| 64 | 65 | public static function disconnect(); |
| 65 | 66 | |
@@ -81,6 +82,7 @@ discard block |
||
| 81 | 82 | * @since 1.1 |
| 82 | 83 | * |
| 83 | 84 | * @throws \Alpha\Exception\RecordFoundException |
| 85 | + * @return void |
|
| 84 | 86 | */ |
| 85 | 87 | public function load($OID, $version = 0); |
| 86 | 88 | |
@@ -100,7 +102,7 @@ discard block |
||
| 100 | 102 | /** |
| 101 | 103 | * Populates the record object from the database table by the given attribute value. |
| 102 | 104 | * |
| 103 | - * @param string $atribute The name of the attribute to load the record by. |
|
| 105 | + * @param string $attribute The name of the attribute to load the record by. |
|
| 104 | 106 | * @param string $value The value of the attribute to load the record by. |
| 105 | 107 | * @param bool $ignoreClassType Default is false, set to true if you want to load from overloaded tables and ignore the class type |
| 106 | 108 | * @param array $loadAttributes The attributes to load from the database to this object (leave blank to load all attributes) |
@@ -108,6 +110,7 @@ discard block |
||
| 108 | 110 | * @since 1.1 |
| 109 | 111 | * |
| 110 | 112 | * @throws \Alpha\Exception\RecordFoundException |
| 113 | + * @return void |
|
| 111 | 114 | */ |
| 112 | 115 | public function loadByAttribute($attribute, $value, $ignoreClassType = false, $loadAttributes = array()); |
| 113 | 116 | |
@@ -131,14 +134,14 @@ discard block |
||
| 131 | 134 | /** |
| 132 | 135 | * Loads all of the objects of this class by the specified attribute into an array which is returned. |
| 133 | 136 | * |
| 134 | - * @param string $atribute The attribute to load the objects by. |
|
| 137 | + * @param string $attribute The attribute to load the objects by. |
|
| 135 | 138 | * @param string $value The value of the attribute to load the objects by. |
| 136 | 139 | * @param int $start The start of the SQL LIMIT clause, useful for pagination. |
| 137 | 140 | * @param int $limit The amount (limit) of objects to load, useful for pagination. |
| 138 | 141 | * @param string $orderBy The name of the field to sort the objects by. |
| 139 | 142 | * @param string $order The order to sort the objects by. |
| 140 | 143 | * @param bool $ignoreClassType Default is false, set to true if you want to load from overloaded tables and ignore the class type. |
| 141 | - * @param array $constructorArgs An optional array of contructor arguements to pass to the records that will be generated and returned. Supports a maximum of 5 arguements. |
|
| 144 | + * @param string[] $constructorArgs An optional array of contructor arguements to pass to the records that will be generated and returned. Supports a maximum of 5 arguements. |
|
| 142 | 145 | * |
| 143 | 146 | * @return array An array containing objects of this type of business object. |
| 144 | 147 | * |
@@ -152,14 +155,14 @@ discard block |
||
| 152 | 155 | /** |
| 153 | 156 | * Loads all of the record objects of this class by the specified attributes into an array which is returned. |
| 154 | 157 | * |
| 155 | - * @param array $atributes The attributes to load the records by. |
|
| 158 | + * @param array $attributes The attributes to load the records by. |
|
| 156 | 159 | * @param array $values The values of the attributes to load the records by. |
| 157 | 160 | * @param int $start The start of the SQL LIMIT clause, useful for pagination. |
| 158 | 161 | * @param int $limit The amount (limit) of records to load, useful for pagination. |
| 159 | 162 | * @param string $orderBy The name of the field to sort the records by. |
| 160 | 163 | * @param string $order The order to sort the records by. |
| 161 | 164 | * @param bool $ignoreClassType Default is false, set to true if you want to load from overloaded tables and ignore the class type |
| 162 | - * @param array $constructorArgs An optional array of contructor arguements to pass to the records that will be generated and returned. Supports a maximum of 5 arguements. |
|
| 165 | + * @param string[] $constructorArgs An optional array of contructor arguements to pass to the records that will be generated and returned. Supports a maximum of 5 arguements. |
|
| 163 | 166 | * |
| 164 | 167 | * @return array An array containing objects of this type of record object. |
| 165 | 168 | * |
@@ -214,6 +217,7 @@ discard block |
||
| 214 | 217 | * @throws \Alpha\Exception\FailedSaveException |
| 215 | 218 | * @throws \Alpha\Exception\LockingException |
| 216 | 219 | * @throws \Alpha\Exception\ValidationException |
| 220 | + * @return void |
|
| 217 | 221 | */ |
| 218 | 222 | public function save(); |
| 219 | 223 | |
@@ -229,6 +233,7 @@ discard block |
||
| 229 | 233 | * @throws \Alpha\Exception\IllegalArguementException |
| 230 | 234 | * @throws \Alpha\Exception\FailedSaveException |
| 231 | 235 | * @throws \Alpha\Exception\LockingException |
| 236 | + * @return void |
|
| 232 | 237 | */ |
| 233 | 238 | public function saveAttribute($attribute, $value); |
| 234 | 239 | |
@@ -238,6 +243,7 @@ discard block |
||
| 238 | 243 | * @since 1.2 |
| 239 | 244 | * |
| 240 | 245 | * @throws \Alpha\Exception\FailedSaveException |
| 246 | + * @return void |
|
| 241 | 247 | */ |
| 242 | 248 | public function saveHistory(); |
| 243 | 249 | |
@@ -247,6 +253,7 @@ discard block |
||
| 247 | 253 | * @since 1.1 |
| 248 | 254 | * |
| 249 | 255 | * @throws \Alpha\Exception\FailedDeleteException |
| 256 | + * @return void |
|
| 250 | 257 | */ |
| 251 | 258 | public function delete(); |
| 252 | 259 | |
@@ -267,6 +274,7 @@ discard block |
||
| 267 | 274 | * @since 1.1 |
| 268 | 275 | * |
| 269 | 276 | * @throws \Alpha\Exception\AlphaException |
| 277 | + * @return void |
|
| 270 | 278 | */ |
| 271 | 279 | public function makeTable(); |
| 272 | 280 | |
@@ -276,6 +284,7 @@ discard block |
||
| 276 | 284 | * @since 1.2 |
| 277 | 285 | * |
| 278 | 286 | * @throws \AlphaException |
| 287 | + * @return void |
|
| 279 | 288 | */ |
| 280 | 289 | public function makeHistoryTable(); |
| 281 | 290 | |
@@ -285,6 +294,7 @@ discard block |
||
| 285 | 294 | * @since 1.1 |
| 286 | 295 | * |
| 287 | 296 | * @throws \Alpha\Exception\AlphaException |
| 297 | + * @return void |
|
| 288 | 298 | */ |
| 289 | 299 | public function rebuildTable(); |
| 290 | 300 | |
@@ -296,6 +306,7 @@ discard block |
||
| 296 | 306 | * @param string $tableName Optional table name, leave blank for the defined table for this class to be dropped |
| 297 | 307 | * |
| 298 | 308 | * @throws \Alpha\Exception\AlphaException |
| 309 | + * @return void |
|
| 299 | 310 | */ |
| 300 | 311 | public function dropTable($tableName = null); |
| 301 | 312 | |
@@ -308,6 +319,7 @@ discard block |
||
| 308 | 319 | * @since 1.1 |
| 309 | 320 | * |
| 310 | 321 | * @throws \Alpha\Exception\AlphaException |
| 322 | + * @return void |
|
| 311 | 323 | */ |
| 312 | 324 | public function addProperty($propName); |
| 313 | 325 | |
@@ -325,7 +337,7 @@ discard block |
||
| 325 | 337 | /** |
| 326 | 338 | * Gets the count from the database for the amount of objects of this class. |
| 327 | 339 | * |
| 328 | - * @param array $atributes The attributes to count the objects by (optional). |
|
| 340 | + * @param array $attributes The attributes to count the objects by (optional). |
|
| 329 | 341 | * @param array $values The values of the attributes to count the objects by (optional). |
| 330 | 342 | * |
| 331 | 343 | * @return int |
@@ -354,6 +366,7 @@ discard block |
||
| 354 | 366 | * @since 1.1 |
| 355 | 367 | * |
| 356 | 368 | * @throws \Alpha\Exception\AlphaException |
| 369 | + * @return void |
|
| 357 | 370 | */ |
| 358 | 371 | public function setEnumOptions(); |
| 359 | 372 | |
@@ -427,12 +440,12 @@ discard block |
||
| 427 | 440 | * @param string $attributeName The name of the attribute to apply the index on. |
| 428 | 441 | * @param string $relatedClass The fully-qualified name of the related class. |
| 429 | 442 | * @param string $relatedClassAttribute The name of the field to relate to on the related class. |
| 430 | - * @param bool $allowNullValues For foreign key indexes that don't allow null values, set this to false (default is true). |
|
| 431 | 443 | * @param string $indexName The optional name for the index, will calculate if not provided. |
| 432 | 444 | * |
| 433 | 445 | * @since 1.1 |
| 434 | 446 | * |
| 435 | 447 | * @throws \Alpha\Exception\FailedIndexCreateException |
| 448 | + * @return void |
|
| 436 | 449 | */ |
| 437 | 450 | public function createForeignIndex($attributeName, $relatedClass, $relatedClassAttribute, $indexName = null); |
| 438 | 451 | |
@@ -446,6 +459,7 @@ discard block |
||
| 446 | 459 | * @since 1.1 |
| 447 | 460 | * |
| 448 | 461 | * @throws \Alpha\Exception\FailedIndexCreateException |
| 462 | + * @return void |
|
| 449 | 463 | */ |
| 450 | 464 | public function createUniqueIndex($attribute1Name, $attribute2Name = '', $attribute3Name = ''); |
| 451 | 465 | |
@@ -455,6 +469,7 @@ discard block |
||
| 455 | 469 | * @since 1.1 |
| 456 | 470 | * |
| 457 | 471 | * @throws \Alpha\Exception\AlphaException |
| 472 | + * @return void |
|
| 458 | 473 | */ |
| 459 | 474 | public function reload(); |
| 460 | 475 | |
@@ -490,6 +505,7 @@ discard block |
||
| 490 | 505 | * @since 1.1 |
| 491 | 506 | * |
| 492 | 507 | * @throws \Alpha\Exception\AlphaException |
| 508 | + * @return void |
|
| 493 | 509 | */ |
| 494 | 510 | public static function begin(); |
| 495 | 511 | |
@@ -499,6 +515,7 @@ discard block |
||
| 499 | 515 | * @since 1.1 |
| 500 | 516 | * |
| 501 | 517 | * @throws \Alpha\Exception\FailedSaveException |
| 518 | + * @return void |
|
| 502 | 519 | */ |
| 503 | 520 | public static function commit(); |
| 504 | 521 | |
@@ -508,6 +525,7 @@ discard block |
||
| 508 | 525 | * @since 1.1 |
| 509 | 526 | * |
| 510 | 527 | * @throws \Alpha\Exception\AlphaException |
| 528 | + * @return void |
|
| 511 | 529 | */ |
| 512 | 530 | public static function rollback(); |
| 513 | 531 | |
@@ -517,6 +535,7 @@ discard block |
||
| 517 | 535 | * @param \Alpha\Model\ActiveRecord $Record |
| 518 | 536 | * |
| 519 | 537 | * @since 1.1 |
| 538 | + * @return void |
|
| 520 | 539 | */ |
| 521 | 540 | public function setRecord($Record); |
| 522 | 541 | |
@@ -549,6 +568,7 @@ discard block |
||
| 549 | 568 | * @throws \Alpha\Exception\AlphaException |
| 550 | 569 | * |
| 551 | 570 | * @since 2.0 |
| 571 | + * @return void |
|
| 552 | 572 | */ |
| 553 | 573 | public static function createDatabase(); |
| 554 | 574 | |
@@ -558,6 +578,7 @@ discard block |
||
| 558 | 578 | * @throws \Alpha\Exception\AlphaException |
| 559 | 579 | * |
| 560 | 580 | * @since 2.0 |
| 581 | + * @return void |
|
| 561 | 582 | */ |
| 562 | 583 | public static function dropDatabase(); |
| 563 | 584 | } |
@@ -2340,11 +2340,11 @@ |
||
| 2340 | 2340 | * parameters. If arrays of attribute names and values are provided, only those will be bound to |
| 2341 | 2341 | * the supplied statement. |
| 2342 | 2342 | * |
| 2343 | - * @param mysqli_stmt $stmt The SQL statement to bind to. |
|
| 2343 | + * @param \mysqli_stmt $stmt The SQL statement to bind to. |
|
| 2344 | 2344 | * @param array Optional array of Record attributes. |
| 2345 | 2345 | * @param array Optional array of Record values. |
| 2346 | 2346 | * |
| 2347 | - * @return mysqli_stmt |
|
| 2347 | + * @return \mysqli_stmt |
|
| 2348 | 2348 | * |
| 2349 | 2349 | * @since 1.1 |
| 2350 | 2350 | */ |
@@ -1014,7 +1014,7 @@ discard block |
||
| 1014 | 1014 | } else { |
| 1015 | 1015 | // there has been an error, so decrement the version number back |
| 1016 | 1016 | $temp = $this->record->getVersionNumber()->getValue(); |
| 1017 | - $this->record->set('version_num', $temp - 1); |
|
| 1017 | + $this->record->set('version_num', $temp-1); |
|
| 1018 | 1018 | |
| 1019 | 1019 | // check for unique violations |
| 1020 | 1020 | if (self::getConnection()->errno == '1062') { |
@@ -1063,7 +1063,7 @@ discard block |
||
| 1063 | 1063 | $this->record->setLastQuery($sqlQuery); |
| 1064 | 1064 | $stmt = self::getConnection()->stmt_init(); |
| 1065 | 1065 | |
| 1066 | - $newVersionNumber = $this->record->getVersionNumber()->getValue() + 1; |
|
| 1066 | + $newVersionNumber = $this->record->getVersionNumber()->getValue()+1; |
|
| 1067 | 1067 | |
| 1068 | 1068 | if ($stmt->prepare($sqlQuery)) { |
| 1069 | 1069 | if ($this->record->getPropObject($attribute) instanceof Integer) { |
@@ -2393,7 +2393,7 @@ discard block |
||
| 2393 | 2393 | |
| 2394 | 2394 | if ($propName == 'version_num') { |
| 2395 | 2395 | $temp = $this->record->getVersionNumber()->getValue(); |
| 2396 | - $this->record->set('version_num', $temp + 1); |
|
| 2396 | + $this->record->set('version_num', $temp+1); |
|
| 2397 | 2397 | $bindingsTypes .= 'i'; |
| 2398 | 2398 | array_push($params, $this->record->getVersionNumber()->getValue()); |
| 2399 | 2399 | } |
@@ -2489,7 +2489,7 @@ discard block |
||
| 2489 | 2489 | $singleQuote1 = mb_strpos($error, "'"); |
| 2490 | 2490 | $singleQuote2 = mb_strrpos($error, "'"); |
| 2491 | 2491 | |
| 2492 | - $value = mb_substr($error, $singleQuote1, ($singleQuote2 - $singleQuote1) + 1); |
|
| 2492 | + $value = mb_substr($error, $singleQuote1, ($singleQuote2-$singleQuote1)+1); |
|
| 2493 | 2493 | self::$logger->debug('<<findOffendingValue ['.$value.'])'); |
| 2494 | 2494 | |
| 2495 | 2495 | return $value; |
@@ -508,7 +508,7 @@ discard block |
||
| 508 | 508 | /** |
| 509 | 509 | * Getter for the Relation value. |
| 510 | 510 | * |
| 511 | - * @return mixed |
|
| 511 | + * @return string |
|
| 512 | 512 | * |
| 513 | 513 | * @since 1.0 |
| 514 | 514 | */ |
@@ -748,7 +748,7 @@ discard block |
||
| 748 | 748 | * Set the taggedClass property to the name of the tagged class when building relations |
| 749 | 749 | * to the TagObject record. |
| 750 | 750 | * |
| 751 | - * @param $taggedClass |
|
| 751 | + * @param string $taggedClass |
|
| 752 | 752 | * |
| 753 | 753 | * @since 1.0 |
| 754 | 754 | */ |
@@ -225,7 +225,7 @@ discard block |
||
| 225 | 225 | // work out how many columns will be in the table |
| 226 | 226 | $reflection = new ReflectionClass(get_class($this->record)); |
| 227 | 227 | $properties = array_keys($reflection->getDefaultProperties()); |
| 228 | - $fields['colCount'] = 1 + count(array_diff($properties, $this->record->getDefaultAttributes(), $this->record->getTransientAttributes())); |
|
| 228 | + $fields['colCount'] = 1+count(array_diff($properties, $this->record->getDefaultAttributes(), $this->record->getTransientAttributes())); |
|
| 229 | 229 | |
| 230 | 230 | // get the class attributes |
| 231 | 231 | $properties = $reflection->getProperties(); |
@@ -246,7 +246,7 @@ discard block |
||
| 246 | 246 | $html .= ' <th>'.$this->record->getDataLabel($propName).'</th>'; |
| 247 | 247 | } |
| 248 | 248 | } else { |
| 249 | - $fields['colCount'] = $fields['colCount'] - 1; |
|
| 249 | + $fields['colCount'] = $fields['colCount']-1; |
|
| 250 | 250 | } |
| 251 | 251 | } |
| 252 | 252 | $html .= '</tr><tr>'; |
@@ -1031,7 +1031,7 @@ discard block |
||
| 1031 | 1031 | if ($viewState->get('markdownTextBoxRows') == '') { |
| 1032 | 1032 | $text = new TextBox($this->record->getPropObject($name), $label, $name, 10); |
| 1033 | 1033 | } else { |
| 1034 | - $text = new TextBox($this->record->getPropObject($name), $label, $name, (integer) $viewState->get('markdownTextBoxRows')); |
|
| 1034 | + $text = new TextBox($this->record->getPropObject($name), $label, $name, (integer)$viewState->get('markdownTextBoxRows')); |
|
| 1035 | 1035 | } |
| 1036 | 1036 | |
| 1037 | 1037 | $html .= $text->render(); |
@@ -103,7 +103,7 @@ discard block |
||
| 103 | 103 | // work out how many columns will be in the table |
| 104 | 104 | $reflection = new \ReflectionClass(get_class($this->record)); |
| 105 | 105 | $properties = array_keys($reflection->getDefaultProperties()); |
| 106 | - $fields['colCount'] = 1 + count(array_diff($properties, $this->record->getDefaultAttributes(), $this->record->getTransientAttributes())); |
|
| 106 | + $fields['colCount'] = 1+count(array_diff($properties, $this->record->getDefaultAttributes(), $this->record->getTransientAttributes())); |
|
| 107 | 107 | |
| 108 | 108 | // get the class attributes |
| 109 | 109 | $properties = $reflection->getProperties(); |
@@ -124,7 +124,7 @@ discard block |
||
| 124 | 124 | $html .= ' <th>'.$this->record->getDataLabel($propName).'</th>'; |
| 125 | 125 | } |
| 126 | 126 | } else { |
| 127 | - $fields['colCount'] = $fields['colCount'] - 1; |
|
| 127 | + $fields['colCount'] = $fields['colCount']-1; |
|
| 128 | 128 | } |
| 129 | 129 | } |
| 130 | 130 | $html .= '</tr><tr>'; |
@@ -253,7 +253,7 @@ |
||
| 253 | 253 | |
| 254 | 254 | $html .= '<tr>'; |
| 255 | 255 | |
| 256 | - $html .= '<td>'.$file.' <em>('.number_format(filesize($this->record->getAttachmentsLocation().'/'.$file) / 1024).' KB)</em></td>'; |
|
| 256 | + $html .= '<td>'.$file.' <em>('.number_format(filesize($this->record->getAttachmentsLocation().'/'.$file)/1024).' KB)</em></td>'; |
|
| 257 | 257 | |
| 258 | 258 | $js = "if(window.jQuery) { |
| 259 | 259 | BootstrapDialog.show({ |
@@ -969,8 +969,8 @@ discard block |
||
| 969 | 969 | $stmt->bindValue(':OID', $this->record->getOID(), SQLITE3_INTEGER); |
| 970 | 970 | |
| 971 | 971 | $temp = $this->record->getVersionNumber()->getValue(); |
| 972 | - $this->record->set('version_num', $temp + 1); |
|
| 973 | - $stmt->bindValue(':version_num', $temp + 1, SQLITE3_INTEGER); |
|
| 972 | + $this->record->set('version_num', $temp+1); |
|
| 973 | + $stmt->bindValue(':version_num', $temp+1, SQLITE3_INTEGER); |
|
| 974 | 974 | |
| 975 | 975 | $stmt->execute(); |
| 976 | 976 | } else { |
@@ -1049,7 +1049,7 @@ discard block |
||
| 1049 | 1049 | } else { |
| 1050 | 1050 | // there has been an error, so decrement the version number back |
| 1051 | 1051 | $temp = $this->record->getVersionNumber()->getValue(); |
| 1052 | - $this->record->set('version_num', $temp - 1); |
|
| 1052 | + $this->record->set('version_num', $temp-1); |
|
| 1053 | 1053 | |
| 1054 | 1054 | throw new FailedSaveException('Failed to save object, SQLite error is ['.self::getLastDatabaseError().'], query ['.$this->record->getLastQuery().']'); |
| 1055 | 1055 | } |
@@ -1093,7 +1093,7 @@ discard block |
||
| 1093 | 1093 | $this->record->setLastQuery($sqlQuery); |
| 1094 | 1094 | $stmt = self::getConnection()->prepare($sqlQuery); |
| 1095 | 1095 | |
| 1096 | - $newVersionNumber = $this->record->getVersionNumber()->getValue() + 1; |
|
| 1096 | + $newVersionNumber = $this->record->getVersionNumber()->getValue()+1; |
|
| 1097 | 1097 | |
| 1098 | 1098 | if ($stmt instanceof SQLite3Stmt) { |
| 1099 | 1099 | if ($this->record->getPropObject($attribute) instanceof Integer) { |