Fix: #4070 - remove ModuleThemeInterface::parameter

16 files changed, 80 insertions, 265 deletions

diff --git a/app/Statistics/Google/ChartAge.php b/app/Statistics/Google/ChartAge.php
index 4998a29225..6fba695875 100644
--- a/app/Statistics/Google/ChartAge.php
+++ b/app/Statistics/Google/ChartAge.php
@@ -27,20 +27,17 @@ use Illuminate\Database\Query\Expression;
 use Illuminate\Database\Query\JoinClause;
 use Illuminate\Support\Collection;
 
+use function round;
+use function view;
+
 /**
  * A chart showing the average age of individuals related to the death century.
  */
 class ChartAge
 {
-    /**
-     * @var Tree
-     */
-    private $tree;
+    private Tree $tree;
 
-    /**
-     * @var CenturyService
-     */
-    private $century_service;
+    private CenturyService $century_service;
 
     /**
      * Constructor.
diff --git a/app/Statistics/Google/ChartBirth.php b/app/Statistics/Google/ChartBirth.php
index e572b1761f..f830ad005f 100644
--- a/app/Statistics/Google/ChartBirth.php
+++ b/app/Statistics/Google/ChartBirth.php
@@ -20,40 +20,25 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Statistics\Google;
 
 use Fisharebest\Webtrees\I18N;
-use Fisharebest\Webtrees\Module\ModuleThemeInterface;
 use Fisharebest\Webtrees\Statistics\Service\CenturyService;
 use Fisharebest\Webtrees\Statistics\Service\ColorService;
 use Fisharebest\Webtrees\Tree;
 use Illuminate\Database\Capsule\Manager as DB;
 use Illuminate\Support\Collection;
 
-use function app;
 use function count;
+use function view;
 
 /**
  * A chart showing birth by century.
  */
 class ChartBirth
 {
-    /**
-     * @var Tree
-     */
-    private $tree;
+    private Tree $tree;
 
-    /**
-     * @var ModuleThemeInterface
-     */
-    private $theme;
+    private CenturyService $century_service;
 
-    /**
-     * @var CenturyService
-     */
-    private $century_service;
-
-    /**
-     * @var ColorService
-     */
-    private $color_service;
+    private ColorService $color_service;
 
     /**
      * Constructor.
@@ -63,7 +48,6 @@ class ChartBirth
     public function __construct(Tree $tree)
     {
         $this->tree            = $tree;
-        $this->theme           = app(ModuleThemeInterface::class);
         $this->century_service = new CenturyService();
         $this->color_service   = new ColorService();
     }
@@ -103,10 +87,8 @@ class ChartBirth
      */
     public function chartBirth(string $color_from = null, string $color_to = null): string
     {
-        $chart_color1 = $this->theme->parameter('distribution-chart-no-values');
-        $chart_color2 = $this->theme->parameter('distribution-chart-high-values');
-        $color_from   = $color_from ?? $chart_color1;
-        $color_to     = $color_to   ?? $chart_color2;
+        $color_from = $color_from ?? 'ffffff';
+        $color_to   = $color_to ?? '84beff';
 
         $data = [
             [
diff --git a/app/Statistics/Google/ChartChildren.php b/app/Statistics/Google/ChartChildren.php
index a9895a7410..74c59faacd 100644
--- a/app/Statistics/Google/ChartChildren.php
+++ b/app/Statistics/Google/ChartChildren.php
@@ -31,15 +31,9 @@ use Illuminate\Support\Collection;
  */
 class ChartChildren
 {
-    /**
-     * @var Tree
-     */
-    private $tree;
+    private Tree $tree;
 
-    /**
-     * @var CenturyService
-     */
-    private $century_service;
+    private CenturyService $century_service;
 
     /**
      * Constructor.
diff --git a/app/Statistics/Google/ChartCommonGiven.php b/app/Statistics/Google/ChartCommonGiven.php
index 6aefdd4d50..9e011053a6 100644
--- a/app/Statistics/Google/ChartCommonGiven.php
+++ b/app/Statistics/Google/ChartCommonGiven.php
@@ -20,33 +20,23 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Statistics\Google;
 
 use Fisharebest\Webtrees\I18N;
-use Fisharebest\Webtrees\Module\ModuleThemeInterface;
 use Fisharebest\Webtrees\Statistics\Service\ColorService;
 
-use function app;
 use function count;
+use function view;
 
 /**
  * A chart showing the top given names.
  */
 class ChartCommonGiven
 {
-    /**
-     * @var ModuleThemeInterface
-     */
-    private $theme;
-
-    /**
-     * @var ColorService
-     */
-    private $color_service;
+    private ColorService $color_service;
 
     /**
      * Constructor.
      */
     public function __construct()
     {
-        $this->theme         = app(ModuleThemeInterface::class);
         $this->color_service = new ColorService();
     }
 
@@ -66,10 +56,8 @@ class ChartCommonGiven
         string $color_from = null,
         string $color_to = null
     ): string {
-        $chart_color1 = $this->theme->parameter('distribution-chart-no-values');
-        $chart_color2 = $this->theme->parameter('distribution-chart-high-values');
-        $color_from   = $color_from ?? $chart_color1;
-        $color_to     = $color_to   ?? $chart_color2;
+        $color_from = $color_from ?? 'ffffff';
+        $color_to   = $color_to ?? '84beff';
 
         $tot = 0;
         foreach ($given as $count) {
diff --git a/app/Statistics/Google/ChartCommonSurname.php b/app/Statistics/Google/ChartCommonSurname.php
index 127d86a504..3b17bd9415 100644
--- a/app/Statistics/Google/ChartCommonSurname.php
+++ b/app/Statistics/Google/ChartCommonSurname.php
@@ -20,32 +20,22 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Statistics\Google;
 
 use Fisharebest\Webtrees\I18N;
-use Fisharebest\Webtrees\Module\ModuleThemeInterface;
 use Fisharebest\Webtrees\Statistics\Service\ColorService;
 use Fisharebest\Webtrees\Tree;
 
-use function app;
+use function array_sum;
 use function count;
+use function preg_replace;
+use function view;
 
 /**
  * A chart showing the top surnames.
  */
 class ChartCommonSurname
 {
-    /**
-     * @var ModuleThemeInterface
-     */
-    private $theme;
+    private string $surname_tradition;
 
-    /**
-     * @var string
-     */
-    private $surname_tradition;
-
-    /**
-     * @var ColorService
-     */
-    private $color_service;
+    private ColorService $color_service;
 
     /**
      * Constructor.
@@ -54,7 +44,6 @@ class ChartCommonSurname
      */
     public function __construct(Tree $tree)
     {
-        $this->theme             = app(ModuleThemeInterface::class);
         $this->surname_tradition = $tree->getPreference('SURNAME_TRADITION');
         $this->color_service     = new ColorService();
     }
@@ -125,10 +114,8 @@ class ChartCommonSurname
         string $color_from = null,
         string $color_to = null
     ): string {
-        $chart_color1 = $this->theme->parameter('distribution-chart-no-values');
-        $chart_color2 = $this->theme->parameter('distribution-chart-high-values');
-        $color_from   = $color_from ?? $chart_color1;
-        $color_to     = $color_to   ?? $chart_color2;
+        $color_from = $color_from ?? 'ffffff';
+        $color_to   = $color_to ?? '84beff';
 
         $tot = 0;
         foreach ($all_surnames as $surnames) {
diff --git a/app/Statistics/Google/ChartDeath.php b/app/Statistics/Google/ChartDeath.php
index 81e7f2c0de..0e652a42d2 100644
--- a/app/Statistics/Google/ChartDeath.php
+++ b/app/Statistics/Google/ChartDeath.php
@@ -20,40 +20,25 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Statistics\Google;
 
 use Fisharebest\Webtrees\I18N;
-use Fisharebest\Webtrees\Module\ModuleThemeInterface;
 use Fisharebest\Webtrees\Statistics\Service\CenturyService;
 use Fisharebest\Webtrees\Statistics\Service\ColorService;
 use Fisharebest\Webtrees\Tree;
 use Illuminate\Database\Capsule\Manager as DB;
 use Illuminate\Support\Collection;
 
-use function app;
 use function count;
+use function view;
 
 /**
  * A chart showing the deaths by century.
  */
 class ChartDeath
 {
-    /**
-     * @var Tree
-     */
-    private $tree;
+    private Tree $tree;
 
-    /**
-     * @var ModuleThemeInterface
-     */
-    private $theme;
+    private CenturyService $century_service;
 
-    /**
-     * @var CenturyService
-     */
-    private $century_service;
-
-    /**
-     * @var ColorService
-     */
-    private $color_service;
+    private ColorService $color_service;
 
     /**
      * Constructor.
@@ -63,7 +48,6 @@ class ChartDeath
     public function __construct(Tree $tree)
     {
         $this->tree            = $tree;
-        $this->theme           = app(ModuleThemeInterface::class);
         $this->century_service = new CenturyService();
         $this->color_service   = new ColorService();
     }
@@ -103,10 +87,8 @@ class ChartDeath
      */
     public function chartDeath(string $color_from = null, string $color_to = null): string
     {
-        $chart_color1 = $this->theme->parameter('distribution-chart-no-values');
-        $chart_color2 = $this->theme->parameter('distribution-chart-high-values');
-        $color_from   = $color_from ?? $chart_color1;
-        $color_to     = $color_to   ?? $chart_color2;
+        $color_from = $color_from ?? 'ffffff';
+        $color_to   = $color_to ?? '84beff';
 
         $data = [
             [
diff --git a/app/Statistics/Google/ChartDistribution.php b/app/Statistics/Google/ChartDistribution.php
index 9082b80870..51502d23e6 100644
--- a/app/Statistics/Google/ChartDistribution.php
+++ b/app/Statistics/Google/ChartDistribution.php
@@ -20,7 +20,6 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Statistics\Google;
 
 use Fisharebest\Webtrees\I18N;
-use Fisharebest\Webtrees\Module\ModuleThemeInterface;
 use Fisharebest\Webtrees\Statistics\Repository\IndividualRepository;
 use Fisharebest\Webtrees\Statistics\Repository\PlaceRepository;
 use Fisharebest\Webtrees\Statistics\Service\CountryService;
@@ -29,38 +28,22 @@ use Illuminate\Database\Capsule\Manager as DB;
 use Illuminate\Database\Query\Expression;
 use Illuminate\Database\Query\JoinClause;
 
-use function app;
 use function array_key_exists;
+use function preg_match_all;
+use function view;
 
 /**
  * A chart showing the distribution of different events on a map.
  */
 class ChartDistribution
 {
-    /**
-     * @var Tree
-     */
-    private $tree;
-
-    /**
-     * @var ModuleThemeInterface
-     */
-    private $theme;
+    private Tree $tree;
 
-    /**
-     * @var CountryService
-     */
-    private $country_service;
+    private CountryService $country_service;
 
-    /**
-     * @var IndividualRepository
-     */
-    private $individualRepository;
+    private IndividualRepository $individualRepository;
 
-    /**
-     * @var PlaceRepository
-     */
-    private $placeRepository;
+    private PlaceRepository $placeRepository;
 
     /**
      * @var array<string>
@@ -76,7 +59,6 @@ class ChartDistribution
     public function __construct(Tree $tree, CountryService $country_service)
     {
         $this->tree                 = $tree;
-        $this->theme                = app(ModuleThemeInterface::class);
         $this->country_service      = new CountryService();
         $this->individualRepository = new IndividualRepository($tree);
         $this->placeRepository      = new PlaceRepository($tree, $country_service);
@@ -355,13 +337,10 @@ class ChartDistribution
                 break;
         }
 
-        $chart_color2 = $this->theme->parameter('distribution-chart-high-values');
-        $chart_color3 = $this->theme->parameter('distribution-chart-low-values');
-
         return view('statistics/other/charts/geo', [
             'chart_title'  => $chart_title,
-            'chart_color2' => $chart_color2,
-            'chart_color3' => $chart_color3,
+            'chart_color2' => '84beff',
+            'chart_color3' => 'c3dfff',
             'region'       => $chart_shows,
             'data'         => $data,
             'language'     => I18N::languageTag(),
diff --git a/app/Statistics/Google/ChartDivorce.php b/app/Statistics/Google/ChartDivorce.php
index b3c2b1c96c..6fcfbd6cf9 100644
--- a/app/Statistics/Google/ChartDivorce.php
+++ b/app/Statistics/Google/ChartDivorce.php
@@ -20,40 +20,25 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Statistics\Google;
 
 use Fisharebest\Webtrees\I18N;
-use Fisharebest\Webtrees\Module\ModuleThemeInterface;
 use Fisharebest\Webtrees\Statistics\Service\CenturyService;
 use Fisharebest\Webtrees\Statistics\Service\ColorService;
 use Fisharebest\Webtrees\Tree;
 use Illuminate\Database\Capsule\Manager as DB;
 use Illuminate\Support\Collection;
 
-use function app;
 use function count;
+use function view;
 
 /**
  * A chart showing the divorces by century.
  */
 class ChartDivorce
 {
-    /**
-     * @var Tree
-     */
-    private $tree;
+    private Tree $tree;
 
-    /**
-     * @var ModuleThemeInterface
-     */
-    private $theme;
+    private CenturyService $century_service;
 
-    /**
-     * @var CenturyService
-     */
-    private $century_service;
-
-    /**
-     * @var ColorService
-     */
-    private $color_service;
+    private ColorService $color_service;
 
     /**
      * Constructor.
@@ -63,7 +48,6 @@ class ChartDivorce
     public function __construct(Tree $tree)
     {
         $this->tree            = $tree;
-        $this->theme           = app(ModuleThemeInterface::class);
         $this->century_service = new CenturyService();
         $this->color_service   = new ColorService();
     }
@@ -103,10 +87,8 @@ class ChartDivorce
      */
     public function chartDivorce(string $color_from = null, string $color_to = null): string
     {
-        $chart_color1 = $this->theme->parameter('distribution-chart-no-values');
-        $chart_color2 = $this->theme->parameter('distribution-chart-high-values');
-        $color_from   = $color_from ?? $chart_color1;
-        $color_to     = $color_to   ?? $chart_color2;
+        $color_from = $color_from ?? 'ffffff';
+        $color_to   = $color_to ?? '84beff';
 
         $data = [
             [
diff --git a/app/Statistics/Google/ChartFamilyLargest.php b/app/Statistics/Google/ChartFamilyLargest.php
index 5bb28a47a2..c9ee7712b4 100644
--- a/app/Statistics/Google/ChartFamilyLargest.php
+++ b/app/Statistics/Google/ChartFamilyLargest.php
@@ -21,33 +21,23 @@ namespace Fisharebest\Webtrees\Statistics\Google;
 
 use Fisharebest\Webtrees\Registry;
 use Fisharebest\Webtrees\I18N;
-use Fisharebest\Webtrees\Module\ModuleThemeInterface;
 use Fisharebest\Webtrees\Statistics\Service\ColorService;
 use Fisharebest\Webtrees\Tree;
 use Illuminate\Database\Capsule\Manager as DB;
 
-use function app;
 use function count;
+use function htmlspecialchars_decode;
+use function strip_tags;
+use function view;
 
 /**
  * A chart showing the largest families (Families with most children).
  */
 class ChartFamilyLargest
 {
-    /**
-     * @var Tree
-     */
-    private $tree;
+    private Tree $tree;
 
-    /**
-     * @var ModuleThemeInterface
-     */
-    private $theme;
-
-    /**
-     * @var ColorService
-     */
-    private $color_service;
+    private ColorService $color_service;
 
     /**
      * Constructor.
@@ -57,7 +47,6 @@ class ChartFamilyLargest
     public function __construct(Tree $tree)
     {
         $this->tree          = $tree;
-        $this->theme         = app(ModuleThemeInterface::class);
         $this->color_service = new ColorService();
     }
 
@@ -93,10 +82,8 @@ class ChartFamilyLargest
         string $color_to = null,
         int $total = 10
     ): string {
-        $chart_color1 = $this->theme->parameter('distribution-chart-no-values');
-        $chart_color2 = $this->theme->parameter('distribution-chart-high-values');
-        $color_from   = $color_from ?? $chart_color1;
-        $color_to     = $color_to   ?? $chart_color2;
+        $color_from = $color_from ?? 'ffffff';
+        $color_to   = $color_to ?? '84beff';
 
         $data = [
             [
diff --git a/app/Statistics/Google/ChartFamilyWithSources.php b/app/Statistics/Google/ChartFamilyWithSources.php
index 1464886388..862b4fade2 100644
--- a/app/Statistics/Google/ChartFamilyWithSources.php
+++ b/app/Statistics/Google/ChartFamilyWithSources.php
@@ -20,33 +20,23 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Statistics\Google;
 
 use Fisharebest\Webtrees\I18N;
-use Fisharebest\Webtrees\Module\ModuleThemeInterface;
 use Fisharebest\Webtrees\Statistics\Service\ColorService;
 
-use function app;
 use function count;
+use function view;
 
 /**
  * A chart showing families with sources.
  */
 class ChartFamilyWithSources
 {
-    /**
-     * @var ModuleThemeInterface
-     */
-    private $theme;
-
-    /**
-     * @var ColorService
-     */
-    private $color_service;
+    private ColorService $color_service;
 
     /**
      * Constructor.
      */
     public function __construct()
     {
-        $this->theme         = app(ModuleThemeInterface::class);
         $this->color_service = new ColorService();
     }
 
@@ -66,10 +56,8 @@ class ChartFamilyWithSources
         string $color_from = null,
         string $color_to = null
     ): string {
-        $chart_color1 = $this->theme->parameter('distribution-chart-no-values');
-        $chart_color2 = $this->theme->parameter('distribution-chart-high-values');
-        $color_from   = $color_from ?? $chart_color1;
-        $color_to     = $color_to   ?? $chart_color2;
+        $color_from = $color_from ?? 'ffffff';
+        $color_to   = $color_to ?? '84beff';
 
         $data = [
             [
diff --git a/app/Statistics/Google/ChartIndividualWithSources.php b/app/Statistics/Google/ChartIndividualWithSources.php
index c6c53ec7a7..adfccaa7a7 100644
--- a/app/Statistics/Google/ChartIndividualWithSources.php
+++ b/app/Statistics/Google/ChartIndividualWithSources.php
@@ -20,33 +20,23 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Statistics\Google;
 
 use Fisharebest\Webtrees\I18N;
-use Fisharebest\Webtrees\Module\ModuleThemeInterface;
 use Fisharebest\Webtrees\Statistics\Service\ColorService;
 
-use function app;
 use function count;
+use function view;
 
 /**
  * A chart showing individuals with sources.
  */
 class ChartIndividualWithSources
 {
-    /**
-     * @var ModuleThemeInterface
-     */
-    private $theme;
-
-    /**
-     * @var ColorService
-     */
-    private $color_service;
+    private ColorService $color_service;
 
     /**
      * Constructor.
      */
     public function __construct()
     {
-        $this->theme         = app(ModuleThemeInterface::class);
         $this->color_service = new ColorService();
     }
 
@@ -66,10 +56,8 @@ class ChartIndividualWithSources
         string $color_from = null,
         string $color_to = null
     ): string {
-        $chart_color1 = $this->theme->parameter('distribution-chart-no-values');
-        $chart_color2 = $this->theme->parameter('distribution-chart-high-values');
-        $color_from   = $color_from ?? $chart_color1;
-        $color_to     = $color_to   ?? $chart_color2;
+        $color_from = $color_from ?? 'ffffff';
+        $color_to   = $color_to ?? '84beff';
 
         $data = [
             [
diff --git a/app/Statistics/Google/ChartMarriage.php b/app/Statistics/Google/ChartMarriage.php
index d44b86859e..163a19f842 100644
--- a/app/Statistics/Google/ChartMarriage.php
+++ b/app/Statistics/Google/ChartMarriage.php
@@ -20,40 +20,25 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Statistics\Google;
 
 use Fisharebest\Webtrees\I18N;
-use Fisharebest\Webtrees\Module\ModuleThemeInterface;
 use Fisharebest\Webtrees\Statistics\Service\CenturyService;
 use Fisharebest\Webtrees\Statistics\Service\ColorService;
 use Fisharebest\Webtrees\Tree;
 use Illuminate\Database\Capsule\Manager as DB;
 use Illuminate\Support\Collection;
 
-use function app;
 use function count;
+use function view;
 
 /**
  * A chart showing the marriages by century.
  */
 class ChartMarriage
 {
-    /**
-     * @var Tree
-     */
-    private $tree;
+    private Tree $tree;
 
-    /**
-     * @var ModuleThemeInterface
-     */
-    private $theme;
+    private CenturyService $century_service;
 
-    /**
-     * @var CenturyService
-     */
-    private $century_service;
-
-    /**
-     * @var ColorService
-     */
-    private $color_service;
+    private ColorService $color_service;
 
     /**
      * Constructor.
@@ -63,7 +48,6 @@ class ChartMarriage
     public function __construct(Tree $tree)
     {
         $this->tree            = $tree;
-        $this->theme           = app(ModuleThemeInterface::class);
         $this->century_service = new CenturyService();
         $this->color_service   = new ColorService();
     }
@@ -103,10 +87,8 @@ class ChartMarriage
      */
     public function chartMarriage(string $color_from = null, string $color_to = null): string
     {
-        $chart_color1 = $this->theme->parameter('distribution-chart-no-values');
-        $chart_color2 = $this->theme->parameter('distribution-chart-high-values');
-        $color_from   = $color_from ?? $chart_color1;
-        $color_to     = $color_to   ?? $chart_color2;
+        $color_from = $color_from ?? 'ffffff';
+        $color_to   = $color_to ?? '84beff';
 
         $data = [
             [
diff --git a/app/Statistics/Google/ChartMarriageAge.php b/app/Statistics/Google/ChartMarriageAge.php
index 6b91af1933..b4d524f2e1 100644
--- a/app/Statistics/Google/ChartMarriageAge.php
+++ b/app/Statistics/Google/ChartMarriageAge.php
@@ -27,20 +27,17 @@ use Illuminate\Database\Query\Expression;
 use Illuminate\Database\Query\JoinClause;
 use Illuminate\Support\Collection;
 
+use function round;
+use function view;
+
 /**
  * A chart showing the marriage ages by century.
  */
 class ChartMarriageAge
 {
-    /**
-     * @var Tree
-     */
-    private $tree;
+    private Tree $tree;
 
-    /**
-     * @var CenturyService
-     */
-    private $century_service;
+    private CenturyService $century_service;
 
     /**
      * Constructor.
diff --git a/app/Statistics/Google/ChartMedia.php b/app/Statistics/Google/ChartMedia.php
index c96c543d61..1ad6377faf 100644
--- a/app/Statistics/Google/ChartMedia.php
+++ b/app/Statistics/Google/ChartMedia.php
@@ -20,34 +20,24 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Statistics\Google;
 
 use Fisharebest\Webtrees\I18N;
-use Fisharebest\Webtrees\Module\ModuleThemeInterface;
 use Fisharebest\Webtrees\Registry;
 use Fisharebest\Webtrees\Statistics\Service\ColorService;
 
-use function app;
 use function count;
+use function view;
 
 /**
  * A chart showing the top used media types.
  */
 class ChartMedia
 {
-    /**
-     * @var ModuleThemeInterface
-     */
-    private $theme;
-
-    /**
-     * @var ColorService
-     */
-    private $color_service;
+    private ColorService $color_service;
 
     /**
      * Constructor.
      */
     public function __construct()
     {
-        $this->theme         = app(ModuleThemeInterface::class);
         $this->color_service = new ColorService();
     }
 
@@ -65,10 +55,8 @@ class ChartMedia
         string $color_from = null,
         string $color_to = null
     ): string {
-        $chart_color1 = $this->theme->parameter('distribution-chart-no-values');
-        $chart_color2 = $this->theme->parameter('distribution-chart-high-values');
-        $color_from   = $color_from ?? $chart_color1;
-        $color_to     = $color_to   ?? $chart_color2;
+        $color_from = $color_from ?? 'ffffff';
+        $color_to   = $color_to ?? '84beff';
 
         $data = [
             [
diff --git a/app/Statistics/Google/ChartMortality.php b/app/Statistics/Google/ChartMortality.php
index 3d8776d03f..873c25b5ba 100644
--- a/app/Statistics/Google/ChartMortality.php
+++ b/app/Statistics/Google/ChartMortality.php
@@ -23,16 +23,14 @@ use Fisharebest\Webtrees\I18N;
 use Fisharebest\Webtrees\Statistics\Service\ColorService;
 
 use function count;
+use function view;
 
 /**
  * A chart showing the mortality.
  */
 class ChartMortality
 {
-    /**
-     * @var ColorService
-     */
-    private $color_service;
+    private ColorService $color_service;
 
     /**
      * Constructor.
diff --git a/app/Statistics/Google/ChartNoChildrenFamilies.php b/app/Statistics/Google/ChartNoChildrenFamilies.php
index f5d34e42d7..b050c11039 100644
--- a/app/Statistics/Google/ChartNoChildrenFamilies.php
+++ b/app/Statistics/Google/ChartNoChildrenFamilies.php
@@ -25,20 +25,16 @@ use Fisharebest\Webtrees\Tree;
 use Illuminate\Database\Capsule\Manager as DB;
 use Illuminate\Database\Query\JoinClause;
 
+use function view;
+
 /**
  * A chart showing the number of families with no children by century.
  */
 class ChartNoChildrenFamilies
 {
-    /**
-     * @var Tree
-     */
-    private $tree;
+    private Tree $tree;
 
-    /**
-     * @var CenturyService
-     */
-    private $century_service;
+    private CenturyService $century_service;
 
     /**
      * Constructor.