Completed
Pull Request — master (#6354)
by Will
08:57
created
src/Forms/UploadField.php 1 patch
Doc Comments   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -304,7 +304,7 @@  discard block
 block discarded – undo
304 304
     /**
305 305
      * Determine if the target folder for new uploads in is visible the field UI.
306 306
      *
307
-     * @return boolean
307
+     * @return boolean|string
308 308
      */
309 309
     public function canPreviewFolder()
310 310
     {
@@ -581,7 +581,7 @@  discard block
 block discarded – undo
581 581
      * Customises a file with additional details suitable for rendering in the
582 582
      * UploadField.ss template
583 583
      *
584
-     * @param ViewableData|AssetContainer $file
584
+     * @param AssetContainer $file
585 585
      * @return ViewableData_Customised
586 586
      */
587 587
     protected function customiseFile(AssetContainer $file)
@@ -690,7 +690,7 @@  discard block
 block discarded – undo
690 690
     /**
691 691
      * Determine if the user has permission to upload.
692 692
      *
693
-     * @return boolean
693
+     * @return boolean|string
694 694
      */
695 695
     public function canUpload()
696 696
     {
@@ -718,7 +718,7 @@  discard block
 block discarded – undo
718 718
      * Determine if the user has permission to attach existing files
719 719
      * By default returns true if the user has the CMS_ACCESS_AssetAdmin permission
720 720
      *
721
-     * @return boolean
721
+     * @return boolean|string
722 722
      */
723 723
     public function canAttachExisting()
724 724
     {
Please login to merge, or discard this patch.
src/i18n/i18n.php 1 patch
Doc Comments   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2171,6 +2171,7 @@  discard block
 block discarded – undo
2171 2171
 
2172 2172
     /**
2173 2173
      * @param String
2174
+     * @param string $name
2174 2175
      * @return Zend_Translate
2175 2176
      */
2176 2177
     public static function get_translator($name)
@@ -2212,6 +2213,7 @@  discard block
 block discarded – undo
2212 2213
 
2213 2214
     /**
2214 2215
      * @param String
2216
+     * @param string $name
2215 2217
      */
2216 2218
     public static function unregister_translator($name)
2217 2219
     {
@@ -2323,7 +2325,7 @@  discard block
 block discarded – undo
2323 2325
      *
2324 2326
      * @see get_locale_name()
2325 2327
      *
2326
-     * @param mixed $code Language code
2328
+     * @param string $code Language code
2327 2329
      * @param boolean $native If true, the native name will be returned
2328 2330
      * @return string Name of the language
2329 2331
      */
Please login to merge, or discard this patch.
src/i18n/i18nTextCollector_Parser.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -52,6 +52,7 @@
 block discarded – undo
52 52
 
53 53
     /**
54 54
      * Parses a template and returns any translatable entities
55
+     * @param string $template
55 56
      */
56 57
     public static function GetTranslatables($template)
57 58
     {
Please login to merge, or discard this patch.
src/ORM/ArrayLib.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -178,7 +178,7 @@
 block discarded – undo
178 178
      *
179 179
      * Actually only one array argument is supported.
180 180
      *
181
-     * @param $f callback to apply
181
+     * @param string $f callback to apply
182 182
      * @param $array array
183 183
      * @return array
184 184
      */
Please login to merge, or discard this patch.
src/ORM/ArrayList.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -745,7 +745,7 @@
 block discarded – undo
745 745
     /**
746 746
      * Returns item stored in list with index $key
747 747
      *
748
-     * @param mixed $offset
748
+     * @param integer $offset
749 749
      * @return DataObject
750 750
      */
751 751
     public function offsetGet($offset)
Please login to merge, or discard this patch.
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.