Completed
Pull Request — 3.3 (#6342)
by Damian
07:25
created
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.
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.
forms/HtmlEditorField.php 1 patch
Doc Comments   +9 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,9 @@  discard block
 block discarded – undo
169 169
 
170 170
 	protected $controller, $name;
171 171
 
172
+	/**
173
+	 * @param string $name
174
+	 */
172 175
 	public function __construct($controller, $name) {
173 176
 		parent::__construct();
174 177
 
@@ -197,7 +200,7 @@  discard block
 block discarded – undo
197 200
 	/**
198 201
 	 * Searches the SiteTree for display in the dropdown
199 202
 	 *
200
-	 * @return callback
203
+	 * @return DataList
201 204
 	 */
202 205
 	public function siteTreeSearchCallback($sourceObject, $labelField, $search) {
203 206
 		return DataObject::get($sourceObject)->filterAny(array(
@@ -559,7 +562,7 @@  discard block
 block discarded – undo
559 562
 	/**
560 563
 	 * Find all anchors available on the given page.
561 564
 	 *
562
-	 * @return array
565
+	 * @return string
563 566
 	 */
564 567
 	public function getanchors() {
565 568
 		$id = (int)$this->getRequest()->getVar('PageID');
@@ -597,6 +600,7 @@  discard block
 block discarded – undo
597 600
 	 * not the "master record" in the database - hence there's no form or saving logic.
598 601
 	 *
599 602
 	 * @param String Relative or absolute URL to file
603
+	 * @param HtmlEditorField_File $file
600 604
 	 * @return FieldList
601 605
 	 */
602 606
 	protected function getFieldsForFile($url, $file) {
@@ -618,6 +622,7 @@  discard block
 block discarded – undo
618 622
 	}
619 623
 
620 624
 	/**
625
+	 * @param HtmlEditorField_Embed $file
621 626
 	 * @return FieldList
622 627
 	 */
623 628
 	protected function getFieldsForOembed($url, $file) {
@@ -827,6 +832,7 @@  discard block
 block discarded – undo
827 832
 
828 833
 	/**
829 834
 	 * @param Int
835
+	 * @param integer $parentID
830 836
 	 * @return DataList
831 837
 	 */
832 838
 	protected function getFiles($parentID = 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/Image.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -816,7 +816,7 @@  discard block
 block discarded – undo
816 816
 	/**
817 817
 	 * Generate patterns that will help to match filenames of cached images
818 818
 	 * @param string $filename Filename of source image
819
-	 * @return array
819
+	 * @return string
820 820
 	 */
821 821
 	private function getFilenamePatterns($filename) {
822 822
 		$methodNames = $this->allMethodNames(true);
@@ -971,7 +971,7 @@  discard block
 block discarded – undo
971 971
 
972 972
 	/**
973 973
 	 * Get the orientation of this image.
974
-	 * @return ORIENTATION_SQUARE | ORIENTATION_PORTRAIT | ORIENTATION_LANDSCAPE
974
+	 * @return integer | ORIENTATION_PORTRAIT | ORIENTATION_LANDSCAPE
975 975
 	 */
976 976
 	public function getOrientation() {
977 977
 		$width = $this->getWidth();
Please login to merge, or discard this patch.
view/SSTemplateParser.php.inc 1 patch
Doc Comments   +9 added lines, -5 removed lines patch added patch discarded remove patch
@@ -111,6 +111,8 @@  discard block
 block discarded – undo
111 111
 
112 112
 	/**
113 113
 	 * Override the function that constructs the result arrays to also prepare a 'php' item in the array
114
+	 * @param string $matchrule
115
+	 * @param string $name
114 116
 	 */
115 117
 	function construct($matchrule, $name, $arguments = null) {
116 118
 		$res = parent::construct($matchrule, $name, $arguments);
@@ -172,9 +174,9 @@  discard block
 block discarded – undo
172 174
 
173 175
 	/**
174 176
 	 * Ensures that the arguments to addOpenBlock and addClosedBlock are valid
175
-	 * @param $name
176
-	 * @param $callable
177
-	 * @param $type
177
+	 * @param string $name
178
+	 * @param callable $callable
179
+	 * @param string $type
178 180
 	 * @throws InvalidArgumentException
179 181
 	 */
180 182
 	protected function validateExtensionBlock($name, $callable, $type) {
@@ -737,6 +739,7 @@  discard block
 block discarded – undo
737 739
 	 * The basic generated PHP of LookupStep and LastLookupStep is the same, except that LookupStep calls 'obj' to
738 740
 	 * get the next ViewableData in the sequence, and LastLookupStep calls different methods (XML_val, hasValue, obj)
739 741
 	 * depending on the context the lookup is used in.
742
+	 * @param string $method
740 743
 	 */
741 744
 	function Lookup_AddLookupStep(&$res, $sub, $method) {
742 745
 		$res['LookupSteps'][] = $sub;
@@ -4691,8 +4694,8 @@  discard block
 block discarded – undo
4691 4694
 	 * Compiles some passed template source code into the php code that will execute as per the template source.
4692 4695
 	 *
4693 4696
 	 * @throws SSTemplateParseException
4694
-	 * @param  $string The source of the template
4695
-	 * @param string $templateName The name of the template, normally the filename the template source was loaded from
4697
+	 * @param  string $string The source of the template
4698
+	 * @param string string The name of the template, normally the filename the template source was loaded from
4696 4699
 	 * @param bool $includeDebuggingComments True is debugging comments should be included in the output
4697 4700
 	 * @param bool $topTemplate True if this is a top template, false if it's just a template
4698 4701
 	 * @return mixed|string The php that, when executed (via include or exec) will behave as per the template source
@@ -4732,6 +4735,7 @@  discard block
 block discarded – undo
4732 4735
 
4733 4736
 	/**
4734 4737
 	 * @param string $code
4738
+	 * @param string $templateName
4735 4739
 	 * @return string $code
4736 4740
 	 */
4737 4741
 	protected function includeDebuggingComments($code, $templateName) {
Please login to merge, or discard this patch.