jon48 / webtrees-lib

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

Indentation +249 added lines, -249 removed lines

@@ -33,253 +33,253 @@
  */
 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 $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);
-
-                try {
-                    $task_schedule->setLastResult($task->run($task_schedule));
-                } catch (Exception $ex) {
-                }
-
-                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 $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);
+
+				try {
+					$task_schedule->setLastResult($task->run($task_schedule));
+				} catch (Exception $ex) {
+				}
+
+				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 +7 added lines, -7 removed lines

@@ -195,14 +195,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()');
@@ -268,17 +268,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/AdminTasks/Services/HealthCheckService.php

Indentation +93 added lines, -93 removed lines

@@ -27,101 +27,101 @@
  */
 class HealthCheckService
 {
-    /**
-     * Returns a query collating all gedcom records, for use in other queries
-     *
-     * @param Tree $tree
-     * @return Builder
-     */
-    private function allGedcomRecords(Tree $tree): Builder
-    {
-        return DB::table('individuals')
-            ->select(DB::raw("'indi' AS ged_type"), 'i_id AS ged_id')->where('i_file', '=', $tree->id())
-            ->unionAll(DB::table('families')
-                ->select(DB::raw("'fam' AS ged_type"), 'f_id AS ged_id')->where('f_file', '=', $tree->id()))
-            ->unionAll(DB::table('sources')
-                ->select(DB::raw("'sour' AS ged_type"), 's_id AS ged_id')->where('s_file', '=', $tree->id()))
-            ->unionAll(DB::table('media')
-                ->select(DB::raw("'media' AS ged_type"), 'm_id AS ged_id')->where('m_file', '=', $tree->id()))
-            ->unionAll(DB::table('other')
-                ->select(DB::raw('LOWER(o_type) AS ged_type'), 'o_id AS ged_id')->where('o_file', '=', $tree->id()));
-    }
+	/**
+	 * Returns a query collating all gedcom records, for use in other queries
+	 *
+	 * @param Tree $tree
+	 * @return Builder
+	 */
+	private function allGedcomRecords(Tree $tree): Builder
+	{
+		return DB::table('individuals')
+			->select(DB::raw("'indi' AS ged_type"), 'i_id AS ged_id')->where('i_file', '=', $tree->id())
+			->unionAll(DB::table('families')
+				->select(DB::raw("'fam' AS ged_type"), 'f_id AS ged_id')->where('f_file', '=', $tree->id()))
+			->unionAll(DB::table('sources')
+				->select(DB::raw("'sour' AS ged_type"), 's_id AS ged_id')->where('s_file', '=', $tree->id()))
+			->unionAll(DB::table('media')
+				->select(DB::raw("'media' AS ged_type"), 'm_id AS ged_id')->where('m_file', '=', $tree->id()))
+			->unionAll(DB::table('other')
+				->select(DB::raw('LOWER(o_type) AS ged_type'), 'o_id AS ged_id')->where('o_file', '=', $tree->id()));
+	}
 
-    /**
-     * Returns the count of gedcom records by type in a Tree, as a keyed Collection.
-     *
-     * Collection output:
-     *      - Key : gedcom record type
-     *      - Value: count of records
-     *
-     * @param Tree $tree
-     * @return Collection
-     */
-    public function countByRecordType(Tree $tree): Collection
-    {
-        return DB::query()
-            ->fromSub($this->allGedcomRecords($tree), 'gedrecords')
-            ->select('ged_type', new Expression('COUNT(ged_id) AS total'))
-            ->groupBy('ged_type')
-            ->pluck('total', 'ged_type');
-    }
+	/**
+	 * Returns the count of gedcom records by type in a Tree, as a keyed Collection.
+	 *
+	 * Collection output:
+	 *      - Key : gedcom record type
+	 *      - Value: count of records
+	 *
+	 * @param Tree $tree
+	 * @return Collection
+	 */
+	public function countByRecordType(Tree $tree): Collection
+	{
+		return DB::query()
+			->fromSub($this->allGedcomRecords($tree), 'gedrecords')
+			->select('ged_type', new Expression('COUNT(ged_id) AS total'))
+			->groupBy('ged_type')
+			->pluck('total', 'ged_type');
+	}
 
-    /**
-     * Returns the count of gedcom records changes by type in a Tree across a number of days, as a keyed Collection.
-     *
-     * Collection output:
-     *      - Key : gedcom record type
-     *      - Value: count of changes
-     *
-     * @param Tree $tree
-     * @return Collection
-     */
-    public function changesByRecordType(Tree $tree, int $nb_days): Collection
-    {
-        return DB::table('change')
-            ->joinSub($this->allGedcomRecords($tree), 'gedrecords', function (JoinClause $join) use ($tree): void {
+	/**
+	 * Returns the count of gedcom records changes by type in a Tree across a number of days, as a keyed Collection.
+	 *
+	 * Collection output:
+	 *      - Key : gedcom record type
+	 *      - Value: count of changes
+	 *
+	 * @param Tree $tree
+	 * @return Collection
+	 */
+	public function changesByRecordType(Tree $tree, int $nb_days): Collection
+	{
+		return DB::table('change')
+			->joinSub($this->allGedcomRecords($tree), 'gedrecords', function (JoinClause $join) use ($tree): void {
 
-                $join->on('change.xref', '=', 'gedrecords.ged_id')
-                    ->where('change.gedcom_id', '=', $tree->id());
-            })
-            ->select('ged_type AS type', new Expression('COUNT(change_id) AS count'))
-            ->where('change.status', '', 'accepted')
-            ->where('change.change_time', '>=', Carbon::now()->subDays($nb_days))
-            ->groupBy('ged_type')
-            ->pluck('total', 'ged_type');
-    }
+				$join->on('change.xref', '=', 'gedrecords.ged_id')
+					->where('change.gedcom_id', '=', $tree->id());
+			})
+			->select('ged_type AS type', new Expression('COUNT(change_id) AS count'))
+			->where('change.status', '', 'accepted')
+			->where('change.change_time', '>=', Carbon::now()->subDays($nb_days))
+			->groupBy('ged_type')
+			->pluck('total', 'ged_type');
+	}
 
-    /**
-     * Return the error logs associated with a tree across a number of days, grouped by error message, as a Collection.
-     *
-     * Collection output:
-     *      - Value: stdClass object
-     *          - log message:  Error log message
-     *          - type:         'site' if no associated Tree, the Tree ID otherwise
-     *          - nblogs:       The number of occurence of the same error message
-     *          - lastoccurred: Date/time of the last occurence of the error message
-     *
-     * @param Tree $tree
-     * @param int $nb_days
-     * @return Collection
-     */
-    public function errorLogs(Tree $tree, int $nb_days): Collection
-    {
-        return DB::table('log')
-            ->select(
-                'log_message',
-                new Expression("IFNULL(gedcom_id, 'site') as type"),
-                new Expression('COUNT(log_id) AS nblogs'),
-                new Expression('MAX(log_time) AS lastoccurred')
-            )
-            ->where('log_type', '=', 'error')
-            ->where(function (Builder $query) use ($tree): void {
-                $query->where('gedcom_id', '=', $tree->id())
-                    ->orWhereNull('gedcom_id');
-            })
-            ->where('log_time', '>=', Carbon::now()->subDays($nb_days))
-            ->groupBy('log_message', 'gedcom_id')
-            ->orderByDesc('lastoccurred')
-            ->get();
-    }
+	/**
+	 * Return the error logs associated with a tree across a number of days, grouped by error message, as a Collection.
+	 *
+	 * Collection output:
+	 *      - Value: stdClass object
+	 *          - log message:  Error log message
+	 *          - type:         'site' if no associated Tree, the Tree ID otherwise
+	 *          - nblogs:       The number of occurence of the same error message
+	 *          - lastoccurred: Date/time of the last occurence of the error message
+	 *
+	 * @param Tree $tree
+	 * @param int $nb_days
+	 * @return Collection
+	 */
+	public function errorLogs(Tree $tree, int $nb_days): Collection
+	{
+		return DB::table('log')
+			->select(
+				'log_message',
+				new Expression("IFNULL(gedcom_id, 'site') as type"),
+				new Expression('COUNT(log_id) AS nblogs'),
+				new Expression('MAX(log_time) AS lastoccurred')
+			)
+			->where('log_type', '=', 'error')
+			->where(function (Builder $query) use ($tree): void {
+				$query->where('gedcom_id', '=', $tree->id())
+					->orWhereNull('gedcom_id');
+			})
+			->where('log_time', '>=', Carbon::now()->subDays($nb_days))
+			->groupBy('log_message', 'gedcom_id')
+			->orderByDesc('lastoccurred')
+			->get();
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -79,7 +79,7 @@ 
     public function changesByRecordType(Tree $tree, int $nb_days): Collection
     {
         return DB::table('change')
-            ->joinSub($this->allGedcomRecords($tree), 'gedrecords', function (JoinClause $join) use ($tree): void {
+            ->joinSub($this->allGedcomRecords($tree), 'gedrecords', function(JoinClause $join) use ($tree): void {
 
                 $join->on('change.xref', '=', 'gedrecords.ged_id')
                     ->where('change.gedcom_id', '=', $tree->id());
@@ -115,7 +115,7 @@ 
                 new Expression('MAX(log_time) AS lastoccurred')
             )
             ->where('log_type', '=', 'error')
-            ->where(function (Builder $query) use ($tree): void {
+            ->where(function(Builder $query) use ($tree): void {
                 $query->where('gedcom_id', '=', $tree->id())
                     ->orWhereNull('gedcom_id');
             })

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

Indentation +40 added lines, -40 removed lines

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

Spacing +3 added lines, -3 removed lines

@@ -58,12 +58,12 @@
         assert($tree instanceof Tree);
         
         $params = $request->getParsedBody();
-        $user_id = (int) $params['sosa-userid'];
+        $user_id = (int)$params['sosa-userid'];
         $root_id = $params['sosa-rootid'] ?? '';
         
-        if(Auth::id() == $user_id || ($user_id == -1 && Auth::isManager($tree))) {
+        if (Auth::id() == $user_id || ($user_id == -1 && Auth::isManager($tree))) {
             $user = $user_id == -1 ? new DefaultUser() : $this->user_service->find($user_id);
-            if($user !== null && $root_indi = Registry::individualFactory()->make($root_id, $tree)) {
+            if ($user !== null && $root_indi = Registry::individualFactory()->make($root_id, $tree)) {
                 $tree->setUserPreference($user, 'MAJ_SOSA_ROOT_ID', $root_indi->xref());
                 FlashMessages::addMessage(I18N::translate('The root individual has been updated.'));
                 return redirect(route(SosaConfig::class, [

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

Indentation +107 added lines, -107 removed lines

@@ -34,125 +34,125 @@
  */
 class SosaStatistics implements RequestHandlerInterface
 {
-    use ViewResponseTrait;
+	use ViewResponseTrait;
     
-    /**
-     * @var SosaModule $module
-     */
-    private $module;
+	/**
+	 * @var SosaModule $module
+	 */
+	private $module;
     
-    /**
-     * Constructor for AncestorsList Request Handler
-     *
-     * @param ModuleService $module_service
-     */
-    public function __construct(
-        ModuleService $module_service
-    ) {
-        $this->module = $module_service->findByInterface(SosaModule::class)->first();
-    }
+	/**
+	 * 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.'));
-        }
+	/**
+	 * {@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]);
         
-        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)
-        ]);
-    }
+		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();
+	/**
+	 * 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($ancestors_distinct_count, $individual_count),
-            'pedi_collapse'         =>  1 - $this->safeDivision($ancestors_distinct_count, $ancestors_count),
-            'mean_gen_time'         =>  $sosa_stats_service->meanGenerationTime()
-        ];
-    }
+		return [
+			'sosa_count'            =>  $ancestors_count,
+			'distinct_count'        =>  $ancestors_distinct_count,
+			'sosa_rate'             =>  $this->safeDivision($ancestors_distinct_count, $individual_count),
+			'pedi_collapse'         =>  1 - $this->safeDivision($ancestors_distinct_count, $ancestors_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();
+	/**
+	 * 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();
+		$generation_stats = array();
         
-        foreach($stats_by_gen as $gen => $stats_gen){
-            $gen_diff = $gen > 1 ?$stats_gen['diffSosaTotalCount'] - $stats_by_gen[$gen - 1]['diffSosaTotalCount'] : 1;
-            $generation_stats[$gen] = array(
-                'gen_min_birth' => $stats_gen['firstBirth'] ?? $stats_gen['firstEstimatedBirth'],
-                'gen_max_birth' => $stats_gen['lastBirth'] ?? $stats_gen['lastEstimatedBirth'],
-                'theoretical' => pow(2, $gen - 1),
-                'known' => $stats_gen['sosaCount'],
-                'perc_known' => $this->safeDivision($stats_gen['sosaCount'], pow(2, $gen - 1)),
-                'missing' => $gen > 1 ? 2 * $stats_by_gen[$gen - 1]['sosaCount'] - $stats_gen['sosaCount'] : 0,
-                'perc_missing' => $gen > 1 ? 1 - $this->safeDivision($stats_gen['sosaCount'],  2 * $stats_by_gen[$gen - 1]['sosaCount']) : 0,
-                'total_known' => $stats_gen['sosaTotalCount'],
-                'perc_total_known' => $this->safeDivision($stats_gen['sosaTotalCount'], pow(2, $gen) - 1),
-                'different' => $gen_diff,
-                'perc_different' => $this->safeDivision($gen_diff, $stats_gen['sosaCount']),
-                'total_different' => $stats_gen['diffSosaTotalCount'],
-                'pedi_collapse' => 1 - $this->safeDivision($stats_gen['diffSosaTotalCount'], $stats_gen['sosaTotalCount'])
-            );
-        }
+		foreach($stats_by_gen as $gen => $stats_gen){
+			$gen_diff = $gen > 1 ?$stats_gen['diffSosaTotalCount'] - $stats_by_gen[$gen - 1]['diffSosaTotalCount'] : 1;
+			$generation_stats[$gen] = array(
+				'gen_min_birth' => $stats_gen['firstBirth'] ?? $stats_gen['firstEstimatedBirth'],
+				'gen_max_birth' => $stats_gen['lastBirth'] ?? $stats_gen['lastEstimatedBirth'],
+				'theoretical' => pow(2, $gen - 1),
+				'known' => $stats_gen['sosaCount'],
+				'perc_known' => $this->safeDivision($stats_gen['sosaCount'], pow(2, $gen - 1)),
+				'missing' => $gen > 1 ? 2 * $stats_by_gen[$gen - 1]['sosaCount'] - $stats_gen['sosaCount'] : 0,
+				'perc_missing' => $gen > 1 ? 1 - $this->safeDivision($stats_gen['sosaCount'],  2 * $stats_by_gen[$gen - 1]['sosaCount']) : 0,
+				'total_known' => $stats_gen['sosaTotalCount'],
+				'perc_total_known' => $this->safeDivision($stats_gen['sosaTotalCount'], pow(2, $gen) - 1),
+				'different' => $gen_diff,
+				'perc_different' => $this->safeDivision($gen_diff, $stats_gen['sosaCount']),
+				'total_different' => $stats_gen['diffSosaTotalCount'],
+				'pedi_collapse' => 1 - $this->safeDivision($stats_gen['diffSosaTotalCount'], $stats_gen['sosaTotalCount'])
+			);
+		}
         
-        return $generation_stats;
-    }
+		return $generation_stats;
+	}
     
-    /**
-     * Return the result of a division, and a default value if denominator is 0
-     * 
-     * @param int $p Numerator
-     * @param int $q Denominator
-     * @param float $default Value if denominator is 0
-     * @return float
-     */
-    private function safeDivision(int $p, int $q, float $default = 0) : float
-    {
-        return $q == 0 ? $default : $p / $q;
-    }
+	/**
+	 * Return the result of a division, and a default value if denominator is 0
+	 * 
+	 * @param int $p Numerator
+	 * @param int $q Denominator
+	 * @param float $default Value if denominator is 0
+	 * @return float
+	 */
+	private function safeDivision(int $p, int $q, float $default = 0) : float
+	{
+		return $q == 0 ? $default : $p / $q;
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -70,7 +70,7 @@ 
         /** @var SosaStatisticsService $sosa_stats_service */
         $sosa_stats_service = app()->makeWith(SosaStatisticsService::class, ['tree' => $tree, 'user' => $user]);
         
-        return $this->viewResponse($this->module->name() . '::statistics-page', [
+        return $this->viewResponse($this->module->name().'::statistics-page', [
             'module_name'       =>  $this->module->name(),
             'title'             =>  I18N::translate('Sosa Statistics'),
             'tree'              =>  $tree,
@@ -121,8 +121,8 @@ 
         
         $generation_stats = array();
         
-        foreach($stats_by_gen as $gen => $stats_gen){
-            $gen_diff = $gen > 1 ?$stats_gen['diffSosaTotalCount'] - $stats_by_gen[$gen - 1]['diffSosaTotalCount'] : 1;
+        foreach ($stats_by_gen as $gen => $stats_gen) {
+            $gen_diff = $gen > 1 ? $stats_gen['diffSosaTotalCount'] - $stats_by_gen[$gen - 1]['diffSosaTotalCount'] : 1;
             $generation_stats[$gen] = array(
                 'gen_min_birth' => $stats_gen['firstBirth'] ?? $stats_gen['firstEstimatedBirth'],
                 'gen_max_birth' => $stats_gen['lastBirth'] ?? $stats_gen['lastEstimatedBirth'],
@@ -130,7 +130,7 @@ 
                 'known' => $stats_gen['sosaCount'],
                 'perc_known' => $this->safeDivision($stats_gen['sosaCount'], pow(2, $gen - 1)),
                 'missing' => $gen > 1 ? 2 * $stats_by_gen[$gen - 1]['sosaCount'] - $stats_gen['sosaCount'] : 0,
-                'perc_missing' => $gen > 1 ? 1 - $this->safeDivision($stats_gen['sosaCount'],  2 * $stats_by_gen[$gen - 1]['sosaCount']) : 0,
+                'perc_missing' => $gen > 1 ? 1 - $this->safeDivision($stats_gen['sosaCount'], 2 * $stats_by_gen[$gen - 1]['sosaCount']) : 0,
                 'total_known' => $stats_gen['sosaTotalCount'],
                 'perc_total_known' => $this->safeDivision($stats_gen['sosaTotalCount'], pow(2, $gen) - 1),
                 'different' => $gen_diff,

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

Indentation +36 added lines, -36 removed lines

@@ -32,48 +32,48 @@
  */
 class SosaComputeAction implements RequestHandlerInterface
 {
-    /**
-     * @var UserService $user_service
-     */
-    private $user_service;
+	/**
+	 * @var UserService $user_service
+	 */
+	private $user_service;
     
-    /**
-     * Constructor for SosaConfigAction Request Handler
-     * 
-     * @param UserService $user_service
-     */
-    public function __construct(UserService $user_service)
-    {
-        $this->user_service = $user_service;
-    }
+	/**
+	 * Constructor for SosaConfigAction Request Handler
+	 * 
+	 * @param UserService $user_service
+	 */
+	public function __construct(UserService $user_service)
+	{
+		$this->user_service = $user_service;
+	}
     
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        $tree = $request->getAttribute('tree');
-        assert($tree instanceof Tree);
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		$tree = $request->getAttribute('tree');
+		assert($tree instanceof Tree);
         
-        $user_id = (int) ($request->getParsedBody()['user_id'] ?? 0);
-        $partial_from = $request->getParsedBody()['partial_from'] ?? null;
+		$user_id = (int) ($request->getParsedBody()['user_id'] ?? 0);
+		$partial_from = $request->getParsedBody()['partial_from'] ?? null;
         
-        if(($user_id == -1 && Auth::isManager($tree)) || Auth::id() == $user_id) {
-            $user = $user_id == -1 ? new DefaultUser() : $this->user_service->find($user_id);
+		if(($user_id == -1 && Auth::isManager($tree)) || Auth::id() == $user_id) {
+			$user = $user_id == -1 ? new DefaultUser() : $this->user_service->find($user_id);
             
-            /** @var SosaCalculatorService $sosa_calc_service */
-            $sosa_calc_service = app()->makeWith(SosaCalculatorService::class, [ 'tree' => $tree, 'user' => $user]);
+			/** @var SosaCalculatorService $sosa_calc_service */
+			$sosa_calc_service = app()->makeWith(SosaCalculatorService::class, [ 'tree' => $tree, 'user' => $user]);
             
-            if($partial_from !== null && $sosa_from = Registry::individualFactory()->make($partial_from, $tree)) {
-                $res = $sosa_calc_service->computeFromIndividual($sosa_from);
-            } else {
-                $res = $sosa_calc_service->computeAll();
-            }
+			if($partial_from !== null && $sosa_from = Registry::individualFactory()->make($partial_from, $tree)) {
+				$res = $sosa_calc_service->computeFromIndividual($sosa_from);
+			} else {
+				$res = $sosa_calc_service->computeAll();
+			}
             
-            return $res ? response('', 200) : response(I18N::translate('An error occurred during Sosa computation.'), 500);
+			return $res ? response('', 200) : response(I18N::translate('An error occurred during Sosa computation.'), 500);
             
-        }
-        throw new HttpAccessDeniedException(I18N::translate("You do not have permission to modify the user"));
-    }
+		}
+		throw new HttpAccessDeniedException(I18N::translate("You do not have permission to modify the user"));
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -56,16 +56,16 @@
         $tree = $request->getAttribute('tree');
         assert($tree instanceof Tree);
         
-        $user_id = (int) ($request->getParsedBody()['user_id'] ?? 0);
+        $user_id = (int)($request->getParsedBody()['user_id'] ?? 0);
         $partial_from = $request->getParsedBody()['partial_from'] ?? null;
         
-        if(($user_id == -1 && Auth::isManager($tree)) || Auth::id() == $user_id) {
+        if (($user_id == -1 && Auth::isManager($tree)) || Auth::id() == $user_id) {
             $user = $user_id == -1 ? new DefaultUser() : $this->user_service->find($user_id);
             
             /** @var SosaCalculatorService $sosa_calc_service */
-            $sosa_calc_service = app()->makeWith(SosaCalculatorService::class, [ 'tree' => $tree, 'user' => $user]);
+            $sosa_calc_service = app()->makeWith(SosaCalculatorService::class, ['tree' => $tree, 'user' => $user]);
             
-            if($partial_from !== null && $sosa_from = Registry::individualFactory()->make($partial_from, $tree)) {
+            if ($partial_from !== null && $sosa_from = Registry::individualFactory()->make($partial_from, $tree)) {
                 $res = $sosa_calc_service->computeFromIndividual($sosa_from);
             } else {
                 $res = $sosa_calc_service->computeAll();

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

Indentation +47 added lines, -47 removed lines

@@ -32,58 +32,58 @@
  */
 class SosaConfig implements RequestHandlerInterface
 {
-    use ViewResponseTrait;
+	use ViewResponseTrait;
     
-    /**
-     * @var SosaModule $module
-     */
-    private $module;
+	/**
+	 * @var SosaModule $module
+	 */
+	private $module;
     
-    /**
-     * Constructor for SosaConfig Request Handler
-     *
-     * @param ModuleService $module_service
-     */
-    public function __construct(
-        ModuleService $module_service
-    ) {
-        $this->module = $module_service->findByInterface(SosaModule::class)->first();
-    }
+	/**
+	 * Constructor for SosaConfig Request Handler
+	 *
+	 * @param ModuleService $module_service
+	 */
+	public function __construct(
+		ModuleService $module_service
+	) {
+		$this->module = $module_service->findByInterface(SosaModule::class)->first();
+	}
     
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        if ($this->module === null) {
-            throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
-        }
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		if ($this->module === null) {
+			throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
+		}
         
-        /** @var Tree $tree */
-        $tree = $request->getAttribute('tree');
-        assert($tree instanceof Tree);
+		/** @var Tree $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')];
+		$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')];
             
-            if(Auth::isManager($tree)) {
-                $default_user = new DefaultUser();
-                $users_root[] = ['user' => $default_user, 'root_id' => $tree->getUserPreference($default_user, 'MAJ_SOSA_ROOT_ID')];
-            }
-        }
+			if(Auth::isManager($tree)) {
+				$default_user = new DefaultUser();
+				$users_root[] = ['user' => $default_user, 'root_id' => $tree->getUserPreference($default_user, 'MAJ_SOSA_ROOT_ID')];
+			}
+		}
         
-        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
+		]);
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -65,23 +65,23 @@
         assert($tree instanceof Tree);
         
         $users_root = array();
-        if(Auth::check()) {
+        if (Auth::check()) {
             /** @var \Fisharebest\Webtrees\User $user */
             $user = Auth::user();
             $users_root[] = ['user' => $user, 'root_id' => $tree->getUserPreference($user, 'MAJ_SOSA_ROOT_ID')];
             
-            if(Auth::isManager($tree)) {
+            if (Auth::isManager($tree)) {
                 $default_user = new DefaultUser();
                 $users_root[] = ['user' => $default_user, 'root_id' => $tree->getUserPreference($default_user, 'MAJ_SOSA_ROOT_ID')];
             }
         }
         
-        return $this->viewResponse($this->module->name() . '::config-page', [
+        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),
+            'selected_user_id'  =>  (int)($request->getQueryParams()['user_id'] ?? 0),
             'immediate_compute' =>  ($request->getQueryParams()['compute'] ?? '') == 'yes',
             'users_root'        =>  $users_root
         ]);

src/Webtrees/Module/Sosa/Schema/Migration1.php

Indentation +8 added lines, -8 removed lines

@@ -22,12 +22,12 @@
 class Migration1 implements MigrationInterface
 {
     
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Schema\MigrationInterface::upgrade()
-     */
-    public function upgrade(): void
-    {
-        // These migrations have been merged into migration 2.
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Schema\MigrationInterface::upgrade()
+	 */
+	public function upgrade(): void
+	{
+		// These migrations have been merged into migration 2.
+	}
 }

src/Webtrees/Module/Sosa/Schema/Migration0.php

Indentation +5 added lines, -5 removed lines

@@ -22,12 +22,12 @@
 class Migration0 implements MigrationInterface
 {
     
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Schema\MigrationInterface::upgrade()
-     */
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Schema\MigrationInterface::upgrade()
+	 */
 	public function upgrade(): void
 	{
-	    // These migrations have been merged into migration 2.
+		// These migrations have been merged into migration 2.
 	}
 }

src/Webtrees/Module/Sosa/Schema/Migration2.php

Indentation +23 added lines, -23 removed lines

@@ -23,36 +23,36 @@
  */
 class Migration2 implements MigrationInterface {
     
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Schema\MigrationInterface::upgrade()
-     */
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Schema\MigrationInterface::upgrade()
+	 */
 	public function upgrade(): void
 	{
 	    
-	    // Clean up previous sosa table if it exists
-	    DB::schema()->dropIfExists('maj_sosa');
+		// Clean up previous sosa table if it exists
+		DB::schema()->dropIfExists('maj_sosa');
 	    
-	    DB::schema()->create('maj_sosa', static function (Blueprint $table): void {
+		DB::schema()->create('maj_sosa', static function (Blueprint $table): void {
 	        
-	        $table->integer('majs_gedcom_id');
-	        $table->integer('majs_user_id')->default(-1);
-	        $table->bigInteger('majs_sosa')->unsigned(); // Allow to calculate sosa on 64 generations
-	        $table->string('majs_i_id', 20);
-	        $table->tinyInteger('majs_gen')->nullable();
-	        $table->smallInteger('majs_birth_year')->nullable();
-	        $table->smallInteger('majs_birth_year_est')->nullable();
-	        $table->smallInteger('majs_death_year')->nullable();
-	        $table->smallInteger('majs_death_year_est')->nullable();
+			$table->integer('majs_gedcom_id');
+			$table->integer('majs_user_id')->default(-1);
+			$table->bigInteger('majs_sosa')->unsigned(); // Allow to calculate sosa on 64 generations
+			$table->string('majs_i_id', 20);
+			$table->tinyInteger('majs_gen')->nullable();
+			$table->smallInteger('majs_birth_year')->nullable();
+			$table->smallInteger('majs_birth_year_est')->nullable();
+			$table->smallInteger('majs_death_year')->nullable();
+			$table->smallInteger('majs_death_year_est')->nullable();
 	        
-	        $table->primary(['majs_gedcom_id', 'majs_user_id', 'majs_sosa']);
+			$table->primary(['majs_gedcom_id', 'majs_user_id', 'majs_sosa']);
 	        
-	        $table->index(['majs_gedcom_id', 'majs_user_id']);
-	        $table->index(['majs_gedcom_id', 'majs_user_id', 'majs_i_id']);
-	        $table->index(['majs_gedcom_id', 'majs_user_id', 'majs_gen']);
+			$table->index(['majs_gedcom_id', 'majs_user_id']);
+			$table->index(['majs_gedcom_id', 'majs_user_id', 'majs_i_id']);
+			$table->index(['majs_gedcom_id', 'majs_user_id', 'majs_gen']);
 	        
-	        $table->foreign('majs_gedcom_id')->references('gedcom_id')->on('gedcom')->onDelete('cascade');
-	        $table->foreign('majs_user_id')->references('user_id')->on('user')->onDelete('cascade');
-	    });
+			$table->foreign('majs_gedcom_id')->references('gedcom_id')->on('gedcom')->onDelete('cascade');
+			$table->foreign('majs_user_id')->references('user_id')->on('user')->onDelete('cascade');
+		});
 	}
 }

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 	    // Clean up previous sosa table if it exists
 	    DB::schema()->dropIfExists('maj_sosa');
 	    
-	    DB::schema()->create('maj_sosa', static function (Blueprint $table): void {
+	    DB::schema()->create('maj_sosa', static function(Blueprint $table): void {
 	        
 	        $table->integer('majs_gedcom_id');
 	        $table->integer('majs_user_id')->default(-1);