Completed
Pull Request — master (#6244)
by Michael
15:14
created
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.
ORM/Connect/Database.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -718,7 +718,7 @@
 block discarded – undo
718 718
 	 * @param boolean $create Flag indicating whether the database should be created
719 719
 	 * if it doesn't exist. If $create is false and the database doesn't exist
720 720
 	 * then an error will be raised
721
-	 * @param int|boolean $errorLevel The level of error reporting to enable for the query, or false if no error
721
+	 * @param boolean $errorLevel The level of error reporting to enable for the query, or false if no error
722 722
 	 * should be raised
723 723
 	 * @return boolean Flag indicating success
724 724
 	 */
Please login to merge, or discard this patch.
ORM/Hierarchy/Hierarchy.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -379,7 +379,7 @@  discard block
 block discarded – undo
379 379
 	/**
380 380
 	 * Return the IDs of all the marked nodes.
381 381
 	 *
382
-	 * @return array
382
+	 * @return integer[]
383 383
 	 */
384 384
 	public function markedNodeIDs() {
385 385
 		return array_keys($this->markedNodes);
@@ -756,7 +756,7 @@  discard block
 block discarded – undo
756 756
 	 * Get the next node in the tree of the type. If there is no instance of the className descended from this node,
757 757
 	 * then search the parents.
758 758
 	 * @param string     $className Class name of the node to find.
759
-	 * @param string|int $root      ID/ClassName of the node to limit the search to
759
+	 * @param integer $root      ID/ClassName of the node to limit the search to
760 760
 	 * @param DataObject $afterNode Used for recursive calls to this function
761 761
 	 * @return DataObject
762 762
 	 */
Please login to merge, or discard this patch.
Security/CMSSecurity.php 1 patch
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -52,6 +52,9 @@  discard block
 block discarded – undo
52 52
 		);
53 53
 	}
54 54
 
55
+	/**
56
+	 * @param string $action
57
+	 */
55 58
 	public function Link($action = null) {
56 59
 		/** @skipUpgrade */
57 60
 		return Controller::join_links(Director::baseURL(), "CMSSecurity", $action);
@@ -68,6 +71,9 @@  discard block
 block discarded – undo
68 71
 		}
69 72
 	}
70 73
 
74
+	/**
75
+	 * @param string $title
76
+	 */
71 77
 	public function getResponseController($title) {
72 78
 		// Use $this to prevent use of Page to render underlying templates
73 79
 		return $this;
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/MemberImportForm.php 1 patch
Doc Comments   +5 added lines, -1 removed lines patch added patch discarded remove patch
@@ -23,6 +23,10 @@  discard block
 block discarded – undo
23 23
 	 */
24 24
 	protected $group;
25 25
 
26
+	/**
27
+	 * @param SecurityAdmin $controller
28
+	 * @param string $name
29
+	 */
26 30
 	public function __construct($controller, $name, $fields = null, $actions = null, $validator = null) {
27 31
 		if(!$fields) {
28 32
 			$helpHtml = _t(
@@ -109,7 +113,7 @@  discard block
 block discarded – undo
109 113
 	}
110 114
 
111 115
 	/**
112
-	 * @param $group Group
116
+	 * @param Group $group Group
113 117
 	 */
114 118
 	public function setGroup($group) {
115 119
 		$this->group = $group;
Please login to merge, or discard this patch.
admin/code/SecurityAdmin.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -251,7 +251,7 @@  discard block
 block discarded – undo
251 251
 	/**
252 252
 	 * @see SecurityAdmin_MemberImportForm
253 253
 	 *
254
-	 * @return Form
254
+	 * @return null|MemberImportForm
255 255
 	 */
256 256
 	public function MemberImportForm() {
257 257
 		if(!Permission::check('ADMIN')) {
@@ -286,7 +286,7 @@  discard block
 block discarded – undo
286 286
 	 * @see SecurityAdmin_MemberImportForm
287 287
 	 *
288 288
 	 * @skipUpgrade
289
-	 * @return Form
289
+	 * @return null|GroupImportForm
290 290
 	 */
291 291
 	public function GroupImportForm() {
292 292
 		if(!Permission::check('ADMIN')) {
Please login to merge, or discard this patch.
Assets/File.php 1 patch
Doc Comments   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -412,7 +412,7 @@  discard block
 block discarded – undo
412 412
 	 * Check if this file can be modified
413 413
 	 *
414 414
 	 * @param Member $member
415
-	 * @return boolean
415
+	 * @return boolean|string
416 416
 	 */
417 417
 	public function canEdit($member = null) {
418 418
 		if(!$member) {
@@ -432,7 +432,7 @@  discard block
 block discarded – undo
432 432
 	 *
433 433
 	 * @param Member $member
434 434
 	 * @param array $context
435
-	 * @return boolean
435
+	 * @return boolean|string
436 436
 	 */
437 437
 	public function canCreate($member = null, $context = array()) {
438 438
 		if(!$member) {
@@ -451,7 +451,7 @@  discard block
 block discarded – undo
451 451
 	 * Check if this file can be deleted
452 452
 	 *
453 453
 	 * @param Member $member
454
-	 * @return boolean
454
+	 * @return boolean|string
455 455
 	 */
456 456
 	public function canDelete($member = null) {
457 457
 		if(!$member) {
@@ -647,7 +647,7 @@  discard block
 block discarded – undo
647 647
 	 *
648 648
 	 * @param string $condition The PHP condition to be evaluated.  The page will be called $item
649 649
 	 * @param array $collator An array, passed by reference, to collect all of the matching descendants.
650
-	 * @return true|null
650
+	 * @return boolean|null
651 651
 	 */
652 652
 	public function collateDescendants($condition, &$collator) {
653 653
 		if($children = $this->Children()) {
@@ -1020,6 +1020,7 @@  discard block
 block discarded – undo
1020 1020
 	 *
1021 1021
 	 * @param String File extension, without dot prefix. Use an asterisk ('*')
1022 1022
 	 * to specify a generic fallback if no mapping is found for an extension.
1023
+	 * @param string $ext
1023 1024
 	 * @return String Classname for a subclass of {@link File}
1024 1025
 	 */
1025 1026
 	public static function get_class_for_file_extension($ext) {
@@ -1163,7 +1164,6 @@  discard block
 block discarded – undo
1163 1164
 	 * Note that the result will not have a leading slash, and should not be used
1164 1165
 	 * with local file paths.
1165 1166
 	 *
1166
-	 * @param string $part,... Parts
1167 1167
 	 * @return string
1168 1168
 	 */
1169 1169
 	public static function join_paths($part = null) {
Please login to merge, or discard this patch.
Assets/Flysystem/AssetAdapter.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -40,6 +40,9 @@
 block discarded – undo
40 40
         ]
41 41
 	);
42 42
 
43
+	/**
44
+	 * @param string $root
45
+	 */
43 46
 	public function __construct($root = null, $writeFlags = LOCK_EX, $linkHandling = self::DISALLOW_LINKS) {
44 47
 		// Get root path
45 48
 		$root = $this->findRoot($root);
Please login to merge, or discard this patch.