jon48 / webtrees-lib

src/Webtrees/Module/AdminTasks/Http/RequestHandlers/TaskStatusAction.php

Indentation +71 added lines, -71 removed lines

@@ -30,75 +30,75 @@
 class TaskStatusAction implements RequestHandlerInterface
 {
 
-    /**
-     * @var AdminTasksModule|null $module
-     */
-    private $module;
-
-    /**
-     * @var TaskScheduleService $taskschedules_service
-     */
-    private $taskschedules_service;
-
-    /**
-     * Constructor for TaskStatusAction Request Handler
-     *
-     * @param ModuleService $module_service
-     * @param TaskScheduleService $taskschedules_service
-     */
-    public function __construct(ModuleService $module_service, TaskScheduleService $taskschedules_service)
-    {
-        $this->module = $module_service->findByInterface(AdminTasksModule::class)->first();
-        $this->taskschedules_service = $taskschedules_service;
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        $admin_config_route = route(AdminConfigPage::class);
-
-        if ($this->module === null) {
-            FlashMessages::addMessage(
-                I18N::translate('The attached module could not be found.'),
-                'danger'
-            );
-            return redirect($admin_config_route);
-        }
-
-        $task_sched_id = (int) $request->getAttribute('task');
-        $task_schedule = $this->taskschedules_service->find($task_sched_id);
-
-        $admin_config_route = route(AdminConfigPage::class);
-
-        if ($task_schedule === null) {
-            FlashMessages::addMessage(
-                I18N::translate('The task shedule with ID “%d” does not exist.', I18N::number($task_sched_id)),
-                'danger'
-            );
-            return redirect($admin_config_route);
-        }
-
-        ((bool) $request->getAttribute('enable', false)) ? $task_schedule->enable() : $task_schedule->disable();
-
-        if ($this->taskschedules_service->update($task_schedule) > 0) {
-            FlashMessages::addMessage(
-                I18N::translate('The scheduled task has been successfully updated'),
-                'success'
-            );
-            //phpcs:ignore Generic.Files.LineLength.TooLong
-            Log::addConfigurationLog('Module ' . $this->module->title() . ' : Task Schedule “' . $task_schedule->id() . '” has been updated.');
-        } else {
-            FlashMessages::addMessage(
-                I18N::translate('An error occured while updating the scheduled task'),
-                'danger'
-            );
-            //phpcs:ignore Generic.Files.LineLength.TooLong
-            Log::addConfigurationLog('Module ' . $this->module->title() . ' : Task Schedule “' . $task_schedule->id() . '” could not be updated. See error log.');
-        }
-
-        return redirect($admin_config_route);
-    }
+	/**
+	 * @var AdminTasksModule|null $module
+	 */
+	private $module;
+
+	/**
+	 * @var TaskScheduleService $taskschedules_service
+	 */
+	private $taskschedules_service;
+
+	/**
+	 * Constructor for TaskStatusAction Request Handler
+	 *
+	 * @param ModuleService $module_service
+	 * @param TaskScheduleService $taskschedules_service
+	 */
+	public function __construct(ModuleService $module_service, TaskScheduleService $taskschedules_service)
+	{
+		$this->module = $module_service->findByInterface(AdminTasksModule::class)->first();
+		$this->taskschedules_service = $taskschedules_service;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		$admin_config_route = route(AdminConfigPage::class);
+
+		if ($this->module === null) {
+			FlashMessages::addMessage(
+				I18N::translate('The attached module could not be found.'),
+				'danger'
+			);
+			return redirect($admin_config_route);
+		}
+
+		$task_sched_id = (int) $request->getAttribute('task');
+		$task_schedule = $this->taskschedules_service->find($task_sched_id);
+
+		$admin_config_route = route(AdminConfigPage::class);
+
+		if ($task_schedule === null) {
+			FlashMessages::addMessage(
+				I18N::translate('The task shedule with ID “%d” does not exist.', I18N::number($task_sched_id)),
+				'danger'
+			);
+			return redirect($admin_config_route);
+		}
+
+		((bool) $request->getAttribute('enable', false)) ? $task_schedule->enable() : $task_schedule->disable();
+
+		if ($this->taskschedules_service->update($task_schedule) > 0) {
+			FlashMessages::addMessage(
+				I18N::translate('The scheduled task has been successfully updated'),
+				'success'
+			);
+			//phpcs:ignore Generic.Files.LineLength.TooLong
+			Log::addConfigurationLog('Module ' . $this->module->title() . ' : Task Schedule “' . $task_schedule->id() . '” has been updated.');
+		} else {
+			FlashMessages::addMessage(
+				I18N::translate('An error occured while updating the scheduled task'),
+				'danger'
+			);
+			//phpcs:ignore Generic.Files.LineLength.TooLong
+			Log::addConfigurationLog('Module ' . $this->module->title() . ' : Task Schedule “' . $task_schedule->id() . '” could not be updated. See error log.');
+		}
+
+		return redirect($admin_config_route);
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -68,7 +68,7 @@ 
             return redirect($admin_config_route);
         }
 
-        $task_sched_id = (int) $request->getAttribute('task');
+        $task_sched_id = (int)$request->getAttribute('task');
         $task_schedule = $this->taskschedules_service->find($task_sched_id);
 
         $admin_config_route = route(AdminConfigPage::class);
@@ -81,7 +81,7 @@ 
             return redirect($admin_config_route);
         }
 
-        ((bool) $request->getAttribute('enable', false)) ? $task_schedule->enable() : $task_schedule->disable();
+        ((bool)$request->getAttribute('enable', false)) ? $task_schedule->enable() : $task_schedule->disable();
 
         if ($this->taskschedules_service->update($task_schedule) > 0) {
             FlashMessages::addMessage(
@@ -89,14 +89,14 @@ 
                 'success'
             );
             //phpcs:ignore Generic.Files.LineLength.TooLong
-            Log::addConfigurationLog('Module ' . $this->module->title() . ' : Task Schedule “' . $task_schedule->id() . '” has been updated.');
+            Log::addConfigurationLog('Module '.$this->module->title().' : Task Schedule “'.$task_schedule->id().'” has been updated.');
         } else {
             FlashMessages::addMessage(
                 I18N::translate('An error occured while updating the scheduled task'),
                 'danger'
             );
             //phpcs:ignore Generic.Files.LineLength.TooLong
-            Log::addConfigurationLog('Module ' . $this->module->title() . ' : Task Schedule “' . $task_schedule->id() . '” could not be updated. See error log.');
+            Log::addConfigurationLog('Module '.$this->module->title().' : Task Schedule “'.$task_schedule->id().'” could not be updated. See error log.');
         }
 
         return redirect($admin_config_route);

src/Webtrees/Module/AdminTasks/Tasks/HealthCheckEmailTask.php

Indentation +184 added lines, -184 removed lines

@@ -39,188 +39,188 @@
  */
 class HealthCheckEmailTask implements TaskInterface, ConfigurableTaskInterface
 {
-    /**
-     * Name of the Tree preference to check if the task is enabled for that tree
-     * @var string
-     */
-    public const TREE_PREFERENCE_NAME = 'MAJ_AT_HEALTHCHECK_ENABLED';
-
-    /**
-     * @var AdminTasksModule|null $module
-     */
-    private $module;
-
-    /**
-     * @var HealthCheckService $healthcheck_service;
-     */
-    private $healthcheck_service;
-
-    /**
-     * @var EmailService $email_service;
-     */
-    private $email_service;
-
-    /**
-     * @var UserService $user_service
-     */
-    private $user_service;
-
-    /**
-     * @var TreeService $tree_service
-     */
-    private $tree_service;
-
-    /**
-     * @var UpgradeService $upgrade_service
-     */
-    private $upgrade_service;
-
-    /**
-     * Constructor for HealthCheckTask
-     *
-     * @param ModuleService $module_service
-     * @param HealthCheckService $healthcheck_service
-     * @param EmailService $email_service
-     * @param UserService $user_service
-     * @param TreeService $tree_service
-     * @param UpgradeService $upgrade_service
-     */
-    public function __construct(
-        ModuleService $module_service,
-        HealthCheckService $healthcheck_service,
-        EmailService $email_service,
-        UserService $user_service,
-        TreeService $tree_service,
-        UpgradeService $upgrade_service
-    ) {
-        $this->module = $module_service->findByInterface(AdminTasksModule::class)->first();
-        $this->healthcheck_service = $healthcheck_service;
-        $this->email_service = $email_service;
-        $this->user_service = $user_service;
-        $this->tree_service = $tree_service;
-        $this->upgrade_service = $upgrade_service;
-    }
-
-
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\TaskInterface::name()
-     */
-    public function name(): string
-    {
-        return I18N::translate('Healthcheck Email');
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\TaskInterface::defaultFrequency()
-     */
-    public function defaultFrequency(): int
-    {
-        return 10080; // = 1 week = 7 * 24 * 60 min
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\TaskInterface::run()
-     */
-    public function run(TaskSchedule $task_schedule): bool
-    {
-        if ($this->module === null) {
-            return false;
-        }
-
-        $res = true;
-
-        // Compute the number of days to compute
-        $interval_lastrun = $task_schedule->lastRunTime()->diffAsCarbonInterval(Carbon::now());
-        //@phpcs:ignore Generic.Files.LineLength.TooLong
-        $interval = $interval_lastrun->greaterThan($task_schedule->frequency()) ? $interval_lastrun : $task_schedule->frequency();
-        $nb_days = (int) $interval->ceilDay()->totalDays;
-
-        $view_params_site = [
-            'nb_days'               =>  $nb_days,
-            'upgrade_available'     =>  $this->upgrade_service->isUpgradeAvailable(),
-            'latest_version'        =>  $this->upgrade_service->latestVersion(),
-            'download_url'          =>  $this->upgrade_service->downloadUrl(),
-            'all_users'             =>  $this->user_service->all(),
-            'unapproved'            =>  $this->user_service->unapproved(),
-            'unverified'            =>  $this->user_service->unverified(),
-        ];
-
-        foreach ($this->tree_service->all() as $tree) {
-        /** @var Tree $tree */
-
-            if ($tree->getPreference(self::TREE_PREFERENCE_NAME) !== '1') {
-                continue;
-            }
-
-            $webmaster = $this->user_service->find((int) $tree->getPreference('WEBMASTER_USER_ID'));
-            if ($webmaster === null) {
-                continue;
-            }
-            I18N::init($webmaster->getPreference('language'));
-
-            $error_logs = $this->healthcheck_service->errorLogs($tree, $nb_days);
-            $nb_errors = $error_logs->sum('nblogs');
-
-            $view_params = array_merge($view_params_site, [
-                'tree'              =>  $tree,
-                'total_by_type'     =>  $this->healthcheck_service->countByRecordType($tree),
-                'change_by_type'    =>  $this->healthcheck_service->changesByRecordType($tree, $nb_days),
-                'error_logs'        =>  $error_logs,
-                'nb_errors'         =>  $nb_errors
-            ]);
-
-            $res = $res && $this->email_service->send(
-                new TreeUser($tree),
-                $webmaster,
-                new NoReplyUser(),
-                I18N::translate('Health Check Report') . ' - ' . I18N::translate('Tree %s', $tree->name()),
-                view($this->module->name() . '::tasks/healthcheck/email-healthcheck-text', $view_params),
-                view($this->module->name() . '::tasks/healthcheck/email-healthcheck-html', $view_params)
-            );
-        }
-
-        return $res;
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\ConfigurableTaskInterface::configView()
-     */
-    public function configView(ServerRequestInterface $request): string
-    {
-        return $this->module === null ? '' : view($this->module->name() . '::tasks/healthcheck/config', [
-            'all_trees'     =>  $this->tree_service->all()
-        ]);
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\ConfigurableTaskInterface::updateConfig()
-     */
-    public function updateConfig(ServerRequestInterface $request, TaskSchedule $task_schedule): bool
-    {
-        try {
-            $params = (array) $request->getParsedBody();
-
-            foreach ($this->tree_service->all() as $tree) {
-                if (Auth::isManager($tree)) {
-                    $tree_enabled = (bool) ($params['HEALTHCHECK_ENABLED_' . $tree->id()] ?? false);
-                    $tree->setPreference(self::TREE_PREFERENCE_NAME, $tree_enabled ? '1' : '0');
-                }
-            }
-            return true;
-        } catch (Throwable $ex) {
-            Log::addErrorLog(
-                sprintf(
-                    'Error while updating the Task schedule "%s". Exception: %s',
-                    $task_schedule->id(),
-                    $ex->getMessage()
-                )
-            );
-        }
-        return false;
-    }
+	/**
+	 * Name of the Tree preference to check if the task is enabled for that tree
+	 * @var string
+	 */
+	public const TREE_PREFERENCE_NAME = 'MAJ_AT_HEALTHCHECK_ENABLED';
+
+	/**
+	 * @var AdminTasksModule|null $module
+	 */
+	private $module;
+
+	/**
+	 * @var HealthCheckService $healthcheck_service;
+	 */
+	private $healthcheck_service;
+
+	/**
+	 * @var EmailService $email_service;
+	 */
+	private $email_service;
+
+	/**
+	 * @var UserService $user_service
+	 */
+	private $user_service;
+
+	/**
+	 * @var TreeService $tree_service
+	 */
+	private $tree_service;
+
+	/**
+	 * @var UpgradeService $upgrade_service
+	 */
+	private $upgrade_service;
+
+	/**
+	 * Constructor for HealthCheckTask
+	 *
+	 * @param ModuleService $module_service
+	 * @param HealthCheckService $healthcheck_service
+	 * @param EmailService $email_service
+	 * @param UserService $user_service
+	 * @param TreeService $tree_service
+	 * @param UpgradeService $upgrade_service
+	 */
+	public function __construct(
+		ModuleService $module_service,
+		HealthCheckService $healthcheck_service,
+		EmailService $email_service,
+		UserService $user_service,
+		TreeService $tree_service,
+		UpgradeService $upgrade_service
+	) {
+		$this->module = $module_service->findByInterface(AdminTasksModule::class)->first();
+		$this->healthcheck_service = $healthcheck_service;
+		$this->email_service = $email_service;
+		$this->user_service = $user_service;
+		$this->tree_service = $tree_service;
+		$this->upgrade_service = $upgrade_service;
+	}
+
+
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\TaskInterface::name()
+	 */
+	public function name(): string
+	{
+		return I18N::translate('Healthcheck Email');
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\TaskInterface::defaultFrequency()
+	 */
+	public function defaultFrequency(): int
+	{
+		return 10080; // = 1 week = 7 * 24 * 60 min
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\TaskInterface::run()
+	 */
+	public function run(TaskSchedule $task_schedule): bool
+	{
+		if ($this->module === null) {
+			return false;
+		}
+
+		$res = true;
+
+		// Compute the number of days to compute
+		$interval_lastrun = $task_schedule->lastRunTime()->diffAsCarbonInterval(Carbon::now());
+		//@phpcs:ignore Generic.Files.LineLength.TooLong
+		$interval = $interval_lastrun->greaterThan($task_schedule->frequency()) ? $interval_lastrun : $task_schedule->frequency();
+		$nb_days = (int) $interval->ceilDay()->totalDays;
+
+		$view_params_site = [
+			'nb_days'               =>  $nb_days,
+			'upgrade_available'     =>  $this->upgrade_service->isUpgradeAvailable(),
+			'latest_version'        =>  $this->upgrade_service->latestVersion(),
+			'download_url'          =>  $this->upgrade_service->downloadUrl(),
+			'all_users'             =>  $this->user_service->all(),
+			'unapproved'            =>  $this->user_service->unapproved(),
+			'unverified'            =>  $this->user_service->unverified(),
+		];
+
+		foreach ($this->tree_service->all() as $tree) {
+		/** @var Tree $tree */
+
+			if ($tree->getPreference(self::TREE_PREFERENCE_NAME) !== '1') {
+				continue;
+			}
+
+			$webmaster = $this->user_service->find((int) $tree->getPreference('WEBMASTER_USER_ID'));
+			if ($webmaster === null) {
+				continue;
+			}
+			I18N::init($webmaster->getPreference('language'));
+
+			$error_logs = $this->healthcheck_service->errorLogs($tree, $nb_days);
+			$nb_errors = $error_logs->sum('nblogs');
+
+			$view_params = array_merge($view_params_site, [
+				'tree'              =>  $tree,
+				'total_by_type'     =>  $this->healthcheck_service->countByRecordType($tree),
+				'change_by_type'    =>  $this->healthcheck_service->changesByRecordType($tree, $nb_days),
+				'error_logs'        =>  $error_logs,
+				'nb_errors'         =>  $nb_errors
+			]);
+
+			$res = $res && $this->email_service->send(
+				new TreeUser($tree),
+				$webmaster,
+				new NoReplyUser(),
+				I18N::translate('Health Check Report') . ' - ' . I18N::translate('Tree %s', $tree->name()),
+				view($this->module->name() . '::tasks/healthcheck/email-healthcheck-text', $view_params),
+				view($this->module->name() . '::tasks/healthcheck/email-healthcheck-html', $view_params)
+			);
+		}
+
+		return $res;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\ConfigurableTaskInterface::configView()
+	 */
+	public function configView(ServerRequestInterface $request): string
+	{
+		return $this->module === null ? '' : view($this->module->name() . '::tasks/healthcheck/config', [
+			'all_trees'     =>  $this->tree_service->all()
+		]);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\ConfigurableTaskInterface::updateConfig()
+	 */
+	public function updateConfig(ServerRequestInterface $request, TaskSchedule $task_schedule): bool
+	{
+		try {
+			$params = (array) $request->getParsedBody();
+
+			foreach ($this->tree_service->all() as $tree) {
+				if (Auth::isManager($tree)) {
+					$tree_enabled = (bool) ($params['HEALTHCHECK_ENABLED_' . $tree->id()] ?? false);
+					$tree->setPreference(self::TREE_PREFERENCE_NAME, $tree_enabled ? '1' : '0');
+				}
+			}
+			return true;
+		} catch (Throwable $ex) {
+			Log::addErrorLog(
+				sprintf(
+					'Error while updating the Task schedule "%s". Exception: %s',
+					$task_schedule->id(),
+					$ex->getMessage()
+				)
+			);
+		}
+		return false;
+	}
 }

Spacing +8 added lines, -8 removed lines

@@ -136,7 +136,7 @@ 
         $interval_lastrun = $task_schedule->lastRunTime()->diffAsCarbonInterval(Carbon::now());
         //@phpcs:ignore Generic.Files.LineLength.TooLong
         $interval = $interval_lastrun->greaterThan($task_schedule->frequency()) ? $interval_lastrun : $task_schedule->frequency();
-        $nb_days = (int) $interval->ceilDay()->totalDays;
+        $nb_days = (int)$interval->ceilDay()->totalDays;
 
         $view_params_site = [
             'nb_days'               =>  $nb_days,
@@ -155,7 +155,7 @@ 
                 continue;
             }
 
-            $webmaster = $this->user_service->find((int) $tree->getPreference('WEBMASTER_USER_ID'));
+            $webmaster = $this->user_service->find((int)$tree->getPreference('WEBMASTER_USER_ID'));
             if ($webmaster === null) {
                 continue;
             }
@@ -176,9 +176,9 @@ 
                 new TreeUser($tree),
                 $webmaster,
                 new NoReplyUser(),
-                I18N::translate('Health Check Report') . ' - ' . I18N::translate('Tree %s', $tree->name()),
-                view($this->module->name() . '::tasks/healthcheck/email-healthcheck-text', $view_params),
-                view($this->module->name() . '::tasks/healthcheck/email-healthcheck-html', $view_params)
+                I18N::translate('Health Check Report').' - '.I18N::translate('Tree %s', $tree->name()),
+                view($this->module->name().'::tasks/healthcheck/email-healthcheck-text', $view_params),
+                view($this->module->name().'::tasks/healthcheck/email-healthcheck-html', $view_params)
             );
         }
 
@@ -191,7 +191,7 @@ 
      */
     public function configView(ServerRequestInterface $request): string
     {
-        return $this->module === null ? '' : view($this->module->name() . '::tasks/healthcheck/config', [
+        return $this->module === null ? '' : view($this->module->name().'::tasks/healthcheck/config', [
             'all_trees'     =>  $this->tree_service->all()
         ]);
     }
@@ -203,11 +203,11 @@ 
     public function updateConfig(ServerRequestInterface $request, TaskSchedule $task_schedule): bool
     {
         try {
-            $params = (array) $request->getParsedBody();
+            $params = (array)$request->getParsedBody();
 
             foreach ($this->tree_service->all() as $tree) {
                 if (Auth::isManager($tree)) {
-                    $tree_enabled = (bool) ($params['HEALTHCHECK_ENABLED_' . $tree->id()] ?? false);
+                    $tree_enabled = (bool)($params['HEALTHCHECK_ENABLED_'.$tree->id()] ?? false);
                     $tree->setPreference(self::TREE_PREFERENCE_NAME, $tree_enabled ? '1' : '0');
                 }
             }

src/Webtrees/Module/AdminTasks/Services/TaskScheduleService.php

Indentation +255 added lines, -255 removed lines

@@ -35,259 +35,259 @@
  */
 class TaskScheduleService
 {
-    /**
-     * Time-out after which the task will be considered not running any more.
-     * In seconds, default 5 mins.
-     * @var integer
-     */
-    public const TASK_TIME_OUT = 600;
-
-    /**
-     * @var Collection|null $available_tasks
-     */
-    private $available_tasks;
-
-    /**
-     * Returns all Tasks schedules in database.
-     * Stored records can be synchronised with the tasks actually available to the system.
-     *
-     * @param bool $sync_available Should tasks synchronised with available ones
-     * @param bool $include_disabled Should disabled tasks be returned
-     * @return Collection Collection of TaskSchedule
-     */
-    public function all(bool $sync_available = false, bool $include_disabled = true): Collection
-    {
-        $tasks_schedules = DB::table('maj_admintasks')
-        ->select()
-        ->get()
-        ->map(self::rowMapper());
-
-        if ($sync_available) {
-            $available_tasks = clone $this->available();
-            foreach ($tasks_schedules as $task_schedule) {
-                /** @var TaskSchedule $task_schedule */
-                if ($available_tasks->has($task_schedule->taskId())) {
-                    $available_tasks->forget($task_schedule->taskId());
-                } else {
-                    $this->delete($task_schedule);
-                }
-            }
-
-            foreach ($available_tasks as $task_name => $task) {
-                /** @var TaskInterface $task */
-                $this->insertTask($task_name, $task->defaultFrequency());
-            }
-
-            return $this->all(false, $include_disabled);
-        }
-
-        return $tasks_schedules;
-    }
-
-    /**
-     * Returns tasks exposed through modules implementing ModuleTasksProviderInterface.
-     *
-     * @return Collection
-     */
-    public function available(): Collection
-    {
-        if ($this->available_tasks === null) {
-            $tasks_providers = app(ModuleService::class)->findByInterface(ModuleTasksProviderInterface::class);
-
-            $this->available_tasks = new Collection();
-            foreach ($tasks_providers as $task_provider) {
-                $this->available_tasks = $this->available_tasks->merge($task_provider->listTasks());
-            }
-        }
-        return $this->available_tasks;
-    }
-
-    /**
-     * Find a task schedule by its ID.
-     *
-     * @param int $task_schedule_id
-     * @return TaskSchedule|NULL
-     */
-    public function find(int $task_schedule_id): ?TaskSchedule
-    {
-        return DB::table('maj_admintasks')
-            ->select()
-            ->where('majat_id', '=', $task_schedule_id)
-            ->get()
-            ->map(self::rowMapper())
-            ->first();
-    }
-
-    /**
-     * Add a new task schedule with the specified task ID, and frequency if defined.
-     * Uses default for other settings.
-     *
-     * @param string $task_id
-     * @param int $frequency
-     * @return bool
-     */
-    public function insertTask(string $task_id, int $frequency = 0): bool
-    {
-        $values = ['majat_task_id' => $task_id];
-        if ($frequency > 0) {
-            $values['majat_frequency'] = $frequency;
-        }
-
-        return DB::table('maj_admintasks')
-            ->insert($values);
-    }
-
-    /**
-     * Update a task schedule.
-     * Returns the number of tasks schedules updated.
-     *
-     * @param TaskSchedule $task_schedule
-     * @return int
-     */
-    public function update(TaskSchedule $task_schedule): int
-    {
-        return DB::table('maj_admintasks')
-            ->where('majat_id', '=', $task_schedule->id())
-            ->update([
-                'majat_status'      =>  $task_schedule->isEnabled() ? 'enabled' : 'disabled',
-                'majat_last_run'    =>  $task_schedule->lastRunTime(),
-                'majat_last_result' =>  $task_schedule->wasLastRunSuccess(),
-                'majat_frequency'   =>  $task_schedule->frequency()->totalMinutes,
-                'majat_nb_occur'    =>  $task_schedule->remainingOccurences(),
-                'majat_running'     =>  $task_schedule->isRunning()
-            ]);
-    }
-
-    /**
-     * Delete a task schedule.
-     *
-     * @param TaskSchedule $task_schedule
-     * @return int
-     */
-    public function delete(TaskSchedule $task_schedule): int
-    {
-        return DB::table('maj_admintasks')
-            ->where('majat_id', '=', $task_schedule->id())
-            ->delete();
-    }
-
-    /**
-     * Find a task by its name
-     *
-     * @param string $task_id
-     * @return TaskInterface|NULL
-     */
-    public function findTask(string $task_id): ?TaskInterface
-    {
-        if ($this->available()->has($task_id)) {
-            return app($this->available()->get($task_id));
-        }
-        return null;
-    }
-
-    /**
-     * Retrieve all tasks that are candidates to be run.
-     *
-     * @param bool $force Should the run be forced
-     * @param string $task_id Specific task ID to be run
-     * @return Collection
-     */
-    public function findTasksToRun(bool $force, string $task_id = null): Collection
-    {
-        $query = DB::table('maj_admintasks')
-            ->select()
-            ->where('majat_status', '=', 'enabled')
-            ->where(function (Builder $query): void {
-
-                $query->where('majat_running', '=', 0)
-                ->orWhere('majat_last_run', '<=', Carbon::now()->subSeconds(self::TASK_TIME_OUT));
-            });
-
-        if (!$force) {
-            $query->where(function (Builder $query): void {
-
-                $query->where('majat_running', '=', 0)
-                    ->orWhereRaw('DATE_ADD(majat_last_run, INTERVAL majat_frequency MINUTE) <= NOW()');
-            });
-        }
-
-        if ($task_id !== null) {
-            $query->where('majat_task_id', '=', $task_id);
-        }
-
-        return $query->get()->map(self::rowMapper());
-    }
-
-    /**
-     * Run the task associated with the schedule.
-     * The task will run if either forced to, or its next scheduled run time has been exceeded.
-     * The last run time is recorded only if the task is successful.
-     *
-     * @param TaskSchedule $task_schedule
-     * @param boolean $force
-     */
-    public function run(TaskSchedule $task_schedule, $force = false): void
-    {
-        /** @var TaskSchedule $task_schedule */
-        $task_schedule = DB::table('maj_admintasks')
-            ->select()
-            ->where('majat_id', '=', $task_schedule->id())
-            ->lockForUpdate()
-            ->get()
-            ->map(self::rowMapper())
-            ->first();
-
-        if (
-            !$task_schedule->isRunning() &&
-            ($force || $task_schedule->lastRunTime()->add($task_schedule->frequency())->lessThan(Carbon::now()))
-        ) {
-            $task_schedule->setLastResult(false);
-
-            $task = $this->findTask($task_schedule->taskId());
-            if ($task !== null) {
-                $task_schedule->startRunning();
-                $this->update($task_schedule);
-
-                $first_error = $task_schedule->wasLastRunSuccess();
-                try {
-                    $task_schedule->setLastResult($task->run($task_schedule));
-                } catch (Throwable $ex) {
-                    if ($first_error) { // Only record the first error, as this could fill the log.
-                        Log::addErrorLog(I18N::translate('Error while running task %s:', $task->name()) . ' ' .
-                            '[' . get_class($ex) . '] ' . $ex->getMessage() . ' ' . $ex->getFile() . ':'
-                            . $ex->getLine() . PHP_EOL . $ex->getTraceAsString());
-                    }
-                }
-
-                if ($task_schedule->wasLastRunSuccess()) {
-                    $task_schedule->setLastRunTime(Carbon::now());
-                    $task_schedule->decrementRemainingOccurences();
-                }
-                $task_schedule->stopRunning();
-            }
-            $this->update($task_schedule);
-        }
-    }
-
-    /**
-     * Mapper to return a TaskSchedule object from an object.
-     *
-     * @return Closure
-     */
-    public static function rowMapper(): Closure
-    {
-        return static function (stdClass $row): TaskSchedule {
-
-            return new TaskSchedule(
-                (int) $row->majat_id,
-                $row->majat_task_id,
-                $row->majat_status === 'enabled',
-                Carbon::parse($row->majat_last_run),
-                (bool) $row->majat_last_result,
-                CarbonInterval::minutes($row->majat_frequency),
-                (int) $row->majat_nb_occur,
-                (bool) $row->majat_running
-            );
-        };
-    }
+	/**
+	 * Time-out after which the task will be considered not running any more.
+	 * In seconds, default 5 mins.
+	 * @var integer
+	 */
+	public const TASK_TIME_OUT = 600;
+
+	/**
+	 * @var Collection|null $available_tasks
+	 */
+	private $available_tasks;
+
+	/**
+	 * Returns all Tasks schedules in database.
+	 * Stored records can be synchronised with the tasks actually available to the system.
+	 *
+	 * @param bool $sync_available Should tasks synchronised with available ones
+	 * @param bool $include_disabled Should disabled tasks be returned
+	 * @return Collection Collection of TaskSchedule
+	 */
+	public function all(bool $sync_available = false, bool $include_disabled = true): Collection
+	{
+		$tasks_schedules = DB::table('maj_admintasks')
+		->select()
+		->get()
+		->map(self::rowMapper());
+
+		if ($sync_available) {
+			$available_tasks = clone $this->available();
+			foreach ($tasks_schedules as $task_schedule) {
+				/** @var TaskSchedule $task_schedule */
+				if ($available_tasks->has($task_schedule->taskId())) {
+					$available_tasks->forget($task_schedule->taskId());
+				} else {
+					$this->delete($task_schedule);
+				}
+			}
+
+			foreach ($available_tasks as $task_name => $task) {
+				/** @var TaskInterface $task */
+				$this->insertTask($task_name, $task->defaultFrequency());
+			}
+
+			return $this->all(false, $include_disabled);
+		}
+
+		return $tasks_schedules;
+	}
+
+	/**
+	 * Returns tasks exposed through modules implementing ModuleTasksProviderInterface.
+	 *
+	 * @return Collection
+	 */
+	public function available(): Collection
+	{
+		if ($this->available_tasks === null) {
+			$tasks_providers = app(ModuleService::class)->findByInterface(ModuleTasksProviderInterface::class);
+
+			$this->available_tasks = new Collection();
+			foreach ($tasks_providers as $task_provider) {
+				$this->available_tasks = $this->available_tasks->merge($task_provider->listTasks());
+			}
+		}
+		return $this->available_tasks;
+	}
+
+	/**
+	 * Find a task schedule by its ID.
+	 *
+	 * @param int $task_schedule_id
+	 * @return TaskSchedule|NULL
+	 */
+	public function find(int $task_schedule_id): ?TaskSchedule
+	{
+		return DB::table('maj_admintasks')
+			->select()
+			->where('majat_id', '=', $task_schedule_id)
+			->get()
+			->map(self::rowMapper())
+			->first();
+	}
+
+	/**
+	 * Add a new task schedule with the specified task ID, and frequency if defined.
+	 * Uses default for other settings.
+	 *
+	 * @param string $task_id
+	 * @param int $frequency
+	 * @return bool
+	 */
+	public function insertTask(string $task_id, int $frequency = 0): bool
+	{
+		$values = ['majat_task_id' => $task_id];
+		if ($frequency > 0) {
+			$values['majat_frequency'] = $frequency;
+		}
+
+		return DB::table('maj_admintasks')
+			->insert($values);
+	}
+
+	/**
+	 * Update a task schedule.
+	 * Returns the number of tasks schedules updated.
+	 *
+	 * @param TaskSchedule $task_schedule
+	 * @return int
+	 */
+	public function update(TaskSchedule $task_schedule): int
+	{
+		return DB::table('maj_admintasks')
+			->where('majat_id', '=', $task_schedule->id())
+			->update([
+				'majat_status'      =>  $task_schedule->isEnabled() ? 'enabled' : 'disabled',
+				'majat_last_run'    =>  $task_schedule->lastRunTime(),
+				'majat_last_result' =>  $task_schedule->wasLastRunSuccess(),
+				'majat_frequency'   =>  $task_schedule->frequency()->totalMinutes,
+				'majat_nb_occur'    =>  $task_schedule->remainingOccurences(),
+				'majat_running'     =>  $task_schedule->isRunning()
+			]);
+	}
+
+	/**
+	 * Delete a task schedule.
+	 *
+	 * @param TaskSchedule $task_schedule
+	 * @return int
+	 */
+	public function delete(TaskSchedule $task_schedule): int
+	{
+		return DB::table('maj_admintasks')
+			->where('majat_id', '=', $task_schedule->id())
+			->delete();
+	}
+
+	/**
+	 * Find a task by its name
+	 *
+	 * @param string $task_id
+	 * @return TaskInterface|NULL
+	 */
+	public function findTask(string $task_id): ?TaskInterface
+	{
+		if ($this->available()->has($task_id)) {
+			return app($this->available()->get($task_id));
+		}
+		return null;
+	}
+
+	/**
+	 * Retrieve all tasks that are candidates to be run.
+	 *
+	 * @param bool $force Should the run be forced
+	 * @param string $task_id Specific task ID to be run
+	 * @return Collection
+	 */
+	public function findTasksToRun(bool $force, string $task_id = null): Collection
+	{
+		$query = DB::table('maj_admintasks')
+			->select()
+			->where('majat_status', '=', 'enabled')
+			->where(function (Builder $query): void {
+
+				$query->where('majat_running', '=', 0)
+				->orWhere('majat_last_run', '<=', Carbon::now()->subSeconds(self::TASK_TIME_OUT));
+			});
+
+		if (!$force) {
+			$query->where(function (Builder $query): void {
+
+				$query->where('majat_running', '=', 0)
+					->orWhereRaw('DATE_ADD(majat_last_run, INTERVAL majat_frequency MINUTE) <= NOW()');
+			});
+		}
+
+		if ($task_id !== null) {
+			$query->where('majat_task_id', '=', $task_id);
+		}
+
+		return $query->get()->map(self::rowMapper());
+	}
+
+	/**
+	 * Run the task associated with the schedule.
+	 * The task will run if either forced to, or its next scheduled run time has been exceeded.
+	 * The last run time is recorded only if the task is successful.
+	 *
+	 * @param TaskSchedule $task_schedule
+	 * @param boolean $force
+	 */
+	public function run(TaskSchedule $task_schedule, $force = false): void
+	{
+		/** @var TaskSchedule $task_schedule */
+		$task_schedule = DB::table('maj_admintasks')
+			->select()
+			->where('majat_id', '=', $task_schedule->id())
+			->lockForUpdate()
+			->get()
+			->map(self::rowMapper())
+			->first();
+
+		if (
+			!$task_schedule->isRunning() &&
+			($force || $task_schedule->lastRunTime()->add($task_schedule->frequency())->lessThan(Carbon::now()))
+		) {
+			$task_schedule->setLastResult(false);
+
+			$task = $this->findTask($task_schedule->taskId());
+			if ($task !== null) {
+				$task_schedule->startRunning();
+				$this->update($task_schedule);
+
+				$first_error = $task_schedule->wasLastRunSuccess();
+				try {
+					$task_schedule->setLastResult($task->run($task_schedule));
+				} catch (Throwable $ex) {
+					if ($first_error) { // Only record the first error, as this could fill the log.
+						Log::addErrorLog(I18N::translate('Error while running task %s:', $task->name()) . ' ' .
+							'[' . get_class($ex) . '] ' . $ex->getMessage() . ' ' . $ex->getFile() . ':'
+							. $ex->getLine() . PHP_EOL . $ex->getTraceAsString());
+					}
+				}
+
+				if ($task_schedule->wasLastRunSuccess()) {
+					$task_schedule->setLastRunTime(Carbon::now());
+					$task_schedule->decrementRemainingOccurences();
+				}
+				$task_schedule->stopRunning();
+			}
+			$this->update($task_schedule);
+		}
+	}
+
+	/**
+	 * Mapper to return a TaskSchedule object from an object.
+	 *
+	 * @return Closure
+	 */
+	public static function rowMapper(): Closure
+	{
+		return static function (stdClass $row): TaskSchedule {
+
+			return new TaskSchedule(
+				(int) $row->majat_id,
+				$row->majat_task_id,
+				$row->majat_status === 'enabled',
+				Carbon::parse($row->majat_last_run),
+				(bool) $row->majat_last_result,
+				CarbonInterval::minutes($row->majat_frequency),
+				(int) $row->majat_nb_occur,
+				(bool) $row->majat_running
+			);
+		};
+	}
 }

Spacing +10 added lines, -10 removed lines

@@ -197,14 +197,14 @@ 
         $query = DB::table('maj_admintasks')
             ->select()
             ->where('majat_status', '=', 'enabled')
-            ->where(function (Builder $query): void {
+            ->where(function(Builder $query): void {
 
                 $query->where('majat_running', '=', 0)
                 ->orWhere('majat_last_run', '<=', Carbon::now()->subSeconds(self::TASK_TIME_OUT));
             });
 
         if (!$force) {
-            $query->where(function (Builder $query): void {
+            $query->where(function(Builder $query): void {
 
                 $query->where('majat_running', '=', 0)
                     ->orWhereRaw('DATE_ADD(majat_last_run, INTERVAL majat_frequency MINUTE) <= NOW()');
@@ -253,9 +253,9 @@ 
                     $task_schedule->setLastResult($task->run($task_schedule));
                 } catch (Throwable $ex) {
                     if ($first_error) { // Only record the first error, as this could fill the log.
-                        Log::addErrorLog(I18N::translate('Error while running task %s:', $task->name()) . ' ' .
-                            '[' . get_class($ex) . '] ' . $ex->getMessage() . ' ' . $ex->getFile() . ':'
-                            . $ex->getLine() . PHP_EOL . $ex->getTraceAsString());
+                        Log::addErrorLog(I18N::translate('Error while running task %s:', $task->name()).' '.
+                            '['.get_class($ex).'] '.$ex->getMessage().' '.$ex->getFile().':'
+                            . $ex->getLine().PHP_EOL.$ex->getTraceAsString());
                     }
                 }
 
@@ -276,17 +276,17 @@ 
      */
     public static function rowMapper(): Closure
     {
-        return static function (stdClass $row): TaskSchedule {
+        return static function(stdClass $row): TaskSchedule {
 
             return new TaskSchedule(
-                (int) $row->majat_id,
+                (int)$row->majat_id,
                 $row->majat_task_id,
                 $row->majat_status === 'enabled',
                 Carbon::parse($row->majat_last_run),
-                (bool) $row->majat_last_result,
+                (bool)$row->majat_last_result,
                 CarbonInterval::minutes($row->majat_frequency),
-                (int) $row->majat_nb_occur,
-                (bool) $row->majat_running
+                (int)$row->majat_nb_occur,
+                (bool)$row->majat_running
             );
         };
     }

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

Indentation +46 added lines, -46 removed lines

@@ -33,59 +33,59 @@
  */
 class AncestorsList implements RequestHandlerInterface
 {
-    use ViewResponseTrait;
+	use ViewResponseTrait;
 
-    /**
-     * @var SosaModule|null $module
-     */
-    private $module;
+	/**
+	 * @var SosaModule|null $module
+	 */
+	private $module;
 
-    /**
-     * @var SosaRecordsService $sosa_record_service
-     */
-    private $sosa_record_service;
+	/**
+	 * @var SosaRecordsService $sosa_record_service
+	 */
+	private $sosa_record_service;
 
-    /**
-     * Constructor for AncestorsList 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;
-    }
+	/**
+	 * Constructor for AncestorsList 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
-    {
-        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]);
+		/** @var SosaStatisticsService $sosa_stats_service */
+		$sosa_stats_service = app()->makeWith(SosaStatisticsService::class, ['tree' => $tree, 'user' => $user]);
 
-        $current_gen = (int) ($request->getQueryParams()['gen'] ?? $request->getAttribute('gen') ?? 0);
+		$current_gen = (int) ($request->getQueryParams()['gen'] ?? $request->getAttribute('gen') ?? 0);
 
-        return $this->viewResponse($this->module->name() . '::list-ancestors-page', [
-            'module_name'       =>  $this->module->name(),
-            'title'             =>  I18N::translate('Sosa Ancestors'),
-            'tree'              =>  $tree,
-            'root_indi'         =>  $sosa_stats_service->rootIndividual(),
-            'max_gen'           =>  $sosa_stats_service->maxGeneration(),
-            'current_gen'       =>  $current_gen
-        ]);
-    }
+		return $this->viewResponse($this->module->name() . '::list-ancestors-page', [
+			'module_name'       =>  $this->module->name(),
+			'title'             =>  I18N::translate('Sosa Ancestors'),
+			'tree'              =>  $tree,
+			'root_indi'         =>  $sosa_stats_service->rootIndividual(),
+			'max_gen'           =>  $sosa_stats_service->maxGeneration(),
+			'current_gen'       =>  $current_gen
+		]);
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -77,9 +77,9 @@
         /** @var SosaStatisticsService $sosa_stats_service */
         $sosa_stats_service = app()->makeWith(SosaStatisticsService::class, ['tree' => $tree, 'user' => $user]);
 
-        $current_gen = (int) ($request->getQueryParams()['gen'] ?? $request->getAttribute('gen') ?? 0);
+        $current_gen = (int)($request->getQueryParams()['gen'] ?? $request->getAttribute('gen') ?? 0);
 
-        return $this->viewResponse($this->module->name() . '::list-ancestors-page', [
+        return $this->viewResponse($this->module->name().'::list-ancestors-page', [
             'module_name'       =>  $this->module->name(),
             'title'             =>  I18N::translate('Sosa Ancestors'),
             'tree'              =>  $tree,

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|null $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|null $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/AncestorsListIndividual.php

Indentation +70 added lines, -70 removed lines

@@ -35,74 +35,74 @@
  */
 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 = $request->getAttribute('tree');
-        assert($tree instanceof Tree);
-
-        $user = Auth::check() ? $request->getAttribute('user') : new DefaultUser();
-
-        $current_gen = (int) ($request->getAttribute('gen') ?? 0);
-
-        if ($current_gen <= 0) {
-            return 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->mapWithKeys(function (stdClass $value) use ($tree): ?array {
-                $indi = Registry::individualFactory()->make($value->majs_i_id, $tree);
-                return ($indi !== null && $indi->canShowName()) ? [(int) $value->majs_sosa => $indi] : null;
-        })->filter();
-
-        $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 = $request->getAttribute('tree');
+		assert($tree instanceof Tree);
+
+		$user = Auth::check() ? $request->getAttribute('user') : new DefaultUser();
+
+		$current_gen = (int) ($request->getAttribute('gen') ?? 0);
+
+		if ($current_gen <= 0) {
+			return 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->mapWithKeys(function (stdClass $value) use ($tree): ?array {
+				$indi = Registry::individualFactory()->make($value->majs_i_id, $tree);
+				return ($indi !== null && $indi->canShowName()) ? [(int) $value->majs_sosa => $indi] : null;
+		})->filter();
+
+		$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
+		]);
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -78,7 +78,7 @@ 
 
         $user = Auth::check() ? $request->getAttribute('user') : new DefaultUser();
 
-        $current_gen = (int) ($request->getAttribute('gen') ?? 0);
+        $current_gen = (int)($request->getAttribute('gen') ?? 0);
 
         if ($current_gen <= 0) {
             return response('Invalid generation', StatusCodeInterface::STATUS_UNPROCESSABLE_ENTITY);
@@ -88,14 +88,14 @@ 
         $nb_ancestors_all = $list_ancestors->count();
 
         /** @var \Illuminate\Support\Collection<int, \Fisharebest\Webtrees\Individual> $list_ancestors */
-        $list_ancestors = $list_ancestors->mapWithKeys(function (stdClass $value) use ($tree): ?array {
+        $list_ancestors = $list_ancestors->mapWithKeys(function(stdClass $value) use ($tree): ?array {
                 $indi = Registry::individualFactory()->make($value->majs_i_id, $tree);
-                return ($indi !== null && $indi->canShowName()) ? [(int) $value->majs_sosa => $indi] : null;
+                return ($indi !== null && $indi->canShowName()) ? [(int)$value->majs_sosa => $indi] : null;
         })->filter();
 
         $nb_ancestors_shown = $list_ancestors->count();
 
-        return $this->viewResponse($this->module->name() . '::list-ancestors-indi-tab', [
+        return $this->viewResponse($this->module->name().'::list-ancestors-indi-tab', [
             'module_name'       =>  $this->module->name(),
             'title'             =>  I18N::translate('Sosa Ancestors'),
             'tree'              =>  $tree,

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

Indentation +32 added lines, -32 removed lines

@@ -28,40 +28,40 @@
  */
 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 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 response(view('modals/error', [
+				'title' => I18N::translate('Error'),
+				'error' => 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);
 
-        return response(view($this->module->name() . '::modals/sosa-compute', [
-            'tree'          => $tree,
-            'xref'          =>  $request->getAttribute('xref')
-        ]));
-    }
+		return response(view($this->module->name() . '::modals/sosa-compute', [
+			'tree'          => $tree,
+			'xref'          =>  $request->getAttribute('xref')
+		]));
+	}
 }

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|null $module
-     */
-    private $module;
+	/**
+	 * @var SosaModule|null $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/Http/RequestHandlers/AncestorsListFamily.php

Indentation +69 added lines, -69 removed lines

@@ -35,73 +35,73 @@
  */
 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 = $request->getAttribute('tree');
-        assert($tree instanceof Tree);
-
-        $user = Auth::check() ? $request->getAttribute('user') : new DefaultUser();
-
-        $current_gen = (int) ($request->getAttribute('gen') ?? 0);
-
-        if ($current_gen <= 0) {
-            return 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->mapWithKeys(function (stdClass $value) use ($tree): ?array {
-                $fam = Registry::familyFactory()->make($value->f_id, $tree);
-                return ($fam !== null && $fam->canShow()) ? [(int) $value->majs_sosa => $fam] : null;
-        })->filter();
-
-        $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 = $request->getAttribute('tree');
+		assert($tree instanceof Tree);
+
+		$user = Auth::check() ? $request->getAttribute('user') : new DefaultUser();
+
+		$current_gen = (int) ($request->getAttribute('gen') ?? 0);
+
+		if ($current_gen <= 0) {
+			return 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->mapWithKeys(function (stdClass $value) use ($tree): ?array {
+				$fam = Registry::familyFactory()->make($value->f_id, $tree);
+				return ($fam !== null && $fam->canShow()) ? [(int) $value->majs_sosa => $fam] : null;
+		})->filter();
+
+		$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
+		]);
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -78,7 +78,7 @@ 
 
         $user = Auth::check() ? $request->getAttribute('user') : new DefaultUser();
 
-        $current_gen = (int) ($request->getAttribute('gen') ?? 0);
+        $current_gen = (int)($request->getAttribute('gen') ?? 0);
 
         if ($current_gen <= 0) {
             return response('Invalid generation', StatusCodeInterface::STATUS_UNPROCESSABLE_ENTITY);
@@ -88,14 +88,14 @@ 
         $nb_families_all = $list_families->count();
 
         /** @var \Illuminate\Support\Collection<int, \Fisharebest\Webtrees\Family> $list_families */
-        $list_families = $list_families->mapWithKeys(function (stdClass $value) use ($tree): ?array {
+        $list_families = $list_families->mapWithKeys(function(stdClass $value) use ($tree): ?array {
                 $fam = Registry::familyFactory()->make($value->f_id, $tree);
-                return ($fam !== null && $fam->canShow()) ? [(int) $value->majs_sosa => $fam] : null;
+                return ($fam !== null && $fam->canShow()) ? [(int)$value->majs_sosa => $fam] : null;
         })->filter();
 
         $nb_families_shown = $list_families->count();
 
-        return $this->viewResponse($this->module->name() . '::list-ancestors-fam-tab', [
+        return $this->viewResponse($this->module->name().'::list-ancestors-fam-tab', [
             'module_name'       =>  $this->module->name(),
             'title'             =>  I18N::translate('Sosa Ancestors'),
             'tree'              =>  $tree,