@@ -379,7 +379,7 @@ discard block |
||
379 | 379 | * |
380 | 380 | * Note that columns may be double quoted as per ANSI sql standard |
381 | 381 | * |
382 | - * @return DataList |
|
382 | + * @return ArrayList |
|
383 | 383 | * @see SS_List::sort() |
384 | 384 | * @example $list->sort('Name'); // default ASC sorting |
385 | 385 | * @example $list->sort('Name DESC'); // DESC sorting |
@@ -515,7 +515,7 @@ discard block |
||
515 | 515 | * $list = $list->filterAny(array('Name'=>array('bob','phil'), 'Age'=>array(21, 43))); |
516 | 516 | * |
517 | 517 | * @param string|array See {@link filter()} |
518 | - * @return DataList |
|
518 | + * @return ArrayList |
|
519 | 519 | */ |
520 | 520 | public function filterAny() { |
521 | 521 | $keepUs = call_user_func_array(array($this, 'normaliseFilterArgs'), func_get_args()); |
@@ -666,7 +666,6 @@ discard block |
||
666 | 666 | /** |
667 | 667 | * Returns whether an item with $key exists |
668 | 668 | * |
669 | - * @param mixed $key |
|
670 | 669 | * @return bool |
671 | 670 | */ |
672 | 671 | public function offsetExists($offset) { |
@@ -676,7 +675,6 @@ discard block |
||
676 | 675 | /** |
677 | 676 | * Returns item stored in list with index $key |
678 | 677 | * |
679 | - * @param mixed $key |
|
680 | 678 | * @return DataObject |
681 | 679 | */ |
682 | 680 | public function offsetGet($offset) { |
@@ -686,7 +684,6 @@ discard block |
||
686 | 684 | /** |
687 | 685 | * Set an item with the key in $key |
688 | 686 | * |
689 | - * @param mixed $key |
|
690 | 687 | * @param mixed $value |
691 | 688 | */ |
692 | 689 | public function offsetSet($offset, $value) { |
@@ -700,7 +697,6 @@ discard block |
||
700 | 697 | /** |
701 | 698 | * Unset an item with the key in $key |
702 | 699 | * |
703 | - * @param mixed $key |
|
704 | 700 | */ |
705 | 701 | public function offsetUnset($offset) { |
706 | 702 | unset($this->items[$offset]); |
@@ -118,6 +118,11 @@ discard block |
||
118 | 118 | ); |
119 | 119 | } |
120 | 120 | |
121 | + /** |
|
122 | + * @param Requirements_Backend $backend |
|
123 | + * @param boolean $async |
|
124 | + * @param boolean $defer |
|
125 | + */ |
|
121 | 126 | protected function setupCombinedRequirementsJavascriptAsyncDefer($backend, $async, $defer) { |
122 | 127 | $basePath = $this->getCurrentRelativePath(); |
123 | 128 | $this->setupRequirements($backend); |
@@ -805,6 +810,10 @@ discard block |
||
805 | 810 | } |
806 | 811 | } |
807 | 812 | |
813 | + /** |
|
814 | + * @param Requirements_Backend $backend |
|
815 | + * @param string $type |
|
816 | + */ |
|
808 | 817 | public function assertFileNotIncluded($backend, $type, $files) { |
809 | 818 | $includedFiles = $this->getBackendFiles($backend, $type); |
810 | 819 | if(is_array($files)) { |