Completed
Pull Request — master (#6394)
by Ed
10:36
created
src/ORM/DataObject.php 1 patch
Doc Comments   +7 added lines, -6 removed lines patch added patch discarded remove patch
@@ -2470,6 +2470,7 @@  discard block
 block discarded – undo
2470 2470
 
2471 2471
     /**
2472 2472
      * {@inheritdoc}
2473
+     * @param string $field
2473 2474
      */
2474 2475
     public function castingHelper($field)
2475 2476
     {
@@ -2638,7 +2639,7 @@  discard block
 block discarded – undo
2638 2639
 
2639 2640
     /**
2640 2641
      * @param Member $member
2641
-     * @return boolean
2642
+     * @return boolean|string
2642 2643
      */
2643 2644
     public function canView($member = null)
2644 2645
     {
@@ -2651,7 +2652,7 @@  discard block
 block discarded – undo
2651 2652
 
2652 2653
     /**
2653 2654
      * @param Member $member
2654
-     * @return boolean
2655
+     * @return boolean|string
2655 2656
      */
2656 2657
     public function canEdit($member = null)
2657 2658
     {
@@ -2664,7 +2665,7 @@  discard block
 block discarded – undo
2664 2665
 
2665 2666
     /**
2666 2667
      * @param Member $member
2667
-     * @return boolean
2668
+     * @return boolean|string
2668 2669
      */
2669 2670
     public function canDelete($member = null)
2670 2671
     {
@@ -2679,7 +2680,7 @@  discard block
 block discarded – undo
2679 2680
      * @param Member $member
2680 2681
      * @param array $context Additional context-specific data which might
2681 2682
      * affect whether (or where) this object could be created.
2682
-     * @return boolean
2683
+     * @return boolean|string
2683 2684
      */
2684 2685
     public function canCreate($member = null, $context = array())
2685 2686
     {
@@ -2789,7 +2790,7 @@  discard block
 block discarded – undo
2789 2790
      * Traverses to a field referenced by relationships between data objects, returning the value
2790 2791
      * The path to the related field is specified with dot separated syntax (eg: Parent.Child.Child.FieldName)
2791 2792
      *
2792
-     * @param $fieldName string
2793
+     * @param string $fieldName string
2793 2794
      * @return string | null - will return null on a missing value
2794 2795
      */
2795 2796
     public function relField($fieldName)
@@ -2867,7 +2868,7 @@  discard block
 block discarded – undo
2867 2868
      * @param string $callerClass The class of objects to be returned
2868 2869
      * @param string|array $filter A filter to be inserted into the WHERE clause.
2869 2870
      * Supports parameterised queries. See SQLSelect::addWhere() for syntax examples.
2870
-     * @param string|array $sort A sort expression to be inserted into the ORDER
2871
+     * @param string $sort A sort expression to be inserted into the ORDER
2871 2872
      * BY clause.  If omitted, self::$default_sort will be used.
2872 2873
      * @param string $join Deprecated 3.0 Join clause. Use leftJoin($table, $joinClause) instead.
2873 2874
      * @param string|array $limit A limit expression to be inserted into the LIMIT clause.
Please login to merge, or discard this patch.
src/ORM/DataObjectSchema.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -392,7 +392,7 @@
 block discarded – undo
392 392
     /**
393 393
      * Get location of all editor.css files
394 394
      *
395
-     * @return array
395
+     * @return string[]
396 396
      */
397 397
     protected function getEditorCSS() {
398 398
         $editor = array();
Please login to merge, or discard this patch.
src/ORM/DataQuery.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
     /**
111 111
      * Remove a filter from the query
112 112
      *
113
-     * @param string|array $fieldExpression The predicate of the condition to remove
113
+     * @param string|null $fieldExpression The predicate of the condition to remove
114 114
      * (ignoring parameters). The expression will be considered a match if it's
115 115
      * contained within any other predicate.
116 116
      * @return DataQuery Self reference
@@ -191,7 +191,7 @@  discard block
 block discarded – undo
191 191
     /**
192 192
      * Ensure that the query is ready to execute.
193 193
      *
194
-     * @param array|null $queriedColumns Any columns to filter the query by
194
+     * @param string[] $queriedColumns Any columns to filter the query by
195 195
      * @return SQLSelect The finalised sql query
196 196
      */
197 197
     public function getFinalisedQuery($queriedColumns = null)
Please login to merge, or discard this patch.
src/ORM/FieldType/DBClassName.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -171,6 +171,9 @@
 block discarded – undo
171 171
         return $classNames;
172 172
     }
173 173
 
174
+    /**
175
+     * @param \SilverStripe\ORM\Tests\DBClassNameTest\ObjectSubClass $record
176
+     */
174 177
     public function setValue($value, $record = null, $markChanged = true)
175 178
     {
176 179
         parent::setValue($value, $record, $markChanged);
Please login to merge, or discard this patch.
src/ORM/FieldType/DBComposite.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -220,6 +220,9 @@
 block discarded – undo
220 220
         return null;
221 221
     }
222 222
 
223
+    /**
224
+     * @param string $field
225
+     */
223 226
     public function hasField($field)
224 227
     {
225 228
         $fields = $this->compositeDatabaseFields();
Please login to merge, or discard this patch.
src/ORM/FieldType/DBCurrency.php 1 patch
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -24,6 +24,9 @@  discard block
 block discarded – undo
24 24
      */
25 25
     private static $currency_symbol = '$';
26 26
 
27
+    /**
28
+     * @param string $name
29
+     */
27 30
     public function __construct($name = null, $wholeSize = 9, $decimalSize = 2, $defaultValue = 0)
28 31
     {
29 32
         parent::__construct($name, $wholeSize, $decimalSize, $defaultValue);
@@ -56,6 +59,9 @@  discard block
 block discarded – undo
56 59
         }
57 60
     }
58 61
 
62
+    /**
63
+     * @param string $value
64
+     */
59 65
     public function setValue($value, $record = null, $markChanged = true)
60 66
     {
61 67
         $matches = null;
Please login to merge, or discard this patch.
src/ORM/FieldType/DBDate.php 1 patch
Doc Comments   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -36,6 +36,9 @@  discard block
 block discarded – undo
36 36
      */
37 37
     private static $nice_format = 'd/m/Y';
38 38
 
39
+    /**
40
+     * @param string|null $value
41
+     */
39 42
     public function setValue($value, $record = null, $markChanged = true)
40 43
     {
41 44
         if ($value === false || $value === null || (is_string($value) && !strlen($value))) {
@@ -205,7 +208,7 @@  discard block
 block discarded – undo
205 208
      * Return a date formatted as per a CMS user's settings.
206 209
      *
207 210
      * @param Member $member
208
-     * @return boolean | string A date formatted as per user-defined settings.
211
+     * @return false|string | string A date formatted as per user-defined settings.
209 212
      */
210 213
     public function FormatFromSettings($member = null)
211 214
     {
Please login to merge, or discard this patch.
src/ORM/FieldType/DBDatetime.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -126,7 +126,7 @@
 block discarded – undo
126 126
      * Return a date and time formatted as per a CMS user's settings.
127 127
      *
128 128
      * @param Member $member
129
-     * @return boolean | string A time and date pair formatted as per user-defined settings.
129
+     * @return false|string | string A time and date pair formatted as per user-defined settings.
130 130
      */
131 131
     public function FormatFromSettings($member = null)
132 132
     {
Please login to merge, or discard this patch.
src/ORM/FieldType/DBDecimal.php 1 patch
Doc Comments   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
      * @param string $name
20 20
      * @param int $wholeSize
21 21
      * @param int $decimalSize
22
-     * @param float|int $defaultValue
22
+     * @param integer $defaultValue
23 23
      */
24 24
     public function __construct($name = null, $wholeSize = 9, $decimalSize = 2, $defaultValue = 0)
25 25
     {
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
     }
34 34
 
35 35
     /**
36
-     * @return float
36
+     * @return string
37 37
      */
38 38
     public function Nice()
39 39
     {
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
     }
42 42
 
43 43
     /**
44
-     * @return int
44
+     * @return double
45 45
      */
46 46
     public function Int()
47 47
     {
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
88 88
     }
89 89
 
90 90
     /**
91
-     * @return float
91
+     * @return integer
92 92
      */
93 93
     public function nullValue()
94 94
     {
Please login to merge, or discard this patch.