Completed
Pull Request — 3.7 (#8242)
by Sam
09:16
created
thirdparty/Zend/Cache/Backend/BlackHole.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
      * Test if a cache is available or not (for the given id)
57 57
      *
58 58
      * @param  string $id cache id
59
-     * @return mixed false (a cache is not available) or "last modified" timestamp (int) of the available cache record
59
+     * @return boolean false (a cache is not available) or "last modified" timestamp (int) of the available cache record
60 60
      */
61 61
     public function test($id)
62 62
     {
@@ -192,7 +192,7 @@  discard block
 block discarded – undo
192 192
      * - mtime : timestamp of last modification time
193 193
      *
194 194
      * @param  string $id cache id
195
-     * @return array array of metadatas (false if the cache id is not found)
195
+     * @return boolean array of metadatas (false if the cache id is not found)
196 196
      */
197 197
     public function getMetadatas($id)
198 198
     {
Please login to merge, or discard this patch.
thirdparty/Zend/Loader/Autoloader/Resource.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -136,7 +136,7 @@
 block discarded – undo
136 136
      * Helper method to calculate the correct class path
137 137
      *
138 138
      * @param string $class
139
-     * @return False if not matched other wise the correct path
139
+     * @return false|string if not matched other wise the correct path
140 140
      */
141 141
     public function getClassPath($class)
142 142
     {
Please login to merge, or discard this patch.
thirdparty/Zend/Loader/PluginLoader.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -283,7 +283,7 @@
 block discarded – undo
283 283
      * Whether or not a Plugin by a specific name is loaded
284 284
      *
285 285
      * @param string $name
286
-     * @return Zend_Loader_PluginLoader
286
+     * @return boolean
287 287
      */
288 288
     public function isLoaded($name)
289 289
     {
Please login to merge, or discard this patch.
thirdparty/Zend/Cache/Core.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -191,7 +191,7 @@
 block discarded – undo
191 191
     /**
192 192
      * Returns the backend
193 193
      *
194
-     * @return Zend_Cache_Backend backend object
194
+     * @return Zend_Cache_Backend_Interface backend object
195 195
      */
196 196
     public function getBackend()
197 197
     {
Please login to merge, or discard this patch.
admin/code/LeftAndMain.php 1 patch
Doc Comments   +6 added lines, -1 removed lines patch added patch discarded remove patch
@@ -555,6 +555,7 @@  discard block
 block discarded – undo
555 555
 	 * Returns the menu title for the given LeftAndMain subclass.
556 556
 	 * Implemented static so that we can get this value without instantiating an object.
557 557
 	 * Menu title is *not* internationalised.
558
+	 * @return string
558 559
 	 */
559 560
 	public static function menu_title_for_class($class) {
560 561
 		$title = Config::inst()->get($class, 'menu_title', Config::FIRST_SET);
@@ -720,6 +721,7 @@  discard block
 block discarded – undo
720 721
 	 * Return a list of appropriate templates for this class, with the given suffix using
721 722
 	 * {@link SSViewer::get_templates_by_class()}
722 723
 	 *
724
+	 * @param string $suffix
723 725
 	 * @return array
724 726
 	 */
725 727
 	public function getTemplatesWithSuffix($suffix) {
@@ -1740,7 +1742,7 @@  discard block
 block discarded – undo
1740 1742
 	}
1741 1743
 
1742 1744
 	/**
1743
-	 * @return String
1745
+	 * @return DBField
1744 1746
 	 */
1745 1747
 	public function Locale() {
1746 1748
 		return DBField::create_field('DBLocale', i18n::get_locale());
@@ -1906,6 +1908,9 @@  discard block
 block discarded – undo
1906 1908
 		return (parent::isFinished() || $this->isFinished);
1907 1909
 	}
1908 1910
 
1911
+	/**
1912
+	 * @param boolean $bool
1913
+	 */
1909 1914
 	public function setIsFinished($bool) {
1910 1915
 		$this->isFinished = $bool;
1911 1916
 	}
Please login to merge, or discard this patch.
api/RSSFeed.php 1 patch
Doc Comments   +2 added lines patch added patch discarded remove patch
@@ -219,6 +219,7 @@  discard block
 block discarded – undo
219 219
 	 * via the standard template inclusion process.
220 220
 	 *
221 221
 	 * @param string
222
+	 * @param string $template
222 223
 	 */
223 224
 	public function setTemplate($template) {
224 225
 		$this->template = $template;
@@ -315,6 +316,7 @@  discard block
 block discarded – undo
315 316
 	/**
316 317
 	 * Return the named field as an obj() call from $this->failover.
317 318
 	 * Default to the given class if there's no casting information.
319
+	 * @param string $fieldName
318 320
 	 */
319 321
 	public function rssField($fieldName, $defaultClass = 'Varchar') {
320 322
 		if($fieldName) {
Please login to merge, or discard this patch.
dev/DebugView.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -126,6 +126,7 @@
 block discarded – undo
126 126
 	 *
127 127
 	 * @param string $title
128 128
 	 * @param string $title
129
+	 * @param string|false $subtitle
129 130
 	 */
130 131
 	public function writeInfo($title, $subtitle, $description=false) {
131 132
 		echo '<div class="info">';
Please login to merge, or discard this patch.
filesystem/Upload.php 1 patch
Doc Comments   +5 added lines, -4 removed lines patch added patch discarded remove patch
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
 	 * Set a different instance than {@link Upload_Validator}
103 103
 	 * for this upload session.
104 104
 	 *
105
-	 * @param object $validator
105
+	 * @param Upload_Validator $validator
106 106
 	 */
107 107
 	public function setValidator($validator) {
108 108
 		$this->validator = $validator;
@@ -223,7 +223,7 @@  discard block
 block discarded – undo
223 223
 	 *
224 224
 	 * @param array $tmpFile
225 225
 	 * @param File $file
226
-	 * @return Boolean
226
+	 * @return boolean|string
227 227
 	 */
228 228
 	public function loadIntoFile($tmpFile, $file, $folderPath = false) {
229 229
 		$this->file = $file;
@@ -231,7 +231,8 @@  discard block
 block discarded – undo
231 231
 	}
232 232
 
233 233
 	/**
234
-	 * @return Boolean
234
+	 * @param boolean $bool
235
+	 * @return boolean|null
235 236
 	 */
236 237
 	public function setReplaceFile($bool) {
237 238
 		$this->replaceFile = $bool;
@@ -295,7 +296,7 @@  discard block
 block discarded – undo
295 296
 	/**
296 297
 	 * Determines wether previous operations caused an error.
297 298
 	 *
298
-	 * @return boolean
299
+	 * @return integer
299 300
 	 */
300 301
 	public function isError() {
301 302
 		return (count($this->errors));
Please login to merge, or discard this patch.
forms/HtmlEditorField.php 1 patch
Doc Comments   +10 added lines, -3 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
 	 *
46 46
 	 * @param string $name The internal field name, passed to forms.
47 47
 	 * @param string $title The human-readable field label.
48
-	 * @param mixed $value The value of the field.
48
+	 * @param integer $value The value of the field.
49 49
 	 * @param string $config HTMLEditorConfig identifier to be used. Default to the active one.
50 50
 	 */
51 51
 	public function __construct($name, $title = null, $value = '', $config = null) {
@@ -169,6 +169,10 @@  discard block
 block discarded – undo
169 169
 
170 170
 	protected $controller, $name;
171 171
 
172
+	/**
173
+	 * @param Controller|null $controller
174
+	 * @param string $name
175
+	 */
172 176
 	public function __construct($controller, $name) {
173 177
 		parent::__construct();
174 178
 
@@ -197,7 +201,7 @@  discard block
 block discarded – undo
197 201
 	/**
198 202
 	 * Searches the SiteTree for display in the dropdown
199 203
 	 *
200
-	 * @return callback
204
+	 * @return DataList
201 205
 	 */
202 206
 	public function siteTreeSearchCallback($sourceObject, $labelField, $search) {
203 207
 		return DataObject::get($sourceObject)->filterAny(array(
@@ -563,7 +567,7 @@  discard block
 block discarded – undo
563 567
 	/**
564 568
 	 * Find all anchors available on the given page.
565 569
 	 *
566
-	 * @return array
570
+	 * @return string
567 571
 	 */
568 572
 	public function getanchors() {
569 573
 		$id = (int)$this->getRequest()->getVar('PageID');
@@ -607,6 +611,7 @@  discard block
 block discarded – undo
607 611
 	 * not the "master record" in the database - hence there's no form or saving logic.
608 612
 	 *
609 613
 	 * @param String Relative or absolute URL to file
614
+	 * @param HtmlEditorField_File $file
610 615
 	 * @return FieldList
611 616
 	 */
612 617
 	protected function getFieldsForFile($url, $file) {
@@ -628,6 +633,7 @@  discard block
 block discarded – undo
628 633
 	}
629 634
 
630 635
 	/**
636
+	 * @param HtmlEditorField_Embed $file
631 637
 	 * @return FieldList
632 638
 	 */
633 639
 	protected function getFieldsForOembed($url, $file) {
@@ -837,6 +843,7 @@  discard block
 block discarded – undo
837 843
 
838 844
 	/**
839 845
 	 * @param Int
846
+	 * @param integer $parentID
840 847
 	 * @return DataList
841 848
 	 */
842 849
 	protected function getFiles($parentID = null) {
Please login to merge, or discard this patch.