Completed
Pull Request — master (#4964)
by Damian
09:36
created
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/ListboxField.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -59,7 +59,7 @@
 block discarded – undo
59 59
 	 * Returns a <select> tag containing all the appropriate <option> tags
60 60
 	 * 
61 61
 	 * @param array $properties
62
-	 * @return string
62
+	 * @return HTMLText
63 63
 	 */
64 64
 	public function Field($properties = array()) {
65 65
 		$properties = array_merge($properties, array(
Please login to merge, or discard this patch.
model/UnsavedRelationList.php 1 patch
Doc Comments   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -52,6 +52,7 @@  discard block
 block discarded – undo
52 52
 	 * Create a new UnsavedRelationList
53 53
 	 *
54 54
 	 * @param string $dataClass The DataObject class used in the relation
55
+	 * @param string $relationName
55 56
 	 */
56 57
 	public function __construct($baseClass, $relationName, $dataClass) {
57 58
 		$this->baseClass = $baseClass;
@@ -144,7 +145,7 @@  discard block
 block discarded – undo
144 145
 	 * Add a number of items to the relation.
145 146
 	 *
146 147
 	 * @param array $items Items to add, as either DataObjects or IDs.
147
-	 * @return DataList
148
+	 * @return UnsavedRelationList
148 149
 	 */
149 150
 	public function addMany($items) {
150 151
 		foreach($items as $item) {
Please login to merge, or discard this patch.
view/ArrayData.php 1 patch
Doc Comments   +3 added lines, -9 removed lines patch added patch discarded remove patch
@@ -50,14 +50,7 @@  discard block
 block discarded – undo
50 50
 	/**
51 51
 	 * Gets a field from this object.
52 52
 	 *
53
-	 * @param string $field
54
-	 *
55
-	 * If the value is an object but not an instance of
56
-	 * ViewableData, it will be converted recursively to an
57
-	 * ArrayData.
58
-	 *
59
-	 * If the value is an associative array, it will likewise be
60
-	 * converted recursively to an ArrayData.
53
+	 * @param string $f
61 54
 	 */
62 55
 	public function getField($f) {
63 56
 		$value = $this->array[$f];
@@ -83,6 +76,7 @@  discard block
 block discarded – undo
83 76
 	 * Check array to see if field isset
84 77
 	 *
85 78
 	 * @param string Field Key
79
+	 * @param string $f
86 80
 	 * @return bool
87 81
 	 */
88 82
 	public function hasField($f) {
@@ -93,7 +87,7 @@  discard block
 block discarded – undo
93 87
 	 * Converts an associative array to a simple object
94 88
 	 *
95 89
 	 * @param array
96
-	 * @return obj $obj
90
+	 * @return stdClass $obj
97 91
 	 */
98 92
 	public static function array_to_object($arr = null) {
99 93
 		$obj = new stdClass();
Please login to merge, or discard this patch.
filesystem/flysystem/AssetAdapter.php 1 patch
Doc Comments   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -37,6 +37,9 @@  discard block
 block discarded – undo
37 37
         ]
38 38
 	);
39 39
 
40
+	/**
41
+	 * @param string $root
42
+	 */
40 43
 	public function __construct($root = null, $writeFlags = LOCK_EX, $linkHandling = self::DISALLOW_LINKS) {
41 44
 		// Get root path
42 45
 		$root = $this->findRoot($root);
@@ -117,7 +120,7 @@  discard block
 block discarded – undo
117 120
 	 * Render server configuration file from a template file
118 121
 	 *
119 122
 	 * @param string $template
120
-	 * @return \HTMLText Rendered results
123
+	 * @return string Rendered results
121 124
 	 */
122 125
 	protected function renderTemplate($template) {
123 126
 		// Build allowed extensions
Please login to merge, or discard this patch.
filesystem/flysystem/ProtectedAssetAdapter.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -42,7 +42,7 @@
 block discarded – undo
42 42
      * Provide secure downloadable
43 43
      *
44 44
      * @param string $path
45
-     * @return string|null
45
+     * @return string
46 46
      */
47 47
     public function getProtectedUrl($path) {
48 48
         // Public URLs are handled via a request handler within /assets.
Please login to merge, or discard this patch.
model/ValidationResult.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -21,6 +21,7 @@
 block discarded – undo
21 21
 	/**
22 22
 	 * Create a new ValidationResult.
23 23
 	 * By default, it is a successful result.	Call $this->error() to record errors.
24
+	 * @param string $message
24 25
 	 */
25 26
 	public function __construct($valid = true, $message = null) {
26 27
 		$this->isValid = $valid;
Please login to merge, or discard this patch.
tests/filesystem/AssetStoreTest.php 1 patch
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -625,6 +625,9 @@  discard block
 block discarded – undo
625 625
 	}
626 626
 
627 627
 
628
+	/**
629
+	 * @param string $fileID
630
+	 */
628 631
 	public function getOriginalFilename($fileID) {
629 632
 		return parent::getOriginalFilename($fileID);
630 633
 	}
@@ -633,6 +636,9 @@  discard block
 block discarded – undo
633 636
 		return parent::removeVariant($fileID);
634 637
 	}
635 638
 
639
+	/**
640
+	 * @param null|string $variant
641
+	 */
636 642
 	public function getDefaultConflictResolution($variant) {
637 643
 		return parent::getDefaultConflictResolution($variant);
638 644
 	}
Please login to merge, or discard this patch.
forms/HtmlEditorField.php 1 patch
Doc Comments   +8 added lines, -4 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
 	 *
47 47
 	 * @param string $name The internal field name, passed to forms.
48 48
 	 * @param string $title The human-readable field label.
49
-	 * @param mixed $value The value of the field.
49
+	 * @param integer $value The value of the field.
50 50
 	 * @param string $config HTMLEditorConfig identifier to be used. Default to the active one.
51 51
 	 */
52 52
 	public function __construct($name, $title = null, $value = '', $config = null) {
@@ -146,6 +146,10 @@  discard block
 block discarded – undo
146 146
 
147 147
 	protected $controller, $name;
148 148
 
149
+	/**
150
+	 * @param Controller $controller
151
+	 * @param string $name
152
+	 */
149 153
 	public function __construct($controller, $name) {
150 154
 		parent::__construct();
151 155
 
@@ -174,7 +178,7 @@  discard block
 block discarded – undo
174 178
 	/**
175 179
 	 * Searches the SiteTree for display in the dropdown
176 180
 	 *
177
-	 * @return callback
181
+	 * @return DataList
178 182
 	 */
179 183
 	public function siteTreeSearchCallback($sourceObject, $labelField, $search) {
180 184
 		return DataObject::get($sourceObject)->filterAny(array(
@@ -454,7 +458,7 @@  discard block
 block discarded – undo
454 458
 	/**
455 459
 	 * Find all anchors available on the given page.
456 460
 	 *
457
-	 * @return array
461
+	 * @return string
458 462
 	 */
459 463
 	public function getanchors() {
460 464
 		$id = (int)$this->getRequest()->getVar('PageID');
@@ -1012,7 +1016,7 @@  discard block
 block discarded – undo
1012 1016
 	/**
1013 1017
 	 * Get OEmbed type
1014 1018
 	 *
1015
-	 * @return string
1019
+	 * @return boolean
1016 1020
 	 */
1017 1021
 	public function getType() {
1018 1022
 		return $this->oembed->type;
Please login to merge, or discard this patch.