@@ -38,7 +38,6 @@ discard block |
||
| 38 | 38 | /** |
| 39 | 39 | * Injector injection point for database controller |
| 40 | 40 | * |
| 41 | - * @param SS_Database $connector |
|
| 42 | 41 | */ |
| 43 | 42 | public function setDatabase(SS_Database $database) { |
| 44 | 43 | $this->database = $database; |
@@ -104,6 +103,7 @@ discard block |
||
| 104 | 103 | * |
| 105 | 104 | * @var callable $callback |
| 106 | 105 | * @throws Exception |
| 106 | + * @param Closure $callback |
|
| 107 | 107 | */ |
| 108 | 108 | public function schemaUpdate($callback) { |
| 109 | 109 | // Begin schema update |
@@ -476,7 +476,7 @@ discard block |
||
| 476 | 476 | /** |
| 477 | 477 | * Given an index spec determines the index type |
| 478 | 478 | * |
| 479 | - * @param array|string $spec |
|
| 479 | + * @param string $spec |
|
| 480 | 480 | * @return string |
| 481 | 481 | */ |
| 482 | 482 | protected function determineIndexType($spec) { |
@@ -544,7 +544,7 @@ discard block |
||
| 544 | 544 | /** |
| 545 | 545 | * Returns true if the given table is exists in the current database |
| 546 | 546 | * |
| 547 | - * @param string $table Name of table to check |
|
| 547 | + * @param string $tableName Name of table to check |
|
| 548 | 548 | * @return boolean Flag indicating existence of table |
| 549 | 549 | */ |
| 550 | 550 | abstract public function hasTable($tableName); |
@@ -115,6 +115,9 @@ |
||
| 115 | 115 | $this->query("ALTER TABLE \"$tableName\" $alterations"); |
| 116 | 116 | } |
| 117 | 117 | |
| 118 | + /** |
|
| 119 | + * @param string $tableName |
|
| 120 | + */ |
|
| 118 | 121 | public function isView($tableName) { |
| 119 | 122 | $info = $this->query("SHOW /*!50002 FULL*/ TABLES LIKE '$tableName'")->record(); |
| 120 | 123 | return $info && strtoupper($info['Table_type']) == 'VIEW'; |
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | /** |
| 108 | 108 | * Gets the url to return to after build |
| 109 | 109 | * |
| 110 | - * @return string|null |
|
| 110 | + * @return string |
|
| 111 | 111 | */ |
| 112 | 112 | protected function getReturnURL() { |
| 113 | 113 | $url = $this->request->getVar('returnURL'); |
@@ -152,7 +152,7 @@ discard block |
||
| 152 | 152 | /** |
| 153 | 153 | * Returns the timestamp of the time that the database was last built |
| 154 | 154 | * |
| 155 | - * @return string Returns the timestamp of the time that the database was |
|
| 155 | + * @return integer|null Returns the timestamp of the time that the database was |
|
| 156 | 156 | * last built |
| 157 | 157 | */ |
| 158 | 158 | public static function lastBuilt() { |
@@ -47,6 +47,7 @@ |
||
| 47 | 47 | * |
| 48 | 48 | * @param DataObject (Optional) |
| 49 | 49 | * @param DataObject |
| 50 | + * @param DataObject|null $fromRecord |
|
| 50 | 51 | */ |
| 51 | 52 | public function __construct($fromRecord, DataObject $toRecord) { |
| 52 | 53 | if(!$toRecord) user_error("DataDifferencer constructed without a toRecord", E_USER_WARNING); |
@@ -217,9 +217,8 @@ discard block |
||
| 217 | 217 | * Given the database configuration, this method will create the correct |
| 218 | 218 | * subclass of {@link SS_Database}. |
| 219 | 219 | * |
| 220 | - * @param array $database A map of options. The 'type' is the name of the subclass of SS_Database to use. For the |
|
| 220 | + * @param array $databaseConfig A map of options. The 'type' is the name of the subclass of SS_Database to use. For the |
|
| 221 | 221 | * rest of the options, see the specific class. |
| 222 | - * @param string $name identifier for the connection |
|
| 223 | 222 | * |
| 224 | 223 | * @return SS_Database |
| 225 | 224 | */ |
@@ -413,7 +412,7 @@ discard block |
||
| 413 | 412 | |
| 414 | 413 | /** |
| 415 | 414 | * Create a new table. |
| 416 | - * @param string $tableName The name of the table |
|
| 415 | + * @param string $table The name of the table |
|
| 417 | 416 | * @param array$fields A map of field names to field types |
| 418 | 417 | * @param array $indexes A map of indexes |
| 419 | 418 | * @param array $options An map of additional options. The available keys are as follows: |
@@ -500,6 +499,8 @@ discard block |
||
| 500 | 499 | |
| 501 | 500 | /** |
| 502 | 501 | * @deprecated since version 4.0 Use DB::require_field instead |
| 502 | + * @param string $table |
|
| 503 | + * @param string $field |
|
| 503 | 504 | */ |
| 504 | 505 | public static function requireField($table, $field, $spec) { |
| 505 | 506 | Deprecation::notice('4.0', 'Use DB::require_field instead'); |
@@ -563,7 +564,7 @@ discard block |
||
| 563 | 564 | /** |
| 564 | 565 | * Checks a table's integrity and repairs it if necessary. |
| 565 | 566 | * |
| 566 | - * @param string $tableName The name of the table. |
|
| 567 | + * @param string $table The name of the table. |
|
| 567 | 568 | * @return boolean Return true if the table has integrity after the method is complete. |
| 568 | 569 | */ |
| 569 | 570 | public static function check_and_repair_table($table) { |
@@ -205,6 +205,9 @@ |
||
| 205 | 205 | return null; |
| 206 | 206 | } |
| 207 | 207 | |
| 208 | + /** |
|
| 209 | + * @param string $field |
|
| 210 | + */ |
|
| 208 | 211 | public function hasField($field) { |
| 209 | 212 | $fields = $this->compositeDatabaseFields(); |
| 210 | 213 | return isset($fields[$field]); |
@@ -23,6 +23,9 @@ discard block |
||
| 23 | 23 | */ |
| 24 | 24 | private static $currency_symbol = '$'; |
| 25 | 25 | |
| 26 | + /** |
|
| 27 | + * @param string $name |
|
| 28 | + */ |
|
| 26 | 29 | public function __construct($name = null, $wholeSize = 9, $decimalSize = 2, $defaultValue = 0) { |
| 27 | 30 | parent::__construct($name, $wholeSize, $decimalSize, $defaultValue); |
| 28 | 31 | } |
@@ -46,6 +49,9 @@ discard block |
||
| 46 | 49 | else return $val; |
| 47 | 50 | } |
| 48 | 51 | |
| 52 | + /** |
|
| 53 | + * @param string $value |
|
| 54 | + */ |
|
| 49 | 55 | public function setValue($value, $record = null, $markChanged = true) { |
| 50 | 56 | $matches = null; |
| 51 | 57 | if(is_numeric($value)) { |
@@ -20,6 +20,9 @@ discard block |
||
| 20 | 20 | */ |
| 21 | 21 | class Date extends DBField { |
| 22 | 22 | |
| 23 | + /** |
|
| 24 | + * @param string|null $value |
|
| 25 | + */ |
|
| 23 | 26 | public function setValue($value, $record = null, $markChanged = true) { |
| 24 | 27 | if($value === false || $value === null || (is_string($value) && !strlen($value))) { |
| 25 | 28 | // don't try to evaluate empty values with strtotime() below, as it returns "1970-01-01" when it should be |
@@ -102,7 +105,7 @@ discard block |
||
| 102 | 105 | |
| 103 | 106 | /** |
| 104 | 107 | * Returns the day of the month. |
| 105 | - * @param boolean $includeOrdinals Include ordinal suffix to day, e.g. "th" or "rd" |
|
| 108 | + * @param boolean $includeOrdinal Include ordinal suffix to day, e.g. "th" or "rd" |
|
| 106 | 109 | * @return string |
| 107 | 110 | */ |
| 108 | 111 | public function DayOfMonth($includeOrdinal = false) { |
@@ -156,7 +159,7 @@ discard block |
||
| 156 | 159 | * Return a date formatted as per a CMS user's settings. |
| 157 | 160 | * |
| 158 | 161 | * @param Member $member |
| 159 | - * @return boolean | string A date formatted as per user-defined settings. |
|
| 162 | + * @return false|string | string A date formatted as per user-defined settings. |
|
| 160 | 163 | */ |
| 161 | 164 | public function FormatFromSettings($member = null) { |
| 162 | 165 | require_once 'Zend/Date.php'; |
@@ -97,7 +97,7 @@ discard block |
||
| 97 | 97 | * Return a date and time formatted as per a CMS user's settings. |
| 98 | 98 | * |
| 99 | 99 | * @param Member $member |
| 100 | - * @return boolean | string A time and date pair formatted as per user-defined settings. |
|
| 100 | + * @return false|string | string A time and date pair formatted as per user-defined settings. |
|
| 101 | 101 | */ |
| 102 | 102 | public function FormatFromSettings($member = null) { |
| 103 | 103 | require_once 'Zend/Date.php'; |
@@ -176,7 +176,7 @@ discard block |
||
| 176 | 176 | * Use {@link clear_mock_now()} to revert to the current system date. |
| 177 | 177 | * Caution: This sets a fixed date that doesn't increment with time. |
| 178 | 178 | * |
| 179 | - * @param SS_Datetime|string $datetime Either in object format, or as a SS_Datetime compatible string. |
|
| 179 | + * @param string $datetime Either in object format, or as a SS_Datetime compatible string. |
|
| 180 | 180 | */ |
| 181 | 181 | public static function set_mock_now($datetime) { |
| 182 | 182 | if($datetime instanceof SS_Datetime) { |