Completed
Pull Request — master (#6884)
by Sam
07:37
created
src/ORM/Connect/Database.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -768,7 +768,7 @@
 block discarded – undo
768 768
      * @param boolean $create Flag indicating whether the database should be created
769 769
      * if it doesn't exist. If $create is false and the database doesn't exist
770 770
      * then an error will be raised
771
-     * @param int|boolean $errorLevel The level of error reporting to enable for the query, or false if no error
771
+     * @param boolean $errorLevel The level of error reporting to enable for the query, or false if no error
772 772
      * should be raised
773 773
      * @return boolean Flag indicating success
774 774
      */
Please login to merge, or discard this patch.
src/ORM/Connect/DBSchemaManager.php 1 patch
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -331,7 +331,7 @@  discard block
 block discarded – undo
331 331
      *   - array('fields' => array('A','B','C'), 'type' => 'index/unique/fulltext'): This gives you full
332 332
      *     control over the index.
333 333
      * @param boolean $hasAutoIncPK A flag indicating that the primary key on this table is an autoincrement type
334
-     * @param array $options Create table options (ENGINE, etc.)
334
+     * @param string|null $options Create table options (ENGINE, etc.)
335 335
      * @param array|bool $extensions List of extensions
336 336
      */
337 337
     public function requireTable(
@@ -529,7 +529,7 @@  discard block
 block discarded – undo
529 529
     /**
530 530
      * Given an index spec determines the index type
531 531
      *
532
-     * @param array|string $spec
532
+     * @param string $spec
533 533
      * @return string
534 534
      */
535 535
     protected function determineIndexType($spec)
@@ -630,7 +630,7 @@  discard block
 block discarded – undo
630 630
      *
631 631
      * @param string $table The table name.
632 632
      * @param string $field The field name.
633
-     * @param array|string $spec The field specification. If passed in array syntax, the specific database
633
+     * @param string $spec The field specification. If passed in array syntax, the specific database
634 634
      *  driver takes care of the ALTER TABLE syntax. If passed as a string, its assumed to
635 635
      *  be prepared as a direct SQL framgment ready for insertion into ALTER TABLE. In this case you'll
636 636
      *  need to take care of database abstraction in your DBField subclass.
Please login to merge, or discard this patch.
src/ORM/Connect/MySQLSchemaManager.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -129,6 +129,9 @@
 block discarded – undo
129 129
         $this->query("ALTER TABLE \"$tableName\" $alterations");
130 130
     }
131 131
 
132
+    /**
133
+     * @param string $tableName
134
+     */
132 135
     public function isView($tableName)
133 136
     {
134 137
         $info = $this->query("SHOW /*!50002 FULL*/ TABLES LIKE '$tableName'")->record();
Please login to merge, or discard this patch.
src/ORM/DatabaseAdmin.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -143,7 +143,7 @@  discard block
 block discarded – undo
143 143
     /**
144 144
      * Gets the url to return to after build
145 145
      *
146
-     * @return string|null
146
+     * @return string
147 147
      */
148 148
     protected function getReturnURL()
149 149
     {
@@ -175,7 +175,7 @@  discard block
 block discarded – undo
175 175
     /**
176 176
      * Returns the timestamp of the time that the database was last built
177 177
      *
178
-     * @return string Returns the timestamp of the time that the database was
178
+     * @return integer|null Returns the timestamp of the time that the database was
179 179
      *                last built
180 180
      */
181 181
     public static function lastBuilt()
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/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.