Completed
Pull Request — master (#926)
by Mark
21:38 queued 09:30
created
app/Report/ReportPdfText.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -70,7 +70,7 @@
 block discarded – undo
70 70
 	 *
71 71
 	 * @param ReportTcpdf $pdf
72 72
 	 *
73
-	 * @return float 0
73
+	 * @return integer 0
74 74
 	 */
75 75
 	public function getHeight($pdf) {
76 76
 		return 0;
Please login to merge, or discard this patch.
app/Report/ReportPdfTextbox.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@
 block discarded – undo
24 24
 	 *
25 25
 	 * @param ReportTcpdf $renderer
26 26
 	 *
27
-	 * @return bool|int
27
+	 * @return boolean
28 28
 	 */
29 29
 	public function render($renderer) {
30 30
 
Please login to merge, or discard this patch.
app/Report/ReportTcpdf.php 1 patch
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
 	/**
142 142
 	 * Add an element to the Page Header -PDF
143 143
 	 *
144
-	 * @param object|string $element
144
+	 * @param ReportBaseElement $element
145 145
 	 *
146 146
 	 * @return int The number of the Page Header elements
147 147
 	 */
@@ -232,7 +232,7 @@  discard block
 block discarded – undo
232 232
 	/**
233 233
 	 * Set the report.
234 234
 	 *
235
-	 * @param $r
235
+	 * @param ReportPdf $r
236 236
 	 */
237 237
 	public function setReport($r) {
238 238
 		$this->wt_report = $r;
@@ -340,7 +340,7 @@  discard block
 block discarded – undo
340 340
 	/**
341 341
 	 * Checks the Footnote and numbers them
342 342
 	 *
343
-	 * @param object $footnote
343
+	 * @param ReportBaseFootnote $footnote
344 344
 	 *
345 345
 	 * @return bool false if not numbered befor | object if already numbered
346 346
 	 */
Please login to merge, or discard this patch.
app/Schema/MigrationInterface.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -21,6 +21,7 @@
 block discarded – undo
21 21
 interface MigrationInterface {
22 22
 	/**
23 23
 	 * Upgrade to to the next version
24
+	 * @return void
24 25
 	 */
25 26
 	public function upgrade();
26 27
 }
Please login to merge, or discard this patch.
app/Source.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -60,7 +60,7 @@
 block discarded – undo
60 60
 	 * @param string $xref
61 61
 	 * @param int    $tree_id
62 62
 	 *
63
-	 * @return null|string
63
+	 * @return string
64 64
 	 */
65 65
 	protected static function fetchGedcomRecord($xref, $tree_id) {
66 66
 		return Database::prepare(
Please login to merge, or discard this patch.
app/Statement.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -142,7 +142,7 @@  discard block
 block discarded – undo
142 142
 	 *
143 143
 	 * @param int $fetch_style
144 144
 	 *
145
-	 * @return \stdClass|array|null
145
+	 * @return \stdClass
146 146
 	 */
147 147
 	public function fetchOneRow($fetch_style = PDO::FETCH_OBJ) {
148 148
 		if (!$this->executed) {
@@ -160,7 +160,7 @@  discard block
 block discarded – undo
160 160
 	 *
161 161
 	 * Execute the query, if necessary.  Typically when there are no parameters.
162 162
 	 *
163
-	 * @return string|null
163
+	 * @return string
164 164
 	 */
165 165
 	public function fetchOne() {
166 166
 		if (!$this->executed) {
Please login to merge, or discard this patch.
app/Stats.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -5362,7 +5362,7 @@
 block discarded – undo
5362 5362
 	/**
5363 5363
 	 * Find common surnames.
5364 5364
 	 *
5365
-	 * @return string
5365
+	 * @return integer|null
5366 5366
 	 */
5367 5367
 	public function getCommonSurname() {
5368 5368
 		$surnames = array_keys(FunctionsDb::getTopSurnames($this->tree->getTreeId(), 1, 1));
Please login to merge, or discard this patch.
app/Theme/ThemeInterface.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -102,6 +102,7 @@  discard block
 block discarded – undo
102 102
 	/**
103 103
 	 * Allow themes to do things after initialization (since they cannot use
104 104
 	 * the constructor).
105
+	 * @return void
105 106
 	 */
106 107
 	public function hookAfterInit();
107 108
 
@@ -193,6 +194,7 @@  discard block
 block discarded – undo
193 194
 	 * happens in a theme file, and we need to be able to change it.
194 195
 	 *
195 196
 	 * @param Tree|null $tree The current tree (if there is one).
197
+	 * @return void
196 198
 	 */
197 199
 	public function init(Tree $tree = null);
198 200
 
@@ -214,6 +216,7 @@  discard block
 block discarded – undo
214 216
 
215 217
 	/**
216 218
 	 * Send any HTTP headers.
219
+	 * @return void
217 220
 	 */
218 221
 	public function sendHeaders();
219 222
 
Please login to merge, or discard this patch.
admin_media.php 1 patch
Braces   +10 added lines, -4 removed lines patch added patch discarded remove patch
@@ -648,16 +648,22 @@
 block discarded – undo
648 648
 					<div dir="ltr">
649 649
 						<?php if (count($media_folders) > 1): ?>
650 650
 						<?php echo WT_DATA_DIR, FunctionsEdit::selectEditControl('media_folder', $media_folders, null, $media_folder, 'onchange="this.form.submit();"'); ?>
651
-						<?php else: ?>
652
-						<?php echo WT_DATA_DIR, Filter::escapeHtml($media_folder); ?>
651
+						<?php else {
652
+	: ?>
653
+						<?php echo WT_DATA_DIR, Filter::escapeHtml($media_folder);
654
+}
655
+?>
653 656
 						<input type="hidden" name="media_folder" value="<?php echo Filter::escapeHtml($media_folder); ?>">
654 657
 						<?php endif; ?>
655 658
 					</div>
656 659
 
657 660
 					<?php if (count($media_paths) > 1): ?>
658 661
 					<?php echo FunctionsEdit::selectEditControl('media_path', $media_paths, null, $media_path, 'onchange="this.form.submit();"'); ?>
659
-					<?php else: ?>
660
-					<?php echo Filter::escapeHtml($media_path); ?>
662
+					<?php else {
663
+	: ?>
664
+					<?php echo Filter::escapeHtml($media_path);
665
+}
666
+?>
661 667
 					<input type="hidden" name="media_path" value="<?php echo Filter::escapeHtml($media_path); ?>">
662 668
 					<?php endif; ?>
663 669
 
Please login to merge, or discard this patch.