@@ -16,7 +16,6 @@ |
||
| 16 | 16 | namespace Fisharebest\Webtrees\Report; |
| 17 | 17 | |
| 18 | 18 | use Fisharebest\Webtrees\Auth; |
| 19 | -use Fisharebest\Webtrees\Date; |
|
| 20 | 19 | use Fisharebest\Webtrees\I18N; |
| 21 | 20 | |
| 22 | 21 | /** |
@@ -66,11 +66,11 @@ |
||
| 66 | 66 | */ |
| 67 | 67 | protected function varStartHandler($attrs) { |
| 68 | 68 | if (preg_match('/^I18N::number\((.+)\)$/', $attrs['var'], $match)) { |
| 69 | - $this->text .= I18N::number($match[1]); |
|
| 69 | + $this->text .= I18N::number($match[1]); |
|
| 70 | 70 | } elseif (preg_match('/^I18N::translate\(\'(.+)\'\)$/', $attrs['var'], $match)) { |
| 71 | - $this->text .= I18N::translate($match[1]); |
|
| 71 | + $this->text .= I18N::translate($match[1]); |
|
| 72 | 72 | } elseif (preg_match('/^I18N::translateContext\(\'(.+)\', *\'(.+)\'\)$/', $attrs['var'], $match)) { |
| 73 | - $this->text .= I18N::translateContext($match[1], $match[2]); |
|
| 73 | + $this->text .= I18N::translateContext($match[1], $match[2]); |
|
| 74 | 74 | } else { |
| 75 | 75 | $this->text .= $attrs['var']; |
| 76 | 76 | } |
@@ -1,18 +1,18 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * webtrees: online genealogy |
|
| 4 | - * Copyright (C) 2016 webtrees development team |
|
| 5 | - * This program is free software: you can redistribute it and/or modify |
|
| 6 | - * it under the terms of the GNU General Public License as published by |
|
| 7 | - * the Free Software Foundation, either version 3 of the License, or |
|
| 8 | - * (at your option) any later version. |
|
| 9 | - * This program is distributed in the hope that it will be useful, |
|
| 10 | - * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
| 11 | - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
| 12 | - * GNU General Public License for more details. |
|
| 13 | - * You should have received a copy of the GNU General Public License |
|
| 14 | - * along with this program. If not, see <http://www.gnu.org/licenses/>. |
|
| 15 | - */ |
|
| 3 | + * webtrees: online genealogy |
|
| 4 | + * Copyright (C) 2016 webtrees development team |
|
| 5 | + * This program is free software: you can redistribute it and/or modify |
|
| 6 | + * it under the terms of the GNU General Public License as published by |
|
| 7 | + * the Free Software Foundation, either version 3 of the License, or |
|
| 8 | + * (at your option) any later version. |
|
| 9 | + * This program is distributed in the hope that it will be useful, |
|
| 10 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
| 11 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
| 12 | + * GNU General Public License for more details. |
|
| 13 | + * You should have received a copy of the GNU General Public License |
|
| 14 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. |
|
| 15 | + */ |
|
| 16 | 16 | namespace Fisharebest\Webtrees; |
| 17 | 17 | |
| 18 | 18 | use Fisharebest\Webtrees\Theme\AdministrationTheme; |
@@ -59,7 +59,7 @@ |
||
| 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; |
@@ -1,18 +1,18 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * webtrees: online genealogy |
|
| 4 | - * Copyright (C) 2016 webtrees development team |
|
| 5 | - * This program is free software: you can redistribute it and/or modify |
|
| 6 | - * it under the terms of the GNU General Public License as published by |
|
| 7 | - * the Free Software Foundation, either version 3 of the License, or |
|
| 8 | - * (at your option) any later version. |
|
| 9 | - * This program is distributed in the hope that it will be useful, |
|
| 10 | - * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
| 11 | - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
| 12 | - * GNU General Public License for more details. |
|
| 13 | - * You should have received a copy of the GNU General Public License |
|
| 14 | - * along with this program. If not, see <http://www.gnu.org/licenses/>. |
|
| 15 | - */ |
|
| 3 | + * webtrees: online genealogy |
|
| 4 | + * Copyright (C) 2016 webtrees development team |
|
| 5 | + * This program is free software: you can redistribute it and/or modify |
|
| 6 | + * it under the terms of the GNU General Public License as published by |
|
| 7 | + * the Free Software Foundation, either version 3 of the License, or |
|
| 8 | + * (at your option) any later version. |
|
| 9 | + * This program is distributed in the hope that it will be useful, |
|
| 10 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
| 11 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
| 12 | + * GNU General Public License for more details. |
|
| 13 | + * You should have received a copy of the GNU General Public License |
|
| 14 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. |
|
| 15 | + */ |
|
| 16 | 16 | namespace Fisharebest\Webtrees; |
| 17 | 17 | |
| 18 | 18 | use Fisharebest\Webtrees\Theme\AdministrationTheme; |
@@ -70,7 +70,7 @@ |
||
| 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; |
@@ -1,18 +1,18 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * webtrees: online genealogy |
|
| 4 | - * Copyright (C) 2016 webtrees development team |
|
| 5 | - * This program is free software: you can redistribute it and/or modify |
|
| 6 | - * it under the terms of the GNU General Public License as published by |
|
| 7 | - * the Free Software Foundation, either version 3 of the License, or |
|
| 8 | - * (at your option) any later version. |
|
| 9 | - * This program is distributed in the hope that it will be useful, |
|
| 10 | - * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
| 11 | - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
| 12 | - * GNU General Public License for more details. |
|
| 13 | - * You should have received a copy of the GNU General Public License |
|
| 14 | - * along with this program. If not, see <http://www.gnu.org/licenses/>. |
|
| 15 | - */ |
|
| 3 | + * webtrees: online genealogy |
|
| 4 | + * Copyright (C) 2016 webtrees development team |
|
| 5 | + * This program is free software: you can redistribute it and/or modify |
|
| 6 | + * it under the terms of the GNU General Public License as published by |
|
| 7 | + * the Free Software Foundation, either version 3 of the License, or |
|
| 8 | + * (at your option) any later version. |
|
| 9 | + * This program is distributed in the hope that it will be useful, |
|
| 10 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
| 11 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
| 12 | + * GNU General Public License for more details. |
|
| 13 | + * You should have received a copy of the GNU General Public License |
|
| 14 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. |
|
| 15 | + */ |
|
| 16 | 16 | namespace Fisharebest\Webtrees; |
| 17 | 17 | |
| 18 | 18 | use Fisharebest\Webtrees\Theme\AdministrationTheme; |
@@ -24,7 +24,7 @@ |
||
| 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 | |
@@ -1,18 +1,18 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * webtrees: online genealogy |
|
| 4 | - * Copyright (C) 2016 webtrees development team |
|
| 5 | - * This program is free software: you can redistribute it and/or modify |
|
| 6 | - * it under the terms of the GNU General Public License as published by |
|
| 7 | - * the Free Software Foundation, either version 3 of the License, or |
|
| 8 | - * (at your option) any later version. |
|
| 9 | - * This program is distributed in the hope that it will be useful, |
|
| 10 | - * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
| 11 | - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
| 12 | - * GNU General Public License for more details. |
|
| 13 | - * You should have received a copy of the GNU General Public License |
|
| 14 | - * along with this program. If not, see <http://www.gnu.org/licenses/>. |
|
| 15 | - */ |
|
| 3 | + * webtrees: online genealogy |
|
| 4 | + * Copyright (C) 2016 webtrees development team |
|
| 5 | + * This program is free software: you can redistribute it and/or modify |
|
| 6 | + * it under the terms of the GNU General Public License as published by |
|
| 7 | + * the Free Software Foundation, either version 3 of the License, or |
|
| 8 | + * (at your option) any later version. |
|
| 9 | + * This program is distributed in the hope that it will be useful, |
|
| 10 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
| 11 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
| 12 | + * GNU General Public License for more details. |
|
| 13 | + * You should have received a copy of the GNU General Public License |
|
| 14 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. |
|
| 15 | + */ |
|
| 16 | 16 | namespace Fisharebest\Webtrees; |
| 17 | 17 | |
| 18 | 18 | use Fisharebest\Webtrees\Theme\AdministrationTheme; |
@@ -141,7 +141,7 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 | */ |
@@ -1,18 +1,18 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * webtrees: online genealogy |
|
| 4 | - * Copyright (C) 2016 webtrees development team |
|
| 5 | - * This program is free software: you can redistribute it and/or modify |
|
| 6 | - * it under the terms of the GNU General Public License as published by |
|
| 7 | - * the Free Software Foundation, either version 3 of the License, or |
|
| 8 | - * (at your option) any later version. |
|
| 9 | - * This program is distributed in the hope that it will be useful, |
|
| 10 | - * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
| 11 | - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
| 12 | - * GNU General Public License for more details. |
|
| 13 | - * You should have received a copy of the GNU General Public License |
|
| 14 | - * along with this program. If not, see <http://www.gnu.org/licenses/>. |
|
| 15 | - */ |
|
| 3 | + * webtrees: online genealogy |
|
| 4 | + * Copyright (C) 2016 webtrees development team |
|
| 5 | + * This program is free software: you can redistribute it and/or modify |
|
| 6 | + * it under the terms of the GNU General Public License as published by |
|
| 7 | + * the Free Software Foundation, either version 3 of the License, or |
|
| 8 | + * (at your option) any later version. |
|
| 9 | + * This program is distributed in the hope that it will be useful, |
|
| 10 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
| 11 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
| 12 | + * GNU General Public License for more details. |
|
| 13 | + * You should have received a copy of the GNU General Public License |
|
| 14 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. |
|
| 15 | + */ |
|
| 16 | 16 | namespace Fisharebest\Webtrees; |
| 17 | 17 | |
| 18 | 18 | use Fisharebest\Webtrees\Theme\AdministrationTheme; |
@@ -21,6 +21,7 @@ |
||
| 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 | } |
@@ -1,18 +1,18 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * webtrees: online genealogy |
|
| 4 | - * Copyright (C) 2016 webtrees development team |
|
| 5 | - * This program is free software: you can redistribute it and/or modify |
|
| 6 | - * it under the terms of the GNU General Public License as published by |
|
| 7 | - * the Free Software Foundation, either version 3 of the License, or |
|
| 8 | - * (at your option) any later version. |
|
| 9 | - * This program is distributed in the hope that it will be useful, |
|
| 10 | - * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
| 11 | - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
| 12 | - * GNU General Public License for more details. |
|
| 13 | - * You should have received a copy of the GNU General Public License |
|
| 14 | - * along with this program. If not, see <http://www.gnu.org/licenses/>. |
|
| 15 | - */ |
|
| 3 | + * webtrees: online genealogy |
|
| 4 | + * Copyright (C) 2016 webtrees development team |
|
| 5 | + * This program is free software: you can redistribute it and/or modify |
|
| 6 | + * it under the terms of the GNU General Public License as published by |
|
| 7 | + * the Free Software Foundation, either version 3 of the License, or |
|
| 8 | + * (at your option) any later version. |
|
| 9 | + * This program is distributed in the hope that it will be useful, |
|
| 10 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
| 11 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
| 12 | + * GNU General Public License for more details. |
|
| 13 | + * You should have received a copy of the GNU General Public License |
|
| 14 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. |
|
| 15 | + */ |
|
| 16 | 16 | namespace Fisharebest\Webtrees; |
| 17 | 17 | |
| 18 | 18 | use Fisharebest\Webtrees\Theme\AdministrationTheme; |
@@ -60,7 +60,7 @@ |
||
| 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( |
@@ -1,18 +1,18 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * webtrees: online genealogy |
|
| 4 | - * Copyright (C) 2016 webtrees development team |
|
| 5 | - * This program is free software: you can redistribute it and/or modify |
|
| 6 | - * it under the terms of the GNU General Public License as published by |
|
| 7 | - * the Free Software Foundation, either version 3 of the License, or |
|
| 8 | - * (at your option) any later version. |
|
| 9 | - * This program is distributed in the hope that it will be useful, |
|
| 10 | - * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
| 11 | - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
| 12 | - * GNU General Public License for more details. |
|
| 13 | - * You should have received a copy of the GNU General Public License |
|
| 14 | - * along with this program. If not, see <http://www.gnu.org/licenses/>. |
|
| 15 | - */ |
|
| 3 | + * webtrees: online genealogy |
|
| 4 | + * Copyright (C) 2016 webtrees development team |
|
| 5 | + * This program is free software: you can redistribute it and/or modify |
|
| 6 | + * it under the terms of the GNU General Public License as published by |
|
| 7 | + * the Free Software Foundation, either version 3 of the License, or |
|
| 8 | + * (at your option) any later version. |
|
| 9 | + * This program is distributed in the hope that it will be useful, |
|
| 10 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
| 11 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
| 12 | + * GNU General Public License for more details. |
|
| 13 | + * You should have received a copy of the GNU General Public License |
|
| 14 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. |
|
| 15 | + */ |
|
| 16 | 16 | namespace Fisharebest\Webtrees; |
| 17 | 17 | |
| 18 | 18 | use Fisharebest\Webtrees\Theme\AdministrationTheme; |
@@ -142,7 +142,7 @@ discard block |
||
| 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 |
||
| 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) { |
@@ -1,18 +1,18 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * webtrees: online genealogy |
|
| 4 | - * Copyright (C) 2016 webtrees development team |
|
| 5 | - * This program is free software: you can redistribute it and/or modify |
|
| 6 | - * it under the terms of the GNU General Public License as published by |
|
| 7 | - * the Free Software Foundation, either version 3 of the License, or |
|
| 8 | - * (at your option) any later version. |
|
| 9 | - * This program is distributed in the hope that it will be useful, |
|
| 10 | - * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
| 11 | - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
| 12 | - * GNU General Public License for more details. |
|
| 13 | - * You should have received a copy of the GNU General Public License |
|
| 14 | - * along with this program. If not, see <http://www.gnu.org/licenses/>. |
|
| 15 | - */ |
|
| 3 | + * webtrees: online genealogy |
|
| 4 | + * Copyright (C) 2016 webtrees development team |
|
| 5 | + * This program is free software: you can redistribute it and/or modify |
|
| 6 | + * it under the terms of the GNU General Public License as published by |
|
| 7 | + * the Free Software Foundation, either version 3 of the License, or |
|
| 8 | + * (at your option) any later version. |
|
| 9 | + * This program is distributed in the hope that it will be useful, |
|
| 10 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
| 11 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
| 12 | + * GNU General Public License for more details. |
|
| 13 | + * You should have received a copy of the GNU General Public License |
|
| 14 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. |
|
| 15 | + */ |
|
| 16 | 16 | namespace Fisharebest\Webtrees; |
| 17 | 17 | |
| 18 | 18 | use Fisharebest\Webtrees\Theme\AdministrationTheme; |
@@ -5362,7 +5362,7 @@ |
||
| 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)); |
@@ -1,18 +1,18 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * webtrees: online genealogy |
|
| 4 | - * Copyright (C) 2016 webtrees development team |
|
| 5 | - * This program is free software: you can redistribute it and/or modify |
|
| 6 | - * it under the terms of the GNU General Public License as published by |
|
| 7 | - * the Free Software Foundation, either version 3 of the License, or |
|
| 8 | - * (at your option) any later version. |
|
| 9 | - * This program is distributed in the hope that it will be useful, |
|
| 10 | - * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
| 11 | - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
| 12 | - * GNU General Public License for more details. |
|
| 13 | - * You should have received a copy of the GNU General Public License |
|
| 14 | - * along with this program. If not, see <http://www.gnu.org/licenses/>. |
|
| 15 | - */ |
|
| 3 | + * webtrees: online genealogy |
|
| 4 | + * Copyright (C) 2016 webtrees development team |
|
| 5 | + * This program is free software: you can redistribute it and/or modify |
|
| 6 | + * it under the terms of the GNU General Public License as published by |
|
| 7 | + * the Free Software Foundation, either version 3 of the License, or |
|
| 8 | + * (at your option) any later version. |
|
| 9 | + * This program is distributed in the hope that it will be useful, |
|
| 10 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
| 11 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
| 12 | + * GNU General Public License for more details. |
|
| 13 | + * You should have received a copy of the GNU General Public License |
|
| 14 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. |
|
| 15 | + */ |
|
| 16 | 16 | namespace Fisharebest\Webtrees; |
| 17 | 17 | |
| 18 | 18 | use Fisharebest\Webtrees\Theme\AdministrationTheme; |