Completed
Pull Request — 3.7 (#8242)
by Sam
09:16
created
search/filters/SearchFilter.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
 	 *  column. Can contain a relation name in dot notation, which will automatically join
48 48
 	 *  the necessary tables (e.g. "Comments.Name" to join the "Comments" has-many relationship and
49 49
 	 *  search the "Name" column when applying this filter to a SiteTree class).
50
-	 * @param mixed $value
50
+	 * @param boolean|string $value
51 51
 	 * @param array $modifiers
52 52
 	 */
53 53
 	public function __construct($fullName, $value = false, array $modifiers = array()) {
@@ -287,7 +287,7 @@  discard block
 block discarded – undo
287 287
 	/**
288 288
 	 * Determines case sensitivity based on {@link getModifiers()}.
289 289
 	 *
290
-	 * @return Mixed TRUE or FALSE to enforce sensitivity, NULL to use field collation.
290
+	 * @return boolean|null TRUE or FALSE to enforce sensitivity, NULL to use field collation.
291 291
 	 */
292 292
 	protected function getCaseSensitive() {
293 293
 		$modifiers = $this->getModifiers();
Please login to merge, or discard this patch.
tests/filesystem/UploadTest.php 1 patch
Doc Comments   +4 added lines patch added patch discarded remove patch
@@ -304,6 +304,10 @@
 block discarded – undo
304 304
 	// Delete files in the default uploads directory that match the name pattern.
305 305
 	// @param String $namePattern	A regular expression applied to files in the directory. If the name matches
306 306
 	// the pattern, it is deleted. Directories, . and .. are excluded.
307
+
308
+	/**
309
+	 * @param string $namePattern
310
+	 */
307 311
 	public function deleteTestUploadFiles($namePattern) {
308 312
 		$tmpFolder = ASSETS_PATH . "/" . Config::inst()->get('Upload', 'uploads_folder');
309 313
 		$files = scandir($tmpFolder);
Please login to merge, or discard this patch.
thirdparty/tinymce-spellchecker/classes/GoogleSpell.php 1 patch
Doc Comments   +7 added lines patch added patch discarded remove patch
@@ -105,6 +105,9 @@  discard block
 block discarded – undo
105 105
 		return $matches;
106 106
 	}
107 107
 
108
+	/**
109
+	 * @param string $string
110
+	 */
108 111
 	function _unhtmlentities($string) {
109 112
 		$string = preg_replace('~&#x([0-9a-f]+);~ei', 'chr(hexdec("\\1"))', $string);
110 113
 		$string = preg_replace('~&#([0-9]+);~e', 'chr(\\1)', $string);
@@ -118,6 +121,10 @@  discard block
 block discarded – undo
118 121
 
119 122
 // Patch in multibyte support
120 123
 if (!function_exists('mb_substr')) {
124
+
125
+	/**
126
+	 * @param string $str
127
+	 */
121 128
 	function mb_substr($str, $start, $len = '', $encoding="UTF-8"){
122 129
 		$limit = strlen($str);
123 130
 
Please login to merge, or discard this patch.
thirdparty/tinymce-spellchecker/classes/PSpell.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -45,6 +45,7 @@
 block discarded – undo
45 45
 
46 46
 	/**
47 47
 	 * Opens a link for pspell.
48
+	 * @return string
48 49
 	 */
49 50
 	function &_getPLink($lang) {
50 51
 		// Check for native PSpell support
Please login to merge, or discard this patch.
thirdparty/Zend/Log.php 1 patch
Doc Comments   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -160,7 +160,6 @@  discard block
 block discarded – undo
160 160
     /**
161 161
      * Construct a writer object based on a configuration array
162 162
      *
163
-     * @param  array $spec config array with writer spec
164 163
      * @return Zend_Log_Writer_Abstract
165 164
      * @throws Zend_Log_Exception
166 165
      */
@@ -457,7 +456,7 @@  discard block
 block discarded – undo
457 456
      * Before a message will be received by any of the writers, it
458 457
      * must be accepted by all filters added with this method.
459 458
      *
460
-     * @param  int|Zend_Config|array|Zend_Log_Filter_Interface $filter
459
+     * @param  Zend_Log_Filter_Priority $filter
461 460
      * @return Zend_Log
462 461
      * @throws Zend_Log_Exception
463 462
      */
Please login to merge, or discard this patch.
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.
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.
model/fieldtypes/Datetime.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -108,7 +108,7 @@
 block discarded – undo
108 108
 	 * Return a date and time formatted as per a CMS user's settings.
109 109
 	 *
110 110
 	 * @param Member $member
111
-	 * @return boolean | string A time and date pair formatted as per user-defined settings.
111
+	 * @return false|string | string A time and date pair formatted as per user-defined settings.
112 112
 	 */
113 113
 	public function FormatFromSettings($member = null) {
114 114
 		require_once 'Zend/Date.php';
Please login to merge, or discard this patch.