Completed
Pull Request — master (#4863)
by Damian
10:43
created
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.
model/Versioned.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -786,7 +786,7 @@  discard block
 block discarded – undo
786 786
 	/**
787 787
 	 * Get the latest published DataObject.
788 788
 	 *
789
-	 * @return DataObject
789
+	 * @return string
790 790
 	 */
791 791
 	public function latestPublished() {
792 792
 		// Get the root data object class - this will have the version field
@@ -980,6 +980,7 @@  discard block
 block discarded – undo
980 980
 	/**
981 981
 	 * Return the base table - the class that directly extends DataObject.
982 982
 	 *
983
+	 * @param string $stage
983 984
 	 * @return string
984 985
 	 */
985 986
 	public function baseTable($stage = null) {
@@ -1134,7 +1135,6 @@  discard block
 block discarded – undo
1134 1135
 	 * @param string $stage The name of the stage.
1135 1136
 	 * @param string $filter A filter to be inserted into the WHERE clause.
1136 1137
 	 * @param boolean $cache Use caching.
1137
-	 * @param string $orderby A sort expression to be inserted into the ORDER BY clause.
1138 1138
 	 *
1139 1139
 	 * @return DataObject
1140 1140
 	 */
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.