jon48 / webtrees-lib

app/Common/GeoDispersion/GeoAnalysis/GeoAnalysisResultItem.php

Indentation +57 added lines, -57 removed lines

@@ -20,67 +20,67 @@
  */
 class GeoAnalysisResultItem
 {
-    private GeoAnalysisPlace $place;
-    private int $count;
+	private GeoAnalysisPlace $place;
+	private int $count;
 
-    /**
-     * Constructor for GeoAnalysisResultItem
-     *
-     * @param GeoAnalysisPlace $place
-     * @param int $count
-     */
-    public function __construct(GeoAnalysisPlace $place, int $count = 0)
-    {
-        $this->place = $place;
-        $this->count = $count;
-    }
+	/**
+	 * Constructor for GeoAnalysisResultItem
+	 *
+	 * @param GeoAnalysisPlace $place
+	 * @param int $count
+	 */
+	public function __construct(GeoAnalysisPlace $place, int $count = 0)
+	{
+		$this->place = $place;
+		$this->count = $count;
+	}
 
-    /**
-     * Get the item key.
-     *
-     * @return string
-     */
-    public function key(): string
-    {
-        return $this->place->key();
-    }
+	/**
+	 * Get the item key.
+	 *
+	 * @return string
+	 */
+	public function key(): string
+	{
+		return $this->place->key();
+	}
 
-    /**
-     * Get the referenced GeoAnalysis Place
-     *
-     * @return GeoAnalysisPlace
-     */
-    public function place(): GeoAnalysisPlace
-    {
-        return $this->place;
-    }
+	/**
+	 * Get the referenced GeoAnalysis Place
+	 *
+	 * @return GeoAnalysisPlace
+	 */
+	public function place(): GeoAnalysisPlace
+	{
+		return $this->place;
+	}
 
-    /**
-     * Get the count of occurrences of the GeoAnalysis Place in the analysis
-     *
-     * @return int
-     */
-    public function count(): int
-    {
-        return $this->count;
-    }
+	/**
+	 * Get the count of occurrences of the GeoAnalysis Place in the analysis
+	 *
+	 * @return int
+	 */
+	public function count(): int
+	{
+		return $this->count;
+	}
 
-    /**
-     * Increment the count of occurrences of the GeoAnalysis Place in the analysis
-     *
-     * @return $this
-     */
-    public function increment(): self
-    {
-        $this->count++;
-        return $this;
-    }
+	/**
+	 * Increment the count of occurrences of the GeoAnalysis Place in the analysis
+	 *
+	 * @return $this
+	 */
+	public function increment(): self
+	{
+		$this->count++;
+		return $this;
+	}
 
-    /**
-     * Clone the item object
-     */
-    public function __clone()
-    {
-        $this->place = clone $this->place;
-    }
+	/**
+	 * Clone the item object
+	 */
+	public function __clone()
+	{
+		$this->place = clone $this->place;
+	}
 }

app/Http/Middleware/AuthTreePreference.php

Indentation +31 added lines, -31 removed lines

@@ -31,40 +31,40 @@
  */
 class AuthTreePreference implements MiddlewareInterface
 {
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\MiddlewareInterface::process()
-     */
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
-    {
-        $tree = Validator::attributes($request)->tree();
-        $route = Validator::attributes($request)->route();
-        $user = Validator::attributes($request)->user();
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\MiddlewareInterface::process()
+	 */
+	public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
+	{
+		$tree = Validator::attributes($request)->tree();
+		$route = Validator::attributes($request)->route();
+		$user = Validator::attributes($request)->user();
 
-        $permission_preference = $route->extras['permission_preference'] ?? '';
-        $permission_level = $permission_preference === '' ? '' : $tree->getPreference($permission_preference);
+		$permission_preference = $route->extras['permission_preference'] ?? '';
+		$permission_level = $permission_preference === '' ? '' : $tree->getPreference($permission_preference);
 
-        // Permissions are configured
-        if (is_numeric($permission_level)) {
-            // Logged in with the correct role?
-            if (Auth::accessLevel($tree, $user) <= (int) $permission_level) {
-                    return $handler->handle($request);
-            }
+		// Permissions are configured
+		if (is_numeric($permission_level)) {
+			// Logged in with the correct role?
+			if (Auth::accessLevel($tree, $user) <= (int) $permission_level) {
+					return $handler->handle($request);
+			}
 
-            // Logged in, but without the correct role?
-            if ($user instanceof User) {
-                throw new HttpAccessDeniedException();
-            }
-        }
+			// Logged in, but without the correct role?
+			if ($user instanceof User) {
+				throw new HttpAccessDeniedException();
+			}
+		}
 
-        // Permissions no configured, or not logged in
-        if ($request->getMethod() === RequestMethodInterface::METHOD_POST) {
-            throw new HttpAccessDeniedException();
-        }
+		// Permissions no configured, or not logged in
+		if ($request->getMethod() === RequestMethodInterface::METHOD_POST) {
+			throw new HttpAccessDeniedException();
+		}
 
-        return Registry::responseFactory()->redirect(
-            LoginPage::class,
-            ['tree' => $tree->name(), 'url' => (string) $request->getUri()]
-        );
-    }
+		return Registry::responseFactory()->redirect(
+			LoginPage::class,
+			['tree' => $tree->name(), 'url' => (string) $request->getUri()]
+		);
+	}
 }

app/Common/Tasks/TaskSchedule.php

Indentation +229 added lines, -229 removed lines

@@ -23,252 +23,252 @@
  */
 class TaskSchedule
 {
-    private int $id;
-    private bool $enabled;
-    private string $task_id;
-    private CarbonInterface $last_run;
-    private bool $last_result;
-    private int $frequency;
-    private int $nb_occurrences;
-    private bool $is_running;
+	private int $id;
+	private bool $enabled;
+	private string $task_id;
+	private CarbonInterface $last_run;
+	private bool $last_result;
+	private int $frequency;
+	private int $nb_occurrences;
+	private bool $is_running;
 
-    /**
-     * Constructor for TaskSchedule
-     *
-     * @param int $id Schedule ID
-     * @param string $task_id Task ID
-     * @param bool $enabled Is the schedule enabled
-     * @param CarbonInterface $last_run Last successful run date/time
-     * @param bool $last_result Result of the last run
-     * @param int $frequency Schedule frequency in minutes
-     * @param int $nb_occurrences Number of remaining occurrences to be run
-     * @param bool $is_running Is the task currently running
-     */
-    public function __construct(
-        int $id,
-        string $task_id,
-        bool $enabled,
-        CarbonInterface $last_run,
-        bool $last_result,
-        int $frequency,
-        int $nb_occurrences,
-        bool $is_running
-    ) {
-        $this->id = $id;
-        $this->task_id = $task_id;
-        $this->enabled = $enabled;
-        $this->last_run = $last_run;
-        $this->last_result = $last_result;
-        $this->frequency = $frequency;
-        $this->nb_occurrences = $nb_occurrences;
-        $this->is_running = $is_running;
-    }
+	/**
+	 * Constructor for TaskSchedule
+	 *
+	 * @param int $id Schedule ID
+	 * @param string $task_id Task ID
+	 * @param bool $enabled Is the schedule enabled
+	 * @param CarbonInterface $last_run Last successful run date/time
+	 * @param bool $last_result Result of the last run
+	 * @param int $frequency Schedule frequency in minutes
+	 * @param int $nb_occurrences Number of remaining occurrences to be run
+	 * @param bool $is_running Is the task currently running
+	 */
+	public function __construct(
+		int $id,
+		string $task_id,
+		bool $enabled,
+		CarbonInterface $last_run,
+		bool $last_result,
+		int $frequency,
+		int $nb_occurrences,
+		bool $is_running
+	) {
+		$this->id = $id;
+		$this->task_id = $task_id;
+		$this->enabled = $enabled;
+		$this->last_run = $last_run;
+		$this->last_result = $last_result;
+		$this->frequency = $frequency;
+		$this->nb_occurrences = $nb_occurrences;
+		$this->is_running = $is_running;
+	}
 
-    /**
-     * Get the schedule ID.
-     *
-     * @return int
-     */
-    public function id(): int
-    {
-        return $this->id;
-    }
+	/**
+	 * Get the schedule ID.
+	 *
+	 * @return int
+	 */
+	public function id(): int
+	{
+		return $this->id;
+	}
 
-    /**
-     * Get the task ID.
-     *
-     * @return string
-     */
-    public function taskId(): string
-    {
-        return $this->task_id;
-    }
+	/**
+	 * Get the task ID.
+	 *
+	 * @return string
+	 */
+	public function taskId(): string
+	{
+		return $this->task_id;
+	}
 
-    /**
-     * Returns whether the schedule is enabled
-     *
-     * @return bool
-     */
-    public function isEnabled(): bool
-    {
-        return $this->enabled;
-    }
+	/**
+	 * Returns whether the schedule is enabled
+	 *
+	 * @return bool
+	 */
+	public function isEnabled(): bool
+	{
+		return $this->enabled;
+	}
 
-    /**
-     * Enable the schedule
-     *
-     * @return $this
-     */
-    public function enable(): self
-    {
-        $this->enabled = true;
-        return $this;
-    }
+	/**
+	 * Enable the schedule
+	 *
+	 * @return $this
+	 */
+	public function enable(): self
+	{
+		$this->enabled = true;
+		return $this;
+	}
 
-    /**
-     * Disable the schedule
-     *
-     * @return $this
-     */
-    public function disable(): self
-    {
-        $this->enabled = false;
-        return $this;
-    }
+	/**
+	 * Disable the schedule
+	 *
+	 * @return $this
+	 */
+	public function disable(): self
+	{
+		$this->enabled = false;
+		return $this;
+	}
 
-    /**
-     * Get the frequency of the schedule
-     *
-     * @return int
-     */
-    public function frequency(): int
-    {
-        return $this->frequency;
-    }
+	/**
+	 * Get the frequency of the schedule
+	 *
+	 * @return int
+	 */
+	public function frequency(): int
+	{
+		return $this->frequency;
+	}
 
-    /**
-     * Set the frequency of the schedule
-     *
-     * @param int $frequency
-     * @return $this
-     */
-    public function setFrequency(int $frequency): self
-    {
-        $this->frequency = $frequency;
-        return $this;
-    }
+	/**
+	 * Set the frequency of the schedule
+	 *
+	 * @param int $frequency
+	 * @return $this
+	 */
+	public function setFrequency(int $frequency): self
+	{
+		$this->frequency = $frequency;
+		return $this;
+	}
 
-    /**
-     * Get the date/time of the last successful run.
-     *
-     * @return CarbonInterface
-     */
-    public function lastRunTime(): CarbonInterface
-    {
-        return $this->last_run;
-    }
+	/**
+	 * Get the date/time of the last successful run.
+	 *
+	 * @return CarbonInterface
+	 */
+	public function lastRunTime(): CarbonInterface
+	{
+		return $this->last_run;
+	}
 
-    /**
-     * Set the last successful run date/time
-     *
-     * @param CarbonInterface $last_run
-     * @return $this
-     */
-    public function setLastRunTime(CarbonInterface $last_run): self
-    {
-        $this->last_run = $last_run;
-        return $this;
-    }
+	/**
+	 * Set the last successful run date/time
+	 *
+	 * @param CarbonInterface $last_run
+	 * @return $this
+	 */
+	public function setLastRunTime(CarbonInterface $last_run): self
+	{
+		$this->last_run = $last_run;
+		return $this;
+	}
 
-    /**
-     * Returns whether the last run was successful
-     *
-     * @return bool
-     */
-    public function wasLastRunSuccess(): bool
-    {
-        return $this->last_result;
-    }
+	/**
+	 * Returns whether the last run was successful
+	 *
+	 * @return bool
+	 */
+	public function wasLastRunSuccess(): bool
+	{
+		return $this->last_result;
+	}
 
-    /**
-     * Set the last run result
-     *
-     * @param bool $last_result
-     * @return $this
-     */
-    public function setLastResult(bool $last_result): self
-    {
-        $this->last_result = $last_result;
-        return $this;
-    }
+	/**
+	 * Set the last run result
+	 *
+	 * @param bool $last_result
+	 * @return $this
+	 */
+	public function setLastResult(bool $last_result): self
+	{
+		$this->last_result = $last_result;
+		return $this;
+	}
 
-    /**
-     * Get the number of remaining of occurrences of task runs.
-     * Returns 0 if the tasks must be run indefinitely.
-     *
-     * @return int
-     */
-    public function remainingOccurrences(): int
-    {
-        return $this->nb_occurrences;
-    }
+	/**
+	 * Get the number of remaining of occurrences of task runs.
+	 * Returns 0 if the tasks must be run indefinitely.
+	 *
+	 * @return int
+	 */
+	public function remainingOccurrences(): int
+	{
+		return $this->nb_occurrences;
+	}
 
-    /**
-     * Decrements the number of remaining occurrences by 1.
-     * The task will be disabled when the number reaches 0.
-     *
-     * @return $this
-     */
-    public function decrementRemainingOccurrences(): self
-    {
-        if ($this->nb_occurrences > 0) {
-            $this->nb_occurrences--;
-            if ($this->nb_occurrences === 0) {
-                $this->disable();
-            }
-        }
-        return $this;
-    }
+	/**
+	 * Decrements the number of remaining occurrences by 1.
+	 * The task will be disabled when the number reaches 0.
+	 *
+	 * @return $this
+	 */
+	public function decrementRemainingOccurrences(): self
+	{
+		if ($this->nb_occurrences > 0) {
+			$this->nb_occurrences--;
+			if ($this->nb_occurrences === 0) {
+				$this->disable();
+			}
+		}
+		return $this;
+	}
 
-    /**
-     * Set the number of remaining occurrences of task runs.
-     *
-     * @param int $nb_occurrences
-     * @return $this
-     */
-    public function setRemainingOccurrences(int $nb_occurrences): self
-    {
-        $this->nb_occurrences = $nb_occurrences;
-        return $this;
-    }
+	/**
+	 * Set the number of remaining occurrences of task runs.
+	 *
+	 * @param int $nb_occurrences
+	 * @return $this
+	 */
+	public function setRemainingOccurrences(int $nb_occurrences): self
+	{
+		$this->nb_occurrences = $nb_occurrences;
+		return $this;
+	}
 
-    /**
-     * Returns whether the task is running
-     * @return bool
-     */
-    public function isRunning(): bool
-    {
-        return $this->is_running;
-    }
+	/**
+	 * Returns whether the task is running
+	 * @return bool
+	 */
+	public function isRunning(): bool
+	{
+		return $this->is_running;
+	}
 
-    /**
-     * Informs the schedule that the task is going to run
-     *
-     * @return $this
-     */
-    public function startRunning(): self
-    {
-        $this->is_running = true;
-        return $this;
-    }
+	/**
+	 * Informs the schedule that the task is going to run
+	 *
+	 * @return $this
+	 */
+	public function startRunning(): self
+	{
+		$this->is_running = true;
+		return $this;
+	}
 
-    /**
-     * Informs the schedule that the task has stopped running.
-     * @return $this
-     */
-    public function stopRunning(): self
-    {
-        $this->is_running = false;
-        return $this;
-    }
+	/**
+	 * Informs the schedule that the task has stopped running.
+	 * @return $this
+	 */
+	public function stopRunning(): self
+	{
+		$this->is_running = false;
+		return $this;
+	}
 
-    /**
-     * Returns the schedule details as an associate array
-     *
-     * @phpcs:ignore Generic.Files.LineLength.TooLong
-     * @return array{id: int, task_id: string, enabled: bool, last_run: CarbonInterface, last_result: bool, frequency: int, nb_occurrences: int, is_running: bool}
-     */
-    public function toArray(): array
-    {
-        return [
-            'id'            =>  $this->id,
-            'task_id'       =>  $this->task_id,
-            'enabled'       =>  $this->enabled,
-            'last_run'      =>  $this->last_run,
-            'last_result'   =>  $this->last_result,
-            'frequency'     =>  $this->frequency,
-            'nb_occurrences' =>  $this->nb_occurrences,
-            'is_running'    =>  $this->is_running
-        ];
-    }
+	/**
+	 * Returns the schedule details as an associate array
+	 *
+	 * @phpcs:ignore Generic.Files.LineLength.TooLong
+	 * @return array{id: int, task_id: string, enabled: bool, last_run: CarbonInterface, last_result: bool, frequency: int, nb_occurrences: int, is_running: bool}
+	 */
+	public function toArray(): array
+	{
+		return [
+			'id'            =>  $this->id,
+			'task_id'       =>  $this->task_id,
+			'enabled'       =>  $this->enabled,
+			'last_run'      =>  $this->last_run,
+			'last_result'   =>  $this->last_result,
+			'frequency'     =>  $this->frequency,
+			'nb_occurrences' =>  $this->nb_occurrences,
+			'is_running'    =>  $this->is_running
+		];
+	}
 }

app/Module/Sosa/Http/RequestHandlers/SosaComputeModal.php

Indentation +31 added lines, -31 removed lines

@@ -28,39 +28,39 @@
  */
 class SosaComputeModal implements RequestHandlerInterface
 {
-    /**
-     * @var SosaModule|null $module
-     */
-    private $module;
+	/**
+	 * @var SosaModule|null $module
+	 */
+	private $module;
 
-    /**
-     * Constructor for SosaComputeModal Request Handler
-     *
-     * @param ModuleService $module_service
-     */
-    public function __construct(ModuleService $module_service)
-    {
-        $this->module = $module_service->findByInterface(SosaModule::class)->first();
-    }
+	/**
+	 * Constructor for SosaComputeModal 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) {
-            return Registry::responseFactory()->response(view('modals/error', [
-                'title' => I18N::translate('Error'),
-                'error' => 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) {
+			return Registry::responseFactory()->response(view('modals/error', [
+				'title' => I18N::translate('Error'),
+				'error' => I18N::translate('The attached module could not be found.')
+			]));
+		}
 
-        $tree = Validator::attributes($request)->tree();
+		$tree = Validator::attributes($request)->tree();
 
-        return Registry::responseFactory()->response(view($this->module->name() . '::modals/sosa-compute', [
-            'tree'          => $tree,
-            'xref'          => Validator::attributes($request)->isXref()->string('xref', '')
-        ]));
-    }
+		return Registry::responseFactory()->response(view($this->module->name() . '::modals/sosa-compute', [
+			'tree'          => $tree,
+			'xref'          => Validator::attributes($request)->isXref()->string('xref', '')
+		]));
+	}
 }

app/Module/Sosa/Http/RequestHandlers/AncestorsListIndividual.php

Indentation +75 added lines, -75 removed lines

@@ -35,79 +35,79 @@
  */
 class AncestorsListIndividual implements RequestHandlerInterface
 {
-    use ViewResponseTrait;
-
-    /**
-     * @var SosaModule|null $module
-     */
-    private $module;
-
-    /**
-     * @var SosaRecordsService $sosa_record_service
-     */
-    private $sosa_record_service;
-
-    /**
-     * Constructor for AncestorsListIndividual Request Handler
-     *
-     * @param ModuleService $module_service
-     * @param SosaRecordsService $sosa_record_service
-     */
-    public function __construct(
-        ModuleService $module_service,
-        SosaRecordsService $sosa_record_service
-    ) {
-        $this->module = $module_service->findByInterface(SosaModule::class)->first();
-        $this->sosa_record_service = $sosa_record_service;
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        $this->layout = 'layouts/ajax';
-
-        if ($this->module === null) {
-            throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
-        }
-
-        $tree = Validator::attributes($request)->tree();
-        $user = Auth::check() ? Validator::attributes($request)->user() : new DefaultUser();
-        $current_gen = Validator::attributes($request)->integer('gen', 0);
-
-        if ($current_gen <= 0) {
-            return Registry::responseFactory()->response(
-                'Invalid generation',
-                StatusCodeInterface::STATUS_UNPROCESSABLE_ENTITY
-            );
-        }
-
-        $list_ancestors = $this->sosa_record_service->listAncestorsAtGeneration($tree, $user, $current_gen);
-        $nb_ancestors_all = $list_ancestors->count();
-
-        /** @var \Illuminate\Support\Collection<int, \Fisharebest\Webtrees\Individual> $list_ancestors */
-        $list_ancestors = $list_ancestors
-            ->filter(function (stdClass $value) use ($tree): bool {
-                $indi = Registry::individualFactory()->make($value->majs_i_id, $tree);
-                return $indi !== null && $indi->canShowName();
-            })
-            ->mapWithKeys(function (stdClass $value) use ($tree): array {
-                $indi = Registry::individualFactory()->make($value->majs_i_id, $tree);
-                return [(int) $value->majs_sosa => $indi];
-            });
-
-        $nb_ancestors_shown = $list_ancestors->count();
-
-        return $this->viewResponse($this->module->name() . '::list-ancestors-indi-tab', [
-            'module_name'       =>  $this->module->name(),
-            'title'             =>  I18N::translate('Sosa Ancestors'),
-            'tree'              =>  $tree,
-            'list_ancestors'    =>  $list_ancestors,
-            'nb_ancestors_all'  =>  $nb_ancestors_all,
-            'nb_ancestors_theor' =>  pow(2, $current_gen - 1),
-            'nb_ancestors_shown' =>  $nb_ancestors_shown
-        ]);
-    }
+	use ViewResponseTrait;
+
+	/**
+	 * @var SosaModule|null $module
+	 */
+	private $module;
+
+	/**
+	 * @var SosaRecordsService $sosa_record_service
+	 */
+	private $sosa_record_service;
+
+	/**
+	 * Constructor for AncestorsListIndividual Request Handler
+	 *
+	 * @param ModuleService $module_service
+	 * @param SosaRecordsService $sosa_record_service
+	 */
+	public function __construct(
+		ModuleService $module_service,
+		SosaRecordsService $sosa_record_service
+	) {
+		$this->module = $module_service->findByInterface(SosaModule::class)->first();
+		$this->sosa_record_service = $sosa_record_service;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		$this->layout = 'layouts/ajax';
+
+		if ($this->module === null) {
+			throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
+		}
+
+		$tree = Validator::attributes($request)->tree();
+		$user = Auth::check() ? Validator::attributes($request)->user() : new DefaultUser();
+		$current_gen = Validator::attributes($request)->integer('gen', 0);
+
+		if ($current_gen <= 0) {
+			return Registry::responseFactory()->response(
+				'Invalid generation',
+				StatusCodeInterface::STATUS_UNPROCESSABLE_ENTITY
+			);
+		}
+
+		$list_ancestors = $this->sosa_record_service->listAncestorsAtGeneration($tree, $user, $current_gen);
+		$nb_ancestors_all = $list_ancestors->count();
+
+		/** @var \Illuminate\Support\Collection<int, \Fisharebest\Webtrees\Individual> $list_ancestors */
+		$list_ancestors = $list_ancestors
+			->filter(function (stdClass $value) use ($tree): bool {
+				$indi = Registry::individualFactory()->make($value->majs_i_id, $tree);
+				return $indi !== null && $indi->canShowName();
+			})
+			->mapWithKeys(function (stdClass $value) use ($tree): array {
+				$indi = Registry::individualFactory()->make($value->majs_i_id, $tree);
+				return [(int) $value->majs_sosa => $indi];
+			});
+
+		$nb_ancestors_shown = $list_ancestors->count();
+
+		return $this->viewResponse($this->module->name() . '::list-ancestors-indi-tab', [
+			'module_name'       =>  $this->module->name(),
+			'title'             =>  I18N::translate('Sosa Ancestors'),
+			'tree'              =>  $tree,
+			'list_ancestors'    =>  $list_ancestors,
+			'nb_ancestors_all'  =>  $nb_ancestors_all,
+			'nb_ancestors_theor' =>  pow(2, $current_gen - 1),
+			'nb_ancestors_shown' =>  $nb_ancestors_shown
+		]);
+	}
 }

app/Module/Sosa/Http/RequestHandlers/AncestorsListFamily.php

Indentation +74 added lines, -74 removed lines

@@ -35,78 +35,78 @@
  */
 class AncestorsListFamily implements RequestHandlerInterface
 {
-    use ViewResponseTrait;
-
-    /**
-     * @var SosaModule|null $module
-     */
-    private $module;
-
-    /**
-     * @var SosaRecordsService $sosa_record_service
-     */
-    private $sosa_record_service;
-
-    /**
-     * Constructor for AncestorsListFamily Request Handler
-     *
-     * @param ModuleService $module_service
-     * @param SosaRecordsService $sosa_record_service
-     */
-    public function __construct(
-        ModuleService $module_service,
-        SosaRecordsService $sosa_record_service
-    ) {
-        $this->module = $module_service->findByInterface(SosaModule::class)->first();
-        $this->sosa_record_service = $sosa_record_service;
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        $this->layout = 'layouts/ajax';
-
-        if ($this->module === null) {
-            throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
-        }
-
-        $tree = Validator::attributes($request)->tree();
-        $user = Auth::check() ? Validator::attributes($request)->user() : new DefaultUser();
-        $current_gen = Validator::attributes($request)->integer('gen', 0);
-
-        if ($current_gen <= 0) {
-            return Registry::responseFactory()->response(
-                'Invalid generation',
-                StatusCodeInterface::STATUS_UNPROCESSABLE_ENTITY
-            );
-        }
-
-        $list_families = $this->sosa_record_service->listAncestorFamiliesAtGeneration($tree, $user, $current_gen);
-        $nb_families_all = $list_families->count();
-
-        /** @var \Illuminate\Support\Collection<int, \Fisharebest\Webtrees\Family> $list_families */
-        $list_families = $list_families
-            ->filter(function (stdClass $value) use ($tree): bool {
-                $fam = Registry::familyFactory()->make($value->f_id, $tree);
-                return $fam !== null && $fam->canShow();
-            })
-            ->mapWithKeys(function (stdClass $value) use ($tree): array {
-                $fam = Registry::familyFactory()->make($value->f_id, $tree);
-                return [(int) $value->majs_sosa => $fam];
-            });
-
-        $nb_families_shown = $list_families->count();
-
-        return $this->viewResponse($this->module->name() . '::list-ancestors-fam-tab', [
-            'module_name'       =>  $this->module->name(),
-            'title'             =>  I18N::translate('Sosa Ancestors'),
-            'tree'              =>  $tree,
-            'list_families'     =>  $list_families,
-            'nb_families_all'   =>  $nb_families_all,
-            'nb_families_shown' =>  $nb_families_shown
-        ]);
-    }
+	use ViewResponseTrait;
+
+	/**
+	 * @var SosaModule|null $module
+	 */
+	private $module;
+
+	/**
+	 * @var SosaRecordsService $sosa_record_service
+	 */
+	private $sosa_record_service;
+
+	/**
+	 * Constructor for AncestorsListFamily Request Handler
+	 *
+	 * @param ModuleService $module_service
+	 * @param SosaRecordsService $sosa_record_service
+	 */
+	public function __construct(
+		ModuleService $module_service,
+		SosaRecordsService $sosa_record_service
+	) {
+		$this->module = $module_service->findByInterface(SosaModule::class)->first();
+		$this->sosa_record_service = $sosa_record_service;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		$this->layout = 'layouts/ajax';
+
+		if ($this->module === null) {
+			throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
+		}
+
+		$tree = Validator::attributes($request)->tree();
+		$user = Auth::check() ? Validator::attributes($request)->user() : new DefaultUser();
+		$current_gen = Validator::attributes($request)->integer('gen', 0);
+
+		if ($current_gen <= 0) {
+			return Registry::responseFactory()->response(
+				'Invalid generation',
+				StatusCodeInterface::STATUS_UNPROCESSABLE_ENTITY
+			);
+		}
+
+		$list_families = $this->sosa_record_service->listAncestorFamiliesAtGeneration($tree, $user, $current_gen);
+		$nb_families_all = $list_families->count();
+
+		/** @var \Illuminate\Support\Collection<int, \Fisharebest\Webtrees\Family> $list_families */
+		$list_families = $list_families
+			->filter(function (stdClass $value) use ($tree): bool {
+				$fam = Registry::familyFactory()->make($value->f_id, $tree);
+				return $fam !== null && $fam->canShow();
+			})
+			->mapWithKeys(function (stdClass $value) use ($tree): array {
+				$fam = Registry::familyFactory()->make($value->f_id, $tree);
+				return [(int) $value->majs_sosa => $fam];
+			});
+
+		$nb_families_shown = $list_families->count();
+
+		return $this->viewResponse($this->module->name() . '::list-ancestors-fam-tab', [
+			'module_name'       =>  $this->module->name(),
+			'title'             =>  I18N::translate('Sosa Ancestors'),
+			'tree'              =>  $tree,
+			'list_families'     =>  $list_families,
+			'nb_families_all'   =>  $nb_families_all,
+			'nb_families_shown' =>  $nb_families_shown
+		]);
+	}
 }

app/Module/Sosa/Http/RequestHandlers/PedigreeCollapseData.php

Indentation +39 added lines, -39 removed lines

@@ -33,49 +33,49 @@
  */
 class PedigreeCollapseData implements RequestHandlerInterface
 {
-    /**
-     * @var SosaModule|null $module
-     */
-    private $module;
+	/**
+	 * @var SosaModule|null $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 = Validator::attributes($request)->tree();
-        $user = Auth::check() ? Validator::attributes($request)->user() : new DefaultUser();
+		$tree = Validator::attributes($request)->tree();
+		$user = Auth::check() ? Validator::attributes($request)->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 Registry::responseFactory()->response($response);
-    }
+		return Registry::responseFactory()->response($response);
+	}
 }

app/Module/Sosa/GeoAnalyses/SosaByGenerationGeoAnalysis.php

Indentation +97 added lines, -97 removed lines

@@ -32,101 +32,101 @@
  */
 class SosaByGenerationGeoAnalysis implements GeoAnalysisInterface
 {
-    private SosaRecordsService $records_service;
-
-    /**
-     * Constructor for SosaByGenerationGeoAnalysis
-     *
-     * @param SosaRecordsService $records_service
-     */
-    public function __construct(SosaRecordsService $records_service)
-    {
-        $this->records_service = $records_service;
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\GeoAnalysisInterface::title()
-     */
-    public function title(): string
-    {
-        return I18N::translate('Sosa ancestors places by generation');
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\GeoAnalysisInterface::itemsDescription()
-     */
-    public function itemsDescription(): callable
-    {
-        return fn(int $count): string => I18N::plural('ancestor', 'ancestors', $count);
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\GeoAnalysisInterface::results()
-     */
-    public function results(Tree $tree, int $depth): GeoAnalysisResults
-    {
-        $results = new GeoAnalysisResults();
-
-        $unique_ancestors = $this->records_service
-            ->listAncestors($tree, Auth::check() ? Auth::user() : new DefaultUser())
-            ->uniqueStrict(fn(stdClass $item): string => $item->majs_i_id);
-
-        foreach ($unique_ancestors as $item) {
-            $ancestor = Registry::individualFactory()->make($item->majs_i_id, $tree);
-            if ($ancestor === null || !$ancestor->canShow()) {
-                continue;
-            }
-            $generation = $this->records_service->generation((int) $item->majs_sosa);
-            $significantplace = new GeoAnalysisPlace($tree, null, $depth);
-            foreach ($this->significantPlaces($ancestor) as $place) {
-                $significantplace = new GeoAnalysisPlace($tree, $place, $depth, true);
-                if ($significantplace->isKnown()) {
-                    break;
-                }
-            }
-            $results->addPlace($significantplace);
-            $results->addPlaceInCategory(
-                I18N::translate('Generation %s', I18N::number($generation)),
-                $generation,
-                $significantplace
-            );
-        }
-
-        return $results;
-    }
-
-    /**
-     * Returns significant places in order of priority for an individual
-     *
-     * @param Individual $individual
-     * @return Generator<\Fisharebest\Webtrees\Place>
-     */
-    protected function significantPlaces(Individual $individual): Generator
-    {
-        yield $individual->getBirthPlace();
-
-        /** @var \Fisharebest\Webtrees\Fact $fact */
-        foreach ($individual->facts(['RESI']) as $fact) {
-            yield $fact->place();
-        }
-
-        yield $individual->getDeathPlace();
-
-        /** @var \Fisharebest\Webtrees\Family $family */
-        foreach ($individual->childFamilies() as $family) {
-            foreach ($family->facts(['RESI']) as $fact) {
-                yield $fact->place();
-            }
-        }
-
-        /** @var \Fisharebest\Webtrees\Family $family */
-        foreach ($individual->spouseFamilies() as $family) {
-            foreach ($family->facts(['RESI']) as $fact) {
-                yield $fact->place();
-            }
-        }
-    }
+	private SosaRecordsService $records_service;
+
+	/**
+	 * Constructor for SosaByGenerationGeoAnalysis
+	 *
+	 * @param SosaRecordsService $records_service
+	 */
+	public function __construct(SosaRecordsService $records_service)
+	{
+		$this->records_service = $records_service;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\GeoAnalysisInterface::title()
+	 */
+	public function title(): string
+	{
+		return I18N::translate('Sosa ancestors places by generation');
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\GeoAnalysisInterface::itemsDescription()
+	 */
+	public function itemsDescription(): callable
+	{
+		return fn(int $count): string => I18N::plural('ancestor', 'ancestors', $count);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\GeoAnalysisInterface::results()
+	 */
+	public function results(Tree $tree, int $depth): GeoAnalysisResults
+	{
+		$results = new GeoAnalysisResults();
+
+		$unique_ancestors = $this->records_service
+			->listAncestors($tree, Auth::check() ? Auth::user() : new DefaultUser())
+			->uniqueStrict(fn(stdClass $item): string => $item->majs_i_id);
+
+		foreach ($unique_ancestors as $item) {
+			$ancestor = Registry::individualFactory()->make($item->majs_i_id, $tree);
+			if ($ancestor === null || !$ancestor->canShow()) {
+				continue;
+			}
+			$generation = $this->records_service->generation((int) $item->majs_sosa);
+			$significantplace = new GeoAnalysisPlace($tree, null, $depth);
+			foreach ($this->significantPlaces($ancestor) as $place) {
+				$significantplace = new GeoAnalysisPlace($tree, $place, $depth, true);
+				if ($significantplace->isKnown()) {
+					break;
+				}
+			}
+			$results->addPlace($significantplace);
+			$results->addPlaceInCategory(
+				I18N::translate('Generation %s', I18N::number($generation)),
+				$generation,
+				$significantplace
+			);
+		}
+
+		return $results;
+	}
+
+	/**
+	 * Returns significant places in order of priority for an individual
+	 *
+	 * @param Individual $individual
+	 * @return Generator<\Fisharebest\Webtrees\Place>
+	 */
+	protected function significantPlaces(Individual $individual): Generator
+	{
+		yield $individual->getBirthPlace();
+
+		/** @var \Fisharebest\Webtrees\Fact $fact */
+		foreach ($individual->facts(['RESI']) as $fact) {
+			yield $fact->place();
+		}
+
+		yield $individual->getDeathPlace();
+
+		/** @var \Fisharebest\Webtrees\Family $family */
+		foreach ($individual->childFamilies() as $family) {
+			foreach ($family->facts(['RESI']) as $fact) {
+				yield $fact->place();
+			}
+		}
+
+		/** @var \Fisharebest\Webtrees\Family $family */
+		foreach ($individual->spouseFamilies() as $family) {
+			foreach ($family->facts(['RESI']) as $fact) {
+				yield $fact->place();
+			}
+		}
+	}
 }

app/Module/Sosa/Services/SosaRecordsService.php

Indentation +272 added lines, -272 removed lines

@@ -30,291 +30,291 @@
  */
 class SosaRecordsService
 {
-    private ?int $max_system_generations = null;
+	private ?int $max_system_generations = null;
 
-    /**
-     * 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();
+	}
 
-    /**
-     * Calculate the descendant sosa of the given sosa, at the given generation.
-     * For instance, the descendant of the Sosa 14 at generation 2 is Sosa 3 (mother).
-     *
-     * @param int $sosa
-     * @param int $gen
-     * @return int
-     */
-    public function sosaDescendantOf(int $sosa, int $gen): int
-    {
-        $gen_sosa = $this->generation($sosa);
-        return $gen_sosa <= $gen ? $sosa : BigInteger::of($sosa)
-            ->dividedBy(BigInteger::of(2)->power($this->generation($sosa) - $gen), RoundingMode::DOWN)
-            ->toInt();
-    }
+	/**
+	 * Calculate the descendant sosa of the given sosa, at the given generation.
+	 * For instance, the descendant of the Sosa 14 at generation 2 is Sosa 3 (mother).
+	 *
+	 * @param int $sosa
+	 * @param int $gen
+	 * @return int
+	 */
+	public function sosaDescendantOf(int $sosa, int $gen): int
+	{
+		$gen_sosa = $this->generation($sosa);
+		return $gen_sosa <= $gen ? $sosa : BigInteger::of($sosa)
+			->dividedBy(BigInteger::of(2)->power($this->generation($sosa) - $gen), RoundingMode::DOWN)
+			->toInt();
+	}
 
-    /**
-     * Check whether an individual is a Sosa ancestor.
-     *
-     * @param Tree $tree
-     * @param UserInterface $user
-     * @param Individual $indi
-     * @return bool
-     */
-    public function isSosa(Tree $tree, UserInterface $user, Individual $indi): bool
-    {
-        return $this->sosaNumbers($tree, $user, $indi)->count() > 0;
-    }
+	/**
+	 * Check whether an individual is a Sosa ancestor.
+	 *
+	 * @param Tree $tree
+	 * @param UserInterface $user
+	 * @param Individual $indi
+	 * @return bool
+	 */
+	public function isSosa(Tree $tree, UserInterface $user, Individual $indi): bool
+	{
+		return $this->sosaNumbers($tree, $user, $indi)->count() > 0;
+	}
 
-    /**
-     * Returns all Sosa numbers associated to an Individual
-     *
-     * @param Tree $tree
-     * @param UserInterface $user
-     * @param Individual $indi
-     * @return Collection<int, int>
-     */
-    public function sosaNumbers(Tree $tree, UserInterface $user, Individual $indi): Collection
-    {
-        return Registry::cache()->array()->remember(
-            'sosanumbers-' . $indi->xref() . '@' . $tree->id() . '-' . $user->id(),
-            function () use ($tree, $user, $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 UserInterface $user
+	 * @param Individual $indi
+	 * @return Collection<int, int>
+	 */
+	public function sosaNumbers(Tree $tree, UserInterface $user, Individual $indi): Collection
+	{
+		return Registry::cache()->array()->remember(
+			'sosanumbers-' . $indi->xref() . '@' . $tree->id() . '-' . $user->id(),
+			function () use ($tree, $user, $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 across all generation
-     *
-     * @param Tree $tree
-     * @param UserInterface $user
-     * @return Collection<\stdClass>
-     */
-    public function listAncestors(Tree $tree, UserInterface $user): Collection
-    {
-        return DB::table('maj_sosa')
-            ->select(['majs_sosa', 'majs_i_id'])
-            ->where('majs_gedcom_id', '=', $tree->id())
-            ->where('majs_user_id', '=', $user->id())
-            ->orderBy('majs_sosa')
-            ->get();
-    }
+	/**
+	 * Return a list of the Sosa ancestors across all generation
+	 *
+	 * @param Tree $tree
+	 * @param UserInterface $user
+	 * @return Collection<\stdClass>
+	 */
+	public function listAncestors(Tree $tree, UserInterface $user): Collection
+	{
+		return DB::table('maj_sosa')
+			->select(['majs_sosa', 'majs_i_id'])
+			->where('majs_gedcom_id', '=', $tree->id())
+			->where('majs_user_id', '=', $user->id())
+			->orderBy('majs_sosa')
+			->get();
+	}
 
-    /**
-     * Return a list of the Sosa ancestors at a given generation
-     *
-     * @param Tree $tree
-     * @param UserInterface $user
-     * @param int $gen
-     * @return Collection<\stdClass>
-     */
-    public function listAncestorsAtGeneration(Tree $tree, UserInterface $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 UserInterface $user
+	 * @param int $gen
+	 * @return Collection<\stdClass>
+	 */
+	public function listAncestorsAtGeneration(Tree $tree, UserInterface $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 UserInterface $user
-     * @param int $gen
-     * @return Collection<\stdClass>
-     */
-    public function listAncestorFamiliesAtGeneration(Tree $tree, UserInterface $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 UserInterface $user
+	 * @param int $gen
+	 * @return Collection<\stdClass>
+	 */
+	public function listAncestorFamiliesAtGeneration(Tree $tree, UserInterface $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 UserInterface $user
-     * @param int $gen
-     * @return Collection<\stdClass>
-     */
-    public function listMissingAncestorsAtGeneration(Tree $tree, UserInterface $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 UserInterface $user
+	 * @param int $gen
+	 * @return Collection<\stdClass>
+	 */
+	public function listMissingAncestorsAtGeneration(Tree $tree, UserInterface $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 UserInterface $user
-     */
-    public function deleteAll(Tree $tree, UserInterface $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 UserInterface $user
+	 */
+	public function deleteAll(Tree $tree, UserInterface $user): void
+	{
+		DB::table('maj_sosa')
+			->where('majs_gedcom_id', '=', $tree->id())
+			->where('majs_user_id', '=', $user->id())
+			->delete();
+	}
 
-    /**
-     *
-     * @param Tree $tree
-     * @param UserInterface $user
-     * @param int $sosa
-     */
-    public function deleteAncestorsFrom(Tree $tree, UserInterface $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 UserInterface $user
+	 * @param int $sosa
+	 */
+	public function deleteAncestorsFrom(Tree $tree, UserInterface $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 UserInterface $user
-     * @param array<array<string,mixed>> $sosa_records
-     */
-    public function insertOrUpdate(Tree $tree, UserInterface $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 UserInterface $user
+	 * @param array<array<string,mixed>> $sosa_records
+	 */
+	public function insertOrUpdate(Tree $tree, UserInterface $user, array $sosa_records): void
+	{
+		$mass_update = DB::connection()->getDriverName() === 'mysql';
 
-        $bindings_placeholders = $bindings_values = [];
-        $has_records = false;
-        foreach ($sosa_records as $i => $row) {
-            $gen = $this->generation($row['sosa']);
-            if ($gen <=  $this->maxSystemGenerations()) {
-                $has_records = true;
-                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 += [
-                        '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 = [];
+		$has_records = false;
+		foreach ($sosa_records as $i => $row) {
+			$gen = $this->generation($row['sosa']);
+			if ($gen <=  $this->maxSystemGenerations()) {
+				$has_records = true;
+				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 += [
+						'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 ($has_records && $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 ($has_records && $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
+			);
+		}
+	}
 }