jon48 / webtrees-lib

src/Webtrees/Module/Sosa/Services/SosaRecordsService.php

Indentation +228 added lines, -228 removed lines

@@ -28,244 +28,244 @@
  */
 class SosaRecordsService
 {
-    /**
-     * @var int $max_system_generations
-     */
-    private $max_system_generations;
+	/**
+	 * @var int $max_system_generations
+	 */
+	private $max_system_generations;
 
-    /**
-     * Maximum number of generation the system is able to hold.
-     * This is based on the size of the bigint SQL type (2^63) and the maximum PHP integer type
-     *
-     * @return int
-     */
-    public function maxSystemGenerations(): int
-    {
-        if ($this->max_system_generations === null) {
-            $this->max_system_generations = min(63, $this->generation(PHP_INT_MAX));
-        }
-        return $this->max_system_generations;
-    }
+	/**
+	 * Maximum number of generation the system is able to hold.
+	 * This is based on the size of the bigint SQL type (2^63) and the maximum PHP integer type
+	 *
+	 * @return int
+	 */
+	public function maxSystemGenerations(): int
+	{
+		if ($this->max_system_generations === null) {
+			$this->max_system_generations = min(63, $this->generation(PHP_INT_MAX));
+		}
+		return $this->max_system_generations;
+	}
 
-    /**
-     * Calculate the generation of a sosa
-     * Sosa 1 is of generation 1.
-     *
-     * @param int $sosa
-     * @return int
-     */
-    public function generation(int $sosa): int
-    {
-        return BigInteger::of($sosa)->getBitLength();
-    }
+	/**
+	 * Calculate the generation of a sosa
+	 * Sosa 1 is of generation 1.
+	 *
+	 * @param int $sosa
+	 * @return int
+	 */
+	public function generation(int $sosa): int
+	{
+		return BigInteger::of($sosa)->getBitLength();
+	}
 
-    /**
-     * Returns all Sosa numbers associated to an Individual
-     *
-     * @param Tree $tree
-     * @param User $user
-     * @param Individual $indi
-     * @return Collection
-     */
-    public function getSosaNumbers(Tree $tree, User $user, Individual $indi): Collection
-    {
-        return DB::table('maj_sosa')
-            ->select(['majs_sosa', 'majs_gen'])
-            ->where('majs_gedcom_id', '=', $tree->id())
-            ->where('majs_user_id', '=', $user->id())
-            ->where('majs_i_id', '=', $indi->xref())
-            ->orderBy('majs_sosa')
-            ->get()->pluck('majs_gen', 'majs_sosa');
-    }
+	/**
+	 * Returns all Sosa numbers associated to an Individual
+	 *
+	 * @param Tree $tree
+	 * @param User $user
+	 * @param Individual $indi
+	 * @return Collection
+	 */
+	public function getSosaNumbers(Tree $tree, User $user, Individual $indi): Collection
+	{
+		return DB::table('maj_sosa')
+			->select(['majs_sosa', 'majs_gen'])
+			->where('majs_gedcom_id', '=', $tree->id())
+			->where('majs_user_id', '=', $user->id())
+			->where('majs_i_id', '=', $indi->xref())
+			->orderBy('majs_sosa')
+			->get()->pluck('majs_gen', 'majs_sosa');
+	}
 
-    /**
-     * Return a list of the Sosa ancestors at a given generation
-     *
-     * @param Tree $tree
-     * @param User $user
-     * @param int $gen
-     * @return Collection
-     */
-    public function listAncestorsAtGeneration(Tree $tree, User $user, int $gen): Collection
-    {
-        return DB::table('maj_sosa')
-            ->select(['majs_sosa', 'majs_i_id'])
-            ->where('majs_gedcom_id', '=', $tree->id())
-            ->where('majs_user_id', '=', $user->id())
-            ->where('majs_gen', '=', $gen)
-            ->orderBy('majs_sosa')
-            ->get();
-    }
+	/**
+	 * Return a list of the Sosa ancestors at a given generation
+	 *
+	 * @param Tree $tree
+	 * @param User $user
+	 * @param int $gen
+	 * @return Collection
+	 */
+	public function listAncestorsAtGeneration(Tree $tree, User $user, int $gen): Collection
+	{
+		return DB::table('maj_sosa')
+			->select(['majs_sosa', 'majs_i_id'])
+			->where('majs_gedcom_id', '=', $tree->id())
+			->where('majs_user_id', '=', $user->id())
+			->where('majs_gen', '=', $gen)
+			->orderBy('majs_sosa')
+			->get();
+	}
 
-    /**
-     * Return a list of the Sosa families at a given generation
-     *
-     * @param Tree $tree
-     * @param User $user
-     * @param int $gen
-     * @return Collection
-     */
-    public function listAncestorFamiliesAtGeneration(Tree $tree, User $user, int $gen): Collection
-    {
-        $table_prefix = DB::connection()->getTablePrefix();
-        return DB::table('families')
-            ->join('maj_sosa AS sosa_husb', function (JoinClause $join) use ($tree, $user): void {
-                // Link to family husband
-                $join->on('families.f_file', '=', 'sosa_husb.majs_gedcom_id')
-                    ->on('families.f_husb', '=', 'sosa_husb.majs_i_id')
-                    ->where('sosa_husb.majs_gedcom_id', '=', $tree->id())
-                    ->where('sosa_husb.majs_user_id', '=', $user->id());
-            })
-            ->join('maj_sosa AS sosa_wife', function (JoinClause $join) use ($tree, $user): void {
-                // Link to family husband
-                $join->on('families.f_file', '=', 'sosa_wife.majs_gedcom_id')
-                ->on('families.f_wife', '=', 'sosa_wife.majs_i_id')
-                ->where('sosa_wife.majs_gedcom_id', '=', $tree->id())
-                ->where('sosa_wife.majs_user_id', '=', $user->id());
-            })
-            ->select(['sosa_husb.majs_sosa', 'families.f_id'])
-            ->where('sosa_husb.majs_gen', '=', $gen)
-            ->whereRaw($table_prefix . 'sosa_husb.majs_sosa + 1 = ' . $table_prefix . 'sosa_wife.majs_sosa')
-            ->orderBy('sosa_husb.majs_sosa')
-            ->get();
-    }
+	/**
+	 * Return a list of the Sosa families at a given generation
+	 *
+	 * @param Tree $tree
+	 * @param User $user
+	 * @param int $gen
+	 * @return Collection
+	 */
+	public function listAncestorFamiliesAtGeneration(Tree $tree, User $user, int $gen): Collection
+	{
+		$table_prefix = DB::connection()->getTablePrefix();
+		return DB::table('families')
+			->join('maj_sosa AS sosa_husb', function (JoinClause $join) use ($tree, $user): void {
+				// Link to family husband
+				$join->on('families.f_file', '=', 'sosa_husb.majs_gedcom_id')
+					->on('families.f_husb', '=', 'sosa_husb.majs_i_id')
+					->where('sosa_husb.majs_gedcom_id', '=', $tree->id())
+					->where('sosa_husb.majs_user_id', '=', $user->id());
+			})
+			->join('maj_sosa AS sosa_wife', function (JoinClause $join) use ($tree, $user): void {
+				// Link to family husband
+				$join->on('families.f_file', '=', 'sosa_wife.majs_gedcom_id')
+				->on('families.f_wife', '=', 'sosa_wife.majs_i_id')
+				->where('sosa_wife.majs_gedcom_id', '=', $tree->id())
+				->where('sosa_wife.majs_user_id', '=', $user->id());
+			})
+			->select(['sosa_husb.majs_sosa', 'families.f_id'])
+			->where('sosa_husb.majs_gen', '=', $gen)
+			->whereRaw($table_prefix . 'sosa_husb.majs_sosa + 1 = ' . $table_prefix . 'sosa_wife.majs_sosa')
+			->orderBy('sosa_husb.majs_sosa')
+			->get();
+	}
 
-    /**
-     * Return a list of Sosa ancestors missing at a given generation.
-     * It includes the reference of either parent if it is known.
-     *
-     * @param Tree $tree
-     * @param User $user
-     * @param int $gen
-     * @return Collection
-     */
-    public function listMissingAncestorsAtGeneration(Tree $tree, User $user, int $gen): Collection
-    {
-        if ($gen == 1) {
-            return collect();
-        }
+	/**
+	 * Return a list of Sosa ancestors missing at a given generation.
+	 * It includes the reference of either parent if it is known.
+	 *
+	 * @param Tree $tree
+	 * @param User $user
+	 * @param int $gen
+	 * @return Collection
+	 */
+	public function listMissingAncestorsAtGeneration(Tree $tree, User $user, int $gen): Collection
+	{
+		if ($gen == 1) {
+			return collect();
+		}
 
-        $table_prefix = DB::connection()->getTablePrefix();
-        return DB::table('maj_sosa AS sosa')
-            ->select(['sosa.majs_i_id', 'sosa_fat.majs_i_id AS majs_fat_id', 'sosa_mot.majs_i_id AS majs_mot_id'])
-            ->selectRaw('MIN(' . $table_prefix . 'sosa.majs_sosa) AS majs_sosa')
-            ->leftJoin('maj_sosa AS sosa_fat', function (JoinClause $join) use ($tree, $user, $table_prefix): void {
-                // Link to sosa's father
-                $join->whereRaw($table_prefix . 'sosa_fat.majs_sosa = 2 * ' . $table_prefix . 'sosa.majs_sosa')
-                    ->where('sosa_fat.majs_gedcom_id', '=', $tree->id())
-                    ->where('sosa_fat.majs_user_id', '=', $user->id());
-            })
-            ->leftJoin('maj_sosa AS sosa_mot', function (JoinClause $join) use ($tree, $user, $table_prefix): void {
-                // Link to sosa's mother
-                $join->whereRaw($table_prefix . 'sosa_mot.majs_sosa = 2 * ' . $table_prefix . 'sosa.majs_sosa + 1')
-                    ->where('sosa_mot.majs_gedcom_id', '=', $tree->id())
-                    ->where('sosa_mot.majs_user_id', '=', $user->id());
-            })
-            ->where('sosa.majs_gedcom_id', '=', $tree->id())
-            ->where('sosa.majs_user_id', '=', $user->id())
-            ->where('sosa.majs_gen', '=', $gen - 1)
-            ->where(function (Builder $query): void {
-                $query->whereNull('sosa_fat.majs_i_id')
-                    ->orWhereNull('sosa_mot.majs_i_id');
-            })
-            ->groupBy('sosa.majs_i_id', 'sosa_fat.majs_i_id', 'sosa_mot.majs_i_id')
-            ->orderByRaw('MIN(' . $table_prefix . 'sosa.majs_sosa)')
-            ->get();
-    }
+		$table_prefix = DB::connection()->getTablePrefix();
+		return DB::table('maj_sosa AS sosa')
+			->select(['sosa.majs_i_id', 'sosa_fat.majs_i_id AS majs_fat_id', 'sosa_mot.majs_i_id AS majs_mot_id'])
+			->selectRaw('MIN(' . $table_prefix . 'sosa.majs_sosa) AS majs_sosa')
+			->leftJoin('maj_sosa AS sosa_fat', function (JoinClause $join) use ($tree, $user, $table_prefix): void {
+				// Link to sosa's father
+				$join->whereRaw($table_prefix . 'sosa_fat.majs_sosa = 2 * ' . $table_prefix . 'sosa.majs_sosa')
+					->where('sosa_fat.majs_gedcom_id', '=', $tree->id())
+					->where('sosa_fat.majs_user_id', '=', $user->id());
+			})
+			->leftJoin('maj_sosa AS sosa_mot', function (JoinClause $join) use ($tree, $user, $table_prefix): void {
+				// Link to sosa's mother
+				$join->whereRaw($table_prefix . 'sosa_mot.majs_sosa = 2 * ' . $table_prefix . 'sosa.majs_sosa + 1')
+					->where('sosa_mot.majs_gedcom_id', '=', $tree->id())
+					->where('sosa_mot.majs_user_id', '=', $user->id());
+			})
+			->where('sosa.majs_gedcom_id', '=', $tree->id())
+			->where('sosa.majs_user_id', '=', $user->id())
+			->where('sosa.majs_gen', '=', $gen - 1)
+			->where(function (Builder $query): void {
+				$query->whereNull('sosa_fat.majs_i_id')
+					->orWhereNull('sosa_mot.majs_i_id');
+			})
+			->groupBy('sosa.majs_i_id', 'sosa_fat.majs_i_id', 'sosa_mot.majs_i_id')
+			->orderByRaw('MIN(' . $table_prefix . 'sosa.majs_sosa)')
+			->get();
+	}
 
-    /**
-     * Remove all Sosa entries related to the gedcom file and user
-     *
-     * @param Tree $tree
-     * @param User $user
-     */
-    public function deleteAll(Tree $tree, User $user): void
-    {
-        DB::table('maj_sosa')
-            ->where('majs_gedcom_id', '=', $tree->id())
-            ->where('majs_user_id', '=', $user->id())
-            ->delete();
-    }
+	/**
+	 * Remove all Sosa entries related to the gedcom file and user
+	 *
+	 * @param Tree $tree
+	 * @param User $user
+	 */
+	public function deleteAll(Tree $tree, User $user): void
+	{
+		DB::table('maj_sosa')
+			->where('majs_gedcom_id', '=', $tree->id())
+			->where('majs_user_id', '=', $user->id())
+			->delete();
+	}
 
-    /**
-     *
-     * @param Tree $tree
-     * @param User $user
-     * @param int $sosa
-     */
-    public function deleteAncestorsFrom(Tree $tree, User $user, int $sosa): void
-    {
-        DB::table('maj_sosa')
-            ->where('majs_gedcom_id', '=', $tree->id())
-            ->where('majs_user_id', '=', $user->id())
-            ->where('majs_sosa', '>=', $sosa)
-            ->whereRaw(
-                'FLOOR(majs_sosa / (POW(2, (majs_gen - ?)))) = ?',
-                [$this->generation($sosa), $sosa]
-            )
-            ->delete();
-    }
+	/**
+	 *
+	 * @param Tree $tree
+	 * @param User $user
+	 * @param int $sosa
+	 */
+	public function deleteAncestorsFrom(Tree $tree, User $user, int $sosa): void
+	{
+		DB::table('maj_sosa')
+			->where('majs_gedcom_id', '=', $tree->id())
+			->where('majs_user_id', '=', $user->id())
+			->where('majs_sosa', '>=', $sosa)
+			->whereRaw(
+				'FLOOR(majs_sosa / (POW(2, (majs_gen - ?)))) = ?',
+				[$this->generation($sosa), $sosa]
+			)
+			->delete();
+	}
 
-    /**
-     * Insert (or update if already existing) a list of Sosa individuals
-     *
-     * @param Tree $tree
-     * @param User $user
-     * @param array $sosa_records
-     */
-    public function insertOrUpdate(Tree $tree, User $user, array $sosa_records): void
-    {
-        $mass_update = DB::connection()->getDriverName() === 'mysql';
+	/**
+	 * Insert (or update if already existing) a list of Sosa individuals
+	 *
+	 * @param Tree $tree
+	 * @param User $user
+	 * @param array $sosa_records
+	 */
+	public function insertOrUpdate(Tree $tree, User $user, array $sosa_records): void
+	{
+		$mass_update = DB::connection()->getDriverName() === 'mysql';
 
-        $bindings_placeholders = $bindings_values = [];
-        foreach ($sosa_records as $i => $row) {
-            $gen = $this->generation($row['sosa']);
-            if ($gen <=  $this->maxSystemGenerations()) {
-                if ($mass_update) {
-                    $bindings_placeholders[] = '(:tree_id' . $i . ', :user_id' . $i . ', :sosa' . $i . ',' .
-                        ' :indi_id' . $i . ', :gen' . $i . ',' .
-                        ' :byear' . $i . ', :byearest' . $i . ', :dyear' . $i . ', :dyearest' . $i . ')';
-                    $bindings_values = array_merge(
-                        $bindings_values,
-                        [
-                            'tree_id' . $i => $tree->id(),
-                            'user_id' . $i => $user->id(),
-                            'sosa' . $i => $row['sosa'],
-                            'indi_id' . $i => $row['indi'],
-                            'gen' . $i => $gen,
-                            'byear' . $i => $row['birth_year'],
-                            'byearest' . $i => $row['birth_year_est'],
-                            'dyear' . $i => $row['death_year'],
-                            'dyearest' . $i => $row['death_year_est']
-                        ]
-                    );
-                } else {
-                    DB::table('maj_sosa')->updateOrInsert(
-                        [ 'majs_gedcom_id' => $tree->id(), 'majs_user_id' => $user->id(), 'majs_sosa' => $row['sosa']],
-                        [
-                            'majs_i_id' => $row['indi'],
-                            'majs_gen' => $gen,
-                            'majs_birth_year' => $row['birth_year'],
-                            'majs_birth_year_est' => $row['birth_year_est'],
-                            'majs_death_year' => $row['death_year'],
-                            'majs_death_year_est' => $row['death_year_est']
-                        ]
-                    );
-                }
-            }
-        }
+		$bindings_placeholders = $bindings_values = [];
+		foreach ($sosa_records as $i => $row) {
+			$gen = $this->generation($row['sosa']);
+			if ($gen <=  $this->maxSystemGenerations()) {
+				if ($mass_update) {
+					$bindings_placeholders[] = '(:tree_id' . $i . ', :user_id' . $i . ', :sosa' . $i . ',' .
+						' :indi_id' . $i . ', :gen' . $i . ',' .
+						' :byear' . $i . ', :byearest' . $i . ', :dyear' . $i . ', :dyearest' . $i . ')';
+					$bindings_values = array_merge(
+						$bindings_values,
+						[
+							'tree_id' . $i => $tree->id(),
+							'user_id' . $i => $user->id(),
+							'sosa' . $i => $row['sosa'],
+							'indi_id' . $i => $row['indi'],
+							'gen' . $i => $gen,
+							'byear' . $i => $row['birth_year'],
+							'byearest' . $i => $row['birth_year_est'],
+							'dyear' . $i => $row['death_year'],
+							'dyearest' . $i => $row['death_year_est']
+						]
+					);
+				} else {
+					DB::table('maj_sosa')->updateOrInsert(
+						[ 'majs_gedcom_id' => $tree->id(), 'majs_user_id' => $user->id(), 'majs_sosa' => $row['sosa']],
+						[
+							'majs_i_id' => $row['indi'],
+							'majs_gen' => $gen,
+							'majs_birth_year' => $row['birth_year'],
+							'majs_birth_year_est' => $row['birth_year_est'],
+							'majs_death_year' => $row['death_year'],
+							'majs_death_year_est' => $row['death_year_est']
+						]
+					);
+				}
+			}
+		}
 
-        if ($mass_update) {
-            DB::connection()->statement(
-                'INSERT INTO `' . DB::connection()->getTablePrefix() . 'maj_sosa`' .
-                ' (majs_gedcom_id, majs_user_id, majs_sosa,' .
-                '   majs_i_id, majs_gen, majs_birth_year, majs_birth_year_est, majs_death_year, majs_death_year_est)' .
-                ' VALUES ' . implode(',', $bindings_placeholders) .
-                ' ON DUPLICATE KEY UPDATE majs_i_id = VALUES(majs_i_id), majs_gen = VALUES(majs_gen),' .
-                '   majs_birth_year = VALUES(majs_birth_year), majs_birth_year_est = VALUES(majs_birth_year_est),' .
-                '   majs_death_year = VALUES(majs_death_year), majs_death_year_est = VALUES(majs_death_year_est)',
-                $bindings_values
-            );
-        }
-    }
+		if ($mass_update) {
+			DB::connection()->statement(
+				'INSERT INTO `' . DB::connection()->getTablePrefix() . 'maj_sosa`' .
+				' (majs_gedcom_id, majs_user_id, majs_sosa,' .
+				'   majs_i_id, majs_gen, majs_birth_year, majs_birth_year_est, majs_death_year, majs_death_year_est)' .
+				' VALUES ' . implode(',', $bindings_placeholders) .
+				' ON DUPLICATE KEY UPDATE majs_i_id = VALUES(majs_i_id), majs_gen = VALUES(majs_gen),' .
+				'   majs_birth_year = VALUES(majs_birth_year), majs_birth_year_est = VALUES(majs_birth_year_est),' .
+				'   majs_death_year = VALUES(majs_death_year), majs_death_year_est = VALUES(majs_death_year_est)',
+				$bindings_values
+			);
+		}
+	}
 }

src/Webtrees/Module/Sosa/Services/SosaStatisticsService.php

Indentation +500 added lines, -500 removed lines

@@ -29,511 +29,511 @@
 class SosaStatisticsService
 {
 
-    /**
-     * Reference user
-     * @var User $user
-     */
-    private $user;
-
-    /**
-     * Reference tree
-     * @var Tree $tree
-     */
-    private $tree;
-
-    /**
-     * Constructor for Sosa Statistics Service
-     *
-     * @param Tree $tree
-     * @param User $user
-     */
-    public function __construct(Tree $tree, User $user)
-    {
-        $this->tree = $tree;
-        $this->user = $user;
-    }
-
-    /**
-     * Return the root individual for the reference tree and user.
-     *
-     * @return Individual|NULL
-     */
-    public function rootIndividual(): ?Individual
-    {
-        $root_indi_id = $this->tree->getUserPreference($this->user, 'MAJ_SOSA_ROOT_ID');
-        return Registry::individualFactory()->make($root_indi_id, $this->tree);
-    }
-
-    /**
-     * Get the highest generation for the reference tree and user.
-     *
-     * @return int
-     */
-    public function maxGeneration(): int
-    {
-        return (int) DB::table('maj_sosa')
-            ->where('majs_gedcom_id', '=', $this->tree->id())
-            ->where('majs_user_id', '=', $this->user->id())
-            ->max('majs_gen');
-    }
-
-    /**
-     * Get the total count of individuals in the tree.
-     *
-     * @return int
-     */
-    public function totalIndividuals(): int
-    {
-        return DB::table('individuals')
-            ->where('i_file', '=', $this->tree->id())
-            ->count();
-    }
-
-    /**
-     * Get the total count of Sosa ancestors for all generations
-     *
-     * @return int
-     */
-    public function totalAncestors(): int
-    {
-        return DB::table('maj_sosa')
-            ->where('majs_gedcom_id', '=', $this->tree->id())
-            ->where('majs_user_id', '=', $this->user->id())
-            ->count();
-    }
-
-    /**
-     * Get the total count of Sosa ancestors for a generation
-     *
-     * @return int
-     */
-    public function totalAncestorsAtGeneration(int $gen): int
-    {
-        return DB::table('maj_sosa')
-            ->where('majs_gedcom_id', '=', $this->tree->id())
-            ->where('majs_user_id', '=', $this->user->id())
-            ->where('majs_gen', '=', $gen)
-            ->count();
-    }
-
-    /**
-     * Get the total count of distinct Sosa ancestors for all generations
-     *
-     * @return int
-     */
-    public function totalDistinctAncestors(): int
-    {
-        return DB::table('maj_sosa')
-            ->where('majs_gedcom_id', '=', $this->tree->id())
-            ->where('majs_user_id', '=', $this->user->id())
-            ->distinct()
-            ->count('majs_i_id');
-    }
-
-    /**
-     * Get the mean generation time, as the slope of the linear regression of birth years vs generations
-     *
-     * @return float
-     */
-    public function meanGenerationTime(): float
-    {
-        $row = DB::table('maj_sosa')
-            ->where('majs_gedcom_id', '=', $this->tree->id())
-            ->where('majs_user_id', '=', $this->user->id())
-            ->whereNotNull('majs_birth_year')
-            ->selectRaw('COUNT(majs_sosa) AS n')
-            ->selectRaw('SUM(majs_gen * majs_birth_year) AS sum_xy')
-            ->selectRaw('SUM(majs_gen) AS sum_x')
-            ->selectRaw('SUM(majs_birth_year) AS sum_y')
-            ->selectRaw('SUM(majs_gen * majs_gen) AS sum_x2')
-            ->get()->first();
-
-        return $row->n == 0 ? 0 :
-            -($row->n * $row->sum_xy - $row->sum_x * $row->sum_y) / ($row->n * $row->sum_x2 - pow($row->sum_x, 2));
-    }
-
-    /**
-     * Get the statistic array detailed by generation.
-     * Statistics for each generation are:
-     *  - The number of Sosa in generation
-     *  - The number of Sosa up to generation
-     *  - The number of distinct Sosa up to generation
-     *  - The year of the first birth in generation
-     *  - The year of the first estimated birth in generation
-     *  - The year of the last birth in generation
-     *  - The year of the last estimated birth in generation
-     *  - The average year of birth in generation
-     *
-     * @return array<int, array<string, int|null>> Statistics array
-     */
-    public function statisticsByGenerations(): array
-    {
-        $stats_by_gen = $this->statisticsByGenerationBasicData();
-        $cumul_stats_by_gen = $this->statisticsByGenerationCumulativeData();
-
-        $statistics_by_gen = [];
-        foreach ($stats_by_gen as $gen => $stats_gen) {
-            $statistics_by_gen[(int) $stats_gen->gen] = array(
-                'sosaCount'             =>  (int) $stats_gen->total_sosa,
-                'sosaTotalCount'        =>  (int) $cumul_stats_by_gen[$gen]->total_cumul,
-                'diffSosaTotalCount'    =>  (int) $cumul_stats_by_gen[$gen]->total_distinct_cumul,
-                'firstBirth'            =>  $stats_gen->first_year,
-                'firstEstimatedBirth'   =>  $stats_gen->first_est_year,
-                'lastBirth'             =>  $stats_gen->last_year,
-                'lastEstimatedBirth'    =>  $stats_gen->last_est_year
-            );
-        }
-
-        return $statistics_by_gen;
-    }
-
-    /**
-     * Returns the basic statistics data by generation.
-     *
-     * @return Collection
-     */
-    private function statisticsByGenerationBasicData(): Collection
-    {
-        return DB::table('maj_sosa')
-            ->where('majs_gedcom_id', '=', $this->tree->id())
-            ->where('majs_user_id', '=', $this->user->id())
-            ->groupBy('majs_gen')
-            ->orderBy('majs_gen', 'asc')
-            ->select('majs_gen AS gen')
-            ->selectRaw('COUNT(majs_sosa) AS total_sosa')
-            ->selectRaw('MIN(majs_birth_year) AS first_year')
-            ->selectRaw('MIN(majs_birth_year_est) AS first_est_year')
-            ->selectRaw('MAX(majs_birth_year) AS last_year')
-            ->selectRaw('MAX(majs_birth_year_est) AS last_est_year')
-            ->get()->keyBy('gen');
-    }
-
-    /**
-     * Returns the cumulative statistics data by generation
-     *
-     * @return Collection
-     */
-    private function statisticsByGenerationCumulativeData(): Collection
-    {
-        $list_gen = DB::table('maj_sosa')->select('majs_gen')->distinct()
-            ->where('majs_gedcom_id', '=', $this->tree->id())
-            ->where('majs_user_id', '=', $this->user->id());
-
-        return DB::table('maj_sosa')
-            ->joinSub($list_gen, 'list_gen', function (JoinClause $join): void {
-                $join->on('maj_sosa.majs_gen', '<=', 'list_gen.majs_gen')
-                ->where('majs_gedcom_id', '=', $this->tree->id())
-                ->where('majs_user_id', '=', $this->user->id());
-            })
-            ->groupBy('list_gen.majs_gen')
-            ->select('list_gen.majs_gen AS gen')
-            ->selectRaw('COUNT(majs_i_id) AS total_cumul')
-            ->selectRaw('COUNT(DISTINCT majs_i_id) AS total_distinct_cumul')
-            ->selectRaw('1 - COUNT(DISTINCT majs_i_id) / COUNT(majs_i_id) AS pedi_collapse_simple')
-            ->get()->keyBy('gen');
-    }
-
-    /**
-     * Returns the pedigree collapse improved calculation by generation.
-     *
-     * Format:
-     *  - key : generation
-     *  - values:
-     *      - pedi_collapse_roots : pedigree collapse of ancestor roots for the generation
-     *      - pedi_collapse_xgen : pedigree cross-generation shrinkage for the generation
-     *
-     * @return array<int, array<string, float>>
-     */
-    public function pedigreeCollapseByGenerationData(): array
-    {
-        $table_prefix = DB::connection()->getTablePrefix();
-
-        $list_gen = DB::table('maj_sosa')->select('majs_gen')->distinct()
-            ->where('majs_gedcom_id', '=', $this->tree->id())
-            ->where('majs_user_id', '=', $this->user->id());
-
-        /* Compute the contributions of nodes of previous generations to the current generation */
-        $root_ancestors_contributions = DB::table('maj_sosa AS sosa')
-            ->select(['list_gen.majs_gen AS gen', 'sosa.majs_gedcom_id', 'sosa.majs_user_id'])
-            ->addSelect(['sosa.majs_i_id', 'sosa.majs_gen'])
-            ->selectRaw(
-                '(CASE ' .
-                    ' WHEN ' . $table_prefix . 'sosa_fat.majs_i_id IS NULL' .
-                    ' THEN POWER(2, ' . $table_prefix . 'list_gen.majs_gen - ' . $table_prefix . 'sosa.majs_gen - 1)' .
-                    ' ELSE 0 ' .
-                ' END)' .
-                ' + (CASE ' .
-                    ' WHEN ' . $table_prefix . 'sosa_mot.majs_i_id IS NULL' .
-                    ' THEN POWER(2, ' . $table_prefix . 'list_gen.majs_gen - ' . $table_prefix . 'sosa.majs_gen - 1)' .
-                    ' ELSE 0 ' .
-                ' END) contrib'
-            )
-            ->joinSub($list_gen, 'list_gen', function (JoinClause $join): void {
-                $join->on('sosa.majs_gen', '<', 'list_gen.majs_gen')
-                    ->where('majs_gedcom_id', '=', $this->tree->id())
-                    ->where('majs_user_id', '=', $this->user->id());
-            })
-            ->leftJoin('maj_sosa AS sosa_fat', function (JoinClause $join) use ($table_prefix): void {
-                // Link to sosa's father
-                $join->whereRaw($table_prefix . 'sosa_fat.majs_sosa = 2 * ' . $table_prefix . 'sosa.majs_sosa')
-                    ->where('sosa_fat.majs_gedcom_id', '=', $this->tree->id())
-                    ->where('sosa_fat.majs_user_id', '=', $this->user->id());
-            })
-            ->leftJoin('maj_sosa AS sosa_mot', function (JoinClause $join) use ($table_prefix): void {
-                // Link to sosa's mother
-                $join->whereRaw($table_prefix . 'sosa_mot.majs_sosa = 2 * ' . $table_prefix . 'sosa.majs_sosa + 1')
-                    ->where('sosa_mot.majs_gedcom_id', '=', $this->tree->id())
-                    ->where('sosa_mot.majs_user_id', '=', $this->user->id());
-            })
-            ->where('sosa.majs_gedcom_id', '=', $this->tree->id())
-            ->where('sosa.majs_user_id', '=', $this->user->id())
-            ->where(function (Builder $query): void {
-                $query->whereNull('sosa_fat.majs_i_id')
-                ->orWhereNull('sosa_mot.majs_i_id');
-            });
-
-        /* Identify nodes in the generations with ancestors who are also in the same generation.
+	/**
+	 * Reference user
+	 * @var User $user
+	 */
+	private $user;
+
+	/**
+	 * Reference tree
+	 * @var Tree $tree
+	 */
+	private $tree;
+
+	/**
+	 * Constructor for Sosa Statistics Service
+	 *
+	 * @param Tree $tree
+	 * @param User $user
+	 */
+	public function __construct(Tree $tree, User $user)
+	{
+		$this->tree = $tree;
+		$this->user = $user;
+	}
+
+	/**
+	 * Return the root individual for the reference tree and user.
+	 *
+	 * @return Individual|NULL
+	 */
+	public function rootIndividual(): ?Individual
+	{
+		$root_indi_id = $this->tree->getUserPreference($this->user, 'MAJ_SOSA_ROOT_ID');
+		return Registry::individualFactory()->make($root_indi_id, $this->tree);
+	}
+
+	/**
+	 * Get the highest generation for the reference tree and user.
+	 *
+	 * @return int
+	 */
+	public function maxGeneration(): int
+	{
+		return (int) DB::table('maj_sosa')
+			->where('majs_gedcom_id', '=', $this->tree->id())
+			->where('majs_user_id', '=', $this->user->id())
+			->max('majs_gen');
+	}
+
+	/**
+	 * Get the total count of individuals in the tree.
+	 *
+	 * @return int
+	 */
+	public function totalIndividuals(): int
+	{
+		return DB::table('individuals')
+			->where('i_file', '=', $this->tree->id())
+			->count();
+	}
+
+	/**
+	 * Get the total count of Sosa ancestors for all generations
+	 *
+	 * @return int
+	 */
+	public function totalAncestors(): int
+	{
+		return DB::table('maj_sosa')
+			->where('majs_gedcom_id', '=', $this->tree->id())
+			->where('majs_user_id', '=', $this->user->id())
+			->count();
+	}
+
+	/**
+	 * Get the total count of Sosa ancestors for a generation
+	 *
+	 * @return int
+	 */
+	public function totalAncestorsAtGeneration(int $gen): int
+	{
+		return DB::table('maj_sosa')
+			->where('majs_gedcom_id', '=', $this->tree->id())
+			->where('majs_user_id', '=', $this->user->id())
+			->where('majs_gen', '=', $gen)
+			->count();
+	}
+
+	/**
+	 * Get the total count of distinct Sosa ancestors for all generations
+	 *
+	 * @return int
+	 */
+	public function totalDistinctAncestors(): int
+	{
+		return DB::table('maj_sosa')
+			->where('majs_gedcom_id', '=', $this->tree->id())
+			->where('majs_user_id', '=', $this->user->id())
+			->distinct()
+			->count('majs_i_id');
+	}
+
+	/**
+	 * Get the mean generation time, as the slope of the linear regression of birth years vs generations
+	 *
+	 * @return float
+	 */
+	public function meanGenerationTime(): float
+	{
+		$row = DB::table('maj_sosa')
+			->where('majs_gedcom_id', '=', $this->tree->id())
+			->where('majs_user_id', '=', $this->user->id())
+			->whereNotNull('majs_birth_year')
+			->selectRaw('COUNT(majs_sosa) AS n')
+			->selectRaw('SUM(majs_gen * majs_birth_year) AS sum_xy')
+			->selectRaw('SUM(majs_gen) AS sum_x')
+			->selectRaw('SUM(majs_birth_year) AS sum_y')
+			->selectRaw('SUM(majs_gen * majs_gen) AS sum_x2')
+			->get()->first();
+
+		return $row->n == 0 ? 0 :
+			-($row->n * $row->sum_xy - $row->sum_x * $row->sum_y) / ($row->n * $row->sum_x2 - pow($row->sum_x, 2));
+	}
+
+	/**
+	 * Get the statistic array detailed by generation.
+	 * Statistics for each generation are:
+	 *  - The number of Sosa in generation
+	 *  - The number of Sosa up to generation
+	 *  - The number of distinct Sosa up to generation
+	 *  - The year of the first birth in generation
+	 *  - The year of the first estimated birth in generation
+	 *  - The year of the last birth in generation
+	 *  - The year of the last estimated birth in generation
+	 *  - The average year of birth in generation
+	 *
+	 * @return array<int, array<string, int|null>> Statistics array
+	 */
+	public function statisticsByGenerations(): array
+	{
+		$stats_by_gen = $this->statisticsByGenerationBasicData();
+		$cumul_stats_by_gen = $this->statisticsByGenerationCumulativeData();
+
+		$statistics_by_gen = [];
+		foreach ($stats_by_gen as $gen => $stats_gen) {
+			$statistics_by_gen[(int) $stats_gen->gen] = array(
+				'sosaCount'             =>  (int) $stats_gen->total_sosa,
+				'sosaTotalCount'        =>  (int) $cumul_stats_by_gen[$gen]->total_cumul,
+				'diffSosaTotalCount'    =>  (int) $cumul_stats_by_gen[$gen]->total_distinct_cumul,
+				'firstBirth'            =>  $stats_gen->first_year,
+				'firstEstimatedBirth'   =>  $stats_gen->first_est_year,
+				'lastBirth'             =>  $stats_gen->last_year,
+				'lastEstimatedBirth'    =>  $stats_gen->last_est_year
+			);
+		}
+
+		return $statistics_by_gen;
+	}
+
+	/**
+	 * Returns the basic statistics data by generation.
+	 *
+	 * @return Collection
+	 */
+	private function statisticsByGenerationBasicData(): Collection
+	{
+		return DB::table('maj_sosa')
+			->where('majs_gedcom_id', '=', $this->tree->id())
+			->where('majs_user_id', '=', $this->user->id())
+			->groupBy('majs_gen')
+			->orderBy('majs_gen', 'asc')
+			->select('majs_gen AS gen')
+			->selectRaw('COUNT(majs_sosa) AS total_sosa')
+			->selectRaw('MIN(majs_birth_year) AS first_year')
+			->selectRaw('MIN(majs_birth_year_est) AS first_est_year')
+			->selectRaw('MAX(majs_birth_year) AS last_year')
+			->selectRaw('MAX(majs_birth_year_est) AS last_est_year')
+			->get()->keyBy('gen');
+	}
+
+	/**
+	 * Returns the cumulative statistics data by generation
+	 *
+	 * @return Collection
+	 */
+	private function statisticsByGenerationCumulativeData(): Collection
+	{
+		$list_gen = DB::table('maj_sosa')->select('majs_gen')->distinct()
+			->where('majs_gedcom_id', '=', $this->tree->id())
+			->where('majs_user_id', '=', $this->user->id());
+
+		return DB::table('maj_sosa')
+			->joinSub($list_gen, 'list_gen', function (JoinClause $join): void {
+				$join->on('maj_sosa.majs_gen', '<=', 'list_gen.majs_gen')
+				->where('majs_gedcom_id', '=', $this->tree->id())
+				->where('majs_user_id', '=', $this->user->id());
+			})
+			->groupBy('list_gen.majs_gen')
+			->select('list_gen.majs_gen AS gen')
+			->selectRaw('COUNT(majs_i_id) AS total_cumul')
+			->selectRaw('COUNT(DISTINCT majs_i_id) AS total_distinct_cumul')
+			->selectRaw('1 - COUNT(DISTINCT majs_i_id) / COUNT(majs_i_id) AS pedi_collapse_simple')
+			->get()->keyBy('gen');
+	}
+
+	/**
+	 * Returns the pedigree collapse improved calculation by generation.
+	 *
+	 * Format:
+	 *  - key : generation
+	 *  - values:
+	 *      - pedi_collapse_roots : pedigree collapse of ancestor roots for the generation
+	 *      - pedi_collapse_xgen : pedigree cross-generation shrinkage for the generation
+	 *
+	 * @return array<int, array<string, float>>
+	 */
+	public function pedigreeCollapseByGenerationData(): array
+	{
+		$table_prefix = DB::connection()->getTablePrefix();
+
+		$list_gen = DB::table('maj_sosa')->select('majs_gen')->distinct()
+			->where('majs_gedcom_id', '=', $this->tree->id())
+			->where('majs_user_id', '=', $this->user->id());
+
+		/* Compute the contributions of nodes of previous generations to the current generation */
+		$root_ancestors_contributions = DB::table('maj_sosa AS sosa')
+			->select(['list_gen.majs_gen AS gen', 'sosa.majs_gedcom_id', 'sosa.majs_user_id'])
+			->addSelect(['sosa.majs_i_id', 'sosa.majs_gen'])
+			->selectRaw(
+				'(CASE ' .
+					' WHEN ' . $table_prefix . 'sosa_fat.majs_i_id IS NULL' .
+					' THEN POWER(2, ' . $table_prefix . 'list_gen.majs_gen - ' . $table_prefix . 'sosa.majs_gen - 1)' .
+					' ELSE 0 ' .
+				' END)' .
+				' + (CASE ' .
+					' WHEN ' . $table_prefix . 'sosa_mot.majs_i_id IS NULL' .
+					' THEN POWER(2, ' . $table_prefix . 'list_gen.majs_gen - ' . $table_prefix . 'sosa.majs_gen - 1)' .
+					' ELSE 0 ' .
+				' END) contrib'
+			)
+			->joinSub($list_gen, 'list_gen', function (JoinClause $join): void {
+				$join->on('sosa.majs_gen', '<', 'list_gen.majs_gen')
+					->where('majs_gedcom_id', '=', $this->tree->id())
+					->where('majs_user_id', '=', $this->user->id());
+			})
+			->leftJoin('maj_sosa AS sosa_fat', function (JoinClause $join) use ($table_prefix): void {
+				// Link to sosa's father
+				$join->whereRaw($table_prefix . 'sosa_fat.majs_sosa = 2 * ' . $table_prefix . 'sosa.majs_sosa')
+					->where('sosa_fat.majs_gedcom_id', '=', $this->tree->id())
+					->where('sosa_fat.majs_user_id', '=', $this->user->id());
+			})
+			->leftJoin('maj_sosa AS sosa_mot', function (JoinClause $join) use ($table_prefix): void {
+				// Link to sosa's mother
+				$join->whereRaw($table_prefix . 'sosa_mot.majs_sosa = 2 * ' . $table_prefix . 'sosa.majs_sosa + 1')
+					->where('sosa_mot.majs_gedcom_id', '=', $this->tree->id())
+					->where('sosa_mot.majs_user_id', '=', $this->user->id());
+			})
+			->where('sosa.majs_gedcom_id', '=', $this->tree->id())
+			->where('sosa.majs_user_id', '=', $this->user->id())
+			->where(function (Builder $query): void {
+				$query->whereNull('sosa_fat.majs_i_id')
+				->orWhereNull('sosa_mot.majs_i_id');
+			});
+
+		/* Identify nodes in the generations with ancestors who are also in the same generation.
          * This is the vertical/generational collapse that will reduce the number or roots.
          */
-        $non_roots_ancestors = DB::table('maj_sosa AS sosa')
-            ->select(['sosa.majs_gen', 'sosa.majs_gedcom_id', 'sosa.majs_user_id', 'sosa.majs_sosa'])
-            ->selectRaw('MAX(' . $table_prefix . 'sosa_anc.majs_sosa) - MIN(' . $table_prefix . 'sosa_anc.majs_sosa)' .
-                ' AS full_ancestors')
-            ->join('maj_sosa AS sosa_anc', function (JoinClause $join) use ($table_prefix): void {
-                $join->on('sosa.majs_gen', '<', 'sosa_anc.majs_gen')
-                    ->whereRaw('FLOOR(' . $table_prefix . 'sosa_anc.majs_sosa / POWER(2, ' .
-                        $table_prefix . 'sosa_anc.majs_gen - ' . $table_prefix . 'sosa.majs_gen)) = ' .
-                        $table_prefix . 'sosa.majs_sosa')
-                    ->where('sosa_anc.majs_gedcom_id', '=', $this->tree->id())
-                    ->where('sosa_anc.majs_user_id', '=', $this->user->id());
-            })
-            ->where('sosa.majs_gedcom_id', '=', $this->tree->id())
-            ->where('sosa.majs_user_id', '=', $this->user->id())
-            ->whereIn('sosa_anc.majs_i_id', function (Builder $query) use ($table_prefix): void {
-                $query->from('maj_sosa AS sosa_gen')
-                ->select('sosa_gen.majs_i_id')->distinct()
-                ->where('sosa_gen.majs_gedcom_id', '=', $this->tree->id())
-                ->where('sosa_gen.majs_user_id', '=', $this->user->id())
-                ->whereRaw($table_prefix . 'sosa_gen.majs_gen = ' . $table_prefix . 'sosa.majs_gen');
-            })
-            ->groupBy(['sosa.majs_gen', 'sosa.majs_gedcom_id', 'sosa.majs_user_id',
-                'sosa.majs_sosa', 'sosa.majs_i_id']);
-
-        /* Compute the contribution of the nodes in the generation,
+		$non_roots_ancestors = DB::table('maj_sosa AS sosa')
+			->select(['sosa.majs_gen', 'sosa.majs_gedcom_id', 'sosa.majs_user_id', 'sosa.majs_sosa'])
+			->selectRaw('MAX(' . $table_prefix . 'sosa_anc.majs_sosa) - MIN(' . $table_prefix . 'sosa_anc.majs_sosa)' .
+				' AS full_ancestors')
+			->join('maj_sosa AS sosa_anc', function (JoinClause $join) use ($table_prefix): void {
+				$join->on('sosa.majs_gen', '<', 'sosa_anc.majs_gen')
+					->whereRaw('FLOOR(' . $table_prefix . 'sosa_anc.majs_sosa / POWER(2, ' .
+						$table_prefix . 'sosa_anc.majs_gen - ' . $table_prefix . 'sosa.majs_gen)) = ' .
+						$table_prefix . 'sosa.majs_sosa')
+					->where('sosa_anc.majs_gedcom_id', '=', $this->tree->id())
+					->where('sosa_anc.majs_user_id', '=', $this->user->id());
+			})
+			->where('sosa.majs_gedcom_id', '=', $this->tree->id())
+			->where('sosa.majs_user_id', '=', $this->user->id())
+			->whereIn('sosa_anc.majs_i_id', function (Builder $query) use ($table_prefix): void {
+				$query->from('maj_sosa AS sosa_gen')
+				->select('sosa_gen.majs_i_id')->distinct()
+				->where('sosa_gen.majs_gedcom_id', '=', $this->tree->id())
+				->where('sosa_gen.majs_user_id', '=', $this->user->id())
+				->whereRaw($table_prefix . 'sosa_gen.majs_gen = ' . $table_prefix . 'sosa.majs_gen');
+			})
+			->groupBy(['sosa.majs_gen', 'sosa.majs_gedcom_id', 'sosa.majs_user_id',
+				'sosa.majs_sosa', 'sosa.majs_i_id']);
+
+		/* Compute the contribution of the nodes in the generation,
          * excluding the nodes with ancestors in the same generation.
          * Nodes with a parent missing are not excluded to cater for the missing one.
          */
-        $known_ancestors_contributions = DB::table('maj_sosa AS sosa')
-            ->select(['sosa.majs_gen AS gen', 'sosa.majs_gedcom_id', 'sosa.majs_user_id'])
-            ->addSelect(['sosa.majs_i_id', 'sosa.majs_gen'])
-            ->selectRaw('1 AS contrib')
-            ->leftJoinSub($non_roots_ancestors, 'nonroot', function (JoinClause $join): void {
-                $join->on('sosa.majs_gen', '=', 'nonroot.majs_gen')
-                    ->on('sosa.majs_sosa', '=', 'nonroot.majs_sosa')
-                    ->where('nonroot.full_ancestors', '>', 0)
-                    ->where('nonroot.majs_gedcom_id', '=', $this->tree->id())
-                    ->where('nonroot.majs_user_id', '=', $this->user->id());
-            })
-            ->where('sosa.majs_gedcom_id', '=', $this->tree->id())
-            ->where('sosa.majs_user_id', '=', $this->user->id())
-            ->whereNull('nonroot.majs_sosa');
-
-        /* Aggregate both queries, and calculate the sum of contributions by generation roots.
+		$known_ancestors_contributions = DB::table('maj_sosa AS sosa')
+			->select(['sosa.majs_gen AS gen', 'sosa.majs_gedcom_id', 'sosa.majs_user_id'])
+			->addSelect(['sosa.majs_i_id', 'sosa.majs_gen'])
+			->selectRaw('1 AS contrib')
+			->leftJoinSub($non_roots_ancestors, 'nonroot', function (JoinClause $join): void {
+				$join->on('sosa.majs_gen', '=', 'nonroot.majs_gen')
+					->on('sosa.majs_sosa', '=', 'nonroot.majs_sosa')
+					->where('nonroot.full_ancestors', '>', 0)
+					->where('nonroot.majs_gedcom_id', '=', $this->tree->id())
+					->where('nonroot.majs_user_id', '=', $this->user->id());
+			})
+			->where('sosa.majs_gedcom_id', '=', $this->tree->id())
+			->where('sosa.majs_user_id', '=', $this->user->id())
+			->whereNull('nonroot.majs_sosa');
+
+		/* Aggregate both queries, and calculate the sum of contributions by generation roots.
          * Exclude as well nodes that already appear in lower generations, as their branche has already been reduced.
          */
-        $ancestors_contributions_sum = DB::connection()->query()
-            ->fromSub($root_ancestors_contributions->unionAll($known_ancestors_contributions), 'sosa_contribs')
-            ->select(['sosa_contribs.gen', 'sosa_contribs.majs_gedcom_id', 'sosa_contribs.majs_user_id'])
-            ->addSelect(['sosa_contribs.majs_i_id', 'sosa_contribs.contrib'])
-            ->selectRaw('COUNT(' . $table_prefix . 'sosa_contribs.majs_i_id) * ' .
-                $table_prefix . 'sosa_contribs.contrib AS totalContrib')
-            ->leftJoin('maj_sosa AS sosa_low', function (JoinClause $join): void {
-                $join->on('sosa_low.majs_gen', '<', 'sosa_contribs.majs_gen')
-                    ->on('sosa_low.majs_i_id', '=', 'sosa_contribs.majs_i_id')
-                    ->where('sosa_low.majs_gedcom_id', '=', $this->tree->id())
-                    ->where('sosa_low.majs_user_id', '=', $this->user->id());
-            })
-            ->whereNull('sosa_low.majs_sosa')
-            ->groupBy(['sosa_contribs.gen', 'sosa_contribs.majs_gedcom_id', 'sosa_contribs.majs_user_id',
-                'sosa_contribs.majs_i_id', 'sosa_contribs.contrib']);
-
-        // Aggregate all generation roots to compute root and generation pedigree collapse
-        $pedi_collapse_coll = DB::connection()->query()->fromSub($ancestors_contributions_sum, 'sosa_contribs_sum')
-            ->select(['gen'])->selectRaw('SUM(contrib), SUM(totalContrib)')
-            ->selectRaw('1 - SUM(contrib) / SUM(totalContrib) AS pedi_collapse_roots')  // Roots/horizontal collapse
-            ->selectRaw('1 - SUM(totalContrib) / POWER ( 2, gen - 1) AS pedi_collapse_xgen') // Crossgeneration collapse
-            ->groupBy(['gen', 'majs_gedcom_id', 'majs_user_id'])
-            ->orderBy('gen')
-            ->get();
-
-        $pedi_collapse_by_gen = [];
-        foreach ($pedi_collapse_coll as $collapse_gen) {
-            $pedi_collapse_by_gen[(int) $collapse_gen->gen] = array(
-                'pedi_collapse_roots'   =>  (float) $collapse_gen->pedi_collapse_roots,
-                'pedi_collapse_xgen'   =>  (float) $collapse_gen->pedi_collapse_xgen
-            );
-        }
-        return $pedi_collapse_by_gen;
-    }
-
-    /**
-     * Return a Collection of the mean generation depth and deviation for all Sosa ancestors at a given generation.
-     * Sosa 1 is of generation 1.
-     *
-     * Mean generation depth and deviation are calculated based on the works of Marie-Héléne Cazes and Pierre Cazes,
-     * published in Population (French Edition), Vol. 51, No. 1 (Jan. - Feb., 1996), pp. 117-140
-     * http://kintip.net/index.php?option=com_jdownloads&task=download.send&id=9&catid=4&m=0
-     *
-     * Format:
-     *  - key : sosa number of the ancestor
-     *  - values:
-     *      - root_ancestor_id : ID of the ancestor
-     *      - mean_gen_depth : Mean generation depth
-     *      - stddev_gen_depth : Standard deviation of generation depth
-     *
-     * @param int $gen Sosa generation
-     * @return Collection
-     */
-    public function generationDepthStatsAtGeneration(int $gen): Collection
-    {
-        $table_prefix = DB::connection()->getTablePrefix();
-        $missing_ancestors_by_gen = DB::table('maj_sosa AS sosa')
-            ->selectRaw($table_prefix . 'sosa.majs_gen - ? AS majs_gen_norm', [$gen])
-            ->selectRaw('FLOOR(((' . $table_prefix . 'sosa.majs_sosa / POW(2, ' . $table_prefix . 'sosa.majs_gen -1 )) - 1) * POWER(2, ? - 1)) + POWER(2, ? - 1) AS root_ancestor', [$gen, $gen])   //@phpcs:ignore Generic.Files.LineLength.TooLong
-            ->selectRaw('SUM(CASE WHEN ' . $table_prefix . 'sosa_fat.majs_i_id IS NULL AND ' . $table_prefix . 'sosa_mot.majs_i_id IS NULL THEN 1 ELSE 0 END) AS full_root_count')  //@phpcs:ignore Generic.Files.LineLength.TooLong
-            ->selectRaw('SUM(CASE WHEN ' . $table_prefix . 'sosa_fat.majs_i_id IS NULL AND ' . $table_prefix . 'sosa_mot.majs_i_id IS NULL THEN 0 ELSE 1 END) As semi_root_count')  //@phpcs:ignore Generic.Files.LineLength.TooLong
-            ->leftJoin('maj_sosa AS sosa_fat', function (JoinClause $join) use ($table_prefix): void {
-                // Link to sosa's father
-                $join->whereRaw($table_prefix . 'sosa_fat.majs_sosa = 2 * ' . $table_prefix . 'sosa.majs_sosa')
-                ->where('sosa_fat.majs_gedcom_id', '=', $this->tree->id())
-                ->where('sosa_fat.majs_user_id', '=', $this->user->id());
-            })
-            ->leftJoin('maj_sosa AS sosa_mot', function (JoinClause $join) use ($table_prefix): void {
-                // Link to sosa's mother
-                $join->whereRaw($table_prefix . 'sosa_mot.majs_sosa = 2 * ' . $table_prefix . 'sosa.majs_sosa + 1')
-                ->where('sosa_mot.majs_gedcom_id', '=', $this->tree->id())
-                ->where('sosa_mot.majs_user_id', '=', $this->user->id());
-            })
-            ->where('sosa.majs_gedcom_id', '=', $this->tree->id())
-            ->where('sosa.majs_user_id', '=', $this->user->id())
-            ->where('sosa.majs_gen', '>=', $gen)
-            ->where(function (Builder $query): void {
-                $query->whereNull('sosa_fat.majs_i_id')
-                    ->orWhereNull('sosa_mot.majs_i_id');
-            })
-            ->groupBy(['sosa.majs_gen', 'root_ancestor']);
-
-        return DB::table('maj_sosa AS sosa_list')
-            ->select(['stats_by_gen.root_ancestor AS root_ancestor_sosa', 'sosa_list.majs_i_id as root_ancestor_id'])
-            ->selectRaw('1 + SUM( (majs_gen_norm) * ( 2 * full_root_count + semi_root_count) /  (2 * POWER(2, majs_gen_norm))) AS mean_gen_depth')  //@phpcs:ignore Generic.Files.LineLength.TooLong
-            ->selectRaw(' SQRT(' .
-                '   SUM(POWER(majs_gen_norm, 2) * ( 2 * full_root_count + semi_root_count) /  (2 * POWER(2, majs_gen_norm)))' .     //@phpcs:ignore Generic.Files.LineLength.TooLong
-                '   - POWER( SUM( (majs_gen_norm) * ( 2 * full_root_count + semi_root_count) /  (2 * POWER(2, majs_gen_norm))), 2)' .       //@phpcs:ignore Generic.Files.LineLength.TooLong
-                ' ) AS stddev_gen_depth')
-            ->joinSub($missing_ancestors_by_gen, 'stats_by_gen', function (JoinClause $join): void {
-                $join->on('sosa_list.majs_sosa', '=', 'stats_by_gen.root_ancestor')
-                    ->where('sosa_list.majs_gedcom_id', '=', $this->tree->id())
-                    ->where('sosa_list.majs_user_id', '=', $this->user->id());
-            })
-            ->groupBy(['stats_by_gen.root_ancestor', 'sosa_list.majs_i_id'])
-            ->orderBy('stats_by_gen.root_ancestor')
-            ->get()->keyBy('root_ancestor_sosa');
-    }
-
-    /**
-     * Return a collection of the most duplicated root Sosa ancestors.
-     * The number of ancestors to return is limited by the parameter $limit.
-     * If several individuals are tied when reaching the limit, none of them are returned,
-     * which means that there can be less individuals returned than requested.
-     *
-     * Format:
-     *  - value:
-     *      - sosa_i_id : sosa individual
-     *      - sosa_count: number of duplications of the ancestor (e.g. 3 if it appears 3 times)
-     *
-     * @param int $limit
-     * @return Collection
-     */
-    public function topMultipleAncestorsWithNoTies(int $limit): Collection
-    {
-        $table_prefix = DB::connection()->getTablePrefix();
-        $multiple_ancestors = DB::table('maj_sosa AS sosa')
-            ->select('sosa.majs_i_id AS sosa_i_id')
-            ->selectRaw('COUNT(' . $table_prefix . 'sosa.majs_sosa) AS sosa_count')
-            ->leftJoin('maj_sosa AS sosa_fat', function (JoinClause $join) use ($table_prefix): void {
-                // Link to sosa's father
-                $join->whereRaw($table_prefix . 'sosa_fat.majs_sosa = 2 * ' . $table_prefix . 'sosa.majs_sosa')
-                    ->where('sosa_fat.majs_gedcom_id', '=', $this->tree->id())
-                    ->where('sosa_fat.majs_user_id', '=', $this->user->id());
-            })
-            ->leftJoin('maj_sosa AS sosa_mot', function (JoinClause $join) use ($table_prefix): void {
-                // Link to sosa's mother
-                $join->whereRaw($table_prefix . 'sosa_mot.majs_sosa = 2 * ' . $table_prefix . 'sosa.majs_sosa + 1')
-                ->where('sosa_mot.majs_gedcom_id', '=', $this->tree->id())
-                ->where('sosa_mot.majs_user_id', '=', $this->user->id());
-            })
-            ->where('sosa.majs_gedcom_id', '=', $this->tree->id())
-            ->where('sosa.majs_user_id', '=', $this->user->id())
-            ->whereNull('sosa_fat.majs_sosa')   // We keep only root individuals, i.e. those with no father or mother
-            ->whereNull('sosa_mot.majs_sosa')
-            ->groupBy('sosa.majs_i_id')
-            ->havingRaw('COUNT(' . $table_prefix . 'sosa.majs_sosa) > 1')    // Limit to the duplicate sosas.
-            ->orderByRaw('COUNT(' . $table_prefix . 'sosa.majs_sosa) DESC, MIN(' . $table_prefix . 'sosa.majs_sosa) ASC')   //@phpcs:ignore Generic.Files.LineLength.TooLong
-            ->limit($limit + 1)     // We want to select one more than required, for ties
-            ->get();
-
-        if ($multiple_ancestors->count() > $limit) {
-            $last_count = $multiple_ancestors->last()->sosa_count;
-            $multiple_ancestors = $multiple_ancestors->reject(function ($element) use ($last_count): bool {
-                return $element->sosa_count ==  $last_count;
-            });
-        }
-        return $multiple_ancestors;
-    }
-
-    /**
-     * Return a computed array of statistics about the dispersion of ancestors across the ancestors
-     * at a specified generation.
-     *
-     * Format:
-     *  - key : rank of the ancestor in generation G for which exclusive ancestors have been found
-     *          For instance 3 represent the maternal grand father
-     *          0 is used for shared ancestors
-     *  - values: number of ancestors exclusively in the ancestors of the ancestor in key
-     *
-     *  For instance a result at generation 3 could be :
-     *      array (   0     =>  12      -> 12 ancestors are shared by the grand-parents
-     *                1     =>  32      -> 32 ancestors are exclusive to the paternal grand-father
-     *                2     =>  25      -> 25 ancestors are exclusive to the paternal grand-mother
-     *                3     =>  12      -> 12 ancestors are exclusive to the maternal grand-father
-     *                4     =>  30      -> 30 ancestors are exclusive to the maternal grand-mother
-     *            )
-     *
-     * @param int $gen
-     * @return Collection
-     */
-    public function ancestorsDispersionForGeneration(int $gen): Collection
-    {
-        $ancestors_branches = DB::table('maj_sosa')
-            ->select('majs_i_id AS i_id')
-            ->selectRaw('FLOOR(majs_sosa / POW(2, (majs_gen - ?))) - POW(2, ? -1) + 1 AS branch', [$gen, $gen])
-            ->where('majs_gedcom_id', '=', $this->tree->id())
-            ->where('majs_user_id', '=', $this->user->id())
-            ->where('majs_gen', '>=', $gen)
-            ->groupBy('majs_i_id', 'branch');
-
-
-        $consolidated_ancestors_branches = DB::table('maj_sosa')
-            ->fromSub($ancestors_branches, 'indi_branch')
-            ->select('i_id')
-            ->selectRaw('CASE WHEN COUNT(branch) > 1 THEN 0 ELSE MIN(branch) END AS branches')
-            ->groupBy('i_id');
-
-        return DB::table('maj_sosa')
-            ->fromSub($consolidated_ancestors_branches, 'indi_branch_consolidated')
-            ->select('branches')
-            ->selectRaw('COUNT(i_id) AS count_indi')
-            ->groupBy('branches')
-            ->get()->pluck('count_indi', 'branches');
-    }
+		$ancestors_contributions_sum = DB::connection()->query()
+			->fromSub($root_ancestors_contributions->unionAll($known_ancestors_contributions), 'sosa_contribs')
+			->select(['sosa_contribs.gen', 'sosa_contribs.majs_gedcom_id', 'sosa_contribs.majs_user_id'])
+			->addSelect(['sosa_contribs.majs_i_id', 'sosa_contribs.contrib'])
+			->selectRaw('COUNT(' . $table_prefix . 'sosa_contribs.majs_i_id) * ' .
+				$table_prefix . 'sosa_contribs.contrib AS totalContrib')
+			->leftJoin('maj_sosa AS sosa_low', function (JoinClause $join): void {
+				$join->on('sosa_low.majs_gen', '<', 'sosa_contribs.majs_gen')
+					->on('sosa_low.majs_i_id', '=', 'sosa_contribs.majs_i_id')
+					->where('sosa_low.majs_gedcom_id', '=', $this->tree->id())
+					->where('sosa_low.majs_user_id', '=', $this->user->id());
+			})
+			->whereNull('sosa_low.majs_sosa')
+			->groupBy(['sosa_contribs.gen', 'sosa_contribs.majs_gedcom_id', 'sosa_contribs.majs_user_id',
+				'sosa_contribs.majs_i_id', 'sosa_contribs.contrib']);
+
+		// Aggregate all generation roots to compute root and generation pedigree collapse
+		$pedi_collapse_coll = DB::connection()->query()->fromSub($ancestors_contributions_sum, 'sosa_contribs_sum')
+			->select(['gen'])->selectRaw('SUM(contrib), SUM(totalContrib)')
+			->selectRaw('1 - SUM(contrib) / SUM(totalContrib) AS pedi_collapse_roots')  // Roots/horizontal collapse
+			->selectRaw('1 - SUM(totalContrib) / POWER ( 2, gen - 1) AS pedi_collapse_xgen') // Crossgeneration collapse
+			->groupBy(['gen', 'majs_gedcom_id', 'majs_user_id'])
+			->orderBy('gen')
+			->get();
+
+		$pedi_collapse_by_gen = [];
+		foreach ($pedi_collapse_coll as $collapse_gen) {
+			$pedi_collapse_by_gen[(int) $collapse_gen->gen] = array(
+				'pedi_collapse_roots'   =>  (float) $collapse_gen->pedi_collapse_roots,
+				'pedi_collapse_xgen'   =>  (float) $collapse_gen->pedi_collapse_xgen
+			);
+		}
+		return $pedi_collapse_by_gen;
+	}
+
+	/**
+	 * Return a Collection of the mean generation depth and deviation for all Sosa ancestors at a given generation.
+	 * Sosa 1 is of generation 1.
+	 *
+	 * Mean generation depth and deviation are calculated based on the works of Marie-Héléne Cazes and Pierre Cazes,
+	 * published in Population (French Edition), Vol. 51, No. 1 (Jan. - Feb., 1996), pp. 117-140
+	 * http://kintip.net/index.php?option=com_jdownloads&task=download.send&id=9&catid=4&m=0
+	 *
+	 * Format:
+	 *  - key : sosa number of the ancestor
+	 *  - values:
+	 *      - root_ancestor_id : ID of the ancestor
+	 *      - mean_gen_depth : Mean generation depth
+	 *      - stddev_gen_depth : Standard deviation of generation depth
+	 *
+	 * @param int $gen Sosa generation
+	 * @return Collection
+	 */
+	public function generationDepthStatsAtGeneration(int $gen): Collection
+	{
+		$table_prefix = DB::connection()->getTablePrefix();
+		$missing_ancestors_by_gen = DB::table('maj_sosa AS sosa')
+			->selectRaw($table_prefix . 'sosa.majs_gen - ? AS majs_gen_norm', [$gen])
+			->selectRaw('FLOOR(((' . $table_prefix . 'sosa.majs_sosa / POW(2, ' . $table_prefix . 'sosa.majs_gen -1 )) - 1) * POWER(2, ? - 1)) + POWER(2, ? - 1) AS root_ancestor', [$gen, $gen])   //@phpcs:ignore Generic.Files.LineLength.TooLong
+			->selectRaw('SUM(CASE WHEN ' . $table_prefix . 'sosa_fat.majs_i_id IS NULL AND ' . $table_prefix . 'sosa_mot.majs_i_id IS NULL THEN 1 ELSE 0 END) AS full_root_count')  //@phpcs:ignore Generic.Files.LineLength.TooLong
+			->selectRaw('SUM(CASE WHEN ' . $table_prefix . 'sosa_fat.majs_i_id IS NULL AND ' . $table_prefix . 'sosa_mot.majs_i_id IS NULL THEN 0 ELSE 1 END) As semi_root_count')  //@phpcs:ignore Generic.Files.LineLength.TooLong
+			->leftJoin('maj_sosa AS sosa_fat', function (JoinClause $join) use ($table_prefix): void {
+				// Link to sosa's father
+				$join->whereRaw($table_prefix . 'sosa_fat.majs_sosa = 2 * ' . $table_prefix . 'sosa.majs_sosa')
+				->where('sosa_fat.majs_gedcom_id', '=', $this->tree->id())
+				->where('sosa_fat.majs_user_id', '=', $this->user->id());
+			})
+			->leftJoin('maj_sosa AS sosa_mot', function (JoinClause $join) use ($table_prefix): void {
+				// Link to sosa's mother
+				$join->whereRaw($table_prefix . 'sosa_mot.majs_sosa = 2 * ' . $table_prefix . 'sosa.majs_sosa + 1')
+				->where('sosa_mot.majs_gedcom_id', '=', $this->tree->id())
+				->where('sosa_mot.majs_user_id', '=', $this->user->id());
+			})
+			->where('sosa.majs_gedcom_id', '=', $this->tree->id())
+			->where('sosa.majs_user_id', '=', $this->user->id())
+			->where('sosa.majs_gen', '>=', $gen)
+			->where(function (Builder $query): void {
+				$query->whereNull('sosa_fat.majs_i_id')
+					->orWhereNull('sosa_mot.majs_i_id');
+			})
+			->groupBy(['sosa.majs_gen', 'root_ancestor']);
+
+		return DB::table('maj_sosa AS sosa_list')
+			->select(['stats_by_gen.root_ancestor AS root_ancestor_sosa', 'sosa_list.majs_i_id as root_ancestor_id'])
+			->selectRaw('1 + SUM( (majs_gen_norm) * ( 2 * full_root_count + semi_root_count) /  (2 * POWER(2, majs_gen_norm))) AS mean_gen_depth')  //@phpcs:ignore Generic.Files.LineLength.TooLong
+			->selectRaw(' SQRT(' .
+				'   SUM(POWER(majs_gen_norm, 2) * ( 2 * full_root_count + semi_root_count) /  (2 * POWER(2, majs_gen_norm)))' .     //@phpcs:ignore Generic.Files.LineLength.TooLong
+				'   - POWER( SUM( (majs_gen_norm) * ( 2 * full_root_count + semi_root_count) /  (2 * POWER(2, majs_gen_norm))), 2)' .       //@phpcs:ignore Generic.Files.LineLength.TooLong
+				' ) AS stddev_gen_depth')
+			->joinSub($missing_ancestors_by_gen, 'stats_by_gen', function (JoinClause $join): void {
+				$join->on('sosa_list.majs_sosa', '=', 'stats_by_gen.root_ancestor')
+					->where('sosa_list.majs_gedcom_id', '=', $this->tree->id())
+					->where('sosa_list.majs_user_id', '=', $this->user->id());
+			})
+			->groupBy(['stats_by_gen.root_ancestor', 'sosa_list.majs_i_id'])
+			->orderBy('stats_by_gen.root_ancestor')
+			->get()->keyBy('root_ancestor_sosa');
+	}
+
+	/**
+	 * Return a collection of the most duplicated root Sosa ancestors.
+	 * The number of ancestors to return is limited by the parameter $limit.
+	 * If several individuals are tied when reaching the limit, none of them are returned,
+	 * which means that there can be less individuals returned than requested.
+	 *
+	 * Format:
+	 *  - value:
+	 *      - sosa_i_id : sosa individual
+	 *      - sosa_count: number of duplications of the ancestor (e.g. 3 if it appears 3 times)
+	 *
+	 * @param int $limit
+	 * @return Collection
+	 */
+	public function topMultipleAncestorsWithNoTies(int $limit): Collection
+	{
+		$table_prefix = DB::connection()->getTablePrefix();
+		$multiple_ancestors = DB::table('maj_sosa AS sosa')
+			->select('sosa.majs_i_id AS sosa_i_id')
+			->selectRaw('COUNT(' . $table_prefix . 'sosa.majs_sosa) AS sosa_count')
+			->leftJoin('maj_sosa AS sosa_fat', function (JoinClause $join) use ($table_prefix): void {
+				// Link to sosa's father
+				$join->whereRaw($table_prefix . 'sosa_fat.majs_sosa = 2 * ' . $table_prefix . 'sosa.majs_sosa')
+					->where('sosa_fat.majs_gedcom_id', '=', $this->tree->id())
+					->where('sosa_fat.majs_user_id', '=', $this->user->id());
+			})
+			->leftJoin('maj_sosa AS sosa_mot', function (JoinClause $join) use ($table_prefix): void {
+				// Link to sosa's mother
+				$join->whereRaw($table_prefix . 'sosa_mot.majs_sosa = 2 * ' . $table_prefix . 'sosa.majs_sosa + 1')
+				->where('sosa_mot.majs_gedcom_id', '=', $this->tree->id())
+				->where('sosa_mot.majs_user_id', '=', $this->user->id());
+			})
+			->where('sosa.majs_gedcom_id', '=', $this->tree->id())
+			->where('sosa.majs_user_id', '=', $this->user->id())
+			->whereNull('sosa_fat.majs_sosa')   // We keep only root individuals, i.e. those with no father or mother
+			->whereNull('sosa_mot.majs_sosa')
+			->groupBy('sosa.majs_i_id')
+			->havingRaw('COUNT(' . $table_prefix . 'sosa.majs_sosa) > 1')    // Limit to the duplicate sosas.
+			->orderByRaw('COUNT(' . $table_prefix . 'sosa.majs_sosa) DESC, MIN(' . $table_prefix . 'sosa.majs_sosa) ASC')   //@phpcs:ignore Generic.Files.LineLength.TooLong
+			->limit($limit + 1)     // We want to select one more than required, for ties
+			->get();
+
+		if ($multiple_ancestors->count() > $limit) {
+			$last_count = $multiple_ancestors->last()->sosa_count;
+			$multiple_ancestors = $multiple_ancestors->reject(function ($element) use ($last_count): bool {
+				return $element->sosa_count ==  $last_count;
+			});
+		}
+		return $multiple_ancestors;
+	}
+
+	/**
+	 * Return a computed array of statistics about the dispersion of ancestors across the ancestors
+	 * at a specified generation.
+	 *
+	 * Format:
+	 *  - key : rank of the ancestor in generation G for which exclusive ancestors have been found
+	 *          For instance 3 represent the maternal grand father
+	 *          0 is used for shared ancestors
+	 *  - values: number of ancestors exclusively in the ancestors of the ancestor in key
+	 *
+	 *  For instance a result at generation 3 could be :
+	 *      array (   0     =>  12      -> 12 ancestors are shared by the grand-parents
+	 *                1     =>  32      -> 32 ancestors are exclusive to the paternal grand-father
+	 *                2     =>  25      -> 25 ancestors are exclusive to the paternal grand-mother
+	 *                3     =>  12      -> 12 ancestors are exclusive to the maternal grand-father
+	 *                4     =>  30      -> 30 ancestors are exclusive to the maternal grand-mother
+	 *            )
+	 *
+	 * @param int $gen
+	 * @return Collection
+	 */
+	public function ancestorsDispersionForGeneration(int $gen): Collection
+	{
+		$ancestors_branches = DB::table('maj_sosa')
+			->select('majs_i_id AS i_id')
+			->selectRaw('FLOOR(majs_sosa / POW(2, (majs_gen - ?))) - POW(2, ? -1) + 1 AS branch', [$gen, $gen])
+			->where('majs_gedcom_id', '=', $this->tree->id())
+			->where('majs_user_id', '=', $this->user->id())
+			->where('majs_gen', '>=', $gen)
+			->groupBy('majs_i_id', 'branch');
+
+
+		$consolidated_ancestors_branches = DB::table('maj_sosa')
+			->fromSub($ancestors_branches, 'indi_branch')
+			->select('i_id')
+			->selectRaw('CASE WHEN COUNT(branch) > 1 THEN 0 ELSE MIN(branch) END AS branches')
+			->groupBy('i_id');
+
+		return DB::table('maj_sosa')
+			->fromSub($consolidated_ancestors_branches, 'indi_branch_consolidated')
+			->select('branches')
+			->selectRaw('COUNT(i_id) AS count_indi')
+			->groupBy('branches')
+			->get()->pluck('count_indi', 'branches');
+	}
 }

src/Webtrees/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 User $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 User $user
-     */
-    public function __construct(SosaRecordsService $sosa_records_service, Tree $tree, User $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->getSosaNumbers($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 User $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 User $user
+	 */
+	public function __construct(SosaRecordsService $sosa_records_service, Tree $tree, User $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->getSosaNumbers($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();
+		}
+	}
 }

src/Webtrees/Module/Sosa/Http/RequestHandlers/SosaStatistics.php

Indentation +140 added lines, -140 removed lines

@@ -36,144 +36,144 @@
  */
 class SosaStatistics implements RequestHandlerInterface
 {
-    use ViewResponseTrait;
-
-    /**
-     * @var SosaModule $module
-     */
-    private $module;
-
-    /**
-     * Constructor for AncestorsList Request Handler
-     *
-     * @param ModuleService $module_service
-     */
-    public function __construct(ModuleService $module_service)
-    {
-        $this->module = $module_service->findByInterface(SosaModule::class)->first();
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        if ($this->module === null) {
-            throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
-        }
-
-        $tree = $request->getAttribute('tree');
-        assert($tree instanceof Tree);
-
-        $user = Auth::check() ? $request->getAttribute('user') : new DefaultUser();
-
-        /** @var SosaStatisticsService $sosa_stats_service */
-        $sosa_stats_service = app()->makeWith(SosaStatisticsService::class, ['tree' => $tree, 'user' => $user]);
-
-        return $this->viewResponse($this->module->name() . '::statistics-page', [
-            'module_name'       =>  $this->module->name(),
-            'title'             =>  I18N::translate('Sosa Statistics'),
-            'tree'              =>  $tree,
-            'theme'             =>  app(ModuleThemeInterface::class),
-            'root_indi'         =>  $sosa_stats_service->rootIndividual(),
-            'general_stats'     =>  $this->statisticsGeneral($sosa_stats_service),
-            'generation_stats'  =>  $this->statisticsByGenerations($sosa_stats_service),
-            'generation_depth'  =>  $sosa_stats_service->generationDepthStatsAtGeneration(1)->first(),
-            'multiple_sosas'    =>  $sosa_stats_service->topMultipleAncestorsWithNoTies(10)->groupBy('sosa_count'),
-            'sosa_dispersion_g2' =>  $sosa_stats_service->ancestorsDispersionForGeneration(2),
-            'sosa_dispersion_g3' =>  $sosa_stats_service->ancestorsDispersionForGeneration(3),
-            'gen_depth_g3'      =>  $sosa_stats_service->generationDepthStatsAtGeneration(3)
-        ]);
-    }
-
-    /**
-     * Retrieve and compute the global statistics of ancestors for the tree.
-     * Statistics include the number of ancestors, the number of different ancestors, pedigree collapse...
-     *
-     * @param SosaStatisticsService $sosa_stats_service
-     * @return array<string, int|float>
-     */
-    private function statisticsGeneral(SosaStatisticsService $sosa_stats_service): array
-    {
-        $ancestors_count = $sosa_stats_service->totalAncestors();
-        $ancestors_distinct_count = $sosa_stats_service->totalDistinctAncestors();
-        $individual_count = $sosa_stats_service->totalIndividuals();
-
-        return [
-            'sosa_count'    =>  $ancestors_count,
-            'distinct_count'    =>  $ancestors_distinct_count,
-            'sosa_rate' =>  $this->safeDivision(
-                BigInteger::of($ancestors_distinct_count),
-                BigInteger::of($individual_count)
-            ),
-            'mean_gen_time'         =>  $sosa_stats_service->meanGenerationTime()
-        ];
-    }
-
-    /**
-     * Retrieve and compute the statistics of ancestors by generations.
-     * Statistics include the number of ancestors, the number of different ancestors, cumulative statistics...
-     *
-     * @param SosaStatisticsService $sosa_stats_service
-     * @return array<int, array<string, int|float>>
-     */
-    private function statisticsByGenerations(SosaStatisticsService $sosa_stats_service): array
-    {
-        $stats_by_gen = $sosa_stats_service->statisticsByGenerations();
-
-        $generation_stats = array();
-
-        foreach ($stats_by_gen as $gen => $stats_gen) {
-            $gen_diff = $gen > 1 ?
-                (int) $stats_gen['diffSosaTotalCount'] - (int) $stats_by_gen[$gen - 1]['diffSosaTotalCount'] :
-                1;
-            $generation_stats[$gen] = array(
-                'gen_min_birth' => $stats_gen['firstBirth'] ?? (int) $stats_gen['firstEstimatedBirth'],
-                'gen_max_birth' => $stats_gen['lastBirth'] ?? (int) $stats_gen['lastEstimatedBirth'],
-                'theoretical' => BigInteger::of(2)->power($gen - 1)->toInt(),
-                'known' => (int) $stats_gen['sosaCount'],
-                'perc_known' => $this->safeDivision(
-                    BigInteger::of((int) $stats_gen['sosaCount']),
-                    BigInteger::of(2)->power($gen - 1)
-                ),
-                'missing' => $gen > 1 ?
-                    2 * (int) $stats_by_gen[$gen - 1]['sosaCount'] - (int) $stats_gen['sosaCount'] :
-                    0,
-                'perc_missing' => $gen > 1 ?
-                    1 - $this->safeDivision(
-                        BigInteger::of((int) $stats_gen['sosaCount']),
-                        BigInteger::of(2 * (int) $stats_by_gen[$gen - 1]['sosaCount'])
-                    ) :
-                    0,
-                'total_known' => (int) $stats_gen['sosaTotalCount'],
-                'perc_total_known' => $this->safeDivision(
-                    BigInteger::of((int) $stats_gen['sosaTotalCount']),
-                    BigInteger::of(2)->power($gen)->minus(1)
-                ),
-                'different' => $gen_diff,
-                'perc_different' => $this->safeDivision(
-                    BigInteger::of($gen_diff),
-                    BigInteger::of((int) $stats_gen['sosaCount'])
-                ),
-                'total_different' => (int) $stats_gen['diffSosaTotalCount']
-            );
-        }
-
-        return $generation_stats;
-    }
-
-    /**
-     * Return the result of a division, and a default value if denominator is 0
-     *
-     * @param BigInteger $p Numerator
-     * @param BigInteger $q Denominator
-     * @param int $scale Rounding scale
-     * @param float $default Value if denominator is 0
-     * @return float
-     */
-    private function safeDivision(BigInteger $p, BigInteger $q, int $scale = 10, float $default = 0): float
-    {
-        return $q->isZero() ? $default : $p->toBigDecimal()->dividedBy($q, $scale, RoundingMode::HALF_DOWN)->toFloat();
-    }
+	use ViewResponseTrait;
+
+	/**
+	 * @var SosaModule $module
+	 */
+	private $module;
+
+	/**
+	 * Constructor for AncestorsList Request Handler
+	 *
+	 * @param ModuleService $module_service
+	 */
+	public function __construct(ModuleService $module_service)
+	{
+		$this->module = $module_service->findByInterface(SosaModule::class)->first();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		if ($this->module === null) {
+			throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
+		}
+
+		$tree = $request->getAttribute('tree');
+		assert($tree instanceof Tree);
+
+		$user = Auth::check() ? $request->getAttribute('user') : new DefaultUser();
+
+		/** @var SosaStatisticsService $sosa_stats_service */
+		$sosa_stats_service = app()->makeWith(SosaStatisticsService::class, ['tree' => $tree, 'user' => $user]);
+
+		return $this->viewResponse($this->module->name() . '::statistics-page', [
+			'module_name'       =>  $this->module->name(),
+			'title'             =>  I18N::translate('Sosa Statistics'),
+			'tree'              =>  $tree,
+			'theme'             =>  app(ModuleThemeInterface::class),
+			'root_indi'         =>  $sosa_stats_service->rootIndividual(),
+			'general_stats'     =>  $this->statisticsGeneral($sosa_stats_service),
+			'generation_stats'  =>  $this->statisticsByGenerations($sosa_stats_service),
+			'generation_depth'  =>  $sosa_stats_service->generationDepthStatsAtGeneration(1)->first(),
+			'multiple_sosas'    =>  $sosa_stats_service->topMultipleAncestorsWithNoTies(10)->groupBy('sosa_count'),
+			'sosa_dispersion_g2' =>  $sosa_stats_service->ancestorsDispersionForGeneration(2),
+			'sosa_dispersion_g3' =>  $sosa_stats_service->ancestorsDispersionForGeneration(3),
+			'gen_depth_g3'      =>  $sosa_stats_service->generationDepthStatsAtGeneration(3)
+		]);
+	}
+
+	/**
+	 * Retrieve and compute the global statistics of ancestors for the tree.
+	 * Statistics include the number of ancestors, the number of different ancestors, pedigree collapse...
+	 *
+	 * @param SosaStatisticsService $sosa_stats_service
+	 * @return array<string, int|float>
+	 */
+	private function statisticsGeneral(SosaStatisticsService $sosa_stats_service): array
+	{
+		$ancestors_count = $sosa_stats_service->totalAncestors();
+		$ancestors_distinct_count = $sosa_stats_service->totalDistinctAncestors();
+		$individual_count = $sosa_stats_service->totalIndividuals();
+
+		return [
+			'sosa_count'    =>  $ancestors_count,
+			'distinct_count'    =>  $ancestors_distinct_count,
+			'sosa_rate' =>  $this->safeDivision(
+				BigInteger::of($ancestors_distinct_count),
+				BigInteger::of($individual_count)
+			),
+			'mean_gen_time'         =>  $sosa_stats_service->meanGenerationTime()
+		];
+	}
+
+	/**
+	 * Retrieve and compute the statistics of ancestors by generations.
+	 * Statistics include the number of ancestors, the number of different ancestors, cumulative statistics...
+	 *
+	 * @param SosaStatisticsService $sosa_stats_service
+	 * @return array<int, array<string, int|float>>
+	 */
+	private function statisticsByGenerations(SosaStatisticsService $sosa_stats_service): array
+	{
+		$stats_by_gen = $sosa_stats_service->statisticsByGenerations();
+
+		$generation_stats = array();
+
+		foreach ($stats_by_gen as $gen => $stats_gen) {
+			$gen_diff = $gen > 1 ?
+				(int) $stats_gen['diffSosaTotalCount'] - (int) $stats_by_gen[$gen - 1]['diffSosaTotalCount'] :
+				1;
+			$generation_stats[$gen] = array(
+				'gen_min_birth' => $stats_gen['firstBirth'] ?? (int) $stats_gen['firstEstimatedBirth'],
+				'gen_max_birth' => $stats_gen['lastBirth'] ?? (int) $stats_gen['lastEstimatedBirth'],
+				'theoretical' => BigInteger::of(2)->power($gen - 1)->toInt(),
+				'known' => (int) $stats_gen['sosaCount'],
+				'perc_known' => $this->safeDivision(
+					BigInteger::of((int) $stats_gen['sosaCount']),
+					BigInteger::of(2)->power($gen - 1)
+				),
+				'missing' => $gen > 1 ?
+					2 * (int) $stats_by_gen[$gen - 1]['sosaCount'] - (int) $stats_gen['sosaCount'] :
+					0,
+				'perc_missing' => $gen > 1 ?
+					1 - $this->safeDivision(
+						BigInteger::of((int) $stats_gen['sosaCount']),
+						BigInteger::of(2 * (int) $stats_by_gen[$gen - 1]['sosaCount'])
+					) :
+					0,
+				'total_known' => (int) $stats_gen['sosaTotalCount'],
+				'perc_total_known' => $this->safeDivision(
+					BigInteger::of((int) $stats_gen['sosaTotalCount']),
+					BigInteger::of(2)->power($gen)->minus(1)
+				),
+				'different' => $gen_diff,
+				'perc_different' => $this->safeDivision(
+					BigInteger::of($gen_diff),
+					BigInteger::of((int) $stats_gen['sosaCount'])
+				),
+				'total_different' => (int) $stats_gen['diffSosaTotalCount']
+			);
+		}
+
+		return $generation_stats;
+	}
+
+	/**
+	 * Return the result of a division, and a default value if denominator is 0
+	 *
+	 * @param BigInteger $p Numerator
+	 * @param BigInteger $q Denominator
+	 * @param int $scale Rounding scale
+	 * @param float $default Value if denominator is 0
+	 * @return float
+	 */
+	private function safeDivision(BigInteger $p, BigInteger $q, int $scale = 10, float $default = 0): float
+	{
+		return $q->isZero() ? $default : $p->toBigDecimal()->dividedBy($q, $scale, RoundingMode::HALF_DOWN)->toFloat();
+	}
 }

src/Webtrees/Module/Sosa/Http/RequestHandlers/PedigreeCollapseData.php

Indentation +40 added lines, -40 removed lines

@@ -33,51 +33,51 @@
  */
 class PedigreeCollapseData implements RequestHandlerInterface
 {
-    /**
-     * @var SosaModule $module
-     */
-    private $module;
+	/**
+	 * @var SosaModule $module
+	 */
+	private $module;
 
-    /**
-     * Constructor for PedigreeCollapseData Request Handler
-     *
-     * @param ModuleService $module_service
-     */
-    public function __construct(ModuleService $module_service)
-    {
-        $this->module = $module_service->findByInterface(SosaModule::class)->first();
-    }
+	/**
+	 * Constructor for PedigreeCollapseData Request Handler
+	 *
+	 * @param ModuleService $module_service
+	 */
+	public function __construct(ModuleService $module_service)
+	{
+		$this->module = $module_service->findByInterface(SosaModule::class)->first();
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        if ($this->module === null) {
-            throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
-        }
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		if ($this->module === null) {
+			throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
+		}
 
-        $tree = $request->getAttribute('tree');
-        assert($tree instanceof Tree);
+		$tree = $request->getAttribute('tree');
+		assert($tree instanceof Tree);
 
-        $user = Auth::check() ? $request->getAttribute('user') : new DefaultUser();
+		$user = Auth::check() ? $request->getAttribute('user') : new DefaultUser();
 
-        /** @var SosaStatisticsService $sosa_stats_service */
-        $sosa_stats_service = app()->makeWith(SosaStatisticsService::class, ['tree' => $tree, 'user' => $user]);
-        $pedi_collapse_data = $sosa_stats_service->pedigreeCollapseByGenerationData();
+		/** @var SosaStatisticsService $sosa_stats_service */
+		$sosa_stats_service = app()->makeWith(SosaStatisticsService::class, ['tree' => $tree, 'user' => $user]);
+		$pedi_collapse_data = $sosa_stats_service->pedigreeCollapseByGenerationData();
 
-        $response = [ 'cells' => [] ];
-        $last_pedi_collapse = 0;
-        foreach ($pedi_collapse_data as $gen => $rec) {
-            $response['cells'][$gen] = view($this->module->name() . '::components/pedigree-collapse-cell', [
-                'pedi_collapse_roots'   =>  $rec['pedi_collapse_roots'],
-                'pedi_collapse_xgen'    =>  $rec['pedi_collapse_xgen']
-            ]);
-            $last_pedi_collapse = $rec['pedi_collapse_roots'];
-        }
-        $response['pedi_collapse'] = I18N::percentage($last_pedi_collapse, 2);
+		$response = [ 'cells' => [] ];
+		$last_pedi_collapse = 0;
+		foreach ($pedi_collapse_data as $gen => $rec) {
+			$response['cells'][$gen] = view($this->module->name() . '::components/pedigree-collapse-cell', [
+				'pedi_collapse_roots'   =>  $rec['pedi_collapse_roots'],
+				'pedi_collapse_xgen'    =>  $rec['pedi_collapse_xgen']
+			]);
+			$last_pedi_collapse = $rec['pedi_collapse_roots'];
+		}
+		$response['pedi_collapse'] = I18N::percentage($last_pedi_collapse, 2);
 
-        return response($response, StatusCodeInterface::STATUS_OK);
-    }
+		return response($response, StatusCodeInterface::STATUS_OK);
+	}
 }

src/Webtrees/Module/Sosa/Http/RequestHandlers/SosaConfigAction.php

Indentation +42 added lines, -42 removed lines

@@ -30,52 +30,52 @@
  */
 class SosaConfigAction implements RequestHandlerInterface
 {
-    /**
-     * @var UserService $user_service
-     */
-    private $user_service;
+	/**
+	 * @var UserService $user_service
+	 */
+	private $user_service;
 
-    /**
-     * Constructor for SosaConfigAction Request Handler
-     *
-     * @param UserService $user_service
-     */
-    public function __construct(UserService $user_service)
-    {
-        $this->user_service = $user_service;
-    }
+	/**
+	 * Constructor for SosaConfigAction Request Handler
+	 *
+	 * @param UserService $user_service
+	 */
+	public function __construct(UserService $user_service)
+	{
+		$this->user_service = $user_service;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        $tree = $request->getAttribute('tree');
-        assert($tree instanceof Tree);
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		$tree = $request->getAttribute('tree');
+		assert($tree instanceof Tree);
 
-        $params = $request->getParsedBody();
-        assert(is_array($params));
+		$params = $request->getParsedBody();
+		assert(is_array($params));
 
-        $user_id = (int) $params['sosa-userid'];
-        $root_id = $params['sosa-rootid'] ?? '';
-        $max_gen = $params['sosa-maxgen'] ?? '';
+		$user_id = (int) $params['sosa-userid'];
+		$root_id = $params['sosa-rootid'] ?? '';
+		$max_gen = $params['sosa-maxgen'] ?? '';
 
-        if (Auth::id() == $user_id || ($user_id == -1 && Auth::isManager($tree))) {
-            $user = $user_id == -1 ? new DefaultUser() : $this->user_service->find($user_id);
-            if ($user !== null && ($root_indi = Registry::individualFactory()->make($root_id, $tree)) !== null) {
-                $tree->setUserPreference($user, 'MAJ_SOSA_ROOT_ID', $root_indi->xref());
-                $tree->setUserPreference($user, 'MAJ_SOSA_MAX_GEN', $max_gen);
-                FlashMessages::addMessage(I18N::translate('The root individual has been updated.'));
-                return redirect(route(SosaConfig::class, [
-                    'tree' => $tree->name(),
-                    'compute' => 'yes',
-                    'user_id' => $user_id
-                ]));
-            }
-        }
+		if (Auth::id() == $user_id || ($user_id == -1 && Auth::isManager($tree))) {
+			$user = $user_id == -1 ? new DefaultUser() : $this->user_service->find($user_id);
+			if ($user !== null && ($root_indi = Registry::individualFactory()->make($root_id, $tree)) !== null) {
+				$tree->setUserPreference($user, 'MAJ_SOSA_ROOT_ID', $root_indi->xref());
+				$tree->setUserPreference($user, 'MAJ_SOSA_MAX_GEN', $max_gen);
+				FlashMessages::addMessage(I18N::translate('The root individual has been updated.'));
+				return redirect(route(SosaConfig::class, [
+					'tree' => $tree->name(),
+					'compute' => 'yes',
+					'user_id' => $user_id
+				]));
+			}
+		}
 
-        FlashMessages::addMessage(I18N::translate('The root individual could not be updated.'), 'danger');
-        return redirect(route(SosaConfig::class, ['tree' => $tree->name()]));
-    }
+		FlashMessages::addMessage(I18N::translate('The root individual could not be updated.'), 'danger');
+		return redirect(route(SosaConfig::class, ['tree' => $tree->name()]));
+	}
 }

src/Webtrees/Module/Sosa/Http/RequestHandlers/SosaConfig.php

Indentation +60 added lines, -60 removed lines

@@ -32,72 +32,72 @@
  */
 class SosaConfig implements RequestHandlerInterface
 {
-    use ViewResponseTrait;
+	use ViewResponseTrait;
 
-    /**
-     * @var SosaModule $module
-     */
-    private $module;
+	/**
+	 * @var SosaModule $module
+	 */
+	private $module;
 
-    /**
-     * Constructor for SosaConfig Request Handler
-     *
-     * @param ModuleService $module_service
-     */
-    public function __construct(ModuleService $module_service)
-    {
-        $this->module = $module_service->findByInterface(SosaModule::class)->first();
-    }
+	/**
+	 * Constructor for SosaConfig Request Handler
+	 *
+	 * @param ModuleService $module_service
+	 */
+	public function __construct(ModuleService $module_service)
+	{
+		$this->module = $module_service->findByInterface(SosaModule::class)->first();
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        if ($this->module === null) {
-            throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
-        }
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		if ($this->module === null) {
+			throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
+		}
 
-        $tree = $request->getAttribute('tree');
-        assert($tree instanceof Tree);
+		$tree = $request->getAttribute('tree');
+		assert($tree instanceof Tree);
 
-        $users_root = array();
-        if (Auth::check()) {
-            /** @var \Fisharebest\Webtrees\User $user */
-            $user = Auth::user();
-            $users_root[] = [
-                'user'      => $user,
-                'root_id'   => $tree->getUserPreference($user, 'MAJ_SOSA_ROOT_ID'),
-                'max_gen'   => $tree->getUserPreference($user, 'MAJ_SOSA_MAX_GEN')
-            ];
+		$users_root = array();
+		if (Auth::check()) {
+			/** @var \Fisharebest\Webtrees\User $user */
+			$user = Auth::user();
+			$users_root[] = [
+				'user'      => $user,
+				'root_id'   => $tree->getUserPreference($user, 'MAJ_SOSA_ROOT_ID'),
+				'max_gen'   => $tree->getUserPreference($user, 'MAJ_SOSA_MAX_GEN')
+			];
 
-            if (Auth::isManager($tree)) {
-                $default_user = new DefaultUser();
-                $users_root[] = [
-                    'user' => $default_user,
-                    'root_id' => $tree->getUserPreference($default_user, 'MAJ_SOSA_ROOT_ID'),
-                    'max_gen'   => $tree->getUserPreference($default_user, 'MAJ_SOSA_MAX_GEN')
-                ];
-            }
-        }
+			if (Auth::isManager($tree)) {
+				$default_user = new DefaultUser();
+				$users_root[] = [
+					'user' => $default_user,
+					'root_id' => $tree->getUserPreference($default_user, 'MAJ_SOSA_ROOT_ID'),
+					'max_gen'   => $tree->getUserPreference($default_user, 'MAJ_SOSA_MAX_GEN')
+				];
+			}
+		}
 
-        // Use the system max generations if not set
-        $max_gen_system = app(SosaRecordsService::class)->maxSystemGenerations();
-        foreach ($users_root as $key => $user_root) {
-            $users_root[$key]['max_gen'] = is_numeric($user_root['max_gen']) ?
-                (int) $user_root['max_gen'] :
-                $max_gen_system;
-        };
+		// Use the system max generations if not set
+		$max_gen_system = app(SosaRecordsService::class)->maxSystemGenerations();
+		foreach ($users_root as $key => $user_root) {
+			$users_root[$key]['max_gen'] = is_numeric($user_root['max_gen']) ?
+				(int) $user_root['max_gen'] :
+				$max_gen_system;
+		};
 
-        return $this->viewResponse($this->module->name() . '::config-page', [
-            'module_name'       =>  $this->module->name(),
-            'title'             =>  I18N::translate('Sosa Configuration'),
-            'tree'              =>  $tree,
-            'user_id'           =>  $request->getAttribute('user'),
-            'selected_user_id'  =>  (int) ($request->getQueryParams()['user_id'] ?? 0),
-            'immediate_compute' =>  ($request->getQueryParams()['compute'] ?? '') == 'yes',
-            'users_root'        =>  $users_root
-        ]);
-    }
+		return $this->viewResponse($this->module->name() . '::config-page', [
+			'module_name'       =>  $this->module->name(),
+			'title'             =>  I18N::translate('Sosa Configuration'),
+			'tree'              =>  $tree,
+			'user_id'           =>  $request->getAttribute('user'),
+			'selected_user_id'  =>  (int) ($request->getQueryParams()['user_id'] ?? 0),
+			'immediate_compute' =>  ($request->getQueryParams()['compute'] ?? '') == 'yes',
+			'users_root'        =>  $users_root
+		]);
+	}
 }

src/Webtrees/Module/Sosa/SosaModule.php

Indentation +165 added lines, -165 removed lines

@@ -47,174 +47,174 @@
  */
 class SosaModule extends AbstractModule implements ModuleMyArtJaubInterface, ModuleGlobalInterface, ModuleMenuInterface
 {
-    use ModuleMyArtJaubTrait {
-        boot as traitBoot;
-    }
-    use ModuleGlobalTrait;
-    use ModuleMenuTrait;
+	use ModuleMyArtJaubTrait {
+		boot as traitBoot;
+	}
+	use ModuleGlobalTrait;
+	use ModuleMenuTrait;
 
 // How to update the database schema for this module
 
 
-    private const SCHEMA_TARGET_VERSION   = 3;
-    private const SCHEMA_SETTING_NAME     = 'MAJ_SOSA_SCHEMA_VERSION';
-    private const SCHEMA_MIGRATION_PREFIX = __NAMESPACE__ . '\Schema';
+	private const SCHEMA_TARGET_VERSION   = 3;
+	private const SCHEMA_SETTING_NAME     = 'MAJ_SOSA_SCHEMA_VERSION';
+	private const SCHEMA_MIGRATION_PREFIX = __NAMESPACE__ . '\Schema';
 /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\AbstractModule::title()
-     */
-    public function title(): string
-    {
-        return /* I18N: Name of the “Sosa” module */ I18N::translate('Sosa');
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\AbstractModule::description()
-     */
-    public function description(): string
-    {
-        //phpcs:ignore Generic.Files.LineLength.TooLong
-        return /* I18N: Description of the “Sosa” module */ I18N::translate('Calculate and display Sosa ancestors of the root person.');
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\AbstractModule::boot()
-     */
-    public function boot(): void
-    {
-        $this->traitBoot();
-        app(MigrationService::class)->updateSchema(
-            self::SCHEMA_MIGRATION_PREFIX,
-            self::SCHEMA_SETTING_NAME,
-            self::SCHEMA_TARGET_VERSION
-        );
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\ModuleMyArtJaubInterface::loadRoutes()
-     */
-    public function loadRoutes(Map $router): void
-    {
-        $router->attach('', '', static function (Map $router): void {
-
-            $router->attach('', '/module-maj/sosa', static function (Map $router): void {
-
-                $router->attach('', '/list', static function (Map $router): void {
-
-                    $router->get(AncestorsList::class, '/ancestors/{tree}{/gen}', AncestorsList::class);
-                    $router->get(AncestorsListIndividual::class, '/ancestors/{tree}/{gen}/tab/individuals', AncestorsListIndividual::class);    //phpcs:ignore Generic.Files.LineLength.TooLong
-                    $router->get(AncestorsListFamily::class, '/ancestors/{tree}/{gen}/tab/families', AncestorsListFamily::class);   //phpcs:ignore Generic.Files.LineLength.TooLong
-                    $router->get(MissingAncestorsList::class, '/missing/{tree}{/gen}', MissingAncestorsList::class);
-                });
-
-                $router->attach('', '/statistics/{tree}', static function (Map $router): void {
-
-                    $router->get(SosaStatistics::class, '', SosaStatistics::class);
-                    $router->get(PedigreeCollapseData::class, '/pedigreecollapse', PedigreeCollapseData::class);
-                });
-
-                $router->attach('', '/config/{tree}', static function (Map $router): void {
-
-                    $router->get(SosaConfig::class, '', SosaConfig::class);
-                    $router->post(SosaConfigAction::class, '', SosaConfigAction::class);
-                    $router->get(SosaComputeModal::class, '/compute/{xref}', SosaComputeModal::class);
-                    $router->post(SosaComputeAction::class, '/compute', SosaComputeAction::class);
-                });
-            });
-        });
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleCustomInterface::customModuleVersion()
-     */
-    public function customModuleVersion(): string
-    {
-        return '2.0.11-v.1';
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleMenuInterface::defaultMenuOrder()
-     */
-    public function defaultMenuOrder(): int
-    {
-        return 7;
-    }
-
-    /**
-     * {@inhericDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleMenuInterface::getMenu()
-     */
-    public function getMenu(Tree $tree): ?Menu
-    {
-        $menu = new Menu(I18N::translate('Sosa Statistics'));
-        $menu->setClass('menu-maj-sosa');
-        $menu->setSubmenus([
-            new Menu(
-                I18N::translate('Sosa Ancestors'),
-                route(AncestorsList::class, ['tree' => $tree->name()]),
-                'menu-maj-sosa-list',
-                ['rel' => 'nofollow']
-            ),
-            new Menu(
-                I18N::translate('Missing Ancestors'),
-                route(MissingAncestorsList::class, ['tree' => $tree->name()]),
-                'menu-maj-sosa-missing',
-                ['rel' => 'nofollow']
-            ),
-            new Menu(
-                I18N::translate('Sosa Statistics'),
-                route(SosaStatistics::class, ['tree' => $tree->name()]),
-                'menu-maj-sosa-stats'
-            )
-        ]);
-
-        if (Auth::check()) {
-            $menu->addSubmenu(new Menu(
-                I18N::translate('Sosa Configuration'),
-                route(SosaConfig::class, ['tree' => $tree->name()]),
-                'menu-maj-sosa-config'
-            ));
-
-            /** @var ServerRequestInterface $request */
-            $request = app(ServerRequestInterface::class);
-            $route = $request->getAttribute('route');
-            assert($route instanceof Route);
-
-            $root_indi_id = $tree->getUserPreference(Auth::user(), 'MAJ_SOSA_ROOT_ID');
-
-            if ($route->name === IndividualPage::class && mb_strlen($root_indi_id) > 0) {
-                $xref = $request->getAttribute('xref');
-                assert(is_string($xref));
-
-                $menu->addSubmenu(new Menu(
-                    I18N::translate('Complete Sosas'),
-                    '#',
-                    'menu-maj-sosa-compute',
-                    [
-                        'rel'           => 'nofollow',
-                        'data-href'     => route(SosaComputeModal::class, ['tree' => $tree->name(), 'xref' => $xref]),
-                        'data-target'   => '#wt-ajax-modal',
-                        'data-toggle'   => 'modal',
-                        'data-backdrop' => 'static'
-                    ]
-                ));
-            }
-        }
-
-        return $menu;
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleGlobalInterface::headContent()
-     */
-    public function headContent(): string
-    {
-        return '<link rel="stylesheet" href="' . e($this->moduleCssUrl()) . '">';
-    }
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\AbstractModule::title()
+	 */
+	public function title(): string
+	{
+		return /* I18N: Name of the “Sosa” module */ I18N::translate('Sosa');
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\AbstractModule::description()
+	 */
+	public function description(): string
+	{
+		//phpcs:ignore Generic.Files.LineLength.TooLong
+		return /* I18N: Description of the “Sosa” module */ I18N::translate('Calculate and display Sosa ancestors of the root person.');
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\AbstractModule::boot()
+	 */
+	public function boot(): void
+	{
+		$this->traitBoot();
+		app(MigrationService::class)->updateSchema(
+			self::SCHEMA_MIGRATION_PREFIX,
+			self::SCHEMA_SETTING_NAME,
+			self::SCHEMA_TARGET_VERSION
+		);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Module\ModuleMyArtJaubInterface::loadRoutes()
+	 */
+	public function loadRoutes(Map $router): void
+	{
+		$router->attach('', '', static function (Map $router): void {
+
+			$router->attach('', '/module-maj/sosa', static function (Map $router): void {
+
+				$router->attach('', '/list', static function (Map $router): void {
+
+					$router->get(AncestorsList::class, '/ancestors/{tree}{/gen}', AncestorsList::class);
+					$router->get(AncestorsListIndividual::class, '/ancestors/{tree}/{gen}/tab/individuals', AncestorsListIndividual::class);    //phpcs:ignore Generic.Files.LineLength.TooLong
+					$router->get(AncestorsListFamily::class, '/ancestors/{tree}/{gen}/tab/families', AncestorsListFamily::class);   //phpcs:ignore Generic.Files.LineLength.TooLong
+					$router->get(MissingAncestorsList::class, '/missing/{tree}{/gen}', MissingAncestorsList::class);
+				});
+
+				$router->attach('', '/statistics/{tree}', static function (Map $router): void {
+
+					$router->get(SosaStatistics::class, '', SosaStatistics::class);
+					$router->get(PedigreeCollapseData::class, '/pedigreecollapse', PedigreeCollapseData::class);
+				});
+
+				$router->attach('', '/config/{tree}', static function (Map $router): void {
+
+					$router->get(SosaConfig::class, '', SosaConfig::class);
+					$router->post(SosaConfigAction::class, '', SosaConfigAction::class);
+					$router->get(SosaComputeModal::class, '/compute/{xref}', SosaComputeModal::class);
+					$router->post(SosaComputeAction::class, '/compute', SosaComputeAction::class);
+				});
+			});
+		});
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleCustomInterface::customModuleVersion()
+	 */
+	public function customModuleVersion(): string
+	{
+		return '2.0.11-v.1';
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleMenuInterface::defaultMenuOrder()
+	 */
+	public function defaultMenuOrder(): int
+	{
+		return 7;
+	}
+
+	/**
+	 * {@inhericDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleMenuInterface::getMenu()
+	 */
+	public function getMenu(Tree $tree): ?Menu
+	{
+		$menu = new Menu(I18N::translate('Sosa Statistics'));
+		$menu->setClass('menu-maj-sosa');
+		$menu->setSubmenus([
+			new Menu(
+				I18N::translate('Sosa Ancestors'),
+				route(AncestorsList::class, ['tree' => $tree->name()]),
+				'menu-maj-sosa-list',
+				['rel' => 'nofollow']
+			),
+			new Menu(
+				I18N::translate('Missing Ancestors'),
+				route(MissingAncestorsList::class, ['tree' => $tree->name()]),
+				'menu-maj-sosa-missing',
+				['rel' => 'nofollow']
+			),
+			new Menu(
+				I18N::translate('Sosa Statistics'),
+				route(SosaStatistics::class, ['tree' => $tree->name()]),
+				'menu-maj-sosa-stats'
+			)
+		]);
+
+		if (Auth::check()) {
+			$menu->addSubmenu(new Menu(
+				I18N::translate('Sosa Configuration'),
+				route(SosaConfig::class, ['tree' => $tree->name()]),
+				'menu-maj-sosa-config'
+			));
+
+			/** @var ServerRequestInterface $request */
+			$request = app(ServerRequestInterface::class);
+			$route = $request->getAttribute('route');
+			assert($route instanceof Route);
+
+			$root_indi_id = $tree->getUserPreference(Auth::user(), 'MAJ_SOSA_ROOT_ID');
+
+			if ($route->name === IndividualPage::class && mb_strlen($root_indi_id) > 0) {
+				$xref = $request->getAttribute('xref');
+				assert(is_string($xref));
+
+				$menu->addSubmenu(new Menu(
+					I18N::translate('Complete Sosas'),
+					'#',
+					'menu-maj-sosa-compute',
+					[
+						'rel'           => 'nofollow',
+						'data-href'     => route(SosaComputeModal::class, ['tree' => $tree->name(), 'xref' => $xref]),
+						'data-target'   => '#wt-ajax-modal',
+						'data-toggle'   => 'modal',
+						'data-backdrop' => 'static'
+					]
+				));
+			}
+		}
+
+		return $menu;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleGlobalInterface::headContent()
+	 */
+	public function headContent(): string
+	{
+		return '<link rel="stylesheet" href="' . e($this->moduleCssUrl()) . '">';
+	}
 }

src/Webtrees/Module/WelcomeBlock/WelcomeBlockModule.php

Indentation +154 added lines, -154 removed lines

@@ -32,158 +32,158 @@
  */
 class WelcomeBlockModule extends AbstractModule implements ModuleMyArtJaubInterface, ModuleBlockInterface
 {
-    use ModuleMyArtJaubTrait;
-    use ModuleBlockTrait;
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\AbstractModule::title()
-     */
-    public function title(): string
-    {
-        return /* I18N: Name of the “WelcomeBlock” module */ I18N::translate('MyArtJaub Welcome Block');
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\AbstractModule::description()
-     */
-    public function description(): string
-    {
-        //phpcs:ignore Generic.Files.LineLength.TooLong
-        return /* I18N: Description of the “WelcomeBlock” module */ I18N::translate('The MyArtJaub Welcome block welcomes the visitor to the site, allows a quick login to the site, and displays statistics on visits.');
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\ModuleMyArtJaubInterface::loadRoutes()
-     */
-    public function loadRoutes(Map $router): void
-    {
-        $router->attach('', '', static function (Map $router): void {
-
-            $router->attach('', '/module-maj/welcomeblock/{block_id}', static function (Map $router): void {
-
-                $router->get(MatomoStats::class, '/matomostats', MatomoStats::class);
-            });
-        });
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleCustomInterface::customModuleVersion()
-     */
-    public function customModuleVersion(): string
-    {
-        return '2.0.11-v.1';
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::getBlock()
-     */
-    public function getBlock(Tree $tree, int $block_id, string $context, array $config = []): string
-    {
-        $fab_welcome_block_view = app(\Fisharebest\Webtrees\Module\WelcomeBlockModule::class)
-            ->getBlock($tree, $block_id, ModuleBlockInterface::CONTEXT_EMBED);
-
-        $fab_login_block_view = app(\Fisharebest\Webtrees\Module\LoginBlockModule::class)
-            ->getBlock($tree, $block_id, ModuleBlockInterface::CONTEXT_EMBED);
-
-        $content = view($this->name() . '::block-embed', [
-            'block_id'                  =>  $block_id,
-            'fab_welcome_block_view'    =>  $fab_welcome_block_view,
-            'fab_login_block_view'      =>  $fab_login_block_view,
-            'matomo_enabled'            =>  $this->isMatomoEnabled($block_id)
-        ]);
-
-        if ($context !== self::CONTEXT_EMBED) {
-            return view('modules/block-template', [
-                'block'      => Str::kebab($this->name()),
-                'id'         => $block_id,
-                'config_url' => $this->configUrl($tree, $context, $block_id),
-                'title'      => $tree->title(),
-                'content'    => $content,
-            ]);
-        }
-
-        return $content;
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::isTreeBlock()
-     */
-    public function isTreeBlock(): bool
-    {
-        return true;
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::editBlockConfiguration()
-     */
-    public function editBlockConfiguration(Tree $tree, int $block_id): string
-    {
-        return view($this->name() . '::config', $this->matomoSettings($block_id));
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::saveBlockConfiguration()
-     */
-    public function saveBlockConfiguration(ServerRequestInterface $request, int $block_id): void
-    {
-        $params = (array) $request->getParsedBody();
-
-        $matomo_enabled = $params['matomo_enabled'] == 'yes';
-        $this->setBlockSetting($block_id, 'matomo_enabled', $matomo_enabled ? 'yes' : 'no');
-        if (!$matomo_enabled) {
-            return;
-        }
-
-        if (filter_var($params['matomo_url'], FILTER_VALIDATE_URL) === false) {
-            FlashMessages::addMessage(I18N::translate('The Matomo URL provided is not valid.'), 'danger');
-            return;
-        }
-
-        if (filter_var($params['matomo_siteid'], FILTER_VALIDATE_INT) === false) {
-            FlashMessages::addMessage(I18N::translate('The Matomo Site ID provided is not valid.'), 'danger');
-            return;
-        }
-
-        $this
-            ->setBlockSetting($block_id, 'matomo_url', trim($params['matomo_url']))
-            ->setBlockSetting($block_id, 'matomo_token', trim($params['matomo_token']))
-            ->setBlockSetting($block_id, 'matomo_siteid', $params['matomo_siteid']);
-
-        app('cache.files')->forget($this->name() . '-matomovisits-yearly-' . $block_id);
-    }
-
-    /**
-     * Returns whether Matomo statistics is enabled for a specific MyArtJaub WelcomeBlock block
-     *
-     * @param int $block_id
-     * @return bool
-     */
-    public function isMatomoEnabled(int $block_id): bool
-    {
-        return $this->getBlockSetting($block_id, 'matomo_enabled', 'no') === 'yes';
-    }
-
-    /**
-     * Returns settings for retrieving Matomo statistics for a specific MyArtJaub WelcomeBlock block
-     *
-     * @param int $block_id
-     * @return array<string, mixed>
-     */
-    public function matomoSettings(int $block_id): array
-    {
-        return [
-            'matomo_enabled' => $this->isMatomoEnabled($block_id),
-            'matomo_url' => $this->getBlockSetting($block_id, 'matomo_url'),
-            'matomo_token' => $this->getBlockSetting($block_id, 'matomo_token'),
-            'matomo_siteid'  => (int) $this->getBlockSetting($block_id, 'matomo_siteid', '0')
-        ];
-    }
+	use ModuleMyArtJaubTrait;
+	use ModuleBlockTrait;
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\AbstractModule::title()
+	 */
+	public function title(): string
+	{
+		return /* I18N: Name of the “WelcomeBlock” module */ I18N::translate('MyArtJaub Welcome Block');
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\AbstractModule::description()
+	 */
+	public function description(): string
+	{
+		//phpcs:ignore Generic.Files.LineLength.TooLong
+		return /* I18N: Description of the “WelcomeBlock” module */ I18N::translate('The MyArtJaub Welcome block welcomes the visitor to the site, allows a quick login to the site, and displays statistics on visits.');
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Module\ModuleMyArtJaubInterface::loadRoutes()
+	 */
+	public function loadRoutes(Map $router): void
+	{
+		$router->attach('', '', static function (Map $router): void {
+
+			$router->attach('', '/module-maj/welcomeblock/{block_id}', static function (Map $router): void {
+
+				$router->get(MatomoStats::class, '/matomostats', MatomoStats::class);
+			});
+		});
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleCustomInterface::customModuleVersion()
+	 */
+	public function customModuleVersion(): string
+	{
+		return '2.0.11-v.1';
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::getBlock()
+	 */
+	public function getBlock(Tree $tree, int $block_id, string $context, array $config = []): string
+	{
+		$fab_welcome_block_view = app(\Fisharebest\Webtrees\Module\WelcomeBlockModule::class)
+			->getBlock($tree, $block_id, ModuleBlockInterface::CONTEXT_EMBED);
+
+		$fab_login_block_view = app(\Fisharebest\Webtrees\Module\LoginBlockModule::class)
+			->getBlock($tree, $block_id, ModuleBlockInterface::CONTEXT_EMBED);
+
+		$content = view($this->name() . '::block-embed', [
+			'block_id'                  =>  $block_id,
+			'fab_welcome_block_view'    =>  $fab_welcome_block_view,
+			'fab_login_block_view'      =>  $fab_login_block_view,
+			'matomo_enabled'            =>  $this->isMatomoEnabled($block_id)
+		]);
+
+		if ($context !== self::CONTEXT_EMBED) {
+			return view('modules/block-template', [
+				'block'      => Str::kebab($this->name()),
+				'id'         => $block_id,
+				'config_url' => $this->configUrl($tree, $context, $block_id),
+				'title'      => $tree->title(),
+				'content'    => $content,
+			]);
+		}
+
+		return $content;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::isTreeBlock()
+	 */
+	public function isTreeBlock(): bool
+	{
+		return true;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::editBlockConfiguration()
+	 */
+	public function editBlockConfiguration(Tree $tree, int $block_id): string
+	{
+		return view($this->name() . '::config', $this->matomoSettings($block_id));
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::saveBlockConfiguration()
+	 */
+	public function saveBlockConfiguration(ServerRequestInterface $request, int $block_id): void
+	{
+		$params = (array) $request->getParsedBody();
+
+		$matomo_enabled = $params['matomo_enabled'] == 'yes';
+		$this->setBlockSetting($block_id, 'matomo_enabled', $matomo_enabled ? 'yes' : 'no');
+		if (!$matomo_enabled) {
+			return;
+		}
+
+		if (filter_var($params['matomo_url'], FILTER_VALIDATE_URL) === false) {
+			FlashMessages::addMessage(I18N::translate('The Matomo URL provided is not valid.'), 'danger');
+			return;
+		}
+
+		if (filter_var($params['matomo_siteid'], FILTER_VALIDATE_INT) === false) {
+			FlashMessages::addMessage(I18N::translate('The Matomo Site ID provided is not valid.'), 'danger');
+			return;
+		}
+
+		$this
+			->setBlockSetting($block_id, 'matomo_url', trim($params['matomo_url']))
+			->setBlockSetting($block_id, 'matomo_token', trim($params['matomo_token']))
+			->setBlockSetting($block_id, 'matomo_siteid', $params['matomo_siteid']);
+
+		app('cache.files')->forget($this->name() . '-matomovisits-yearly-' . $block_id);
+	}
+
+	/**
+	 * Returns whether Matomo statistics is enabled for a specific MyArtJaub WelcomeBlock block
+	 *
+	 * @param int $block_id
+	 * @return bool
+	 */
+	public function isMatomoEnabled(int $block_id): bool
+	{
+		return $this->getBlockSetting($block_id, 'matomo_enabled', 'no') === 'yes';
+	}
+
+	/**
+	 * Returns settings for retrieving Matomo statistics for a specific MyArtJaub WelcomeBlock block
+	 *
+	 * @param int $block_id
+	 * @return array<string, mixed>
+	 */
+	public function matomoSettings(int $block_id): array
+	{
+		return [
+			'matomo_enabled' => $this->isMatomoEnabled($block_id),
+			'matomo_url' => $this->getBlockSetting($block_id, 'matomo_url'),
+			'matomo_token' => $this->getBlockSetting($block_id, 'matomo_token'),
+			'matomo_siteid'  => (int) $this->getBlockSetting($block_id, 'matomo_siteid', '0')
+		];
+	}
 }