jon48 / webtrees-lib

app/Contracts/GeoDispersion/GeoAnalysisInterface.php

Indentation +20 added lines, -20 removed lines

@@ -22,26 +22,26 @@
  */
 interface GeoAnalysisInterface
 {
-    /**
-     * Get the geographical dispersion analysis title
-     *
-     * @return string
-     */
-    public function title(): string;
+	/**
+	 * Get the geographical dispersion analysis title
+	 *
+	 * @return string
+	 */
+	public function title(): string;
 
-    /**
-     * Gets the function to translate
-     *
-     * @return callable(int $count): string
-     */
-    public function itemsDescription(): callable;
+	/**
+	 * Gets the function to translate
+	 *
+	 * @return callable(int $count): string
+	 */
+	public function itemsDescription(): callable;
 
-    /**
-     * Get the results of the geographical dispersion analysis
-     *
-     * @param Tree $tree
-     * @param int $depth
-     * @return GeoAnalysisResults
-     */
-    public function results(Tree $tree, int $depth): GeoAnalysisResults;
+	/**
+	 * Get the results of the geographical dispersion analysis
+	 *
+	 * @param Tree $tree
+	 * @param int $depth
+	 * @return GeoAnalysisResults
+	 */
+	public function results(Tree $tree, int $depth): GeoAnalysisResults;
 }

app/Contracts/GeoDispersion/MapDefinitionInterface.php

Indentation +18 added lines, -18 removed lines

@@ -19,24 +19,24 @@
  */
 interface MapDefinitionInterface
 {
-    /**
-     * Get the map ID
-     *
-     * @return string
-     */
-    public function id(): string;
+	/**
+	 * Get the map ID
+	 *
+	 * @return string
+	 */
+	public function id(): string;
 
-    /**
-     * Get the map title
-     *
-     * @return string
-     */
-    public function title(): string;
+	/**
+	 * Get the map title
+	 *
+	 * @return string
+	 */
+	public function title(): string;
 
-    /**
-     * Get the features in the map
-     *
-     * @return \Brick\Geo\IO\GeoJSON\Feature[]
-     */
-    public function features(): array;
+	/**
+	 * Get the features in the map
+	 *
+	 * @return \Brick\Geo\IO\GeoJSON\Feature[]
+	 */
+	public function features(): array;
 }

app/Contracts/GeoDispersion/MapViewConfigInterface.php

Indentation +20 added lines, -20 removed lines

@@ -19,26 +19,26 @@
  */
 interface MapViewConfigInterface
 {
-    /**
-     * Get the feature property to be used for mapping the map feature with the analysis results
-     *
-     * @return string
-     */
-    public function mapMappingProperty(): string;
+	/**
+	 * Get the feature property to be used for mapping the map feature with the analysis results
+	 *
+	 * @return string
+	 */
+	public function mapMappingProperty(): string;
 
-    /**
-     * Get the config of the mapper associated with the map view
-     *
-     * @return PlaceMapperConfigInterface
-     */
-    public function mapperConfig(): PlaceMapperConfigInterface;
+	/**
+	 * Get the config of the mapper associated with the map view
+	 *
+	 * @return PlaceMapperConfigInterface
+	 */
+	public function mapperConfig(): PlaceMapperConfigInterface;
 
-    /**
-     * Get a MapViewConfigInterface object with the new properties
-     *
-     * @param string $mapping_property
-     * @param PlaceMapperConfigInterface $mapper_config
-     * @return static
-     */
-    public function with(string $mapping_property, PlaceMapperConfigInterface $mapper_config): self;
+	/**
+	 * Get a MapViewConfigInterface object with the new properties
+	 *
+	 * @param string $mapping_property
+	 * @param PlaceMapperConfigInterface $mapper_config
+	 * @return static
+	 */
+	public function with(string $mapping_property, PlaceMapperConfigInterface $mapper_config): self;
 }

app/Contracts/GeoDispersion/PlaceMapperInterface.php

Indentation +44 added lines, -44 removed lines

@@ -22,54 +22,54 @@
  */
 interface PlaceMapperInterface
 {
-    /**
-     * Get the Place mapper title
-     *
-     * @return string
-     */
-    public function title(): string;
+	/**
+	 * Get the Place mapper title
+	 *
+	 * @return string
+	 */
+	public function title(): string;
 
-    /**
-     * Boot the Place mapper
-     */
-    public function boot(): void;
+	/**
+	 * Boot the Place mapper
+	 */
+	public function boot(): void;
 
-    /**
-     * Get the configuration associated to the mapper
-     *
-     * @return PlaceMapperConfigInterface
-     */
-    public function config(): PlaceMapperConfigInterface;
+	/**
+	 * Get the configuration associated to the mapper
+	 *
+	 * @return PlaceMapperConfigInterface
+	 */
+	public function config(): PlaceMapperConfigInterface;
 
-    /**
-     * Set the configured associated to the mapper
-     *
-     * @param PlaceMapperConfigInterface $config
-     */
-    public function setConfig(PlaceMapperConfigInterface $config): void;
+	/**
+	 * Set the configured associated to the mapper
+	 *
+	 * @param PlaceMapperConfigInterface $config
+	 */
+	public function setConfig(PlaceMapperConfigInterface $config): void;
 
-    /**
-     * Get the data associated to the mapper, for a specific key
-     *
-     * @param string $key
-     * @return null|mixed
-     */
-    public function data(string $key);
+	/**
+	 * Get the data associated to the mapper, for a specific key
+	 *
+	 * @param string $key
+	 * @return null|mixed
+	 */
+	public function data(string $key);
 
-    /**
-     * Set the data associated to the mapper, for a specific key
-     *
-     * @param string $key
-     * @param mixed $data
-     */
-    public function setData(string $key, $data): void;
+	/**
+	 * Set the data associated to the mapper, for a specific key
+	 *
+	 * @param string $key
+	 * @param mixed $data
+	 */
+	public function setData(string $key, $data): void;
 
-    /**
-     * Return the property value of the feature identifying a place in a GeoJson map.
-     *
-     * @param Place $place
-     * @param string $feature_property
-     * @return string|NULL
-     */
-    public function map(Place $place, string $feature_property): ?string;
+	/**
+	 * Return the property value of the feature identifying a place in a GeoJson map.
+	 *
+	 * @param Place $place
+	 * @param string $feature_property
+	 * @return string|NULL
+	 */
+	public function map(Place $place, string $feature_property): ?string;
 }

app/Contracts/GeoDispersion/PlaceMapperConfigInterface.php

Indentation +37 added lines, -37 removed lines

@@ -24,45 +24,45 @@
  */
 interface PlaceMapperConfigInterface extends JsonSerializable
 {
-    /**
-     * Deserialise the mapper configuration from a string or an array
-     *
-     * @param mixed $config
-     * @return $this
-     */
-    public function jsonDeserialize($config): self;
+	/**
+	 * Deserialise the mapper configuration from a string or an array
+	 *
+	 * @param mixed $config
+	 * @return $this
+	 */
+	public function jsonDeserialize($config): self;
 
-    /**
-     * Check if the configuration contains a specific key
-     *
-     * @param string $key
-     * @return bool
-     */
-    public function has(string $key): bool;
+	/**
+	 * Check if the configuration contains a specific key
+	 *
+	 * @param string $key
+	 * @return bool
+	 */
+	public function has(string $key): bool;
 
-    /**
-     * Return the configuration associated with a key, or a default value if none found.
-     *
-     * @param string $key
-     * @param mixed|null $default
-     * @return mixed|null
-     */
-    public function get(string $key, $default = null);
+	/**
+	 * Return the configuration associated with a key, or a default value if none found.
+	 *
+	 * @param string $key
+	 * @param mixed|null $default
+	 * @return mixed|null
+	 */
+	public function get(string $key, $default = null);
 
-    /**
-     * Return the content of the mapper configuration section of the config page
-     *
-     * @param ModuleInterface $module
-     * @param Tree $tree
-     * @return string
-     */
-    public function configContent(ModuleInterface $module, Tree $tree): string;
+	/**
+	 * Return the content of the mapper configuration section of the config page
+	 *
+	 * @param ModuleInterface $module
+	 * @param Tree $tree
+	 * @return string
+	 */
+	public function configContent(ModuleInterface $module, Tree $tree): string;
 
-    /**
-     * Return a PlaceMapperConfigInterface object updated according to its mapper configuration rules
-     *
-     * @param ServerRequestInterface $request
-     * @return static
-     */
-    public function withConfigUpdate(ServerRequestInterface $request): self;
+	/**
+	 * Return a PlaceMapperConfigInterface object updated according to its mapper configuration rules
+	 *
+	 * @param ServerRequestInterface $request
+	 * @return static
+	 */
+	public function withConfigUpdate(ServerRequestInterface $request): self;
 }

app/Contracts/Tasks/TaskInterface.php

Indentation +19 added lines, -19 removed lines

@@ -19,25 +19,25 @@
  */
 interface TaskInterface
 {
-    /**
-     * Display name of the task
-     *
-     * @return string
-     */
-    public function name(): string;
+	/**
+	 * Display name of the task
+	 *
+	 * @return string
+	 */
+	public function name(): string;
     
-    /**
-     * Return the default frequency for the execution of the task, in minutes.
-     *
-     * @return int Frequency for the execution of the task
-     */
-    public function defaultFrequency(): int;
+	/**
+	 * Return the default frequency for the execution of the task, in minutes.
+	 *
+	 * @return int Frequency for the execution of the task
+	 */
+	public function defaultFrequency(): int;
     
-    /**
-     * Run the task's actions, and return whether the execution has been successful.
-     *
-     * @param TaskSchedule $task_schedule
-     * @return bool Has the execution been a success
-     */
-    public function run(TaskSchedule $task_schedule): bool;
+	/**
+	 * Run the task's actions, and return whether the execution has been successful.
+	 *
+	 * @param TaskSchedule $task_schedule
+	 * @return bool Has the execution been a success
+	 */
+	public function run(TaskSchedule $task_schedule): bool;
 }

app/Module/PatronymicLineage/Model/LineageNode.php

Spacing +2 added lines, -2 removed lines

@@ -68,7 +68,7 @@ 
     public function addFamily(Family $fams): object
     {
         if (!$this->linked_fams->has($fams->xref())) {
-            $this->linked_fams->put($fams->xref(), (object) [
+            $this->linked_fams->put($fams->xref(), (object)[
                 'family'   =>  $fams,
                 'children' =>  new Collection()
             ]);
@@ -135,6 +135,6 @@ 
      */
     public function hasFollowUpSurname(): bool
     {
-        return mb_strlen($this->followUpSurname()) > 0 ;
+        return mb_strlen($this->followUpSurname()) > 0;
     }
 }

Indentation +93 added lines, -93 removed lines

@@ -24,106 +24,106 @@
  */
 class LineageNode
 {
-    /**
-     * @var Collection<string, stdClass>  $linked_fams Spouse families linked to the node
-     */
-    private Collection $linked_fams;
+	/**
+	 * @var Collection<string, stdClass>  $linked_fams Spouse families linked to the node
+	 */
+	private Collection $linked_fams;
 
-    private ?Individual $node_indi;
-    private LineageRootNode $root_node;
-    private ?string $alt_surname;
+	private ?Individual $node_indi;
+	private LineageRootNode $root_node;
+	private ?string $alt_surname;
 
-    /**
-     * Constructor for Lineage node
-     *
-     * @param Individual $node_indi Main individual
-     * @param LineageRootNode $root_node Node of the lineage root
-     * @param null|string $alt_surname Follow-up surname
-     */
-    public function __construct(?Individual $node_indi = null, LineageRootNode $root_node, $alt_surname = null)
-    {
-        $this->node_indi = $node_indi;
-        $this->root_node = $root_node;
-        $this->alt_surname = $alt_surname;
-        $this->linked_fams = new Collection();
-    }
+	/**
+	 * Constructor for Lineage node
+	 *
+	 * @param Individual $node_indi Main individual
+	 * @param LineageRootNode $root_node Node of the lineage root
+	 * @param null|string $alt_surname Follow-up surname
+	 */
+	public function __construct(?Individual $node_indi = null, LineageRootNode $root_node, $alt_surname = null)
+	{
+		$this->node_indi = $node_indi;
+		$this->root_node = $root_node;
+		$this->alt_surname = $alt_surname;
+		$this->linked_fams = new Collection();
+	}
 
-    /**
-     * Add a spouse family to the node
-     *
-     * @param Family $fams
-     * @return stdClass
-     */
-    public function addFamily(Family $fams): object
-    {
-        if (!$this->linked_fams->has($fams->xref())) {
-            $this->linked_fams->put($fams->xref(), (object) [
-                'family'   =>  $fams,
-                'children' =>  new Collection()
-            ]);
-        }
-        return $this->linked_fams->get($fams->xref());
-    }
+	/**
+	 * Add a spouse family to the node
+	 *
+	 * @param Family $fams
+	 * @return stdClass
+	 */
+	public function addFamily(Family $fams): object
+	{
+		if (!$this->linked_fams->has($fams->xref())) {
+			$this->linked_fams->put($fams->xref(), (object) [
+				'family'   =>  $fams,
+				'children' =>  new Collection()
+			]);
+		}
+		return $this->linked_fams->get($fams->xref());
+	}
 
-    /**
-     * Add a child LineageNode to the node
-     *
-     * @param Family $fams
-     * @param LineageNode $child
-     */
-    public function addChild(Family $fams, LineageNode $child = null): void
-    {
-        $this->addFamily($fams)->children->push($child);
-        $this->root_node->incrementChildNodes();
-    }
+	/**
+	 * Add a child LineageNode to the node
+	 *
+	 * @param Family $fams
+	 * @param LineageNode $child
+	 */
+	public function addChild(Family $fams, LineageNode $child = null): void
+	{
+		$this->addFamily($fams)->children->push($child);
+		$this->root_node->incrementChildNodes();
+	}
 
-    /**
-     * Returns the node individual
-     *
-     * @return Individual|NULL
-     */
-    public function individual(): ?Individual
-    {
-        return $this->node_indi;
-    }
+	/**
+	 * Returns the node individual
+	 *
+	 * @return Individual|NULL
+	 */
+	public function individual(): ?Individual
+	{
+		return $this->node_indi;
+	}
 
-    /**
-     * Returns the lineage root node individual
-     *
-     * @return LineageRootNode
-     */
-    public function rootNode(): LineageRootNode
-    {
-        return $this->root_node;
-    }
+	/**
+	 * Returns the lineage root node individual
+	 *
+	 * @return LineageRootNode
+	 */
+	public function rootNode(): LineageRootNode
+	{
+		return $this->root_node;
+	}
 
-    /**
-     * Returns the spouse families linked to the node
-     *
-     * @return Collection<string, \stdClass>
-     */
-    public function families(): Collection
-    {
-        return $this->linked_fams;
-    }
+	/**
+	 * Returns the spouse families linked to the node
+	 *
+	 * @return Collection<string, \stdClass>
+	 */
+	public function families(): Collection
+	{
+		return $this->linked_fams;
+	}
 
-    /**
-     * Returns the follow-up surname
-     *
-     * @return string
-     */
-    public function followUpSurname(): string
-    {
-        return $this->alt_surname ?? '';
-    }
+	/**
+	 * Returns the follow-up surname
+	 *
+	 * @return string
+	 */
+	public function followUpSurname(): string
+	{
+		return $this->alt_surname ?? '';
+	}
 
-    /**
-     * Indicates whether the node has a follow up surname
-     *
-     * @return boolean
-     */
-    public function hasFollowUpSurname(): bool
-    {
-        return mb_strlen($this->followUpSurname()) > 0 ;
-    }
+	/**
+	 * Indicates whether the node has a follow up surname
+	 *
+	 * @return boolean
+	 */
+	public function hasFollowUpSurname(): bool
+	{
+		return mb_strlen($this->followUpSurname()) > 0 ;
+	}
 }

app/Module/WelcomeBlock/Http/RequestHandlers/MatomoStats.php

Spacing +2 added lines, -2 removed lines

@@ -81,12 +81,12 @@
             }
         } catch (Throwable $ex) {
             return $this->viewResponse('errors/unhandled-exception', [
-                'error' => I18N::translate('Error while retrieving Matomo statistics: ') .
+                'error' => I18N::translate('Error while retrieving Matomo statistics: ').
                     (Auth::isAdmin() ? $ex->getMessage() : I18N::translate('Log in as admin for error details'))
             ], StatusCodeInterface::STATUS_INTERNAL_SERVER_ERROR);
         }
 
-        return $this->viewResponse($this->module->name() . '::matomo-stats', [
+        return $this->viewResponse($this->module->name().'::matomo-stats', [
             'visits_year'   =>  $nb_visits_year,
             'visits_today'  =>  $nb_visits_today
         ]);

Indentation +52 added lines, -52 removed lines

@@ -32,64 +32,64 @@
  */
 class MatomoStats implements RequestHandlerInterface
 {
-    use ViewResponseTrait;
+	use ViewResponseTrait;
 
-    /**
-     * @var WelcomeBlockModule|null $module
-     */
-    private $module;
+	/**
+	 * @var WelcomeBlockModule|null $module
+	 */
+	private $module;
 
-    /**
-     * @var MatomoStatsService $matomo_service
-     */
-    private $matomo_service;
+	/**
+	 * @var MatomoStatsService $matomo_service
+	 */
+	private $matomo_service;
 
-    /**
-     * Constructor for MatomoStats request handler
-     * @param ModuleService $module_service
-     * @param MatomoStatsService $matomo_service
-     */
-    public function __construct(
-        ModuleService $module_service,
-        MatomoStatsService $matomo_service
-    ) {
-        $this->module = $module_service->findByInterface(WelcomeBlockModule::class)->first();
-        $this->matomo_service = $matomo_service;
-    }
+	/**
+	 * Constructor for MatomoStats request handler
+	 * @param ModuleService $module_service
+	 * @param MatomoStatsService $matomo_service
+	 */
+	public function __construct(
+		ModuleService $module_service,
+		MatomoStatsService $matomo_service
+	) {
+		$this->module = $module_service->findByInterface(WelcomeBlockModule::class)->first();
+		$this->matomo_service = $matomo_service;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        $this->layout = 'layouts/ajax';
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		$this->layout = 'layouts/ajax';
 
-        if ($this->module === null) {
-            return $this->viewResponse('errors/unhandled-exception', [
-                'error' => 'The attached module could not be found.'
-            ], StatusCodeInterface::STATUS_NOT_FOUND);
-        }
+		if ($this->module === null) {
+			return $this->viewResponse('errors/unhandled-exception', [
+				'error' => 'The attached module could not be found.'
+			], StatusCodeInterface::STATUS_NOT_FOUND);
+		}
 
-        $block_id = Validator::attributes($request)->integer('block_id', -1);
-        $nb_visits_year = $nb_visits_today = null;
+		$block_id = Validator::attributes($request)->integer('block_id', -1);
+		$nb_visits_year = $nb_visits_today = null;
 
-        try {
-            if ($block_id !== -1 && $this->module->isMatomoEnabled($block_id)) {
-                $nb_visits_today = $this->matomo_service->visitsToday($this->module, $block_id) ?? 0;
-                $nb_visits_year = ($this->matomo_service->visitsThisYear($this->module, $block_id) ?? 0)
-                    + $nb_visits_today;
-            }
-        } catch (Throwable $ex) {
-            return $this->viewResponse('errors/unhandled-exception', [
-                'error' => I18N::translate('Error while retrieving Matomo statistics: ') .
-                    (Auth::isAdmin() ? $ex->getMessage() : I18N::translate('Log in as admin for error details'))
-            ], StatusCodeInterface::STATUS_INTERNAL_SERVER_ERROR);
-        }
+		try {
+			if ($block_id !== -1 && $this->module->isMatomoEnabled($block_id)) {
+				$nb_visits_today = $this->matomo_service->visitsToday($this->module, $block_id) ?? 0;
+				$nb_visits_year = ($this->matomo_service->visitsThisYear($this->module, $block_id) ?? 0)
+					+ $nb_visits_today;
+			}
+		} catch (Throwable $ex) {
+			return $this->viewResponse('errors/unhandled-exception', [
+				'error' => I18N::translate('Error while retrieving Matomo statistics: ') .
+					(Auth::isAdmin() ? $ex->getMessage() : I18N::translate('Log in as admin for error details'))
+			], StatusCodeInterface::STATUS_INTERNAL_SERVER_ERROR);
+		}
 
-        return $this->viewResponse($this->module->name() . '::matomo-stats', [
-            'visits_year'   =>  $nb_visits_year,
-            'visits_today'  =>  $nb_visits_today
-        ]);
-    }
+		return $this->viewResponse($this->module->name() . '::matomo-stats', [
+			'visits_year'   =>  $nb_visits_year,
+			'visits_today'  =>  $nb_visits_today
+		]);
+	}
 }

app/Module/WelcomeBlock/Services/MatomoStatsService.php

Spacing +6 added lines, -6 removed lines

@@ -40,13 +40,13 @@ 
     public function visitsThisYear(WelcomeBlockModule $module, int $block_id): ?int
     {
         return Registry::cache()->file()->remember(
-            $module->name() . '-matomovisits-yearly-' . $block_id,
-            function () use ($module, $block_id): ?int {
+            $module->name().'-matomovisits-yearly-'.$block_id,
+            function() use ($module, $block_id) : ?int {
                 $visits_year = $this->visits($module, $block_id, 'year');
                 if ($visits_year === null) {
                     return null;
                 }
-                $visits_today = (int) $this->visits($module, $block_id, 'day');
+                $visits_today = (int)$this->visits($module, $block_id, 'day');
 
                 return $visits_year - $visits_today;
             },
@@ -64,8 +64,8 @@ 
     public function visitsToday(WelcomeBlockModule $module, int $block_id): ?int
     {
         return Registry::cache()->array()->remember(
-            $module->name() . '-matomovisits-daily-' . $block_id,
-            function () use ($module, $block_id): ?int {
+            $module->name().'-matomovisits-daily-'.$block_id,
+            function() use ($module, $block_id) : ?int {
                 return $this->visits($module, $block_id, 'day');
             }
         );
@@ -107,7 +107,7 @@ 
                 ]);
 
                 if ($response->getStatusCode() === StatusCodeInterface::STATUS_OK) {
-                    $result = json_decode((string) $response->getBody(), true)['value'] ?? null;
+                    $result = json_decode((string)$response->getBody(), true)['value'] ?? null;
                     if ($result !== null) {
                         return (int)$result;
                     }

Indentation +100 added lines, -100 removed lines

@@ -29,113 +29,113 @@
  */
 class MatomoStatsService
 {
-    protected ?HandlerStack $handler = null;
+	protected ?HandlerStack $handler = null;
 
-    /**
-     * Set or get the http handler for the service
-     *
-     * @param HandlerStack $handler
-     * @return HandlerStack
-     */
-    public function httpHandler(HandlerStack $handler = null): HandlerStack
-    {
-        if ($this->handler === null) {
-            $this->handler = HandlerStack::create();
-        }
-        if ($handler !== null) {
-            $this->handler = $handler;
-        }
-        return $this->handler;
-    }
+	/**
+	 * Set or get the http handler for the service
+	 *
+	 * @param HandlerStack $handler
+	 * @return HandlerStack
+	 */
+	public function httpHandler(HandlerStack $handler = null): HandlerStack
+	{
+		if ($this->handler === null) {
+			$this->handler = HandlerStack::create();
+		}
+		if ($handler !== null) {
+			$this->handler = $handler;
+		}
+		return $this->handler;
+	}
 
-    /**
-     * Returns the number of visits for the current year (up to the day before).
-     * That statistic is cached for the day, to avoid unecessary calls to Matomo API.
-     *
-     * @param WelcomeBlockModule $module
-     * @param int $block_id
-     * @return int|NULL
-     */
-    public function visitsThisYear(WelcomeBlockModule $module, int $block_id): ?int
-    {
-        return Registry::cache()->file()->remember(
-            $module->name() . '-matomovisits-yearly-' . $block_id,
-            function () use ($module, $block_id): ?int {
-                $visits_year = $this->visits($module, $block_id, 'year');
-                if ($visits_year === null) {
-                    return null;
-                }
-                $visits_today = (int) $this->visits($module, $block_id, 'day');
+	/**
+	 * Returns the number of visits for the current year (up to the day before).
+	 * That statistic is cached for the day, to avoid unecessary calls to Matomo API.
+	 *
+	 * @param WelcomeBlockModule $module
+	 * @param int $block_id
+	 * @return int|NULL
+	 */
+	public function visitsThisYear(WelcomeBlockModule $module, int $block_id): ?int
+	{
+		return Registry::cache()->file()->remember(
+			$module->name() . '-matomovisits-yearly-' . $block_id,
+			function () use ($module, $block_id): ?int {
+				$visits_year = $this->visits($module, $block_id, 'year');
+				if ($visits_year === null) {
+					return null;
+				}
+				$visits_today = (int) $this->visits($module, $block_id, 'day');
 
-                return $visits_year - $visits_today;
-            },
-            Carbon::now()->addDay()->startOfDay()->diffInSeconds(Carbon::now()) // Valid until midnight
-        );
-    }
+				return $visits_year - $visits_today;
+			},
+			Carbon::now()->addDay()->startOfDay()->diffInSeconds(Carbon::now()) // Valid until midnight
+		);
+	}
 
-    /**
-     * Returns the number of visits for the current day.
-     *
-     * @param WelcomeBlockModule $module
-     * @param int $block_id
-     * @return int|NULL
-     */
-    public function visitsToday(WelcomeBlockModule $module, int $block_id): ?int
-    {
-        return Registry::cache()->array()->remember(
-            $module->name() . '-matomovisits-daily-' . $block_id,
-            function () use ($module, $block_id): ?int {
-                return $this->visits($module, $block_id, 'day');
-            }
-        );
-    }
+	/**
+	 * Returns the number of visits for the current day.
+	 *
+	 * @param WelcomeBlockModule $module
+	 * @param int $block_id
+	 * @return int|NULL
+	 */
+	public function visitsToday(WelcomeBlockModule $module, int $block_id): ?int
+	{
+		return Registry::cache()->array()->remember(
+			$module->name() . '-matomovisits-daily-' . $block_id,
+			function () use ($module, $block_id): ?int {
+				return $this->visits($module, $block_id, 'day');
+			}
+		);
+	}
 
-    /**
-     * Invoke the Matomo API to retrieve the number of visits over a period.
-     *
-     * @param WelcomeBlockModule $module
-     * @param int $block_id
-     * @param string $period
-     * @return int|NULL
-     */
-    protected function visits(WelcomeBlockModule $module, int $block_id, string $period): ?int
-    {
-        $settings = $module->matomoSettings($block_id);
+	/**
+	 * Invoke the Matomo API to retrieve the number of visits over a period.
+	 *
+	 * @param WelcomeBlockModule $module
+	 * @param int $block_id
+	 * @param string $period
+	 * @return int|NULL
+	 */
+	protected function visits(WelcomeBlockModule $module, int $block_id, string $period): ?int
+	{
+		$settings = $module->matomoSettings($block_id);
 
-        if (
-            $settings['matomo_enabled'] === true
-            && mb_strlen($settings['matomo_url']) > 0
-            && mb_strlen($settings['matomo_token']) > 0
-            && $settings['matomo_siteid'] > 0
-        ) {
-            try {
-                $http_client = new Client([
-                    RequestOptions::TIMEOUT => 30,
-                    'handler'   => $this->handler
-                ]);
+		if (
+			$settings['matomo_enabled'] === true
+			&& mb_strlen($settings['matomo_url']) > 0
+			&& mb_strlen($settings['matomo_token']) > 0
+			&& $settings['matomo_siteid'] > 0
+		) {
+			try {
+				$http_client = new Client([
+					RequestOptions::TIMEOUT => 30,
+					'handler'   => $this->handler
+				]);
 
-                $response = $http_client->get($settings['matomo_url'], [
-                    'query' =>  [
-                        'module'    =>  'API',
-                        'method'    =>  'VisitsSummary.getVisits',
-                        'idSite'    =>  $settings['matomo_siteid'],
-                        'period'    =>  $period,
-                        'date'      =>  'today',
-                        'token_auth' =>  $settings['matomo_token'],
-                        'format'    =>  'json'
-                    ]
-                ]);
+				$response = $http_client->get($settings['matomo_url'], [
+					'query' =>  [
+						'module'    =>  'API',
+						'method'    =>  'VisitsSummary.getVisits',
+						'idSite'    =>  $settings['matomo_siteid'],
+						'period'    =>  $period,
+						'date'      =>  'today',
+						'token_auth' =>  $settings['matomo_token'],
+						'format'    =>  'json'
+					]
+				]);
 
-                if ($response->getStatusCode() === StatusCodeInterface::STATUS_OK) {
-                    $result = json_decode((string) $response->getBody(), true)['value'] ?? null;
-                    if ($result !== null) {
-                        return (int)$result;
-                    }
-                }
-            } catch (GuzzleException $ex) {
-            }
-        }
+				if ($response->getStatusCode() === StatusCodeInterface::STATUS_OK) {
+					$result = json_decode((string) $response->getBody(), true)['value'] ?? null;
+					if ($result !== null) {
+						return (int)$result;
+					}
+				}
+			} catch (GuzzleException $ex) {
+			}
+		}
 
-        return null;
-    }
+		return null;
+	}
 }