Completed
Pull Request — 3.4 (#6199)
by Jono
10:15
created
thirdparty/Zend/Log/Writer/Stream.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -48,7 +48,7 @@
 block discarded – undo
48 48
      *
49 49
      * @param array|string|resource $streamOrUrl Stream or URL to open as a stream
50 50
      * @param string|null $mode Mode, only applicable if a URL is given
51
-     * @return void
51
+     * @return null|Zend_Log_Writer_Abstract
52 52
      * @throws Zend_Log_Exception
53 53
      */
54 54
     public function __construct($streamOrUrl, $mode = null)
Please login to merge, or discard this patch.
view/Requirements.php 1 patch
Doc Comments   +6 added lines, -4 removed lines patch added patch discarded remove patch
@@ -49,6 +49,7 @@  discard block
 block discarded – undo
49 49
 	 * while automatically busting this cache every time the file is changed.
50 50
 	 *
51 51
 	 * @param bool
52
+	 * @param boolean $var
52 53
 	 */
53 54
 	public static function set_suffix_requirements($var) {
54 55
 		self::backend()->set_suffix_requirements($var);
@@ -109,7 +110,7 @@  discard block
 block discarded – undo
109 110
 	/**
110 111
 	 * Return all registered custom scripts
111 112
 	 *
112
-	 * @return array
113
+	 * @return string
113 114
 	 */
114 115
 	public static function get_custom_scripts() {
115 116
 		return self::backend()->get_custom_scripts();
@@ -517,7 +518,7 @@  discard block
 block discarded – undo
517 518
 	/**
518 519
 	 * Enable or disable the combination of CSS and JavaScript files
519 520
 	 * 
520
-	 * @param $enable
521
+	 * @param boolean $enable
521 522
 	 */
522 523
 	public function set_combined_files_enabled($enable) {
523 524
 		$this->combined_files_enabled = (bool) $enable;
@@ -585,6 +586,7 @@  discard block
 block discarded – undo
585 586
 	 * Forces the JavaScript requirements to the end of the body, right before the closing tag
586 587
 	 *
587 588
 	 * @param bool
589
+	 * @param boolean $var
588 590
 	 */
589 591
 	public function set_force_js_to_bottom($var) {
590 592
 		$this->force_js_to_bottom = $var;
@@ -624,7 +626,7 @@  discard block
 block discarded – undo
624 626
 	/**
625 627
 	 * Return all registered custom scripts
626 628
 	 *
627
-	 * @return array
629
+	 * @return string
628 630
 	 */
629 631
 	public function get_custom_scripts() {
630 632
 		$requirements = "";
@@ -1037,7 +1039,7 @@  discard block
 block discarded – undo
1037 1039
 	 * @param array  $files            Array of filenames relative to docroot
1038 1040
 	 * @param string $media
1039 1041
 	 * 
1040
-	 * @return bool|void
1042
+	 * @return false|null
1041 1043
 	 */
1042 1044
 	public function combine_files($combinedFileName, $files, $media = null) {
1043 1045
 		// duplicate check
Please login to merge, or discard this patch.
tests/forms/HtmlEditorFieldToolbarTest.php 1 patch
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -5,10 +5,16 @@
 block discarded – undo
5 5
 		return parent::viewfile_getLocalFileByID($id);
6 6
 	}
7 7
 
8
+	/**
9
+	 * @param string $fileUrl
10
+	 */
8 11
 	public function viewfile_getLocalFileByURL($fileUrl) {
9 12
 		return parent::viewfile_getLocalFileByURL($fileUrl);
10 13
 	}
11 14
 
15
+	/**
16
+	 * @param string $fileUrl
17
+	 */
12 18
 	public function viewfile_getRemoteFileByURL($fileUrl) {
13 19
 		return parent::viewfile_getRemoteFileByURL($fileUrl);
14 20
 	}
Please login to merge, or discard this patch.
thirdparty/Zend/Cache/Backend/File.php 1 patch
Doc Comments   +4 added lines patch added patch discarded remove patch
@@ -732,6 +732,9 @@  discard block
 block discarded – undo
732 732
         return $result;
733 733
     }
734 734
 
735
+    /**
736
+     * @param string $mode
737
+     */
735 738
     protected function _get($dir, $mode, $tags = array())
736 739
     {
737 740
         if (!is_dir($dir)) {
@@ -819,6 +822,7 @@  discard block
 block discarded – undo
819 822
     /**
820 823
      * Compute & return the expire time
821 824
      *
825
+     * @param integer $lifetime
822 826
      * @return int expire time (unix timestamp)
823 827
      */
824 828
     protected function _expireTime($lifetime)
Please login to merge, or discard this patch.
forms/MoneyField.php 1 patch
Doc Comments   +5 added lines patch added patch discarded remove patch
@@ -32,6 +32,10 @@  discard block
 block discarded – undo
32 32
 	 */
33 33
 	protected $fieldCurrency = null;
34 34
 
35
+	/**
36
+	 * @param string $name
37
+	 * @param string $title
38
+	 */
35 39
 	public function __construct($name, $title = null, $value = "") {
36 40
 		// naming with underscores to prevent values from actually being saved somewhere
37 41
 		$this->fieldAmount = new NumericField("{$name}[Amount]", _t('MoneyField.FIELDLABELAMOUNT', 'Amount'));
@@ -135,6 +139,7 @@  discard block
 block discarded – undo
135 139
 	/**
136 140
 	 * @todo Implement removal of readonly state with $bool=false
137 141
 	 * @todo Set readonly state whenever field is recreated, e.g. in setAllowedCurrencies()
142
+	 * @param boolean $bool
138 143
 	 */
139 144
 	public function setReadonly($bool) {
140 145
 		parent::setReadonly($bool);
Please login to merge, or discard this patch.
tests/core/ObjectTest.php 1 patch
Doc Comments   +5 added lines patch added patch discarded remove patch
@@ -619,6 +619,11 @@
 block discarded – undo
619 619
 		'ObjectTest_Extending_Extension'
620 620
 	);
621 621
 
622
+	/**
623
+	 * @param integer $first
624
+	 * @param integer $second
625
+	 * @param integer $third
626
+	 */
622 627
 	public function getResults(&$first, &$second, &$third) {
623 628
 		// Before extending should be invoked second
624 629
 		$this->beforeExtending('updateResult', function(&$first, &$second, &$third) {
Please login to merge, or discard this patch.
model/DataQuery.php 1 patch
Doc Comments   +10 added lines, -2 removed lines patch added patch discarded remove patch
@@ -44,6 +44,7 @@  discard block
 block discarded – undo
44 44
 	 * Create a new DataQuery.
45 45
 	 *
46 46
 	 * @param String The name of the DataObject class that you wish to query
47
+	 * @param string $dataClass
47 48
 	 */
48 49
 	public function __construct($dataClass) {
49 50
 		$this->dataClass = $dataClass;
@@ -166,7 +167,7 @@  discard block
 block discarded – undo
166 167
 	/**
167 168
 	 * Ensure that the query is ready to execute.
168 169
 	 *
169
-	 * @param array|null $queriedColumns Any columns to filter the query by
170
+	 * @param string[] $queriedColumns Any columns to filter the query by
170 171
 	 * @return SQLSelect The finalised sql query
171 172
 	 */
172 173
 	public function getFinalisedQuery($queriedColumns = null) {
@@ -641,7 +642,7 @@  discard block
 block discarded – undo
641 642
 	 * mappings to the query object state. This has to be called
642 643
 	 * in any overloaded {@link SearchFilter->apply()} methods manually.
643 644
 	 *
644
-	 * @param String|array $relation The array/dot-syntax relation to follow
645
+	 * @param string $relation The array/dot-syntax relation to follow
645 646
 	 * @param bool $linearOnly Set to true to restrict to linear relations only. Set this
646 647
 	 * if this relation will be used for sorting, and should not include duplicate rows.
647 648
 	 * @return The model class of the related item
@@ -917,6 +918,7 @@  discard block
 block discarded – undo
917 918
 
918 919
 	/**
919 920
 	 * Set an arbitrary query parameter, that can be used by decorators to add additional meta-data to the query.
921
+	 * @param string $key
920 922
 	 */
921 923
 	public function getQueryParam($key) {
922 924
 		if(isset($this->queryParams[$key])) return $this->queryParams[$key];
@@ -949,6 +951,9 @@  discard block
 block discarded – undo
949 951
 	 */
950 952
 	protected $whereQuery;
951 953
 
954
+	/**
955
+	 * @param string $connective
956
+	 */
952 957
 	public function __construct(DataQuery $base, $connective) {
953 958
 		$this->dataClass = $base->dataClass;
954 959
 		$this->query = $base->query;
@@ -958,6 +963,9 @@  discard block
 block discarded – undo
958 963
 		$base->where($this);
959 964
 	}
960 965
 
966
+	/**
967
+	 * @param string $filter
968
+	 */
961 969
 	public function where($filter) {
962 970
 		if($filter) {
963 971
 			$this->whereQuery->addWhere($filter);
Please login to merge, or discard this patch.
model/ArrayList.php 1 patch
Doc Comments   +5 added lines, -6 removed lines patch added patch discarded remove patch
@@ -379,7 +379,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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());
@@ -582,6 +582,9 @@  discard block
 block discarded – undo
582 582
 		return $this->filter('ID', $ids);
583 583
 	}
584 584
 
585
+	/**
586
+	 * @param integer $id
587
+	 */
585 588
 	public function byID($id) {
586 589
 		$firstElement = $this->filter("ID", $id)->first();
587 590
 
@@ -666,7 +669,6 @@  discard block
 block discarded – undo
666 669
 	/**
667 670
 	 * Returns whether an item with $key exists
668 671
 	 *
669
-	 * @param mixed $key
670 672
 	 * @return bool
671 673
 	 */
672 674
 	public function offsetExists($offset) {
@@ -676,7 +678,6 @@  discard block
 block discarded – undo
676 678
 	/**
677 679
 	 * Returns item stored in list with index $key
678 680
 	 *
679
-	 * @param mixed $key
680 681
 	 * @return DataObject
681 682
 	 */
682 683
 	public function offsetGet($offset) {
@@ -686,7 +687,6 @@  discard block
 block discarded – undo
686 687
 	/**
687 688
 	 * Set an item with the key in $key
688 689
 	 *
689
-	 * @param mixed $key
690 690
 	 * @param mixed $value
691 691
 	 */
692 692
 	public function offsetSet($offset, $value) {
@@ -700,7 +700,6 @@  discard block
 block discarded – undo
700 700
 	/**
701 701
 	 * Unset an item with the key in $key
702 702
 	 *
703
-	 * @param mixed $key
704 703
 	 */
705 704
 	public function offsetUnset($offset) {
706 705
 		unset($this->items[$offset]);
Please login to merge, or discard this patch.
model/UnsavedRelationList.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -146,7 +146,7 @@
 block discarded – undo
146 146
 	 * Add a number of items to the relation.
147 147
 	 *
148 148
 	 * @param array $items Items to add, as either DataObjects or IDs.
149
-	 * @return DataList
149
+	 * @return UnsavedRelationList
150 150
 	 */
151 151
 	public function addMany($items) {
152 152
 		foreach($items as $item) {
Please login to merge, or discard this patch.