@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | * Set a different instance than {@link Upload_Validator} |
| 115 | 115 | * for this upload session. |
| 116 | 116 | * |
| 117 | - * @param object $validator |
|
| 117 | + * @param Upload_Validator $validator |
|
| 118 | 118 | */ |
| 119 | 119 | public function setValidator($validator) { |
| 120 | 120 | $this->validator = $validator; |
@@ -363,7 +363,7 @@ discard block |
||
| 363 | 363 | /** |
| 364 | 364 | * Determines wether previous operations caused an error. |
| 365 | 365 | * |
| 366 | - * @return boolean |
|
| 366 | + * @return integer |
|
| 367 | 367 | */ |
| 368 | 368 | public function isError() { |
| 369 | 369 | return (count($this->errors)); |
@@ -118,6 +118,7 @@ discard block |
||
| 118 | 118 | * or TabSet.Tab.Subtab. |
| 119 | 119 | * This function will create any missing tabs. |
| 120 | 120 | * @param array $fields An array of {@link FormField} objects. |
| 121 | + * @param string $insertBefore |
|
| 121 | 122 | */ |
| 122 | 123 | public function addFieldsToTab($tabName, $fields, $insertBefore = null) { |
| 123 | 124 | $this->flushFieldsCache(); |
@@ -157,7 +158,7 @@ discard block |
||
| 157 | 158 | * Removes a number of fields from a Tab/TabSet within this FieldList. |
| 158 | 159 | * |
| 159 | 160 | * @param string $tabName The name of the Tab or TabSet field |
| 160 | - * @param array $fields A list of fields, e.g. array('Name', 'Email') |
|
| 161 | + * @param string[] $fields A list of fields, e.g. array('Name', 'Email') |
|
| 161 | 162 | */ |
| 162 | 163 | public function removeFieldsFromTab($tabName, $fields) { |
| 163 | 164 | $this->flushFieldsCache(); |
@@ -440,6 +441,7 @@ discard block |
||
| 440 | 441 | |
| 441 | 442 | /** |
| 442 | 443 | * Handler method called before the FieldList is going to be manipulated. |
| 444 | + * @param FormField $item |
|
| 443 | 445 | */ |
| 444 | 446 | protected function onBeforeInsert($item) { |
| 445 | 447 | $this->flushFieldsCache(); |
@@ -512,6 +514,7 @@ discard block |
||
| 512 | 514 | * Transform this FieldList with a given tranform method, |
| 513 | 515 | * e.g. $this->transform(new ReadonlyTransformation()) |
| 514 | 516 | * |
| 517 | + * @param ReadonlyTransformation $trans |
|
| 515 | 518 | * @return FieldList |
| 516 | 519 | */ |
| 517 | 520 | public function transform($trans) { |
@@ -531,6 +534,9 @@ discard block |
||
| 531 | 534 | else return $this; |
| 532 | 535 | } |
| 533 | 536 | |
| 537 | + /** |
|
| 538 | + * @param CompositeField $field |
|
| 539 | + */ |
|
| 534 | 540 | public function setContainerField($field) { |
| 535 | 541 | $this->containerField = $field; |
| 536 | 542 | return $this; |
@@ -549,6 +555,7 @@ discard block |
||
| 549 | 555 | * Transform the named field into a readonly feld. |
| 550 | 556 | * |
| 551 | 557 | * @param string|FormField |
| 558 | + * @param string $field |
|
| 552 | 559 | */ |
| 553 | 560 | public function makeFieldReadonly($field) { |
| 554 | 561 | $fieldName = ($field instanceof FormField) ? $field->getName() : $field; |
@@ -598,6 +605,7 @@ discard block |
||
| 598 | 605 | * the children collection. Doesn't work recursively. |
| 599 | 606 | * |
| 600 | 607 | * @param string|FormField |
| 608 | + * @param string $field |
|
| 601 | 609 | * @return int Position in children collection (first position starts with 0). Returns FALSE if the field can't |
| 602 | 610 | * be found. |
| 603 | 611 | */ |
@@ -645,7 +653,7 @@ discard block |
||
| 645 | 653 | * Support function for backwards compatibility purposes. |
| 646 | 654 | * Caution: Volatile API, might be removed in 3.1 or later. |
| 647 | 655 | * |
| 648 | - * @param String $tabname Path to a tab, e.g. "Root.Content.Main" |
|
| 656 | + * @param string $name Path to a tab, e.g. "Root.Content.Main" |
|
| 649 | 657 | * @return String Rewritten path, based on {@link tabPathRewrites} |
| 650 | 658 | */ |
| 651 | 659 | protected function rewriteTabPath($name) { |
@@ -185,6 +185,7 @@ discard block |
||
| 185 | 185 | |
| 186 | 186 | /** |
| 187 | 187 | * @param String |
| 188 | + * @param string $class |
|
| 188 | 189 | */ |
| 189 | 190 | public function setItemRequestClass($class) { |
| 190 | 191 | $this->itemRequestClass = $class; |
@@ -292,6 +293,9 @@ discard block |
||
| 292 | 293 | parent::__construct(); |
| 293 | 294 | } |
| 294 | 295 | |
| 296 | + /** |
|
| 297 | + * @param string $action |
|
| 298 | + */ |
|
| 295 | 299 | public function Link($action = null) { |
| 296 | 300 | return Controller::join_links($this->gridField->Link('item'), |
| 297 | 301 | $this->record->ID ? $this->record->ID : 'new', $action); |
@@ -320,6 +324,9 @@ discard block |
||
| 320 | 324 | } |
| 321 | 325 | } |
| 322 | 326 | |
| 327 | + /** |
|
| 328 | + * @param SS_HTTPRequest $request |
|
| 329 | + */ |
|
| 323 | 330 | public function edit($request) { |
| 324 | 331 | $controller = $this->getToplevelController(); |
| 325 | 332 | $form = $this->ItemEditForm($this->gridField, $request); |
@@ -517,6 +524,9 @@ discard block |
||
| 517 | 524 | return $c; |
| 518 | 525 | } |
| 519 | 526 | |
| 527 | + /** |
|
| 528 | + * @return string |
|
| 529 | + */ |
|
| 520 | 530 | protected function getBackLink(){ |
| 521 | 531 | // TODO Coupling with CMS |
| 522 | 532 | $backlink = ''; |
@@ -618,6 +628,9 @@ discard block |
||
| 618 | 628 | } |
| 619 | 629 | } |
| 620 | 630 | |
| 631 | + /** |
|
| 632 | + * @param integer $errorCode |
|
| 633 | + */ |
|
| 621 | 634 | public function httpError($errorCode, $errorMessage = null) { |
| 622 | 635 | $controller = $this->getToplevelController(); |
| 623 | 636 | return $controller->httpError($errorCode, $errorMessage); |
@@ -608,6 +608,11 @@ |
||
| 608 | 608 | 'ObjectTest_Extending_Extension' |
| 609 | 609 | ); |
| 610 | 610 | |
| 611 | + /** |
|
| 612 | + * @param integer $first |
|
| 613 | + * @param integer $second |
|
| 614 | + * @param integer $third |
|
| 615 | + */ |
|
| 611 | 616 | public function getResults(&$first, &$second, &$third) { |
| 612 | 617 | // Before extending should be invoked second |
| 613 | 618 | $this->beforeExtending('updateResult', function(&$first, &$second, &$third) { |
@@ -634,6 +634,9 @@ discard block |
||
| 634 | 634 | } |
| 635 | 635 | |
| 636 | 636 | |
| 637 | + /** |
|
| 638 | + * @param string $fileID |
|
| 639 | + */ |
|
| 637 | 640 | public function getOriginalFilename($fileID) { |
| 638 | 641 | return parent::getOriginalFilename($fileID); |
| 639 | 642 | } |
@@ -642,6 +645,9 @@ discard block |
||
| 642 | 645 | return parent::removeVariant($fileID); |
| 643 | 646 | } |
| 644 | 647 | |
| 648 | + /** |
|
| 649 | + * @param null|string $variant |
|
| 650 | + */ |
|
| 645 | 651 | public function getDefaultConflictResolution($variant) { |
| 646 | 652 | return parent::getDefaultConflictResolution($variant); |
| 647 | 653 | } |
@@ -4,7 +4,6 @@ |
||
| 4 | 4 | use League\Flysystem\AdapterInterface; |
| 5 | 5 | use League\Flysystem\Filesystem; |
| 6 | 6 | use SilverStripe\Filesystem\Flysystem\FlysystemAssetStore; |
| 7 | -use SilverStripe\Filesystem\Flysystem\FlysystemUrlPlugin; |
|
| 8 | 7 | use SilverStripe\Filesystem\Flysystem\ProtectedAssetAdapter; |
| 9 | 8 | use SilverStripe\Filesystem\Flysystem\PublicAssetAdapter; |
| 10 | 9 | use SilverStripe\Filesystem\Storage\AssetContainer; |
@@ -2,9 +2,6 @@ |
||
| 2 | 2 | |
| 3 | 3 | use Filesystem as SS_Filesystem; |
| 4 | 4 | use League\Flysystem\Filesystem; |
| 5 | -use SilverStripe\Filesystem\Flysystem\AssetAdapter; |
|
| 6 | -use SilverStripe\Filesystem\Flysystem\FlysystemAssetStore; |
|
| 7 | -use SilverStripe\Filesystem\Flysystem\FlysystemUrlPlugin; |
|
| 8 | 5 | |
| 9 | 6 | /** |
| 10 | 7 | * @package framework |
@@ -50,14 +50,7 @@ discard block |
||
| 50 | 50 | /** |
| 51 | 51 | * Gets a field from this object. |
| 52 | 52 | * |
| 53 | - * @param string $field |
|
| 54 | - * |
|
| 55 | - * If the value is an object but not an instance of |
|
| 56 | - * ViewableData, it will be converted recursively to an |
|
| 57 | - * ArrayData. |
|
| 58 | - * |
|
| 59 | - * If the value is an associative array, it will likewise be |
|
| 60 | - * converted recursively to an ArrayData. |
|
| 53 | + * @param string $f |
|
| 61 | 54 | */ |
| 62 | 55 | public function getField($f) { |
| 63 | 56 | $value = $this->array[$f]; |
@@ -83,6 +76,7 @@ discard block |
||
| 83 | 76 | * Check array to see if field isset |
| 84 | 77 | * |
| 85 | 78 | * @param string Field Key |
| 79 | + * @param string $f |
|
| 86 | 80 | * @return bool |
| 87 | 81 | */ |
| 88 | 82 | public function hasField($f) { |
@@ -27,6 +27,9 @@ |
||
| 27 | 27 | return $this->can(__FUNCTION__, $member, $context); |
| 28 | 28 | } |
| 29 | 29 | |
| 30 | + /** |
|
| 31 | + * @param string $perm |
|
| 32 | + */ |
|
| 30 | 33 | public function can($perm, $member = null, $context = array()) { |
| 31 | 34 | $perms = [ |
| 32 | 35 | "PERM_{$perm}", |
@@ -139,6 +139,7 @@ discard block |
||
| 139 | 139 | |
| 140 | 140 | /** |
| 141 | 141 | * Set the manifest to be used to look up test classes by helper functions |
| 142 | + * @param SS_ClassManifest $manifest |
|
| 142 | 143 | */ |
| 143 | 144 | public static function set_test_class_manifest($manifest) { |
| 144 | 145 | self::$test_class_manifest = $manifest; |
@@ -422,7 +423,7 @@ discard block |
||
| 422 | 423 | * Will collate all IDs form all fixtures if multiple fixtures are provided. |
| 423 | 424 | * |
| 424 | 425 | * @param string $className |
| 425 | - * @return array A map of fixture-identifier => object-id |
|
| 426 | + * @return A A map of fixture-identifier => object-id |
|
| 426 | 427 | */ |
| 427 | 428 | protected function allFixtureIDs($className) { |
| 428 | 429 | return $this->getFixtureFactory()->getIds($className); |
@@ -582,10 +583,10 @@ discard block |
||
| 582 | 583 | /** |
| 583 | 584 | * Assert that the matching email was sent since the last call to clearEmails() |
| 584 | 585 | * All of the parameters can either be a string, or, if they start with "/", a PREG-compatible regular expression. |
| 585 | - * @param $to |
|
| 586 | + * @param string $to |
|
| 586 | 587 | * @param $from |
| 587 | - * @param $subject |
|
| 588 | - * @param $content |
|
| 588 | + * @param string $subject |
|
| 589 | + * @param string $content |
|
| 589 | 590 | * @return array Contains the keys: 'type', 'to', 'from', 'subject', 'content', 'plainContent', 'attachedFiles', |
| 590 | 591 | * 'customHeaders', 'htmlContent', inlineImages' |
| 591 | 592 | */ |
@@ -753,7 +754,7 @@ discard block |
||
| 753 | 754 | * @param string $expectedSQL |
| 754 | 755 | * @param string $actualSQL |
| 755 | 756 | * @param string $message |
| 756 | - * @param float $delta |
|
| 757 | + * @param integer $delta |
|
| 757 | 758 | * @param integer $maxDepth |
| 758 | 759 | * @param boolean $canonicalize |
| 759 | 760 | * @param boolean $ignoreCase |
@@ -1039,9 +1040,9 @@ discard block |
||
| 1039 | 1040 | /** |
| 1040 | 1041 | * Test against a theme. |
| 1041 | 1042 | * |
| 1042 | - * @param $themeBaseDir string - themes directory |
|
| 1043 | - * @param $theme string - theme name |
|
| 1044 | - * @param $callback Closure |
|
| 1043 | + * @param string $themeBaseDir string - themes directory |
|
| 1044 | + * @param string $theme string - theme name |
|
| 1045 | + * @param Closure $callback Closure |
|
| 1045 | 1046 | */ |
| 1046 | 1047 | protected function useTestTheme($themeBaseDir, $theme, $callback) { |
| 1047 | 1048 | Config::nest(); |