Completed
Pull Request — master (#5942)
by Ingo
13:34
created
ORM/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.
ORM/Versioning/DataDifferencer.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -47,6 +47,7 @@
 block discarded – undo
47 47
 	 *
48 48
 	 * @param DataObject (Optional)
49 49
 	 * @param DataObject
50
+	 * @param DataObject|null $fromRecord
50 51
 	 */
51 52
 	public function __construct($fromRecord, DataObject $toRecord) {
52 53
 		if(!$toRecord) user_error("DataDifferencer constructed without a toRecord", E_USER_WARNING);
Please login to merge, or discard this patch.
ORM/Versioning/VersionedGridFieldItemRequest.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -82,7 +82,7 @@
 block discarded – undo
82 82
      *
83 83
      * @param array $data
84 84
      * @param Form $form
85
-	 * @return SS_HTTPResponse
85
+	 * @return \SS_HTTPResponse|null
86 86
      */
87 87
 	public function doArchive($data, $form) {
88 88
 		$record = $this->getRecord();
Please login to merge, or discard this patch.
parsers/HTML/HTMLValue.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -144,7 +144,7 @@
 block discarded – undo
144 144
 	/**
145 145
 	 * Make an xpath query against this HTML
146 146
 	 *
147
-	 * @param $query string - The xpath query string
147
+	 * @param string $query string - The xpath query string
148 148
 	 * @return DOMNodeList
149 149
 	 */
150 150
 	public function query($query) {
Please login to merge, or discard this patch.
tests/i18n/i18nTextCollectorTest.php 1 patch
Doc Comments   +10 added lines patch added patch discarded remove patch
@@ -843,6 +843,10 @@  discard block
 block discarded – undo
843 843
  * Assist with testing of specific protected methods
844 844
  */
845 845
 class i18nTextCollectorTest_Collector extends i18nTextCollector implements TestOnly {
846
+
847
+	/**
848
+	 * @param string $directory
849
+	 */
846 850
 	public function getModules_Test($directory) {
847 851
 		return $this->getModules($directory);
848 852
 	}
@@ -851,6 +855,9 @@  discard block
 block discarded – undo
851 855
 		return $this->resolveDuplicateConflicts($entitiesByModule);
852 856
 	}
853 857
 
858
+	/**
859
+	 * @param string $module
860
+	 */
854 861
 	public function getFileListForModule_Test($module) {
855 862
 		return $this->getFileListForModule($module);
856 863
 	}
@@ -859,6 +866,9 @@  discard block
 block discarded – undo
859 866
 		return $this->getConflicts($entitiesByModule);
860 867
 	}
861 868
 
869
+	/**
870
+	 * @param string $class
871
+	 */
862 872
 	public function findModuleForClass_Test($class) {
863 873
 		return $this->findModuleForClass($class);
864 874
 	}
Please login to merge, or discard this patch.
tests/model/VersionedOwnershipTest.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -730,7 +730,7 @@  discard block
 block discarded – undo
730 730
 	/**
731 731
 	 * All custom objects with the same number. E.g. 'Page 1' owns 'Custom 1'
732 732
 	 *
733
-	 * @return DataList
733
+	 * @return SilverStripe\ORM\DataList
734 734
 	 */
735 735
 	public function Custom() {
736 736
 		$title = str_replace('Page', 'Custom', $this->Title);
@@ -784,7 +784,7 @@  discard block
 block discarded – undo
784 784
 	/**
785 785
 	 * All pages with the same number. E.g. 'Page 1' owns 'Custom 1'
786 786
 	 *
787
-	 * @return DataList
787
+	 * @return SilverStripe\ORM\DataList
788 788
 	 */
789 789
 	public function Pages() {
790 790
 		$title = str_replace('Custom', 'Page', $this->Title);
Please login to merge, or discard this patch.
admin/code/CMSMenu.php 1 patch
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
 	 *                          left.
100 100
 	 * @param array $attributes an array of attributes to include on the link.
101 101
 	 *
102
-	 * @return boolean The result of the operation.
102
+	 * @return boolean|null The result of the operation.
103 103
 	 */
104 104
 	public static function add_link($code, $menuTitle, $url, $priority = -1, $attributes = null) {
105 105
 		return self::add_menu_item($code, $menuTitle, $url, null, $priority, $attributes);
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
 	 *                    have the rights to access some other part of the admin area.
120 120
 	 * @param int $priority
121 121
 	 * @param array $attributes an array of attributes to include on the link.
122
-	 * @return bool Success
122
+	 * @return boolean|null Success
123 123
 	 */
124 124
 	public static function add_menu_item($code, $menuTitle, $url, $controllerClass = null, $priority = -1,
125 125
 											$attributes = null) {
@@ -250,7 +250,7 @@  discard block
 block discarded – undo
250 250
 	 *                    have the rights to access some other part of the admin area.
251 251
 	 * @param int $priority
252 252
 	 * @param array $attributes an array of attributes to include on the link.
253
-	 * @return bool Success
253
+	 * @return boolean|null Success
254 254
 	 */
255 255
 	public static function replace_menu_item($code, $menuTitle, $url, $controllerClass = null, $priority = -1,
256 256
 												$attributes = null) {
Please login to merge, or discard this patch.
control/RequestHandler.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -282,7 +282,7 @@
 block discarded – undo
282 282
 	 *
283 283
 	 * Must not raise SS_HTTPResponse_Exceptions - instead it should return
284 284
 	 *
285
-	 * @param $request
285
+	 * @param SS_HTTPRequest $request
286 286
 	 * @param $action
287 287
 	 * @return SS_HTTPResponse
288 288
 	 */
Please login to merge, or discard this patch.
dev/Backtrace.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -116,7 +116,7 @@
 block discarded – undo
116 116
 	 * @param mixed $returnVal
117 117
 	 * @param bool $ignoreAjax
118 118
 	 * @param array $ignoredFunctions
119
-	 * @return mixed
119
+	 * @return string|null
120 120
 	 */
121 121
 	public static function backtrace($returnVal = false, $ignoreAjax = false, $ignoredFunctions = null) {
122 122
 		$plainText = Director::is_cli() || (Director::is_ajax() && !$ignoreAjax);
Please login to merge, or discard this patch.