Completed
Pull Request — master (#5258)
by Sean
11:38
created
i18n/i18nTextCollector.php 1 patch
Doc Comments   +6 added lines, -1 removed lines patch added patch discarded remove patch
@@ -712,7 +712,8 @@  discard block
 block discarded – undo
712 712
 	 * Input for langArrayCodeForEntitySpec() should be suitable for insertion
713 713
 	 * into single-quoted strings, so needs to be escaped already.
714 714
 	 *
715
-	 * @param string $entity The entity name, e.g. CMSMain.BUTTONSAVE
715
+	 * @param string $entitySpec The entity name, e.g. CMSMain.BUTTONSAVE
716
+	 * @param string $locale
716 717
 	 */
717 718
 	public function langArrayCodeForEntitySpec($entityFullName, $entitySpec, $locale) {
718 719
 		$php = '';
@@ -775,6 +776,9 @@  discard block
 block discarded – undo
775 776
 		return true;
776 777
 	}
777 778
 
779
+	/**
780
+	 * @param string $locale
781
+	 */
778 782
 	public function getYaml($entities, $locale) {
779 783
 		// Unflatten array
780 784
 		$entitiesNested = array();
@@ -843,6 +847,7 @@  discard block
 block discarded – undo
843 847
 
844 848
 	/**
845 849
 	 * Parses a template and returns any translatable entities
850
+	 * @param string $template
846 851
 	 */
847 852
 	public static function GetTranslatables($template) {
848 853
 		self::$entities = array();
Please login to merge, or discard this patch.
model/ArrayList.php 1 patch
Doc Comments   +4 added lines, -5 removed lines patch added patch discarded remove patch
@@ -387,7 +387,7 @@  discard block
 block discarded – undo
387 387
 	 *
388 388
 	 * Note that columns may be double quoted as per ANSI sql standard
389 389
 	 *
390
-	 * @return DataList
390
+	 * @return ArrayList
391 391
 	 * @see SS_List::sort()
392 392
 	 * @example $list->sort('Name'); // default ASC sorting
393 393
 	 * @example $list->sort('Name DESC'); // DESC sorting
@@ -523,6 +523,9 @@  discard block
 block discarded – undo
523 523
 		return $list;
524 524
 	}
525 525
 
526
+	/**
527
+	 * @param integer $id
528
+	 */
526 529
 	public function byID($id) {
527 530
 		$firstElement = $this->filter("ID", $id)->first();
528 531
 
@@ -624,7 +627,6 @@  discard block
 block discarded – undo
624 627
 	/**
625 628
 	 * Returns whether an item with $key exists
626 629
 	 *
627
-	 * @param mixed $key
628 630
 	 * @return bool
629 631
 	 */
630 632
 	public function offsetExists($offset) {
@@ -634,7 +636,6 @@  discard block
 block discarded – undo
634 636
 	/**
635 637
 	 * Returns item stored in list with index $key
636 638
 	 *
637
-	 * @param mixed $key
638 639
 	 * @return DataObject
639 640
 	 */
640 641
 	public function offsetGet($offset) {
@@ -644,7 +645,6 @@  discard block
 block discarded – undo
644 645
 	/**
645 646
 	 * Set an item with the key in $key
646 647
 	 *
647
-	 * @param mixed $key
648 648
 	 * @param mixed $value
649 649
 	 */
650 650
 	public function offsetSet($offset, $value) {
@@ -658,7 +658,6 @@  discard block
 block discarded – undo
658 658
 	/**
659 659
 	 * Unset an item with the key in $key
660 660
 	 *
661
-	 * @param mixed $key
662 661
 	 */
663 662
 	public function offsetUnset($offset) {
664 663
 		unset($this->items[$offset]);
Please login to merge, or discard this patch.
model/connect/DBSchemaManager.php 1 patch
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -38,7 +38,6 @@  discard block
 block discarded – undo
38 38
 	/**
39 39
 	 * Injector injection point for database controller
40 40
 	 *
41
-	 * @param SS_Database $connector
42 41
 	 */
43 42
 	public function setDatabase(SS_Database $database) {
44 43
 		$this->database = $database;
@@ -104,6 +103,7 @@  discard block
 block discarded – undo
104 103
 	 *
105 104
 	 * @var callable $callback
106 105
 	 * @throws Exception
106
+	 * @param Closure $callback
107 107
 	 */
108 108
 	public function schemaUpdate($callback) {
109 109
 		// Begin schema update
@@ -476,7 +476,7 @@  discard block
 block discarded – undo
476 476
 	/**
477 477
 	 * Given an index spec determines the index type
478 478
 	 *
479
-	 * @param array|string $spec
479
+	 * @param string $spec
480 480
 	 * @return string
481 481
 	 */
482 482
 	protected function determineIndexType($spec) {
@@ -544,7 +544,7 @@  discard block
 block discarded – undo
544 544
 	/**
545 545
 	 * Returns true if the given table is exists in the current database
546 546
 	 *
547
-	 * @param string $table Name of table to check
547
+	 * @param string $tableName Name of table to check
548 548
 	 * @return boolean Flag indicating existence of table
549 549
 	 */
550 550
 	abstract public function hasTable($tableName);
Please login to merge, or discard this patch.
model/connect/MySQLSchemaManager.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -115,6 +115,9 @@
 block discarded – undo
115 115
 		$this->query("ALTER TABLE \"$tableName\" $alterations");
116 116
 	}
117 117
 
118
+	/**
119
+	 * @param string $tableName
120
+	 */
118 121
 	public function isView($tableName) {
119 122
 		$info = $this->query("SHOW /*!50002 FULL*/ TABLES LIKE '$tableName'")->record();
120 123
 		return $info && strtoupper($info['Table_type']) == 'VIEW';
Please login to merge, or discard this patch.
model/DatabaseAdmin.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
 	/**
108 108
 	 * Gets the url to return to after build
109 109
 	 *
110
-	 * @return string|null
110
+	 * @return string
111 111
 	 */
112 112
 	protected function getReturnURL() {
113 113
 		$url = $this->request->getVar('returnURL');
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
152 152
 	/**
153 153
 	 * Returns the timestamp of the time that the database was last built
154 154
 	 *
155
-	 * @return string Returns the timestamp of the time that the database was
155
+	 * @return integer|null Returns the timestamp of the time that the database was
156 156
 	 *                last built
157 157
 	 */
158 158
 	public static function lastBuilt() {
Please login to merge, or discard this patch.
model/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.
model/DB.php 1 patch
Doc Comments   +5 added lines, -4 removed lines patch added patch discarded remove patch
@@ -217,9 +217,8 @@  discard block
 block discarded – undo
217 217
 	 * Given the database configuration, this method will create the correct
218 218
 	 * subclass of {@link SS_Database}.
219 219
 	 *
220
-	 * @param array $database A map of options. The 'type' is the name of the subclass of SS_Database to use. For the
220
+	 * @param array $databaseConfig A map of options. The 'type' is the name of the subclass of SS_Database to use. For the
221 221
 	 *                        rest of the options, see the specific class.
222
-	 * @param string $name identifier for the connection
223 222
 	 *
224 223
 	 * @return SS_Database
225 224
 	 */
@@ -413,7 +412,7 @@  discard block
 block discarded – undo
413 412
 
414 413
 	/**
415 414
 	 * Create a new table.
416
-	 * @param string $tableName The name of the table
415
+	 * @param string $table The name of the table
417 416
 	 * @param array$fields A map of field names to field types
418 417
 	 * @param array $indexes A map of indexes
419 418
 	 * @param array $options An map of additional options.  The available keys are as follows:
@@ -500,6 +499,8 @@  discard block
 block discarded – undo
500 499
 
501 500
 	/**
502 501
 	 * @deprecated since version 4.0 Use DB::require_field instead
502
+	 * @param string $table
503
+	 * @param string $field
503 504
 	 */
504 505
 	public static function requireField($table, $field, $spec) {
505 506
 		Deprecation::notice('4.0', 'Use DB::require_field instead');
@@ -563,7 +564,7 @@  discard block
 block discarded – undo
563 564
 	/**
564 565
 	 * Checks a table's integrity and repairs it if necessary.
565 566
 	 *
566
-	 * @param string $tableName The name of the table.
567
+	 * @param string $table The name of the table.
567 568
 	 * @return boolean Return true if the table has integrity after the method is complete.
568 569
 	 */
569 570
 	public static function check_and_repair_table($table) {
Please login to merge, or discard this patch.
model/Hierarchy.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -707,7 +707,7 @@
 block discarded – undo
707 707
 	 * Get the next node in the tree of the type. If there is no instance of the className descended from this node,
708 708
 	 * then search the parents.
709 709
 	 * @param string $className Class name of the node to find.
710
-	 * @param string|int $root ID/ClassName of the node to limit the search to
710
+	 * @param integer $root ID/ClassName of the node to limit the search to
711 711
 	 * @param DataObject afterNode Used for recursive calls to this function
712 712
 	 * @return DataObject
713 713
 	 */
Please login to merge, or discard this patch.
model/queries/SQLAssignmentRow.php 1 patch
Doc Comments   -3 removed lines patch added patch discarded remove patch
@@ -74,9 +74,6 @@
 block discarded – undo
74 74
 	 * Given a list of assignments in any user-acceptible format, normalise the
75 75
 	 * value to a common array('SQL' => array(parameters)) format
76 76
 	 *
77
-	 * @param array $predicates List of assignments.
78
-	 * The key of this array should be the field name, and the value the assigned
79
-	 * literal value, or an array with parameterised information.
80 77
 	 * @return array List of normalised assignments
81 78
 	 */
82 79
 	protected function normaliseAssignments(array $assignments) {
Please login to merge, or discard this patch.