@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | /** |
64 | 64 | * Assign a new configuration instance or identifier |
65 | 65 | * |
66 | - * @param string|HTMLEditorConfig $config |
|
66 | + * @param string $config |
|
67 | 67 | * @return $this |
68 | 68 | */ |
69 | 69 | public function setEditorConfig($config) { |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | * |
78 | 78 | * @param string $name The internal field name, passed to forms. |
79 | 79 | * @param string $title The human-readable field label. |
80 | - * @param mixed $value The value of the field. |
|
80 | + * @param integer $value The value of the field. |
|
81 | 81 | * @param string $config HTMLEditorConfig identifier to be used. Default to the active one. |
82 | 82 | */ |
83 | 83 | public function __construct($name, $title = null, $value = '', $config = null) { |
@@ -118,6 +118,9 @@ discard block |
||
118 | 118 | $record->{$this->name} = $htmlValue->getContent(); |
119 | 119 | } |
120 | 120 | |
121 | + /** |
|
122 | + * @param string|null $value |
|
123 | + */ |
|
121 | 124 | public function setValue($value) { |
122 | 125 | // Regenerate links prior to preview, so that the editor can see them. |
123 | 126 | $value = Image::regenerate_html_links($value); |
@@ -185,6 +188,10 @@ discard block |
||
185 | 188 | |
186 | 189 | protected $controller, $name; |
187 | 190 | |
191 | + /** |
|
192 | + * @param Controller|null $controller |
|
193 | + * @param string $name |
|
194 | + */ |
|
188 | 195 | public function __construct($controller, $name) { |
189 | 196 | parent::__construct(); |
190 | 197 | |
@@ -203,7 +210,7 @@ discard block |
||
203 | 210 | /** |
204 | 211 | * Searches the SiteTree for display in the dropdown |
205 | 212 | * |
206 | - * @return callback |
|
213 | + * @return SilverStripe\ORM\DataList |
|
207 | 214 | */ |
208 | 215 | public function siteTreeSearchCallback($sourceObject, $labelField, $search) { |
209 | 216 | return DataObject::get($sourceObject)->filterAny(array( |
@@ -583,7 +590,7 @@ discard block |
||
583 | 590 | /** |
584 | 591 | * Find all anchors available on the given page. |
585 | 592 | * |
586 | - * @return array |
|
593 | + * @return string |
|
587 | 594 | * @throws SS_HTTPResponse_Exception |
588 | 595 | */ |
589 | 596 | public function getanchors() { |
@@ -646,7 +653,7 @@ discard block |
||
646 | 653 | * Gets files filtered by a given parent with the allowed extensions |
647 | 654 | * |
648 | 655 | * @param int $parentID |
649 | - * @return DataList |
|
656 | + * @return SilverStripe\ORM\DataList |
|
650 | 657 | */ |
651 | 658 | protected function getFiles($parentID = null) { |
652 | 659 | $exts = $this->getAllowedExtensions(); |
@@ -1159,7 +1166,7 @@ discard block |
||
1159 | 1166 | } |
1160 | 1167 | |
1161 | 1168 | /** |
1162 | - * @return AdapterInterface |
|
1169 | + * @return Embed |
|
1163 | 1170 | */ |
1164 | 1171 | public function getEmbed() { |
1165 | 1172 | return $this->embed; |
@@ -105,6 +105,9 @@ |
||
105 | 105 | return $this->descriptionTemplate; |
106 | 106 | } |
107 | 107 | |
108 | + /** |
|
109 | + * @param string $template |
|
110 | + */ |
|
108 | 111 | public function setDescriptionTemplate($template) { |
109 | 112 | $this->descriptionTemplate = $template; |
110 | 113 | } |
@@ -389,7 +389,7 @@ discard block |
||
389 | 389 | * |
390 | 390 | * Note that columns may be double quoted as per ANSI sql standard |
391 | 391 | * |
392 | - * @return DataList |
|
392 | + * @return ArrayList |
|
393 | 393 | * @see SS_List::sort() |
394 | 394 | * @example $list->sort('Name'); // default ASC sorting |
395 | 395 | * @example $list->sort('Name DESC'); // DESC sorting |
@@ -525,7 +525,7 @@ discard block |
||
525 | 525 | * $list = $list->filterAny(array('Name'=>array('bob','phil'), 'Age'=>array(21, 43))); |
526 | 526 | * |
527 | 527 | * @param string|array See {@link filter()} |
528 | - * @return DataList |
|
528 | + * @return ArrayList |
|
529 | 529 | */ |
530 | 530 | public function filterAny() { |
531 | 531 | $keepUs = call_user_func_array(array($this, 'normaliseFilterArgs'), func_get_args()); |
@@ -676,7 +676,6 @@ discard block |
||
676 | 676 | /** |
677 | 677 | * Returns whether an item with $key exists |
678 | 678 | * |
679 | - * @param mixed $key |
|
680 | 679 | * @return bool |
681 | 680 | */ |
682 | 681 | public function offsetExists($offset) { |
@@ -686,7 +685,6 @@ discard block |
||
686 | 685 | /** |
687 | 686 | * Returns item stored in list with index $key |
688 | 687 | * |
689 | - * @param mixed $key |
|
690 | 688 | * @return DataObject |
691 | 689 | */ |
692 | 690 | public function offsetGet($offset) { |
@@ -696,7 +694,6 @@ discard block |
||
696 | 694 | /** |
697 | 695 | * Set an item with the key in $key |
698 | 696 | * |
699 | - * @param mixed $key |
|
700 | 697 | * @param mixed $value |
701 | 698 | */ |
702 | 699 | public function offsetSet($offset, $value) { |
@@ -710,7 +707,6 @@ discard block |
||
710 | 707 | /** |
711 | 708 | * Unset an item with the key in $key |
712 | 709 | * |
713 | - * @param mixed $key |
|
714 | 710 | */ |
715 | 711 | public function offsetUnset($offset) { |
716 | 712 | unset($this->items[$offset]); |
@@ -5,7 +5,6 @@ |
||
5 | 5 | use Config; |
6 | 6 | use Exception; |
7 | 7 | use PaginatedList; |
8 | -use SilverStripe\Framework\Core\Configurable; |
|
9 | 8 | use SilverStripe\ORM\DataList; |
10 | 9 | use SilverStripe\ORM\ArrayList; |
11 | 10 |
@@ -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'; |
@@ -74,8 +74,8 @@ |
||
74 | 74 | |
75 | 75 | /** |
76 | 76 | * Hook the result-set given into a Query class, suitable for use by SilverStripe. |
77 | - * @param mysqli_stmt $statement The related statement, if present |
|
78 | - * @param mysqli_result $metadata The metadata for this statement |
|
77 | + * @param \mysqli_stmt $statement The related statement, if present |
|
78 | + * @param \mysqli_result $metadata The metadata for this statement |
|
79 | 79 | */ |
80 | 80 | public function __construct($statement, $metadata) { |
81 | 81 | $this->statement = $statement; |
@@ -320,7 +320,7 @@ |
||
320 | 320 | * @param int $errorLevel |
321 | 321 | * @param string $sql |
322 | 322 | * @param array $parameters |
323 | - * @return \PDOQuery |
|
323 | + * @return PDOQuery|null |
|
324 | 324 | */ |
325 | 325 | protected function prepareResults($statement, $errorLevel, $sql, $parameters = array()) { |
326 | 326 |
@@ -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() { |
@@ -4,11 +4,9 @@ |
||
4 | 4 | |
5 | 5 | use Deprecation; |
6 | 6 | use SQLExpression; |
7 | - |
|
8 | 7 | use InvalidArgumentException; |
9 | 8 | use Config; |
10 | 9 | use LogicException; |
11 | - |
|
12 | 10 | use Injector; |
13 | 11 | use SilverStripe\Model\Connect\Database; |
14 | 12 | use SilverStripe\Control\Director; |
@@ -78,9 +78,15 @@ |
||
78 | 78 | public function can($member) { |
79 | 79 | } |
80 | 80 | |
81 | + /** |
|
82 | + * @param \SilverStripe\Security\Member|null $member |
|
83 | + */ |
|
81 | 84 | public function canEdit($member) { |
82 | 85 | } |
83 | 86 | |
87 | + /** |
|
88 | + * @param \SilverStripe\Security\Member|null $member |
|
89 | + */ |
|
84 | 90 | public function canDelete($member) { |
85 | 91 | } |
86 | 92 |