diff options
Diffstat (limited to 'app')
37 files changed, 60 insertions, 60 deletions
diff --git a/app/Date.php b/app/Date.php index c2567c79a2..4daf8c70ff 100644 --- a/app/Date.php +++ b/app/Date.php @@ -257,7 +257,7 @@ class Date public function display($url = false, $date_format = null, $convert_calendars = true) { // Do we need a new DateFormatterService class? - $tree = app()->make(Tree::class); + $tree = app(Tree::class); $CALENDAR_FORMAT = $tree->getPreference('CALENDAR_FORMAT'); diff --git a/app/Functions/FunctionsCharts.php b/app/Functions/FunctionsCharts.php index c5a6ba8521..bebe88f641 100644 --- a/app/Functions/FunctionsCharts.php +++ b/app/Functions/FunctionsCharts.php @@ -100,7 +100,7 @@ class FunctionsCharts */ public static function printFamilyParents(Family $family, int $sosa = 0, string $daboville = '', string $parid = '', string $gparid = '') { - $pbheight = app()->make(ModuleThemeInterface::class)->parameter('chart-box-y') + 14; + $pbheight = app(ModuleThemeInterface::class)->parameter('chart-box-y') + 14; $husb = $family->husband(); if ($husb) { @@ -309,7 +309,7 @@ class FunctionsCharts string $label = '', bool $show_cousins = false ) { - $bheight = app()->make(ModuleThemeInterface::class)->parameter('chart-box-y'); + $bheight = app(ModuleThemeInterface::class)->parameter('chart-box-y'); $pbheight = $bheight + 14; $children = $family->children(); $numchil = $children->count(); @@ -506,7 +506,7 @@ class FunctionsCharts */ private static function printCousins(Family $family) { - $bheight = app()->make(ModuleThemeInterface::class)->parameter('chart-box-y'); + $bheight = app(ModuleThemeInterface::class)->parameter('chart-box-y'); $fchildren = $family->children(); $kids = $fchildren->count(); diff --git a/app/Functions/FunctionsEdit.php b/app/Functions/FunctionsEdit.php index c8a9b7d674..5cd085448c 100644 --- a/app/Functions/FunctionsEdit.php +++ b/app/Functions/FunctionsEdit.php @@ -461,7 +461,7 @@ class FunctionsEdit */ public static function addSimpleTag(Tree $tree, $tag, $upperlevel = '', $label = ''): string { - $request = app()->make(Request::class); + $request = app(Request::class); $xref = $request->get('xref', ''); // Some form fields need access to previous form fields. diff --git a/app/Functions/FunctionsPrint.php b/app/Functions/FunctionsPrint.php index ecf14bf930..fd5eed18d8 100644 --- a/app/Functions/FunctionsPrint.php +++ b/app/Functions/FunctionsPrint.php @@ -53,9 +53,9 @@ class FunctionsPrint public static function printPedigreePerson(Individual $person = null): string { if ($person instanceof Individual) { - return app()->make(ModuleThemeInterface::class)->individualBox($person); + return app(ModuleThemeInterface::class)->individualBox($person); } else { - return app()->make(ModuleThemeInterface::class)->individualBoxEmpty(); + return app(ModuleThemeInterface::class)->individualBoxEmpty(); } } diff --git a/app/Functions/FunctionsPrintFacts.php b/app/Functions/FunctionsPrintFacts.php index 71aedbd691..7e3ad4528d 100644 --- a/app/Functions/FunctionsPrintFacts.php +++ b/app/Functions/FunctionsPrintFacts.php @@ -178,7 +178,7 @@ class FunctionsPrintFacts echo '<th scope="row">'; if ($tree->getPreference('SHOW_FACT_ICONS')) { - echo app()->make(ModuleThemeInterface::class)->icon($fact), ' '; + echo app(ModuleThemeInterface::class)->icon($fact), ' '; } switch ($fact->getTag()) { diff --git a/app/Helpers/functions.php b/app/Helpers/functions.php index bbb3216392..6e641a23f7 100644 --- a/app/Helpers/functions.php +++ b/app/Helpers/functions.php @@ -25,7 +25,7 @@ use Illuminate\Cache\Repository; * * @param string|null $abstract * - * @return Application|Repository|mixed + * @return mixed */ function app(string $abstract = null) { diff --git a/app/Http/Controllers/EditIndividualController.php b/app/Http/Controllers/EditIndividualController.php index 9e1c13ed2a..409a3dff28 100644 --- a/app/Http/Controllers/EditIndividualController.php +++ b/app/Http/Controllers/EditIndividualController.php @@ -620,7 +620,7 @@ class EditIndividualController extends AbstractEditController Auth::checkIndividualAccess($individual, true); // @TODO - Move the name-specific code to this function? - return app()->make(EditGedcomRecordController::class)->updateFact($request, $tree); + return app(EditGedcomRecordController::class)->updateFact($request, $tree); } /** @@ -669,7 +669,7 @@ class EditIndividualController extends AbstractEditController // @TODO - Move the name-specific code to this function? - return app()->make(EditGedcomRecordController::class)->updateFact($request, $tree); + return app(EditGedcomRecordController::class)->updateFact($request, $tree); } /** diff --git a/app/Http/Middleware/Housekeeping.php b/app/Http/Middleware/Housekeeping.php index 4886a5cda3..bb1423d615 100644 --- a/app/Http/Middleware/Housekeeping.php +++ b/app/Http/Middleware/Housekeeping.php @@ -89,7 +89,7 @@ class Housekeeping implements MiddlewareInterface */ private function runHousekeeping() { - $data_filesystem = app()->make(FilesystemInterface::class); + $data_filesystem = app(FilesystemInterface::class); $root_filesystem = new Filesystem(new Local(WT_ROOT)); // Clear files in the (user-specified) data folder - which might not be local files diff --git a/app/Http/Middleware/UseLocale.php b/app/Http/Middleware/UseLocale.php index a5e1acd75c..a888e07dc0 100644 --- a/app/Http/Middleware/UseLocale.php +++ b/app/Http/Middleware/UseLocale.php @@ -41,7 +41,7 @@ class UseLocale implements MiddlewareInterface */ public function handle(Request $request, Closure $next): Response { - $tree = app()->make(Tree::class); + $tree = app(Tree::class); // Select a locale define('WT_LOCALE', I18N::init('', $tree)); diff --git a/app/Http/Middleware/UseTheme.php b/app/Http/Middleware/UseTheme.php index 94bfe98ee1..750a05e125 100644 --- a/app/Http/Middleware/UseTheme.php +++ b/app/Http/Middleware/UseTheme.php @@ -84,7 +84,7 @@ class UseTheme implements MiddlewareInterface yield $themes->get(Session::get('theme_id', '')); // Default for tree - $tree = app()->make(Tree::class); + $tree = app(Tree::class); if ($tree instanceof Tree) { yield $themes->get($tree->getPreference('THEME_DIR')); @@ -94,6 +94,6 @@ class UseTheme implements MiddlewareInterface yield $themes->get(Site::getPreference('THEME_DIR')); // Default for application - yield app()->make(WebtreesTheme::class); + yield app(WebtreesTheme::class); } } diff --git a/app/Location.php b/app/Location.php index 55da3d916c..61c75d0d4e 100644 --- a/app/Location.php +++ b/app/Location.php @@ -66,7 +66,7 @@ class Location */ public function id(): int { - return app()->make('cache.array')->rememberForever(__CLASS__ . __METHOD__ . $this->location_name, function () { + return app('cache.array')->rememberForever(__CLASS__ . __METHOD__ . $this->location_name, function () { // The "top-level" location won't exist in the database. if ($this->parts->isEmpty()) { return 0; @@ -127,7 +127,7 @@ class Location */ private function details(): stdClass { - return app()->make('cache.array')->rememberForever(__CLASS__ . __METHOD__ . $this->id(), function () { + return app('cache.array')->rememberForever(__CLASS__ . __METHOD__ . $this->id(), function () { // The "top-level" location won't exist in the database. if ($this->parts->isEmpty()) { return (object) [ diff --git a/app/Module/FamilyBookChartModule.php b/app/Module/FamilyBookChartModule.php index 059eac3dd9..dcf4d763cd 100644 --- a/app/Module/FamilyBookChartModule.php +++ b/app/Module/FamilyBookChartModule.php @@ -182,8 +182,8 @@ class FamilyBookChartModule extends AbstractModule implements ModuleChartInterfa public function chart(Individual $individual, int $generations, int $book_size, bool $show_spouse): Response { $this->box = (object) [ - 'width' => app()->make(ModuleThemeInterface::class)->parameter('chart-box-x'), - 'height' => app()->make(ModuleThemeInterface::class)->parameter('chart-box-y'), + 'width' => app(ModuleThemeInterface::class)->parameter('chart-box-x'), + 'height' => app(ModuleThemeInterface::class)->parameter('chart-box-y'), ]; $this->show_spouse = $show_spouse; @@ -487,7 +487,7 @@ class FamilyBookChartModule extends AbstractModule implements ModuleChartInterfa private function printEmptyBox() { - echo app()->make(ModuleThemeInterface::class)->individualBoxEmpty(); + echo app(ModuleThemeInterface::class)->individualBoxEmpty(); } /** diff --git a/app/Module/FamilyTreeStatisticsModule.php b/app/Module/FamilyTreeStatisticsModule.php index 62e1dd4c4e..62e3b9732e 100644 --- a/app/Module/FamilyTreeStatisticsModule.php +++ b/app/Module/FamilyTreeStatisticsModule.php @@ -70,7 +70,7 @@ class FamilyTreeStatisticsModule extends AbstractModule implements ModuleBlockIn */ public function getBlock(Tree $tree, int $block_id, string $ctype = '', array $cfg = []): string { - $statistics = app()->make(Statistics::class); + $statistics = app(Statistics::class); $show_last_update = $this->getBlockSetting($block_id, 'show_last_update', '1'); $show_common_surnames = $this->getBlockSetting($block_id, 'show_common_surnames', '1'); diff --git a/app/Module/FanChartModule.php b/app/Module/FanChartModule.php index 03f8457f20..db19cc6773 100644 --- a/app/Module/FanChartModule.php +++ b/app/Module/FanChartModule.php @@ -203,7 +203,7 @@ class FanChartModule extends AbstractModule implements ModuleChartInterface $transparent = imagecolorallocate($image, 0, 0, 0); imagecolortransparent($image, $transparent); - $theme = app()->make(ModuleThemeInterface::class); + $theme = app(ModuleThemeInterface::class); $foreground = $this->imageColor($image, $theme->parameter('chart-font-color')); diff --git a/app/Module/GoogleAnalyticsModule.php b/app/Module/GoogleAnalyticsModule.php index cf35226e37..52543d5fc1 100644 --- a/app/Module/GoogleAnalyticsModule.php +++ b/app/Module/GoogleAnalyticsModule.php @@ -82,8 +82,8 @@ class GoogleAnalyticsModule extends AbstractModule implements ModuleAnalyticsInt public function analyticsSnippet(array $parameters): string { // Add extra dimensions (i.e. filtering categories) - $tree = app()->make(Tree::class); - $user = app()->make(UserInterface::class); + $tree = app(Tree::class); + $user = app(UserInterface::class); $parameters['dimensions'] = (object) [ 'dimension1' => $tree instanceof Tree ? $tree->name() : '-', diff --git a/app/Module/HitCountFooterModule.php b/app/Module/HitCountFooterModule.php index dd1c29aa2e..9c2dea09c1 100644 --- a/app/Module/HitCountFooterModule.php +++ b/app/Module/HitCountFooterModule.php @@ -155,7 +155,7 @@ class HitCountFooterModule extends AbstractModule implements ModuleFooterInterfa */ public function handle(Request $request, Closure $next): Response { - $tree = app()->make(Tree::class); + $tree = app(Tree::class); if ($tree instanceof Tree && $tree->getPreference('SHOW_COUNTER')) { $route = $request->get('route'); @@ -177,7 +177,7 @@ class HitCountFooterModule extends AbstractModule implements ModuleFooterInterfa break; case 'user-page': - $user = app()->make(UserInterface::class); + $user = app(UserInterface::class); $this->page_hits = $this->countHit($tree, $page_name, 'user:' . $user->id()); break; } diff --git a/app/Module/HourglassChartModule.php b/app/Module/HourglassChartModule.php index 7ab237c9eb..0689e095dd 100644 --- a/app/Module/HourglassChartModule.php +++ b/app/Module/HourglassChartModule.php @@ -153,7 +153,7 @@ class HourglassChartModule extends AbstractModule implements ModuleChartInterfac return new Response(view('modules/hourglass-chart/chart', [ 'descendants' => $descendants, 'ancestors' => $ancestors, - 'bhalfheight' => (int) (app()->make(ModuleThemeInterface::class)->parameter('chart-box-y') / 2), + 'bhalfheight' => (int) (app(ModuleThemeInterface::class)->parameter('chart-box-y') / 2), 'module_name' => $this->name(), ])); } @@ -275,21 +275,21 @@ class HourglassChartModule extends AbstractModule implements ModuleChartInterfac echo '</table>'; } echo '</td>'; - echo '<td class="myCharts" width="', app()->make(ModuleThemeInterface::class)->parameter('chart-box-x'), '">'; + echo '<td class="myCharts" width="', app(ModuleThemeInterface::class)->parameter('chart-box-x'), '">'; } // Print the descendency expansion arrow if ($generation == $generations) { - $tbwidth = app()->make(ModuleThemeInterface::class)->parameter('chart-box-x') + 16; + $tbwidth = app(ModuleThemeInterface::class)->parameter('chart-box-x') + 16; for ($j = $generation; $j < $generations; $j++) { - echo "<div style='width: ", $tbwidth, "px;'><br></div></td><td style='width:", app()->make(ModuleThemeInterface::class)->parameter('chart-box-x'), "px'>"; + echo "<div style='width: ", $tbwidth, "px;'><br></div></td><td style='width:", app(ModuleThemeInterface::class)->parameter('chart-box-x'), "px'>"; } $kcount = 0; foreach ($families as $family) { $kcount += $family->numberOfChildren(); } if ($kcount == 0) { - echo "</td><td style='width:", app()->make(ModuleThemeInterface::class)->parameter('chart-box-x'), "px'>"; + echo "</td><td style='width:", app(ModuleThemeInterface::class)->parameter('chart-box-x'), "px'>"; } else { echo '<a href="#" title="' . I18N::translate('Children') . '" data-route="Descendants" data-xref="' . e($pid) . '" data-spouses="' . e($show_spouse) . '" data-tree="' . e($individual->tree()->name()) . '">' . view('icons/arrow-left') . '</a>'; @@ -297,7 +297,7 @@ class HourglassChartModule extends AbstractModule implements ModuleChartInterfac if ($show_spouse) { echo str_repeat('<br><br><br>', count($families)); } - echo "</td><td style='width:", app()->make(ModuleThemeInterface::class)->parameter('chart-box-x'), "px'>"; + echo "</td><td style='width:", app(ModuleThemeInterface::class)->parameter('chart-box-x'), "px'>"; } } @@ -314,14 +314,14 @@ class HourglassChartModule extends AbstractModule implements ModuleChartInterfac } //-- add offset divs to make things line up better if ($generation == $generations) { - echo "<tr><td colspan '2'><div style='height:", (app()->make(ModuleThemeInterface::class)->parameter('chart-box-y') / 4), 'px; width:', app()->make(ModuleThemeInterface::class)->parameter('chart-box-x'), "px;'><br></div>"; + echo "<tr><td colspan '2'><div style='height:", (app(ModuleThemeInterface::class)->parameter('chart-box-y') / 4), 'px; width:', app(ModuleThemeInterface::class)->parameter('chart-box-x'), "px;'><br></div>"; } } echo '</td></tr></table>'; // For the root individual, print a down arrow that allows changing the root of tree if ($show_menu && $generation == 1) { - echo '<div class="text-center" id="childarrow" style="position:absolute; width:', app()->make(ModuleThemeInterface::class)->parameter('chart-box-x'), 'px;">'; + echo '<div class="text-center" id="childarrow" style="position:absolute; width:', app(ModuleThemeInterface::class)->parameter('chart-box-x'), 'px;">'; echo '<a href="#" title="' . I18N::translate('Family') . '" id="spouse-child-links">' . view('icons/arrow-down') . '</a>'; echo '<div id="childbox">'; echo '<table cellspacing="0" cellpadding="0" border="0" class="person_box"><tr><td> '; @@ -421,12 +421,12 @@ class HourglassChartModule extends AbstractModule implements ModuleChartInterfac if ($family === null) { // Prints empty table columns for children w/o parents up to the max generation // This allows vertical line spacing to be consistent - echo '<table><tr><td> ' . app()->make(ModuleThemeInterface::class)->individualBoxEmpty() . '</td>'; + echo '<table><tr><td> ' . app(ModuleThemeInterface::class)->individualBoxEmpty() . '</td>'; echo '<td> '; // Recursively get the father’s family $this->printPersonPedigree($individual, $generation + 1, $generations, $show_spouse); echo '</td></tr>'; - echo '<tr><td> ' . app()->make(ModuleThemeInterface::class)->individualBoxEmpty() . '</td>'; + echo '<tr><td> ' . app(ModuleThemeInterface::class)->individualBoxEmpty() . '</td>'; echo '<td> '; // Recursively get the mother’s family $this->printPersonPedigree($individual, $generation + 1, $generations, $show_spouse); @@ -455,9 +455,9 @@ class HourglassChartModule extends AbstractModule implements ModuleChartInterfac if ($generation < $genoffset - 1) { echo '<table>'; for ($i = $generation; $i < ((2 ** (($genoffset - 1) - $generation)) / 2) + 2; $i++) { - echo app()->make(ModuleThemeInterface::class)->individualBoxEmpty(); + echo app(ModuleThemeInterface::class)->individualBoxEmpty(); echo '</tr>'; - echo app()->make(ModuleThemeInterface::class)->individualBoxEmpty(); + echo app(ModuleThemeInterface::class)->individualBoxEmpty(); echo '</tr>'; } echo '</table>'; diff --git a/app/Module/HtmlBlockModule.php b/app/Module/HtmlBlockModule.php index cd08cf15db..6434081d72 100644 --- a/app/Module/HtmlBlockModule.php +++ b/app/Module/HtmlBlockModule.php @@ -65,7 +65,7 @@ class HtmlBlockModule extends AbstractModule implements ModuleBlockInterface */ public function getBlock(Tree $tree, int $block_id, string $ctype = '', array $cfg = []): string { - $statistics = app()->make(Statistics::class); + $statistics = app(Statistics::class); $title = $this->getBlockSetting($block_id, 'title', ''); $content = $this->getBlockSetting($block_id, 'html', ''); diff --git a/app/Module/LoggedInUsersModule.php b/app/Module/LoggedInUsersModule.php index 1c79d66cd0..8ae423a185 100644 --- a/app/Module/LoggedInUsersModule.php +++ b/app/Module/LoggedInUsersModule.php @@ -80,7 +80,7 @@ class LoggedInUsersModule extends AbstractModule implements ModuleBlockInterface public function getBlock(Tree $tree, int $block_id, string $ctype = '', array $cfg = []): string { /** @var Statistics $statistics */ - $statistics = app()->make(Statistics::class); + $statistics = app(Statistics::class); $content = '<div class="logged_in_count">' . $statistics->usersLoggedInList() . '</div>'; diff --git a/app/Module/ModuleThemeTrait.php b/app/Module/ModuleThemeTrait.php index 09ae533064..4a99c4cad2 100644 --- a/app/Module/ModuleThemeTrait.php +++ b/app/Module/ModuleThemeTrait.php @@ -502,7 +502,7 @@ trait ModuleThemeTrait { $themes = app(ModuleService::class)->findByInterface(ModuleThemeInterface::class); - $current_theme = app()->make(ModuleThemeInterface::class); + $current_theme = app(ModuleThemeInterface::class); if ($themes->count() > 1) { $submenus = $themes->map(function (ModuleThemeInterface $theme) use ($current_theme): Menu { diff --git a/app/Module/ThemeSelectModule.php b/app/Module/ThemeSelectModule.php index a700214c92..b06e15a962 100644 --- a/app/Module/ThemeSelectModule.php +++ b/app/Module/ThemeSelectModule.php @@ -62,7 +62,7 @@ class ThemeSelectModule extends AbstractModule implements ModuleBlockInterface */ public function getBlock(Tree $tree, int $block_id, string $ctype = '', array $cfg = []): string { - $menu = app()->make(ModuleThemeInterface::class)->menuThemes(); + $menu = app(ModuleThemeInterface::class)->menuThemes(); if ($menu) { $content = '<ul class="nav text-justify">' . $menu->bootstrap4() . '</ul>'; diff --git a/app/Module/TopGivenNamesModule.php b/app/Module/TopGivenNamesModule.php index a62b483c15..1c4ceac502 100644 --- a/app/Module/TopGivenNamesModule.php +++ b/app/Module/TopGivenNamesModule.php @@ -68,7 +68,7 @@ class TopGivenNamesModule extends AbstractModule implements ModuleBlockInterface */ public function getBlock(Tree $tree, int $block_id, string $ctype = '', array $cfg = []): string { - $statistics = app()->make(Statistics::class); + $statistics = app(Statistics::class); $num = $this->getBlockSetting($block_id, 'num', self::DEFAULT_NUMBER); $infoStyle = $this->getBlockSetting($block_id, 'infoStyle', self::DEFAULT_STYLE); diff --git a/app/Place.php b/app/Place.php index a1487f02c9..861f33c7a5 100644 --- a/app/Place.php +++ b/app/Place.php @@ -74,7 +74,7 @@ class Place */ public function id(): int { - return app()->make('cache.array')->rememberForever(__CLASS__ . __METHOD__ . $this->place_name, function () { + return app('cache.array')->rememberForever(__CLASS__ . __METHOD__ . $this->place_name, function () { // The "top-level" place won't exist in the database. if ($this->parts->isEmpty()) { return 0; diff --git a/app/Services/ModuleService.php b/app/Services/ModuleService.php index 5f5e9ec306..70d53b441f 100644 --- a/app/Services/ModuleService.php +++ b/app/Services/ModuleService.php @@ -275,7 +275,7 @@ class ModuleService { return Collection::make(self::CORE_MODULES) ->map(function (string $class, string $name): ModuleInterface { - $module = app()->make($class); + $module = app($class); $module->setName($name); diff --git a/app/Services/UserService.php b/app/Services/UserService.php index 0b05bbb58b..a6404b3328 100644 --- a/app/Services/UserService.php +++ b/app/Services/UserService.php @@ -324,9 +324,9 @@ class UserService */ public function contactLink(User $contact_user): string { - $tree = app()->make(Tree::class); - $user = app()->make(UserInterface::class); - $request = app()->make(Request::class); + $tree = app(Tree::class); + $user = app(UserInterface::class); + $request = app(Request::class); if ($contact_user->getPreference('contactmethod') === 'mailto') { $url = 'mailto:' . $contact_user->email(); diff --git a/app/Statistics/Google/ChartBirth.php b/app/Statistics/Google/ChartBirth.php index 482b0d7cc5..e679cd4645 100644 --- a/app/Statistics/Google/ChartBirth.php +++ b/app/Statistics/Google/ChartBirth.php @@ -57,7 +57,7 @@ class ChartBirth public function __construct(Tree $tree) { $this->tree = $tree; - $this->theme = app()->make(ModuleThemeInterface::class); + $this->theme = app(ModuleThemeInterface::class); $this->century_service = new CenturyService(); $this->color_service = new ColorService(); } diff --git a/app/Statistics/Google/ChartCommonGiven.php b/app/Statistics/Google/ChartCommonGiven.php index c9f3a7e700..ea710ba8cf 100644 --- a/app/Statistics/Google/ChartCommonGiven.php +++ b/app/Statistics/Google/ChartCommonGiven.php @@ -41,7 +41,7 @@ class ChartCommonGiven */ public function __construct() { - $this->theme = app()->make(ModuleThemeInterface::class); + $this->theme = app(ModuleThemeInterface::class); $this->color_service = new ColorService(); } diff --git a/app/Statistics/Google/ChartCommonSurname.php b/app/Statistics/Google/ChartCommonSurname.php index 311578142a..50a99ebde2 100644 --- a/app/Statistics/Google/ChartCommonSurname.php +++ b/app/Statistics/Google/ChartCommonSurname.php @@ -49,7 +49,7 @@ class ChartCommonSurname */ public function __construct(Tree $tree) { - $this->theme = app()->make(ModuleThemeInterface::class); + $this->theme = app(ModuleThemeInterface::class); $this->surname_tradition = $tree->getPreference('SURNAME_TRADITION'); $this->color_service = new ColorService(); } diff --git a/app/Statistics/Google/ChartDeath.php b/app/Statistics/Google/ChartDeath.php index 5ea88c9c73..5f50ebe57f 100644 --- a/app/Statistics/Google/ChartDeath.php +++ b/app/Statistics/Google/ChartDeath.php @@ -57,7 +57,7 @@ class ChartDeath public function __construct(Tree $tree) { $this->tree = $tree; - $this->theme = app()->make(ModuleThemeInterface::class); + $this->theme = app(ModuleThemeInterface::class); $this->century_service = new CenturyService(); $this->color_service = new ColorService(); } diff --git a/app/Statistics/Google/ChartDistribution.php b/app/Statistics/Google/ChartDistribution.php index fd09c6c9b7..b8adcef137 100644 --- a/app/Statistics/Google/ChartDistribution.php +++ b/app/Statistics/Google/ChartDistribution.php @@ -69,7 +69,7 @@ class ChartDistribution public function __construct(Tree $tree) { $this->tree = $tree; - $this->theme = app()->make(ModuleThemeInterface::class); + $this->theme = app(ModuleThemeInterface::class); $this->country_service = new CountryService(); $this->individualRepository = new IndividualRepository($tree); $this->placeRepository = new PlaceRepository($tree); diff --git a/app/Statistics/Google/ChartDivorce.php b/app/Statistics/Google/ChartDivorce.php index 8878329793..68b9444232 100644 --- a/app/Statistics/Google/ChartDivorce.php +++ b/app/Statistics/Google/ChartDivorce.php @@ -57,7 +57,7 @@ class ChartDivorce public function __construct(Tree $tree) { $this->tree = $tree; - $this->theme = app()->make(ModuleThemeInterface::class); + $this->theme = app(ModuleThemeInterface::class); $this->century_service = new CenturyService(); $this->color_service = new ColorService(); } diff --git a/app/Statistics/Google/ChartFamilyLargest.php b/app/Statistics/Google/ChartFamilyLargest.php index cd8a761ac1..80f3783934 100644 --- a/app/Statistics/Google/ChartFamilyLargest.php +++ b/app/Statistics/Google/ChartFamilyLargest.php @@ -52,7 +52,7 @@ class ChartFamilyLargest public function __construct(Tree $tree) { $this->tree = $tree; - $this->theme = app()->make(ModuleThemeInterface::class); + $this->theme = app(ModuleThemeInterface::class); $this->color_service = new ColorService(); } diff --git a/app/Statistics/Google/ChartFamilyWithSources.php b/app/Statistics/Google/ChartFamilyWithSources.php index 0db2467cf8..7c725fe16f 100644 --- a/app/Statistics/Google/ChartFamilyWithSources.php +++ b/app/Statistics/Google/ChartFamilyWithSources.php @@ -41,7 +41,7 @@ class ChartFamilyWithSources */ public function __construct() { - $this->theme = app()->make(ModuleThemeInterface::class); + $this->theme = app(ModuleThemeInterface::class); $this->color_service = new ColorService(); } diff --git a/app/Statistics/Google/ChartIndividualWithSources.php b/app/Statistics/Google/ChartIndividualWithSources.php index 09166f15e3..0a468ac0b1 100644 --- a/app/Statistics/Google/ChartIndividualWithSources.php +++ b/app/Statistics/Google/ChartIndividualWithSources.php @@ -41,7 +41,7 @@ class ChartIndividualWithSources */ public function __construct() { - $this->theme = app()->make(ModuleThemeInterface::class); + $this->theme = app(ModuleThemeInterface::class); $this->color_service = new ColorService(); } diff --git a/app/Statistics/Google/ChartMarriage.php b/app/Statistics/Google/ChartMarriage.php index 117d594d93..bb0c387be7 100644 --- a/app/Statistics/Google/ChartMarriage.php +++ b/app/Statistics/Google/ChartMarriage.php @@ -57,7 +57,7 @@ class ChartMarriage public function __construct(Tree $tree) { $this->tree = $tree; - $this->theme = app()->make(ModuleThemeInterface::class); + $this->theme = app(ModuleThemeInterface::class); $this->century_service = new CenturyService(); $this->color_service = new ColorService(); } diff --git a/app/Statistics/Google/ChartMedia.php b/app/Statistics/Google/ChartMedia.php index ff505ea595..9348917b9e 100644 --- a/app/Statistics/Google/ChartMedia.php +++ b/app/Statistics/Google/ChartMedia.php @@ -42,7 +42,7 @@ class ChartMedia */ public function __construct() { - $this->theme = app()->make(ModuleThemeInterface::class); + $this->theme = app(ModuleThemeInterface::class); $this->color_service = new ColorService(); } diff --git a/app/View.php b/app/View.php index 375ed14e05..7dcc6554f0 100644 --- a/app/View.php +++ b/app/View.php @@ -200,7 +200,7 @@ class View //$paths = glob(WT_ROOT . Webtrees::MODULES_PATH . '*/' . self::TEMPLATE_PATH); // Theme views // @TODO - this won't work during setup. - //$paths[] = WT_ROOT . Webtrees::THEMES_PATH . app()->make(ModuleThemeInterface::class)->name() . '/' . self::TEMPLATE_PATH; + //$paths[] = WT_ROOT . Webtrees::THEMES_PATH . app(ModuleThemeInterface::class)->name() . '/' . self::TEMPLATE_PATH; // Core views $paths[] = WT_ROOT . self::TEMPLATE_PATH; |