diff options
| author | Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> | 2015-03-21 18:29:20 +0000 |
|---|---|---|
| committer | Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> | 2015-03-21 18:29:20 +0000 |
| commit | 4a8aaa00d6e8f36082a710e74b8189a4bc6e6f40 (patch) | |
| tree | 70c3582a928950b3079816c807cd55e769cac0d4 /app | |
| parent | 9b0d6698fc7c6dd5ed80352c0ae3c17536a6c631 (diff) | |
| download | webtrees-4a8aaa00d6e8f36082a710e74b8189a4bc6e6f40.tar.gz webtrees-4a8aaa00d6e8f36082a710e74b8189a4bc6e6f40.tar.bz2 webtrees-4a8aaa00d6e8f36082a710e74b8189a4bc6e6f40.zip | |
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
Diffstat (limited to 'app')
| -rw-r--r-- | app/Auth.php | 2 | ||||
| -rw-r--r-- | app/Controller/ChartController.php | 2 | ||||
| -rw-r--r-- | app/Controller/HourglassController.php | 2 | ||||
| -rw-r--r-- | app/Controller/LifespanController.php | 2 | ||||
| -rw-r--r-- | app/Controller/PedigreeController.php | 2 | ||||
| -rw-r--r-- | app/I18N.php | 2 | ||||
| -rw-r--r-- | app/Individual.php | 2 | ||||
| -rw-r--r-- | app/Module/FamilyTreeStatisticsModule.php | 18 | ||||
| -rw-r--r-- | app/Query/QueryName.php | 1 | ||||
| -rw-r--r-- | app/Theme/BaseTheme.php | 4 |
10 files changed, 18 insertions, 19 deletions
diff --git a/app/Auth.php b/app/Auth.php index 45c43a9826..45f3afc791 100644 --- a/app/Auth.php +++ b/app/Auth.php @@ -123,7 +123,7 @@ class Auth { * @param Tree $tree * @param User|null $user * - * @return boolean + * @return integer */ public static function accessLevel(Tree $tree, User $user = null) { if ($user === null) { diff --git a/app/Controller/ChartController.php b/app/Controller/ChartController.php index 9f33eae89c..028d95dffd 100644 --- a/app/Controller/ChartController.php +++ b/app/Controller/ChartController.php @@ -125,7 +125,7 @@ class ChartController extends PageController { /** * Function boxDimensions - * @return personbox|\stdClass + * @return \stdClass */ public function getBoxDimensions() { return $this->box; diff --git a/app/Controller/HourglassController.php b/app/Controller/HourglassController.php index bfebecafb7..f027e1047f 100644 --- a/app/Controller/HourglassController.php +++ b/app/Controller/HourglassController.php @@ -106,7 +106,7 @@ class HourglassController extends ChartController { //-- recursively get the father’s family $this->printPersonPedigree($person, $count + 1); echo '</td></tr>'; - echo '<tr><td>' . $this->printEmptyBox() . '</td>'; + echo '<tr><td>' . $this->printEmptyBox() . '</td>'; echo '<td>'; //-- recursively get the father’s family $this->printPersonPedigree($person, $count + 1); diff --git a/app/Controller/LifespanController.php b/app/Controller/LifespanController.php index e3d30f55d6..a140491573 100644 --- a/app/Controller/LifespanController.php +++ b/app/Controller/LifespanController.php @@ -427,7 +427,7 @@ class LifespanController extends PageController { } sort_facts($unparsedEvents); - $eventinformation = Array(); + $eventinformation = array(); foreach ($unparsedEvents as $val) { $date = $val->getDate(); if (!empty($date)) { diff --git a/app/Controller/PedigreeController.php b/app/Controller/PedigreeController.php index ab5d252adc..bb3924e201 100644 --- a/app/Controller/PedigreeController.php +++ b/app/Controller/PedigreeController.php @@ -29,7 +29,7 @@ class PedigreeController extends ChartController { const LANDSCAPE = 1; const OLDEST_AT_TOP = 2; const OLDEST_AT_BOTTOM = 3; - CONST MENU_ITEM = '<a href="pedigree.php?rootid=%s&show_full=%s&PEDIGREE_GENERATIONS=%s&orientation=%s" class="%s noprint">%s</a>'; + const MENU_ITEM = '<a href="pedigree.php?rootid=%s&show_full=%s&PEDIGREE_GENERATIONS=%s&orientation=%s" class="%s noprint">%s</a>'; /** * Next and previous generation arrow size diff --git a/app/I18N.php b/app/I18N.php index 56db77f3a2..f096a9150a 100644 --- a/app/I18N.php +++ b/app/I18N.php @@ -151,7 +151,7 @@ class I18N { } } - File::mkdir( WT_DATA_DIR . 'cache'); + File::mkdir(WT_DATA_DIR . 'cache'); $cache_file = WT_DATA_DIR . 'cache/language-' . self::$locale->languageTag() . '-cache.php'; if (file_exists($cache_file)) { $filemtime = filemtime($cache_file); diff --git a/app/Individual.php b/app/Individual.php index 7a7befca06..173b48b75d 100644 --- a/app/Individual.php +++ b/app/Individual.php @@ -59,7 +59,7 @@ class Individual extends GedcomRecord { * Typically when we load families and their members. * * @param Tree $tree - * @param array $xrefs + * @param string[] $xrefs */ public static function load(Tree $tree, array $xrefs) { $sql = ''; diff --git a/app/Module/FamilyTreeStatisticsModule.php b/app/Module/FamilyTreeStatisticsModule.php index be34e44207..7572990da5 100644 --- a/app/Module/FamilyTreeStatisticsModule.php +++ b/app/Module/FamilyTreeStatisticsModule.php @@ -85,30 +85,30 @@ class FamilyTreeStatisticsModule extends Module implements ModuleBlockInterface $content .= '<div class="stat-table1">'; if ($stat_indi) { - $content .= '<div class="stat-row"><div class="facts_label stat-cell">' . I18N::translate('Individuals') . '</div><div class="facts_value stats_value stat-cell"><a href="' . "indilist.php?surname_sublist=no&ged=" . $WT_TREE->getNameUrl() . '">' . $stats->totalIndividuals() . '</a></div></div>'; - $content .= '<div class="stat-row"><div class="facts_label stat-cell">' . I18N::translate('Males') . '</div><div class="facts_value stats_value stat-cell">' . $stats->totalSexMales() . '<br>' . $stats->totalSexMalesPercentage() . '</a></div></div>'; - $content .= '<div class="stat-row"><div class="facts_label stat-cell">' . I18N::translate('Females') . '</div><div class="facts_value stats_value stat-cell">' . $stats->totalSexFemales() . '<br>' . $stats->totalSexFemalesPercentage() . '</a></div></div>'; + $content .= '<div class="stat-row"><div class="facts_label stat-cell">' . I18N::translate('Individuals') . '</div><div class="facts_value stats_value stat-cell"><a href="' . "indilist.php?surname_sublist=no&ged=" . $WT_TREE->getNameUrl() . '">' . $stats->totalIndividuals() . '</a></div></div>'; + $content .= '<div class="stat-row"><div class="facts_label stat-cell">' . I18N::translate('Males') . '</div><div class="facts_value stats_value stat-cell">' . $stats->totalSexMales() . '<br>' . $stats->totalSexMalesPercentage() . '</a></div></div>'; + $content .= '<div class="stat-row"><div class="facts_label stat-cell">' . I18N::translate('Females') . '</div><div class="facts_value stats_value stat-cell">' . $stats->totalSexFemales() . '<br>' . $stats->totalSexFemalesPercentage() . '</a></div></div>'; } if ($stat_surname) { $content .= '<div class="stat-row"><div class="facts_label stat-cell">' . I18N::translate('Total surnames') . '</div><div class="facts_value stats_value stat-cell"><a href="indilist.php?show_all=yes&surname_sublist=yes&ged=' . $WT_TREE->getNameUrl() . '">' . $stats->totalSurnames() . '</a></div></div>'; } if ($stat_fam) { - $content .= '<div class="stat-row"><div class="facts_label stat-cell">' . I18N::translate('Families') . '</div><div class="facts_value stats_value stat-cell"><a href="famlist.php?ged=' . $WT_TREE->getNameUrl() . '">' . $stats->totalFamilies() . '</a></div></div>'; + $content .= '<div class="stat-row"><div class="facts_label stat-cell">' . I18N::translate('Families') . '</div><div class="facts_value stats_value stat-cell"><a href="famlist.php?ged=' . $WT_TREE->getNameUrl() . '">' . $stats->totalFamilies() . '</a></div></div>'; } if ($stat_sour) { - $content .= '<div class="stat-row"><div class="facts_label stat-cell">' . I18N::translate('Sources') . '</div><div class="facts_value stats_value stat-cell"><a href="sourcelist.php?ged=' . $WT_TREE->getNameUrl() . '">' . $stats->totalSources() . '</a></div></div>'; + $content .= '<div class="stat-row"><div class="facts_label stat-cell">' . I18N::translate('Sources') . '</div><div class="facts_value stats_value stat-cell"><a href="sourcelist.php?ged=' . $WT_TREE->getNameUrl() . '">' . $stats->totalSources() . '</a></div></div>'; } if ($stat_media) { - $content .= '<div class="stat-row"><div class="facts_label stat-cell">' . I18N::translate('Media objects') . '</div><div class="facts_value stats_value stat-cell"><a href="medialist.php?ged=' . $WT_TREE->getNameUrl() . '">' . $stats->totalMedia() . '</a></div></div>'; + $content .= '<div class="stat-row"><div class="facts_label stat-cell">' . I18N::translate('Media objects') . '</div><div class="facts_value stats_value stat-cell"><a href="medialist.php?ged=' . $WT_TREE->getNameUrl() . '">' . $stats->totalMedia() . '</a></div></div>'; } if ($stat_repo) { - $content .= '<div class="stat-row"><div class="facts_label stat-cell">' . I18N::translate('Repositories') . '</div><div class="facts_value stats_value stat-cell"><a href="repolist.php?ged=' . $WT_TREE->getNameUrl() . '">' . $stats->totalRepositories() . '</a></div></div>'; + $content .= '<div class="stat-row"><div class="facts_label stat-cell">' . I18N::translate('Repositories') . '</div><div class="facts_value stats_value stat-cell"><a href="repolist.php?ged=' . $WT_TREE->getNameUrl() . '">' . $stats->totalRepositories() . '</a></div></div>'; } if ($stat_events) { - $content .= '<div class="stat-row"><div class="facts_label stat-cell">' . I18N::translate('Total events') . '</div><div class="facts_value stats_value stat-cell">' . $stats->totalEvents() . '</div></div>'; + $content .= '<div class="stat-row"><div class="facts_label stat-cell">' . I18N::translate('Total events') . '</div><div class="facts_value stats_value stat-cell">' . $stats->totalEvents() . '</div></div>'; } if ($stat_users) { - $content .= '<div class="stat-row"><div class="facts_label stat-cell">' . I18N::translate('Total users') . '</div><div class="facts_value stats_value stat-cell">'; + $content .= '<div class="stat-row"><div class="facts_label stat-cell">' . I18N::translate('Total users') . '</div><div class="facts_value stats_value stat-cell">'; if (Auth::isManager($WT_TREE)) { $content .= '<a href="admin_users.php">' . $stats->totalUsers() . '</a>'; } else { diff --git a/app/Query/QueryName.php b/app/Query/QueryName.php index 73a463c6a7..d5774066bb 100644 --- a/app/Query/QueryName.php +++ b/app/Query/QueryName.php @@ -311,7 +311,6 @@ class QueryName { * @param string $salpha if set, only consider surnames starting with this letter * @param boolean $marnm if set, include married names * @param boolean $fams if set, only consider individuals with FAMS records - * @param integer $ged_id only consider individuals from this tree * * @return integer[] */ diff --git a/app/Theme/BaseTheme.php b/app/Theme/BaseTheme.php index 665a3f2cc7..64cb318572 100644 --- a/app/Theme/BaseTheme.php +++ b/app/Theme/BaseTheme.php @@ -1314,7 +1314,7 @@ abstract class BaseTheme { /** * Create a menu to show lists of individuals, families, sources, etc. * - * @return Menu|null + * @return Menu */ protected function menuLists() { $menu = new Menu(I18N::translate('Lists'), 'indilist.php?' . $this->tree_url, 'menu-list'); @@ -1518,7 +1518,7 @@ abstract class BaseTheme { /** * A link to the user's personal home page. * - * @return Menu|null + * @return Menu */ protected function menuMyPage() { |
