Completed
Push — develop ( 5093fb...fcc755 )
by Greg
09:08
created
app/Fact.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -87,7 +87,7 @@
 block discarded – undo
87 87
 	/**
88 88
 	 * Get the record to which this fact links
89 89
 	 *
90
-	 * @return Individual|Family|Source|Repository|Media|Note|null
90
+	 * @return GedcomRecord|null
91 91
 	 */
92 92
 	public function getTarget() {
93 93
 		$xref = trim($this->getValue(), '@');
Please login to merge, or discard this patch.
app/Module.php 2 patches
Doc Comments   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
152 152
 	 *
153 153
 	 * @param Tree $tree
154 154
 	 *
155
-	 * @return ModuleBlockInterface[]
155
+	 * @return AbstractModule[]
156 156
 	 */
157 157
 	public static function getActiveBlocks(Tree $tree) {
158 158
 		return self::getActiveModulesByComponent($tree, 'block');
@@ -163,7 +163,7 @@  discard block
 block discarded – undo
163 163
 	 *
164 164
 	 * @param Tree $tree
165 165
 	 *
166
-	 * @return ModuleChartInterface[]
166
+	 * @return AbstractModule[]
167 167
 	 */
168 168
 	public static function getActiveCharts(Tree $tree) {
169 169
 		return self::getActiveModulesByComponent($tree, 'chart');
@@ -174,7 +174,7 @@  discard block
 block discarded – undo
174 174
 	 *
175 175
 	 * @param Tree $tree
176 176
 	 *
177
-	 * @return ModuleMenuInterface[]
177
+	 * @return AbstractModule[]
178 178
 	 */
179 179
 	public static function getActiveMenus(Tree $tree) {
180 180
 		return self::getActiveModulesByComponent($tree, 'menu');
@@ -185,7 +185,7 @@  discard block
 block discarded – undo
185 185
 	 *
186 186
 	 * @param Tree $tree
187 187
 	 *
188
-	 * @return ModuleReportInterface[]
188
+	 * @return AbstractModule[]
189 189
 	 */
190 190
 	public static function getActiveReports(Tree $tree) {
191 191
 		return self::getActiveModulesByComponent($tree, 'report');
@@ -196,7 +196,7 @@  discard block
 block discarded – undo
196 196
 	 *
197 197
 	 * @param Tree $tree
198 198
 	 *
199
-	 * @return ModuleSidebarInterface[]
199
+	 * @return AbstractModule[]
200 200
 	 */
201 201
 	public static function getActiveSidebars(Tree $tree) {
202 202
 		return self::getActiveModulesByComponent($tree, 'sidebar');
@@ -207,7 +207,7 @@  discard block
 block discarded – undo
207 207
 	 *
208 208
 	 * @param Tree $tree
209 209
 	 *
210
-	 * @return ModuleTabInterface[]
210
+	 * @return AbstractModule[]
211 211
 	 */
212 212
 	public static function getActiveTabs(Tree $tree) {
213 213
 		return self::getActiveModulesByComponent($tree, 'tab');
@@ -218,7 +218,7 @@  discard block
 block discarded – undo
218 218
 	 *
219 219
 	 * @param Tree $tree
220 220
 	 *
221
-	 * @return ModuleThemeInterface[]
221
+	 * @return AbstractModule[]
222 222
 	 */
223 223
 	public static function getActiveThemes(Tree $tree) {
224 224
 		return self::getActiveModulesByComponent($tree, 'theme');
Please login to merge, or discard this patch.
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@
 block discarded – undo
53 53
 					}
54 54
 				} catch (\Exception $ex) {
55 55
 					// The module has been deleted or is broken?  Disable it.
56
-					Log::addConfigurationLog("Module {$module_name} is missing or broken - disabling it");
56
+					Log::addConfigurationLog("module {$module_name} is missing or broken - disabling it");
57 57
 					Database::prepare(
58 58
 						"UPDATE `##module` SET status = 'disabled' WHERE module_name = :module_name"
59 59
 					)->execute(array(
Please login to merge, or discard this patch.
app/Module/BatchUpdateModule.php 2 patches
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -268,7 +268,7 @@  discard block
 block discarded – undo
268 268
 	 *
269 269
 	 * @param string $xref
270 270
 	 *
271
-	 * @return string|null
271
+	 * @return integer|null
272 272
 	 */
273 273
 	private function findNextXref($xref) {
274 274
 		foreach (array_keys($this->all_xrefs) as $key) {
@@ -288,7 +288,7 @@  discard block
 block discarded – undo
288 288
 	 *
289 289
 	 * @param string $xref
290 290
 	 *
291
-	 * @return string|null
291
+	 * @return integer|null
292 292
 	 */
293 293
 	private function findPrevXref($xref) {
294 294
 		foreach (array_reverse(array_keys($this->all_xrefs)) as $key) {
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2760,7 +2760,8 @@  discard block
 block discarded – undo
2760 2760
 			var pl_name = '<?= Filter::escapeJs($place_name) ?>';
2761 2761
 			<?php if ($place_lati !== 0.0 && $place_long !== 0.0): ?>
2762 2762
 				var latlng = new google.maps.LatLng(<?= $place_lati ?>, <?= $place_long ?>);
2763
-			<?php else: ?>
2763
+			<?php else {
2764
+	: ?>
2764 2765
 				var latlng = new google.maps.LatLng(<?= $parent_lati ?>, <?= $parent_long ?>);
2765 2766
 			<?php endif ?>
2766 2767
 			var pl_zoom = <?= $zoomfactor ?>;
@@ -2862,6 +2863,7 @@  discard block
 block discarded – undo
2862 2863
 
2863 2864
 				<?php
2864 2865
 				$coordsAsStr = [];
2866
+}
2865 2867
 				switch (strtoupper($place_name)) {
2866 2868
 				case 'ENGLAND':
2867 2869
 					$coordsAsStr[] = '-4.74361,50.66750|-4.78361,50.59361|-4.91584,50.57722|-5.01750,50.54264|-5.02569,50.47271|-5.04729,50.42750|-5.15208,50.34374|-5.26805,50.27389|-5.43194,50.19326|-5.49584,50.21695|-5.54639,50.20527|-5.71000,50.12916|-5.71681,50.06083|-5.66174,50.03631|-5.58278,50.04777|-5.54166,50.07055|-5.53416,50.11569|-5.47055,50.12499|-5.33361,50.09138|-5.27666,50.05972|-5.25674,50.00514|-5.19306,49.95527|-5.16070,50.00319|-5.06555,50.03750|-5.07090,50.08166|-5.04806,50.17111|-4.95278,50.19333|-4.85750,50.23166|-4.76250,50.31138|-4.67861,50.32583|-4.54334,50.32222|-4.48278,50.32583|-4.42972,50.35139|-4.38000,50.36388|-4.16555,50.37028|-4.11139,50.33027|-4.05708,50.29791|-3.94389,50.31346|-3.87764,50.28139|-3.83653,50.22972|-3.78944,50.21222|-3.70666,50.20972|-3.65195,50.23111|-3.55139,50.43833|-3.49416,50.54639|-3.46181,50.58792|-3.41139,50.61610|-3.24416,50.67444|-3.17347,50.68833|-3.09445,50.69222|-2.97806,50.70638|-2.92750,50.73125|-2.88278,50.73111|-2.82305,50.72027|-2.77139,50.70861|-2.66195,50.67334|-2.56305,50.63222|-2.45861,50.57500|-2.44666,50.62639|-2.39097,50.64166|-2.19722,50.62611|-2.12195,50.60722|-2.05445,50.58569|-1.96437,50.59674|-1.95441,50.66536|-2.06681,50.71430|-1.93416,50.71277|-1.81639,50.72306|-1.68445,50.73888|-1.59278,50.72416|-1.33139,50.79138|-1.11695,50.80694|-1.15889,50.84083|-1.09445,50.84584|-0.92842,50.83966|-0.86584,50.79965|-0.90826,50.77396|-0.78187,50.72722|-0.74611,50.76583|-0.67528,50.78111|-0.57722,50.79527|-0.25500,50.82638|-0.19084,50.82583|-0.13805,50.81833|0.05695,50.78083|0.12334,50.75944|0.22778,50.73944|0.28695,50.76500|0.37195,50.81638|0.43084,50.83111|0.56722,50.84777|0.67889,50.87681|0.71639,50.90500|0.79334,50.93610|0.85666,50.92556|0.97125,50.98111|0.99778,51.01903|1.04555,51.04944|1.10028,51.07361|1.26250,51.10166|1.36889,51.13583|1.41111,51.20111|1.42750,51.33111|1.38556,51.38777|1.19195,51.37861|1.05278,51.36722|0.99916,51.34777|0.90806,51.34069|0.70416,51.37749|0.61972,51.38304|0.55945,51.40596|0.64236,51.44042|0.69750,51.47084|0.59195,51.48777|0.53611,51.48806|0.48916,51.48445|0.45215,51.45562|0.38894,51.44822|0.46500,51.50306|0.65195,51.53680|0.76695,51.52138|0.82084,51.53556|0.87528,51.56110|0.95250,51.60923|0.94695,51.72556|0.90257,51.73465|0.86306,51.71166|0.76140,51.69164|0.70111,51.71847|0.86211,51.77361|0.93236,51.80583|0.98278,51.82527|1.03569,51.77416|1.08834,51.77056|1.13222,51.77694|1.18139,51.78972|1.22361,51.80888|1.26611,51.83916|1.28097,51.88096|1.20834,51.95083|1.16347,52.02361|1.27750,51.98555|1.33125,51.92875|1.39028,51.96999|1.58736,52.08388|1.63000,52.19527|1.68576,52.32630|1.73028,52.41138|1.74945,52.45583|1.74590,52.62021|1.70250,52.71583|1.64528,52.77111|1.50361,52.83749|1.43222,52.87472|1.35250,52.90972|1.28222,52.92750|1.18389,52.93889|0.99472,52.95111|0.94222,52.95083|0.88472,52.96638|0.66722,52.97611|0.54778,52.96618|0.49139,52.93430|0.44431,52.86569|0.42903,52.82403|0.36334,52.78027|0.21778,52.80694|0.16125,52.86250|0.05778,52.88916|0.00211,52.87985|0.03222,52.91722|0.20389,53.02805|0.27666,53.06694|0.33916,53.09236|0.35389,53.18722|0.33958,53.23472|0.23555,53.39944|0.14347,53.47527|0.08528,53.48638|0.02694,53.50972|-0.10084,53.57306|-0.20722,53.63083|-0.26445,53.69083|-0.30166,53.71319|-0.39022,53.70794|-0.51972,53.68527|-0.71653,53.69638|-0.65445,53.72527|-0.60584,53.72972|-0.54916,53.70611|-0.42261,53.71755|-0.35728,53.73056|-0.29389,53.73666|-0.23139,53.72166|-0.10584,53.63166|-0.03472,53.62555|0.04416,53.63916|0.08916,53.62666|0.14945,53.58847|0.12639,53.64527|0.06264,53.70389|-0.12750,53.86388|-0.16916,53.91847|-0.21222,54.00833|-0.20569,54.05153|-0.16111,54.08806|-0.11694,54.13222|-0.20053,54.15171|-0.26250,54.17444|-0.39334,54.27277|-0.42166,54.33222|-0.45750,54.37694|-0.51847,54.44749|-0.56472,54.48000|-0.87584,54.57027|-1.06139,54.61722|-1.16528,54.64972|-1.30445,54.77138|-1.34556,54.87138|-1.41278,54.99944|-1.48292,55.08625|-1.51500,55.14972|-1.56584,55.28722|-1.58097,55.48361|-1.63597,55.58194|-1.69000,55.60556|-1.74695,55.62499|-1.81764,55.63306|-1.97681,55.75416|-2.02166,55.80611|-2.08361,55.78054|-2.22000,55.66499|-2.27916,55.64472|-2.27416,55.57527|-2.21528,55.50583|-2.18278,55.45985|-2.21236,55.42777|-2.46305,55.36111|-2.63055,55.25500|-2.69945,55.17722|-2.96278,55.03889|-3.01500,55.05222|-3.05103,54.97986|-3.13292,54.93139|-3.20861,54.94944|-3.28931,54.93792|-3.39166,54.87639|-3.42916,54.81555|-3.56916,54.64249|-3.61306,54.48861|-3.49305,54.40333|-3.43389,54.34806|-3.41056,54.28014|-3.38055,54.24444|-3.21472,54.09555|-3.15222,54.08194|-2.93097,54.15333|-2.81361,54.22277|-2.81750,54.14277|-2.83361,54.08500|-2.93250,53.95055|-3.05264,53.90764|-3.03708,53.74944|-2.99278,53.73277|-2.89979,53.72499|-2.97729,53.69382|-3.07306,53.59805|-3.10563,53.55993|-3.00678,53.41738|-2.95389,53.36027|-2.85736,53.32083|-2.70493,53.35062|-2.77639,53.29250|-2.89972,53.28916|-2.94250,53.31056|-3.02889,53.38191|-3.07248,53.40936|-3.16695,53.35708|-3.12611,53.32500|-3.08860,53.26001|-3.02000,53.24722|-2.95528,53.21555|-2.91069,53.17014|-2.89389,53.10416|-2.85695,53.03249|-2.77792,52.98514|-2.73109,52.96873|-2.71945,52.91902|-2.79278,52.90207|-2.85069,52.93875|-2.99389,52.95361|-3.08639,52.91611|-3.13014,52.88486|-3.13708,52.79312|-3.06806,52.77027|-3.01111,52.71166|-3.06666,52.63527|-3.11750,52.58666|-3.07089,52.55702|-3.00792,52.56902|-2.98028,52.53083|-3.02736,52.49792|-3.11916,52.49194|-3.19514,52.46722|-3.19611,52.41027|-3.02195,52.34027|-2.95486,52.33117|-2.99750,52.28139|-3.05125,52.23347|-3.07555,52.14804|-3.12222,52.11805|-3.11250,52.06945|-3.08500,52.01930|-3.04528,51.97639|-2.98889,51.92555|-2.91757,51.91569|-2.86639,51.92889|-2.77861,51.88583|-2.65944,51.81806|-2.68334,51.76957|-2.68666,51.71889|-2.66500,51.61500|-2.62916,51.64416|-2.57889,51.67777|-2.46056,51.74666|-2.40389,51.74041|-2.47166,51.72445|-2.55305,51.65722|-2.65334,51.56389|-2.77055,51.48916|-2.85278,51.44472|-2.96000,51.37499|-3.00695,51.30722|-3.01278,51.25632|-3.02834,51.20611|-3.30139,51.18111|-3.39361,51.18138|-3.43729,51.20638|-3.50722,51.22333|-3.57014,51.23027|-3.63222,51.21805|-3.70028,51.23000|-3.79250,51.23916|-3.88389,51.22416|-3.98472,51.21695|-4.11666,51.21222|-4.22805,51.18777|-4.22028,51.11054|-4.23702,51.04659|-4.30361,51.00416|-4.37639,50.99110|-4.42736,51.00958|-4.47445,51.01416|-4.52132,51.01424|-4.54334,50.92694|-4.56139,50.77625|-4.65139,50.71527|-4.74361,50.66750';
Please login to merge, or discard this patch.
app/Report/ReportBase.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -463,7 +463,7 @@
 block discarded – undo
463 463
 	 *
464 464
 	 * @param string $s Style name
465 465
 	 *
466
-	 * @return array
466
+	 * @return string
467 467
 	 */
468 468
 	public function getStyle($s) {
469 469
 		if (!isset($this->Styles[$s])) {
Please login to merge, or discard this patch.
app/Report/ReportBaseCell.php 1 patch
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
127 127
 	 * @param int $stretch Stretch carachter mode
128 128
 	 * @param string $bocolor Border color
129 129
 	 * @param string $tcolor  Text color
130
-	 * @param        $reseth
130
+	 * @param        boolean $reseth
131 131
 	 */
132 132
 	public function __construct(
133 133
 		$width, $height, $border, $align, $bgcolor, $style, $ln, $top, $left, $fill, $stretch, $bocolor, $tcolor, $reseth
@@ -157,7 +157,7 @@  discard block
 block discarded – undo
157 157
 	 *
158 158
 	 * @param $renderer
159 159
 	 *
160
-	 * @return float
160
+	 * @return integer
161 161
 	 */
162 162
 	public function getHeight($renderer) {
163 163
 		return $this->height;
@@ -181,7 +181,7 @@  discard block
 block discarded – undo
181 181
 	 *
182 182
 	 * @param $renderer
183 183
 	 *
184
-	 * @return float
184
+	 * @return integer
185 185
 	 */
186 186
 	public function getWidth($renderer) {
187 187
 		return $this->width;
Please login to merge, or discard this patch.
app/Report/ReportHtml.php 1 patch
Doc Comments   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -308,7 +308,7 @@  discard block
 block discarded – undo
308 308
 	 * @param string $tcolor  Text color
309 309
 	 * @param bool    $reseth
310 310
 	 *
311
-	 * @return object ReportHtmlCell
311
+	 * @return ReportHtmlCell ReportHtmlCell
312 312
 	 */
313 313
 	public function createCell($width, $height, $border, $align, $bgcolor, $style, $ln, $top, $left, $fill, $stretch, $bocolor, $tcolor, $reseth) {
314 314
 		return new ReportHtmlCell($width, $height, $border, $align, $bgcolor, $style, $ln, $top, $left, $fill, $stretch, $bocolor, $tcolor, $reseth);
@@ -466,7 +466,7 @@  discard block
 block discarded – undo
466 466
 	/**
467 467
 	 * Add a page header.
468 468
 	 *
469
-	 * @param $element
469
+	 * @param ReportBaseElement $element
470 470
 	 *
471 471
 	 * @return int
472 472
 	 */
@@ -479,7 +479,7 @@  discard block
 block discarded – undo
479 479
 	/**
480 480
 	 * Checks the Footnote and numbers them - ReportHtml
481 481
 	 *
482
-	 * @param object $footnote
482
+	 * @param ReportBaseFootnote $footnote
483 483
 	 *
484 484
 	 * @return bool false if not numbered before | object if already numbered
485 485
 	 */
@@ -553,7 +553,7 @@  discard block
 block discarded – undo
553 553
 	/**
554 554
 	 * Get the current footnotes height.
555 555
 	 *
556
-	 * @param $cellWidth
556
+	 * @param double $cellWidth
557 557
 	 *
558 558
 	 * @return int
559 559
 	 */
@@ -600,9 +600,9 @@  discard block
 block discarded – undo
600 600
 	/**
601 601
 	 * Get a text height in points - ReportHtml
602 602
 	 *
603
-	 * @param $str
603
+	 * @param string $str
604 604
 	 *
605
-	 * @return int
605
+	 * @return double
606 606
 	 */
607 607
 	public function getTextCellHeight($str) {
608 608
 		// Count the number of lines to calculate the height
@@ -641,7 +641,7 @@  discard block
 block discarded – undo
641 641
 	/**
642 642
 	 * Set the current style.
643 643
 	 *
644
-	 * @param $s
644
+	 * @param string $s
645 645
 	 */
646 646
 	public function setCurrentStyle($s) {
647 647
 		$this->currentStyle = $s;
Please login to merge, or discard this patch.
app/Report/ReportHtmlFootnote.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -59,7 +59,7 @@
 block discarded – undo
59 59
 	 * @param ReportHtml $html
60 60
 	 * @param int        $cellWidth The width of the cell to use it for text wraping
61 61
 	 *
62
-	 * @return int       Footnote height in points
62
+	 * @return double       Footnote height in points
63 63
 	 */
64 64
 	public function getFootnoteHeight($html, $cellWidth = 0) {
65 65
 		if ($html->getCurrentStyle() != $this->styleName) {
Please login to merge, or discard this patch.
app/Report/ReportPdfFootnote.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -59,7 +59,7 @@
 block discarded – undo
59 59
 	 *
60 60
 	 * @param ReportTcpdf $renderer
61 61
 	 *
62
-	 * @return float $h
62
+	 * @return integer $h
63 63
 	 */
64 64
 	public function getFootnoteHeight($renderer) {
65 65
 		return 0;
Please login to merge, or discard this patch.
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.