jon48 / webtrees-lib

app/Module/Hooks/Hooks/RecordNameTextExtenderCollector.php

Indentation +44 added lines, -44 removed lines

@@ -27,52 +27,52 @@
  */
 class RecordNameTextExtenderCollector extends AbstractHookCollector implements RecordNameTextExtenderInterface
 {
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Common\Hooks\AbstractHookCollector::title()
-     */
-    public function title(): string
-    {
-        return I18N::translate('Text extender for records’ name');
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Common\Hooks\AbstractHookCollector::title()
+	 */
+	public function title(): string
+	{
+		return I18N::translate('Text extender for records’ name');
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Common\Hooks\AbstractHookCollector::description()
-     */
-    public function description(): string
-    {
-        return I18N::translate('Extends the full name of GEDCOM records with additional text or icons.');
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Common\Hooks\AbstractHookCollector::description()
+	 */
+	public function description(): string
+	{
+		return I18N::translate('Extends the full name of GEDCOM records with additional text or icons.');
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Common\Hooks\AbstractHookCollector::hookInterface()
-     */
-    public function hookInterface(): string
-    {
-        return RecordNameTextExtenderInterface::class;
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Common\Hooks\AbstractHookCollector::hookInterface()
+	 */
+	public function hookInterface(): string
+	{
+		return RecordNameTextExtenderInterface::class;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\Hooks\RecordNameTextExtenderInterface::recordNamePrepend()
-     */
-    public function recordNamePrepend(GedcomRecord $record, bool $use_long = false, string $size = ''): string
-    {
-        return $this->hooks()
-            ->map(fn(RecordNameTextExtenderInterface $hook) => $hook->recordNamePrepend($record, $use_long, $size))
-            ->implode('');
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\Hooks\RecordNameTextExtenderInterface::recordNamePrepend()
+	 */
+	public function recordNamePrepend(GedcomRecord $record, bool $use_long = false, string $size = ''): string
+	{
+		return $this->hooks()
+			->map(fn(RecordNameTextExtenderInterface $hook) => $hook->recordNamePrepend($record, $use_long, $size))
+			->implode('');
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\Hooks\RecordNameTextExtenderInterface::recordNameAppend()
-     */
-    public function recordNameAppend(GedcomRecord $record, bool $use_long = false, string $size = ''): string
-    {
-        return $this->hooks()
-            ->map(fn(RecordNameTextExtenderInterface $hook) => $hook->recordNameAppend($record, $use_long, $size))
-            ->implode('');
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\Hooks\RecordNameTextExtenderInterface::recordNameAppend()
+	 */
+	public function recordNameAppend(GedcomRecord $record, bool $use_long = false, string $size = ''): string
+	{
+		return $this->hooks()
+			->map(fn(RecordNameTextExtenderInterface $hook) => $hook->recordNameAppend($record, $use_long, $size))
+			->implode('');
+	}
 }

app/Module/Hooks/Hooks/NameAccordionExtenderCollector.php

Indentation +34 added lines, -34 removed lines

@@ -27,41 +27,41 @@
  */
 class NameAccordionExtenderCollector extends AbstractHookCollector implements NameAccordionExtenderInterface
 {
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Common\Hooks\AbstractHookCollector::title()
-     */
-    public function title(): string
-    {
-        return I18N::translate('Individual names accordion extender');
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Common\Hooks\AbstractHookCollector::title()
+	 */
+	public function title(): string
+	{
+		return I18N::translate('Individual names accordion extender');
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Common\Hooks\AbstractHookCollector::description()
-     */
-    public function description(): string
-    {
-        return I18N::translate('Extends the names accordion of on an individual’s page.');
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Common\Hooks\AbstractHookCollector::description()
+	 */
+	public function description(): string
+	{
+		return I18N::translate('Extends the names accordion of on an individual’s page.');
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Common\Hooks\AbstractHookCollector::hookInterface()
-     */
-    public function hookInterface(): string
-    {
-        return NameAccordionExtenderInterface::class;
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Common\Hooks\AbstractHookCollector::hookInterface()
+	 */
+	public function hookInterface(): string
+	{
+		return NameAccordionExtenderInterface::class;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\Hooks\NameAccordionExtenderInterface::accordionCard()
-     */
-    public function accordionCard(Individual $individual): string
-    {
-        return $this->hooks()
-            ->map(fn(NameAccordionExtenderInterface $hook) => $hook->accordionCard($individual))
-            ->implode('');
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\Hooks\NameAccordionExtenderInterface::accordionCard()
+	 */
+	public function accordionCard(Individual $individual): string
+	{
+		return $this->hooks()
+			->map(fn(NameAccordionExtenderInterface $hook) => $hook->accordionCard($individual))
+			->implode('');
+	}
 }

app/Module/Hooks/Http/RequestHandlers/AdminConfigPage.php

Indentation +29 added lines, -29 removed lines

@@ -29,38 +29,38 @@
  */
 class AdminConfigPage implements RequestHandlerInterface
 {
-    use ViewResponseTrait;
+	use ViewResponseTrait;
 
-    private ?HooksModule $module;
-    private HookService $hook_service;
+	private ?HooksModule $module;
+	private HookService $hook_service;
 
-    /**
-     * Constructor for AdminConfigPage Request Handler
-     *
-     * @param ModuleService $module_service
-     * @param HookService $hook_service
-     */
-    public function __construct(ModuleService $module_service, HookService $hook_service)
-    {
-        $this->module = $module_service->findByInterface(HooksModule::class)->first();
-        $this->hook_service = $hook_service;
-    }
+	/**
+	 * Constructor for AdminConfigPage Request Handler
+	 *
+	 * @param ModuleService $module_service
+	 * @param HookService $hook_service
+	 */
+	public function __construct(ModuleService $module_service, HookService $hook_service)
+	{
+		$this->module = $module_service->findByInterface(HooksModule::class)->first();
+		$this->hook_service = $hook_service;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        $this->layout = 'layouts/administration';
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		$this->layout = 'layouts/administration';
 
-        if ($this->module === null) {
-            throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
-        }
+		if ($this->module === null) {
+			throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
+		}
 
-        return $this->viewResponse($this->module->name() . '::admin/config', [
-            'title'                 =>  $this->module->title(),
-            'hook_interfaces_list'  =>  $this->hook_service->all(true)
-        ]);
-    }
+		return $this->viewResponse($this->module->name() . '::admin/config', [
+			'title'                 =>  $this->module->title(),
+			'hook_interfaces_list'  =>  $this->hook_service->all(true)
+		]);
+	}
 }

app/Module/MiscExtensions/Http/RequestHandlers/AdminConfigPage.php

Indentation +31 added lines, -31 removed lines

@@ -28,35 +28,35 @@
  */
 class AdminConfigPage implements RequestHandlerInterface
 {
-    use ViewResponseTrait;
-
-    private ?MiscExtensionsModule $module;
-
-    /**
-     * Constructor for AdminConfigPage Request Handler
-     *
-     * @param ModuleService $module_service
-     */
-    public function __construct(ModuleService $module_service)
-    {
-        $this->module = $module_service->findByInterface(MiscExtensionsModule::class)->first();
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        $this->layout = 'layouts/administration';
-
-        if ($this->module === null) {
-            throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
-        }
-
-        return $this->viewResponse($this->module->name() . '::admin/config', [
-            'module'    =>  $this->module,
-            'title'     =>  $this->module->title()
-        ]);
-    }
+	use ViewResponseTrait;
+
+	private ?MiscExtensionsModule $module;
+
+	/**
+	 * Constructor for AdminConfigPage Request Handler
+	 *
+	 * @param ModuleService $module_service
+	 */
+	public function __construct(ModuleService $module_service)
+	{
+		$this->module = $module_service->findByInterface(MiscExtensionsModule::class)->first();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		$this->layout = 'layouts/administration';
+
+		if ($this->module === null) {
+			throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
+		}
+
+		return $this->viewResponse($this->module->name() . '::admin/config', [
+			'module'    =>  $this->module,
+			'title'     =>  $this->module->title()
+		]);
+	}
 }

app/Module/Sosa/Data/MissingAncestor.php

Indentation +67 added lines, -67 removed lines

@@ -21,79 +21,79 @@
  */
 class MissingAncestor
 {
-    /**
-     * @var Individual $individual
-     */
-    private $individual;
+	/**
+	 * @var Individual $individual
+	 */
+	private $individual;
 
-    /**
-     * @var int $sosa
-     */
-    private $sosa;
+	/**
+	 * @var int $sosa
+	 */
+	private $sosa;
 
-    /**
-     * @var bool $missing_father
-     */
-    private $missing_father;
+	/**
+	 * @var bool $missing_father
+	 */
+	private $missing_father;
 
-    /**
-     * @var bool $missing_mother
-     */
-    private $missing_mother;
+	/**
+	 * @var bool $missing_mother
+	 */
+	private $missing_mother;
 
-    /**
-     * Constructor for MissingAncestor data class
-     *
-     * @param Individual $ancestor
-     * @param int $sosa
-     * @param bool $missing_father
-     * @param bool $missing_mother
-     */
-    public function __construct(Individual $ancestor, int $sosa, bool $missing_father, bool $missing_mother)
-    {
-        $this->individual = $ancestor;
-        $this->sosa = $sosa;
-        $this->missing_father = $missing_father;
-        $this->missing_mother = $missing_mother;
-    }
+	/**
+	 * Constructor for MissingAncestor data class
+	 *
+	 * @param Individual $ancestor
+	 * @param int $sosa
+	 * @param bool $missing_father
+	 * @param bool $missing_mother
+	 */
+	public function __construct(Individual $ancestor, int $sosa, bool $missing_father, bool $missing_mother)
+	{
+		$this->individual = $ancestor;
+		$this->sosa = $sosa;
+		$this->missing_father = $missing_father;
+		$this->missing_mother = $missing_mother;
+	}
 
-    /**
-     * Reference individual of the row
-     *
-     * @return Individual
-     */
-    public function individual(): Individual
-    {
-        return $this->individual;
-    }
+	/**
+	 * Reference individual of the row
+	 *
+	 * @return Individual
+	 */
+	public function individual(): Individual
+	{
+		return $this->individual;
+	}
 
-    /**
-     * Minimum sosa of the reference individual
-     *
-     * @return int
-     */
-    public function sosa(): int
-    {
-        return $this->sosa;
-    }
+	/**
+	 * Minimum sosa of the reference individual
+	 *
+	 * @return int
+	 */
+	public function sosa(): int
+	{
+		return $this->sosa;
+	}
 
-    /**
-     * Indicate whether the reference individual does not have a father
-     *
-     * @return bool
-     */
-    public function isFatherMissing(): bool
-    {
-        return $this->missing_father;
-    }
+	/**
+	 * Indicate whether the reference individual does not have a father
+	 *
+	 * @return bool
+	 */
+	public function isFatherMissing(): bool
+	{
+		return $this->missing_father;
+	}
 
-    /**
-     * Indicate whether the reference individual does not have a mother
-     *
-     * @return bool
-     */
-    public function isMotherMissing(): bool
-    {
-        return $this->missing_mother;
-    }
+	/**
+	 * Indicate whether the reference individual does not have a mother
+	 *
+	 * @return bool
+	 */
+	public function isMotherMissing(): bool
+	{
+		return $this->missing_mother;
+	}
 }

app/Module/Sosa/Services/SosaCalculatorService.php

Indentation +139 added lines, -139 removed lines

@@ -24,143 +24,143 @@
  */
 class SosaCalculatorService
 {
-    /**
-     * Maximium size for the temporary Sosa table
-     * @var int TMP_SOSA_TABLE_LIMIT
-     */
-    private const TMP_SOSA_TABLE_LIMIT = 1000;
-
-    /**
-     * @var SosaRecordsService $sosa_records_service
-     */
-    private $sosa_records_service;
-
-    /**
-     * Reference user
-     * @var UserInterface $user
-     */
-    private $user;
-
-    /**
-     * Reference tree
-     * @var Tree $tree
-     */
-    private $tree;
-
-    /**
-     * Temporary Sosa table, used during construction
-     * @var array<array<string,mixed>> $tmp_sosa_table
-     */
-    private $tmp_sosa_table;
-
-    /**
-     * Maximum number of generations to calculate
-     * @var int $max_generations
-     */
-    private $max_generations;
-
-    /**
-     * Constructor for the Sosa Calculator
-     *
-     * @param SosaRecordsService $sosa_records_service
-     * @param Tree $tree
-     * @param UserInterface $user
-     */
-    public function __construct(SosaRecordsService $sosa_records_service, Tree $tree, UserInterface $user)
-    {
-        $this->sosa_records_service = $sosa_records_service;
-        $this->tree = $tree;
-        $this->user = $user;
-        $this->tmp_sosa_table = array();
-        $max_gen_setting = $tree->getUserPreference($user, 'MAJ_SOSA_MAX_GEN');
-        $this->max_generations = is_numeric($max_gen_setting) ?
-            (int) $max_gen_setting :
-            $this->sosa_records_service->maxSystemGenerations();
-    }
-
-    /**
-     * Compute all Sosa ancestors from the user's root individual.
-     *
-     * @return bool Result of the computation
-     */
-    public function computeAll(): bool
-    {
-        $root_id = $this->tree->getUserPreference($this->user, 'MAJ_SOSA_ROOT_ID');
-        if (($indi = Registry::individualFactory()->make($root_id, $this->tree)) !== null) {
-            $this->sosa_records_service->deleteAll($this->tree, $this->user);
-            $this->addNode($indi, 1);
-            $this->flushTmpSosaTable(true);
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Compute all Sosa Ancestors from a specified Individual
-     *
-     * @param Individual $indi
-     * @return bool
-     */
-    public function computeFromIndividual(Individual $indi): bool
-    {
-        $current_sosas = $this->sosa_records_service->sosaNumbers($this->tree, $this->user, $indi);
-        foreach ($current_sosas->keys() as $sosa) {
-            $this->sosa_records_service->deleteAncestorsFrom($this->tree, $this->user, $sosa);
-            $this->addNode($indi, $sosa);
-        }
-        $this->flushTmpSosaTable(true);
-        return true;
-    }
-
-    /**
-     * Recursive method to add individual to the Sosa table, and flush it regularly
-     *
-     * @param Individual $indi Individual to add
-     * @param int $sosa Individual's sosa
-     */
-    private function addNode(Individual $indi, int $sosa): void
-    {
-        $birth_year = $indi->getBirthDate()->gregorianYear();
-        $birth_year_est = $birth_year === 0 ? $indi->getEstimatedBirthDate()->gregorianYear() : $birth_year;
-
-        $death_year = $indi->getDeathDate()->gregorianYear();
-        $death_year_est = $death_year === 0 ? $indi->getEstimatedDeathDate()->gregorianYear() : $death_year;
-
-        $this->tmp_sosa_table[] = [
-            'indi' => $indi->xref(),
-            'sosa' => $sosa,
-            'birth_year' => $birth_year === 0 ? null : $birth_year,
-            'birth_year_est' => $birth_year_est === 0 ? null : $birth_year_est,
-            'death_year' => $death_year === 0 ? null : $death_year,
-            'death_year_est' => $death_year_est === 0 ? null : $death_year_est
-        ];
-
-        $this->flushTmpSosaTable();
-
-        if (
-            ($fam = $indi->childFamilies()->first()) !== null
-            && $this->sosa_records_service->generation($sosa) < $this->max_generations
-        ) {
-            /** @var \Fisharebest\Webtrees\Family $fam */
-            if (($husb = $fam->husband()) !== null) {
-                $this->addNode($husb, 2 * $sosa);
-            }
-            if (($wife = $fam->wife()) !== null) {
-                $this->addNode($wife, 2 * $sosa + 1);
-            }
-        }
-    }
-
-    /**
-     * Write sosas in the table, if the number of items is superior to the limit, or if forced.
-     *
-     * @param bool $force Should the flush be forced
-     */
-    private function flushTmpSosaTable($force = false): void
-    {
-        if ($force || count($this->tmp_sosa_table) >= self::TMP_SOSA_TABLE_LIMIT) {
-            $this->sosa_records_service->insertOrUpdate($this->tree, $this->user, $this->tmp_sosa_table);
-            $this->tmp_sosa_table = array();
-        }
-    }
+	/**
+	 * Maximium size for the temporary Sosa table
+	 * @var int TMP_SOSA_TABLE_LIMIT
+	 */
+	private const TMP_SOSA_TABLE_LIMIT = 1000;
+
+	/**
+	 * @var SosaRecordsService $sosa_records_service
+	 */
+	private $sosa_records_service;
+
+	/**
+	 * Reference user
+	 * @var UserInterface $user
+	 */
+	private $user;
+
+	/**
+	 * Reference tree
+	 * @var Tree $tree
+	 */
+	private $tree;
+
+	/**
+	 * Temporary Sosa table, used during construction
+	 * @var array<array<string,mixed>> $tmp_sosa_table
+	 */
+	private $tmp_sosa_table;
+
+	/**
+	 * Maximum number of generations to calculate
+	 * @var int $max_generations
+	 */
+	private $max_generations;
+
+	/**
+	 * Constructor for the Sosa Calculator
+	 *
+	 * @param SosaRecordsService $sosa_records_service
+	 * @param Tree $tree
+	 * @param UserInterface $user
+	 */
+	public function __construct(SosaRecordsService $sosa_records_service, Tree $tree, UserInterface $user)
+	{
+		$this->sosa_records_service = $sosa_records_service;
+		$this->tree = $tree;
+		$this->user = $user;
+		$this->tmp_sosa_table = array();
+		$max_gen_setting = $tree->getUserPreference($user, 'MAJ_SOSA_MAX_GEN');
+		$this->max_generations = is_numeric($max_gen_setting) ?
+			(int) $max_gen_setting :
+			$this->sosa_records_service->maxSystemGenerations();
+	}
+
+	/**
+	 * Compute all Sosa ancestors from the user's root individual.
+	 *
+	 * @return bool Result of the computation
+	 */
+	public function computeAll(): bool
+	{
+		$root_id = $this->tree->getUserPreference($this->user, 'MAJ_SOSA_ROOT_ID');
+		if (($indi = Registry::individualFactory()->make($root_id, $this->tree)) !== null) {
+			$this->sosa_records_service->deleteAll($this->tree, $this->user);
+			$this->addNode($indi, 1);
+			$this->flushTmpSosaTable(true);
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Compute all Sosa Ancestors from a specified Individual
+	 *
+	 * @param Individual $indi
+	 * @return bool
+	 */
+	public function computeFromIndividual(Individual $indi): bool
+	{
+		$current_sosas = $this->sosa_records_service->sosaNumbers($this->tree, $this->user, $indi);
+		foreach ($current_sosas->keys() as $sosa) {
+			$this->sosa_records_service->deleteAncestorsFrom($this->tree, $this->user, $sosa);
+			$this->addNode($indi, $sosa);
+		}
+		$this->flushTmpSosaTable(true);
+		return true;
+	}
+
+	/**
+	 * Recursive method to add individual to the Sosa table, and flush it regularly
+	 *
+	 * @param Individual $indi Individual to add
+	 * @param int $sosa Individual's sosa
+	 */
+	private function addNode(Individual $indi, int $sosa): void
+	{
+		$birth_year = $indi->getBirthDate()->gregorianYear();
+		$birth_year_est = $birth_year === 0 ? $indi->getEstimatedBirthDate()->gregorianYear() : $birth_year;
+
+		$death_year = $indi->getDeathDate()->gregorianYear();
+		$death_year_est = $death_year === 0 ? $indi->getEstimatedDeathDate()->gregorianYear() : $death_year;
+
+		$this->tmp_sosa_table[] = [
+			'indi' => $indi->xref(),
+			'sosa' => $sosa,
+			'birth_year' => $birth_year === 0 ? null : $birth_year,
+			'birth_year_est' => $birth_year_est === 0 ? null : $birth_year_est,
+			'death_year' => $death_year === 0 ? null : $death_year,
+			'death_year_est' => $death_year_est === 0 ? null : $death_year_est
+		];
+
+		$this->flushTmpSosaTable();
+
+		if (
+			($fam = $indi->childFamilies()->first()) !== null
+			&& $this->sosa_records_service->generation($sosa) < $this->max_generations
+		) {
+			/** @var \Fisharebest\Webtrees\Family $fam */
+			if (($husb = $fam->husband()) !== null) {
+				$this->addNode($husb, 2 * $sosa);
+			}
+			if (($wife = $fam->wife()) !== null) {
+				$this->addNode($wife, 2 * $sosa + 1);
+			}
+		}
+	}
+
+	/**
+	 * Write sosas in the table, if the number of items is superior to the limit, or if forced.
+	 *
+	 * @param bool $force Should the flush be forced
+	 */
+	private function flushTmpSosaTable($force = false): void
+	{
+		if ($force || count($this->tmp_sosa_table) >= self::TMP_SOSA_TABLE_LIMIT) {
+			$this->sosa_records_service->insertOrUpdate($this->tree, $this->user, $this->tmp_sosa_table);
+			$this->tmp_sosa_table = array();
+		}
+	}
 }

app/Module/GeoDispersion/Services/GeoAnalysisViewDataService.php

Indentation +182 added lines, -182 removed lines

@@ -32,186 +32,186 @@
  */
 class GeoAnalysisViewDataService
 {
-    /**
-     * Find a Geographical dispersion analysis view by ID
-     *
-     * @param Tree $tree
-     * @param int $id
-     * @return AbstractGeoAnalysisView|NULL
-     */
-    public function find(Tree $tree, int $id, bool $include_disabled = false): ?AbstractGeoAnalysisView
-    {
-        return $this->all($tree, $include_disabled)
-            ->first(fn(AbstractGeoAnalysisView $view): bool => $view->id() === $id);
-    }
-
-    /**
-     * Get all Geographical dispersion analysis views, with or without the disabled ones.
-     *
-     * {@internal It would ignore any view for which the class could not be loaded by the container}
-     *
-     * @param Tree $tree
-     * @param bool $include_disabled
-     * @return Collection<AbstractGeoAnalysisView>
-     */
-    public function all(Tree $tree, bool $include_disabled = false): Collection
-    {
-        return Registry::cache()->array()->remember(
-            'all-geodispersion-views',
-            function () use ($tree, $include_disabled): Collection {
-                return DB::table('maj_geodisp_views')
-                    ->select('maj_geodisp_views.*')
-                    ->where('majgv_gedcom_id', '=', $tree->id())
-                    ->get()
-                    ->map($this->viewMapper($tree))
-                    ->filter()
-                    ->filter($this->enabledFilter($include_disabled));
-            }
-        );
-    }
-
-    /**
-     * Insert a geographical dispersion analysis view object in the database.
-     *
-     * @param AbstractGeoAnalysisView $view
-     * @return int
-     */
-    public function insertGetId(AbstractGeoAnalysisView $view): int
-    {
-        return DB::table('maj_geodisp_views')
-            ->insertGetId([
-                'majgv_gedcom_id' => $view->tree()->id(),
-                'majgv_view_class' => get_class($view),
-                'majgv_status' => $view->isEnabled() ? 'enabled' : 'disabled',
-                'majgv_descr' => mb_substr($view->description(), 0, 248),
-                'majgv_analysis' => get_class($view->analysis()),
-                'majgv_place_depth' => $view->placesDepth()
-            ]);
-    }
-
-    /**
-     * Update a geographical dispersion analysis view object in the database.
-     *
-     * @param AbstractGeoAnalysisView $view
-     * @return int
-     */
-    public function update(AbstractGeoAnalysisView $view): int
-    {
-        return DB::table('maj_geodisp_views')
-            ->where('majgv_id', '=', $view->id())
-            ->update([
-                'majgv_gedcom_id' => $view->tree()->id(),
-                'majgv_view_class' => get_class($view),
-                'majgv_status' => $view->isEnabled() ? 'enabled' : 'disabled',
-                'majgv_descr' => mb_substr($view->description(), 0, 248),
-                'majgv_analysis' => get_class($view->analysis()),
-                'majgv_place_depth' => $view->placesDepth(),
-                'majgv_top_places' => $view->numberTopPlaces(),
-                'majgv_colors' => $view instanceof GeoAnalysisMap ? json_encode($view->colors()) : null
-            ]);
-    }
-
-    /**
-     * Update the status of a geographical dispersion analysis view object in the database.
-     *
-     * @param AbstractGeoAnalysisView $view
-     * @param bool $status
-     * @return int
-     */
-    public function updateStatus(AbstractGeoAnalysisView $view, bool $status): int
-    {
-        return DB::table('maj_geodisp_views')
-            ->where('majgv_id', '=', $view->id())
-            ->update(['majgv_status' => $status ? 'enabled' : 'disabled']);
-    }
-
-    /**
-     * Delete a geographical dispersion analysis view object from the database.
-     *
-     * @param AbstractGeoAnalysisView $view
-     * @return int
-     */
-    public function delete(AbstractGeoAnalysisView $view): int
-    {
-        return DB::table('maj_geodisp_views')
-            ->where('majgv_id', '=', $view->id())
-            ->delete();
-    }
-
-    /**
-     * Get the closure to create a AbstractGeoAnalysisView object from a row in the database.
-     * It returns null if the classes stored in the DB cannot be loaded through the Laravel container,
-     * or if the types do not match with the ones expected.
-     *
-     * @param Tree $tree
-     * @return Closure(\stdClass $row):?AbstractGeoAnalysisView
-     */
-    private function viewMapper(Tree $tree): Closure
-    {
-        return function (stdClass $row) use ($tree): ?AbstractGeoAnalysisView {
-            try {
-                $geoanalysis = app($row->majgv_analysis);
-                if (!($geoanalysis instanceof GeoAnalysisInterface)) {
-                    return null;
-                }
-
-                $view = app()->makeWith($row->majgv_view_class, [
-                    'id'                    =>  (int) $row->majgv_id,
-                    'tree'                  =>  $tree,
-                    'enabled'               =>  $row->majgv_status === 'enabled',
-                    'description'           =>  $row->majgv_descr,
-                    'geoanalysis'           =>  $geoanalysis,
-                    'depth'                 =>  (int) $row->majgv_place_depth,
-                    'detailed_top_places'   =>  (int) $row->majgv_top_places
-                ]);
-
-                if ($row->majgv_colors !== null && $view instanceof GeoAnalysisMap) {
-                    $view = $view->withColors($this->colorsDecoder($row->majgv_colors));
-                }
-
-                return $view instanceof AbstractGeoAnalysisView ? $view : null;
-            } catch (BindingResolutionException $ex) {
-                return null;
-            }
-        };
-    }
-
-    /**
-     * Create a MapColorsConfig object from a JSON column value.
-     * Returns null if the JSON string is invalid, or if the colors are not valid.
-     *
-     * @param string $colors_config
-     * @return MapColorsConfig|NULL
-     */
-    private function colorsDecoder(string $colors_config): ?MapColorsConfig
-    {
-        $colors = json_decode($colors_config, true);
-        if (!is_array($colors) && count($colors) !== 4) {
-            return null;
-        }
-        try {
-            return new MapColorsConfig(
-                \Spatie\Color\Factory::fromString($colors['default'] ?? ''),
-                \Spatie\Color\Factory::fromString($colors['stroke'] ?? ''),
-                \Spatie\Color\Factory::fromString($colors['maxvalue'] ?? ''),
-                \Spatie\Color\Factory::fromString($colors['hover'] ?? '')
-            );
-        } catch (InvalidColorValue $ex) {
-            return null;
-        }
-    }
-
-    /**
-     * Get a closure to filter views by enabled/disabled status
-     *
-     * @param bool $include_disabled
-     *
-     * @return Closure(AbstractGeoAnalysisView $view):bool
-     */
-    private function enabledFilter(bool $include_disabled): Closure
-    {
-        return function (AbstractGeoAnalysisView $view) use ($include_disabled): bool {
-            return $include_disabled || $view->isEnabled();
-        };
-    }
+	/**
+	 * Find a Geographical dispersion analysis view by ID
+	 *
+	 * @param Tree $tree
+	 * @param int $id
+	 * @return AbstractGeoAnalysisView|NULL
+	 */
+	public function find(Tree $tree, int $id, bool $include_disabled = false): ?AbstractGeoAnalysisView
+	{
+		return $this->all($tree, $include_disabled)
+			->first(fn(AbstractGeoAnalysisView $view): bool => $view->id() === $id);
+	}
+
+	/**
+	 * Get all Geographical dispersion analysis views, with or without the disabled ones.
+	 *
+	 * {@internal It would ignore any view for which the class could not be loaded by the container}
+	 *
+	 * @param Tree $tree
+	 * @param bool $include_disabled
+	 * @return Collection<AbstractGeoAnalysisView>
+	 */
+	public function all(Tree $tree, bool $include_disabled = false): Collection
+	{
+		return Registry::cache()->array()->remember(
+			'all-geodispersion-views',
+			function () use ($tree, $include_disabled): Collection {
+				return DB::table('maj_geodisp_views')
+					->select('maj_geodisp_views.*')
+					->where('majgv_gedcom_id', '=', $tree->id())
+					->get()
+					->map($this->viewMapper($tree))
+					->filter()
+					->filter($this->enabledFilter($include_disabled));
+			}
+		);
+	}
+
+	/**
+	 * Insert a geographical dispersion analysis view object in the database.
+	 *
+	 * @param AbstractGeoAnalysisView $view
+	 * @return int
+	 */
+	public function insertGetId(AbstractGeoAnalysisView $view): int
+	{
+		return DB::table('maj_geodisp_views')
+			->insertGetId([
+				'majgv_gedcom_id' => $view->tree()->id(),
+				'majgv_view_class' => get_class($view),
+				'majgv_status' => $view->isEnabled() ? 'enabled' : 'disabled',
+				'majgv_descr' => mb_substr($view->description(), 0, 248),
+				'majgv_analysis' => get_class($view->analysis()),
+				'majgv_place_depth' => $view->placesDepth()
+			]);
+	}
+
+	/**
+	 * Update a geographical dispersion analysis view object in the database.
+	 *
+	 * @param AbstractGeoAnalysisView $view
+	 * @return int
+	 */
+	public function update(AbstractGeoAnalysisView $view): int
+	{
+		return DB::table('maj_geodisp_views')
+			->where('majgv_id', '=', $view->id())
+			->update([
+				'majgv_gedcom_id' => $view->tree()->id(),
+				'majgv_view_class' => get_class($view),
+				'majgv_status' => $view->isEnabled() ? 'enabled' : 'disabled',
+				'majgv_descr' => mb_substr($view->description(), 0, 248),
+				'majgv_analysis' => get_class($view->analysis()),
+				'majgv_place_depth' => $view->placesDepth(),
+				'majgv_top_places' => $view->numberTopPlaces(),
+				'majgv_colors' => $view instanceof GeoAnalysisMap ? json_encode($view->colors()) : null
+			]);
+	}
+
+	/**
+	 * Update the status of a geographical dispersion analysis view object in the database.
+	 *
+	 * @param AbstractGeoAnalysisView $view
+	 * @param bool $status
+	 * @return int
+	 */
+	public function updateStatus(AbstractGeoAnalysisView $view, bool $status): int
+	{
+		return DB::table('maj_geodisp_views')
+			->where('majgv_id', '=', $view->id())
+			->update(['majgv_status' => $status ? 'enabled' : 'disabled']);
+	}
+
+	/**
+	 * Delete a geographical dispersion analysis view object from the database.
+	 *
+	 * @param AbstractGeoAnalysisView $view
+	 * @return int
+	 */
+	public function delete(AbstractGeoAnalysisView $view): int
+	{
+		return DB::table('maj_geodisp_views')
+			->where('majgv_id', '=', $view->id())
+			->delete();
+	}
+
+	/**
+	 * Get the closure to create a AbstractGeoAnalysisView object from a row in the database.
+	 * It returns null if the classes stored in the DB cannot be loaded through the Laravel container,
+	 * or if the types do not match with the ones expected.
+	 *
+	 * @param Tree $tree
+	 * @return Closure(\stdClass $row):?AbstractGeoAnalysisView
+	 */
+	private function viewMapper(Tree $tree): Closure
+	{
+		return function (stdClass $row) use ($tree): ?AbstractGeoAnalysisView {
+			try {
+				$geoanalysis = app($row->majgv_analysis);
+				if (!($geoanalysis instanceof GeoAnalysisInterface)) {
+					return null;
+				}
+
+				$view = app()->makeWith($row->majgv_view_class, [
+					'id'                    =>  (int) $row->majgv_id,
+					'tree'                  =>  $tree,
+					'enabled'               =>  $row->majgv_status === 'enabled',
+					'description'           =>  $row->majgv_descr,
+					'geoanalysis'           =>  $geoanalysis,
+					'depth'                 =>  (int) $row->majgv_place_depth,
+					'detailed_top_places'   =>  (int) $row->majgv_top_places
+				]);
+
+				if ($row->majgv_colors !== null && $view instanceof GeoAnalysisMap) {
+					$view = $view->withColors($this->colorsDecoder($row->majgv_colors));
+				}
+
+				return $view instanceof AbstractGeoAnalysisView ? $view : null;
+			} catch (BindingResolutionException $ex) {
+				return null;
+			}
+		};
+	}
+
+	/**
+	 * Create a MapColorsConfig object from a JSON column value.
+	 * Returns null if the JSON string is invalid, or if the colors are not valid.
+	 *
+	 * @param string $colors_config
+	 * @return MapColorsConfig|NULL
+	 */
+	private function colorsDecoder(string $colors_config): ?MapColorsConfig
+	{
+		$colors = json_decode($colors_config, true);
+		if (!is_array($colors) && count($colors) !== 4) {
+			return null;
+		}
+		try {
+			return new MapColorsConfig(
+				\Spatie\Color\Factory::fromString($colors['default'] ?? ''),
+				\Spatie\Color\Factory::fromString($colors['stroke'] ?? ''),
+				\Spatie\Color\Factory::fromString($colors['maxvalue'] ?? ''),
+				\Spatie\Color\Factory::fromString($colors['hover'] ?? '')
+			);
+		} catch (InvalidColorValue $ex) {
+			return null;
+		}
+	}
+
+	/**
+	 * Get a closure to filter views by enabled/disabled status
+	 *
+	 * @param bool $include_disabled
+	 *
+	 * @return Closure(AbstractGeoAnalysisView $view):bool
+	 */
+	private function enabledFilter(bool $include_disabled): Closure
+	{
+		return function (AbstractGeoAnalysisView $view) use ($include_disabled): bool {
+			return $include_disabled || $view->isEnabled();
+		};
+	}
 }

app/Module/GeoDispersion/GeoAnalyses/AllEventsByTypeGeoAnalysis.php

Indentation +45 added lines, -45 removed lines

@@ -26,55 +26,55 @@
  */
 class AllEventsByTypeGeoAnalysis implements GeoAnalysisInterface
 {
-    private GeoAnalysisDataService $geoanalysis_data_service;
+	private GeoAnalysisDataService $geoanalysis_data_service;
 
-    /**
-     * Constructor for AllEventsByTypeGeoAnalysis
-     *
-     * @param GeoAnalysisDataService $geoanalysis_data_service
-     */
-    public function __construct(GeoAnalysisDataService $geoanalysis_data_service)
-    {
-        $this->geoanalysis_data_service = $geoanalysis_data_service;
-    }
+	/**
+	 * Constructor for AllEventsByTypeGeoAnalysis
+	 *
+	 * @param GeoAnalysisDataService $geoanalysis_data_service
+	 */
+	public function __construct(GeoAnalysisDataService $geoanalysis_data_service)
+	{
+		$this->geoanalysis_data_service = $geoanalysis_data_service;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\GeoAnalysisInterface::title()
-     */
-    public function title(): string
-    {
-        return I18N::translate('All events places by event type');
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\GeoAnalysisInterface::title()
+	 */
+	public function title(): string
+	{
+		return I18N::translate('All events places by event type');
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\GeoAnalysisInterface::itemsDescription()
-     */
-    public function itemsDescription(): callable
-    {
-        return fn(int $count): string => I18N::plural('event', 'events', $count);
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\GeoAnalysisInterface::itemsDescription()
+	 */
+	public function itemsDescription(): callable
+	{
+		return fn(int $count): string => I18N::plural('event', 'events', $count);
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\GeoAnalysisInterface::results()
-     */
-    public function results(Tree $tree, int $depth): GeoAnalysisResults
-    {
-        $results = new GeoAnalysisResults();
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\GeoAnalysisInterface::results()
+	 */
+	public function results(Tree $tree, int $depth): GeoAnalysisResults
+	{
+		$results = new GeoAnalysisResults();
 
-        foreach ($this->geoanalysis_data_service->individualsAndFamilies($tree) as $record) {
-            foreach ($record->facts([]) as $fact) {
-                $place = new GeoAnalysisPlace($tree, $fact->place(), $depth);
-                if ($place->isUnknown()) {
-                    continue;
-                }
-                $results->addPlace($place);
-                $results->addPlaceInCategory($fact->label(), 0, $place);
-            }
-        }
+		foreach ($this->geoanalysis_data_service->individualsAndFamilies($tree) as $record) {
+			foreach ($record->facts([]) as $fact) {
+				$place = new GeoAnalysisPlace($tree, $fact->place(), $depth);
+				if ($place->isUnknown()) {
+					continue;
+				}
+				$results->addPlace($place);
+				$results->addPlaceInCategory($fact->label(), 0, $place);
+			}
+		}
 
-        return $results;
-    }
+		return $results;
+	}
 }

app/Module/GeoDispersion/GeoAnalyses/AllEventsByCenturyGeoAnalysis.php

Indentation +56 added lines, -56 removed lines

@@ -28,66 +28,66 @@
  */
 class AllEventsByCenturyGeoAnalysis implements GeoAnalysisInterface
 {
-    private GeoAnalysisDataService $geoanalysis_data_service;
-    private CenturyService $century_service;
+	private GeoAnalysisDataService $geoanalysis_data_service;
+	private CenturyService $century_service;
 
-    /**
-     * Constructor for AllEventsByCenturyGeoAnalysis
-     *
-     * @param GeoAnalysisDataService $geoanalysis_data_service
-     * @param CenturyService $century_service
-     */
-    public function __construct(GeoAnalysisDataService $geoanalysis_data_service, CenturyService $century_service)
-    {
-        $this->geoanalysis_data_service = $geoanalysis_data_service;
-        $this->century_service = $century_service;
-    }
+	/**
+	 * Constructor for AllEventsByCenturyGeoAnalysis
+	 *
+	 * @param GeoAnalysisDataService $geoanalysis_data_service
+	 * @param CenturyService $century_service
+	 */
+	public function __construct(GeoAnalysisDataService $geoanalysis_data_service, CenturyService $century_service)
+	{
+		$this->geoanalysis_data_service = $geoanalysis_data_service;
+		$this->century_service = $century_service;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\GeoAnalysisInterface::title()
-     */
-    public function title(): string
-    {
-        return I18N::translate('All events places by century');
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\GeoAnalysisInterface::title()
+	 */
+	public function title(): string
+	{
+		return I18N::translate('All events places by century');
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\GeoAnalysisInterface::itemsDescription()
-     */
-    public function itemsDescription(): callable
-    {
-        return fn(int $count): string => I18N::plural('event', 'events', $count);
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\GeoAnalysisInterface::itemsDescription()
+	 */
+	public function itemsDescription(): callable
+	{
+		return fn(int $count): string => I18N::plural('event', 'events', $count);
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\GeoAnalysisInterface::results()
-     */
-    public function results(Tree $tree, int $depth): GeoAnalysisResults
-    {
-        $results = new GeoAnalysisResults();
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\GeoAnalysisInterface::results()
+	 */
+	public function results(Tree $tree, int $depth): GeoAnalysisResults
+	{
+		$results = new GeoAnalysisResults();
 
-        foreach ($this->geoanalysis_data_service->individualsAndFamilies($tree) as $record) {
-            foreach ($record->facts([]) as $fact) {
-                $place = new GeoAnalysisPlace($tree, $fact->place(), $depth);
-                if ($place->isUnknown()) {
-                    continue;
-                }
-                $results->addPlace($place);
-                $date = $fact->date();
-                if ($date->isOK()) {
-                    $century = intdiv($date->gregorianYear(), 100);
-                    $results->addPlaceInCategory(
-                        I18N::translate('%s century', $this->century_service->centuryName($century)),
-                        $century,
-                        $place
-                    );
-                }
-            }
-        }
+		foreach ($this->geoanalysis_data_service->individualsAndFamilies($tree) as $record) {
+			foreach ($record->facts([]) as $fact) {
+				$place = new GeoAnalysisPlace($tree, $fact->place(), $depth);
+				if ($place->isUnknown()) {
+					continue;
+				}
+				$results->addPlace($place);
+				$date = $fact->date();
+				if ($date->isOK()) {
+					$century = intdiv($date->gregorianYear(), 100);
+					$results->addPlaceInCategory(
+						I18N::translate('%s century', $this->century_service->centuryName($century)),
+						$century,
+						$place
+					);
+				}
+			}
+		}
 
-        return $results;
-    }
+		return $results;
+	}
 }