jon48 / webtrees-lib

app/Module/AdminTasks/Schema/Migration0.php

Indentation +8 added lines, -8 removed lines

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

app/Module/AdminTasks/Services/TaskScheduleService.php

Indentation +257 added lines, -257 removed lines

@@ -36,261 +36,261 @@
  */
 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;
-
-    private ModuleService $module_service;
-
-    /**
-     * Constructor for TaskScheduleService
-     *
-     * @param ModuleService $module_service
-     */
-    public function __construct(ModuleService $module_service)
-    {
-        $this->module_service = $module_service;
-    }
-
-    /**
-     * 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<TaskSchedule> 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<array<string, string>>
-     */
-    public function available(): Collection
-    {
-        return Registry::cache()->array()->remember('maj-available-admintasks', function () {
-            return $this->module_service
-                ->findByInterface(ModuleTasksProviderInterface::class)
-                ->flatMap(fn(ModuleTasksProviderInterface $module) => $module->listTasks());
-        });
-    }
-
-    /**
-     * 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<TaskSchedule>
-     */
-    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
-    {
-        $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(stdClass $row): TaskSchedule
-     */
-    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;
+
+	private ModuleService $module_service;
+
+	/**
+	 * Constructor for TaskScheduleService
+	 *
+	 * @param ModuleService $module_service
+	 */
+	public function __construct(ModuleService $module_service)
+	{
+		$this->module_service = $module_service;
+	}
+
+	/**
+	 * 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<TaskSchedule> 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<array<string, string>>
+	 */
+	public function available(): Collection
+	{
+		return Registry::cache()->array()->remember('maj-available-admintasks', function () {
+			return $this->module_service
+				->findByInterface(ModuleTasksProviderInterface::class)
+				->flatMap(fn(ModuleTasksProviderInterface $module) => $module->listTasks());
+		});
+	}
+
+	/**
+	 * 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<TaskSchedule>
+	 */
+	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
+	{
+		$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(stdClass $row): TaskSchedule
+	 */
+	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 +11 added lines, -11 removed lines

@@ -99,7 +99,7 @@ 
      */
     public function available(): Collection
     {
-        return Registry::cache()->array()->remember('maj-available-admintasks', function () {
+        return Registry::cache()->array()->remember('maj-available-admintasks', function() {
             return $this->module_service
                 ->findByInterface(ModuleTasksProviderInterface::class)
                 ->flatMap(fn(ModuleTasksProviderInterface $module) => $module->listTasks());
@@ -201,14 +201,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()');
@@ -256,9 +256,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());
                     }
                 }
 
@@ -279,17 +279,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
             );
         };
     }

app/Module/AdminTasks/Services/TokenService.php

Indentation +28 added lines, -28 removed lines

@@ -20,32 +20,32 @@
  */
 class TokenService
 {
-    /**
-     * Returns a random-ish generated token of a given size
-     *
-     * @param int $length Length of the token, default to 32
-     * @return string Random token
-     */
-    public function generateRandomToken(int $length = 32): string
-    {
-        $chars = str_split('abcdefghijkmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789');
-        $len_chars = count($chars);
-        $token = '';
-
-        for ($i = 0; $i < $length; $i++) {
-            $token .= $chars[mt_rand(0, $len_chars - 1)];
-        }
-
-        # Number of 32 char chunks
-        $chunks = ceil(strlen($token) / 32);
-        $md5token = '';
-
-        # Run each chunk through md5
-        for ($i = 1; $i <= $chunks; $i++) {
-            $md5token .= md5(substr($token, $i * 32 - 32, 32));
-        }
-
-        # Trim the token to the required length
-        return substr($md5token, 0, $length);
-    }
+	/**
+	 * Returns a random-ish generated token of a given size
+	 *
+	 * @param int $length Length of the token, default to 32
+	 * @return string Random token
+	 */
+	public function generateRandomToken(int $length = 32): string
+	{
+		$chars = str_split('abcdefghijkmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789');
+		$len_chars = count($chars);
+		$token = '';
+
+		for ($i = 0; $i < $length; $i++) {
+			$token .= $chars[mt_rand(0, $len_chars - 1)];
+		}
+
+		# Number of 32 char chunks
+		$chunks = ceil(strlen($token) / 32);
+		$md5token = '';
+
+		# Run each chunk through md5
+		for ($i = 1; $i <= $chunks; $i++) {
+			$md5token .= md5(substr($token, $i * 32 - 32, 32));
+		}
+
+		# Trim the token to the required length
+		return substr($md5token, 0, $length);
+	}
 }

app/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<string, int>
-     */
-    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<string, int>
+	 */
+	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<string, int>
-     */
-    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<string, int>
+	 */
+	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<\stdClass>
-     */
-    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<\stdClass>
+	 */
+	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');
             })

app/Module/AdminTasks/AdminTasksModule.php

Indentation +122 added lines, -122 removed lines

@@ -41,127 +41,127 @@
  * Allow for tasks to be run on a (nearly-)regular schedule
  */
 class AdminTasksModule extends AbstractModule implements
-    ModuleMyArtJaubInterface,
-    ModuleConfigInterface,
-    ModuleGlobalInterface,
-    ModuleTasksProviderInterface
+	ModuleMyArtJaubInterface,
+	ModuleConfigInterface,
+	ModuleGlobalInterface,
+	ModuleTasksProviderInterface
 {
-    use ModuleMyArtJaubTrait {
-        boot as traitBoot;
-    }
-    use ModuleConfigTrait;
-    use ModuleGlobalTrait;
-
-    //How to update the database schema for this module
-    private const SCHEMA_TARGET_VERSION   = 2;
-    private const SCHEMA_SETTING_NAME     = 'MAJ_ADMTASKS_SCHEMA_VERSION';
-    private const SCHEMA_MIGRATION_PREFIX = __NAMESPACE__ . '\Schema';
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\AbstractModule::title()
-     */
-    public function title(): string
-    {
-        return I18N::translate('Administration Tasks');
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\AbstractModule::description()
-     */
-    public function description(): string
-    {
-        return I18N::translate('Manage and run nearly-scheduled administration tasks.');
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\AbstractModule::boot()
-     */
-    public function boot(): void
-    {
-        $this->traitBoot();
-        app(MigrationService::class)->updateSchema(
-            self::SCHEMA_MIGRATION_PREFIX,
-            self::SCHEMA_SETTING_NAME,
-            self::SCHEMA_TARGET_VERSION
-        );
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\ModuleMyArtJaubInterface::loadRoutes()
-     */
-    public function loadRoutes(Map $router): void
-    {
-        $router->attach('', '', static function (Map $router): void {
-
-            $router->attach('', '/module-maj/admintasks', static function (Map $router): void {
-                $router->tokens(['enable' => '[01]']);
-
-                $router->attach('', '/admin', static function (Map $router): void {
-
-                    $router->extras([
-                        'middleware' => [
-                            AuthAdministrator::class,
-                        ],
-                    ]);
-                    $router->get(AdminConfigPage::class, '/config', AdminConfigPage::class);
-
-                    $router->attach('', '/tasks', static function (Map $router): void {
-
-                        $router->get(TasksList::class, '', TasksList::class);
-                        $router->get(TaskEditPage::class, '/{task}', TaskEditPage::class);
-                        $router->post(TaskEditAction::class, '/{task}', TaskEditAction::class);
-                        $router->get(TaskStatusAction::class, '/{task}/status/{enable}', TaskStatusAction::class);
-                    });
-                });
-
-                $router->get(TaskTrigger::class, '/trigger{/task}', TaskTrigger::class)
-                    ->allows(RequestMethodInterface::METHOD_POST);
-
-                $router->post(TokenGenerate::class, '/token', TokenGenerate::class)
-                    ->extras(['middleware' => [AuthAdministrator::class]]);
-            });
-        });
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleCustomInterface::customModuleLatestVersion()
-     */
-    public function customModuleVersion(): string
-    {
-        return '2.1.0-v.1';
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleConfigInterface::getConfigLink()
-     */
-    public function getConfigLink(): string
-    {
-        return route(AdminConfigPage::class);
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleGlobalInterface::bodyContent()
-     */
-    public function bodyContent(): string
-    {
-        return view($this->name() . '::snippet', [ 'url' => route(TaskTrigger::class) ]);
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see ModuleTasksProviderInterface::listTasks()
-     */
-    public function listTasks(): array
-    {
-        return [
-            'maj-healthcheck' => HealthCheckEmailTask::class
-        ];
-    }
+	use ModuleMyArtJaubTrait {
+		boot as traitBoot;
+	}
+	use ModuleConfigTrait;
+	use ModuleGlobalTrait;
+
+	//How to update the database schema for this module
+	private const SCHEMA_TARGET_VERSION   = 2;
+	private const SCHEMA_SETTING_NAME     = 'MAJ_ADMTASKS_SCHEMA_VERSION';
+	private const SCHEMA_MIGRATION_PREFIX = __NAMESPACE__ . '\Schema';
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\AbstractModule::title()
+	 */
+	public function title(): string
+	{
+		return I18N::translate('Administration Tasks');
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\AbstractModule::description()
+	 */
+	public function description(): string
+	{
+		return I18N::translate('Manage and run nearly-scheduled administration tasks.');
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\AbstractModule::boot()
+	 */
+	public function boot(): void
+	{
+		$this->traitBoot();
+		app(MigrationService::class)->updateSchema(
+			self::SCHEMA_MIGRATION_PREFIX,
+			self::SCHEMA_SETTING_NAME,
+			self::SCHEMA_TARGET_VERSION
+		);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Module\ModuleMyArtJaubInterface::loadRoutes()
+	 */
+	public function loadRoutes(Map $router): void
+	{
+		$router->attach('', '', static function (Map $router): void {
+
+			$router->attach('', '/module-maj/admintasks', static function (Map $router): void {
+				$router->tokens(['enable' => '[01]']);
+
+				$router->attach('', '/admin', static function (Map $router): void {
+
+					$router->extras([
+						'middleware' => [
+							AuthAdministrator::class,
+						],
+					]);
+					$router->get(AdminConfigPage::class, '/config', AdminConfigPage::class);
+
+					$router->attach('', '/tasks', static function (Map $router): void {
+
+						$router->get(TasksList::class, '', TasksList::class);
+						$router->get(TaskEditPage::class, '/{task}', TaskEditPage::class);
+						$router->post(TaskEditAction::class, '/{task}', TaskEditAction::class);
+						$router->get(TaskStatusAction::class, '/{task}/status/{enable}', TaskStatusAction::class);
+					});
+				});
+
+				$router->get(TaskTrigger::class, '/trigger{/task}', TaskTrigger::class)
+					->allows(RequestMethodInterface::METHOD_POST);
+
+				$router->post(TokenGenerate::class, '/token', TokenGenerate::class)
+					->extras(['middleware' => [AuthAdministrator::class]]);
+			});
+		});
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleCustomInterface::customModuleLatestVersion()
+	 */
+	public function customModuleVersion(): string
+	{
+		return '2.1.0-v.1';
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleConfigInterface::getConfigLink()
+	 */
+	public function getConfigLink(): string
+	{
+		return route(AdminConfigPage::class);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleGlobalInterface::bodyContent()
+	 */
+	public function bodyContent(): string
+	{
+		return view($this->name() . '::snippet', [ 'url' => route(TaskTrigger::class) ]);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see ModuleTasksProviderInterface::listTasks()
+	 */
+	public function listTasks(): array
+	{
+		return [
+			'maj-healthcheck' => HealthCheckEmailTask::class
+		];
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -55,7 +55,7 @@ 
     //How to update the database schema for this module
     private const SCHEMA_TARGET_VERSION   = 2;
     private const SCHEMA_SETTING_NAME     = 'MAJ_ADMTASKS_SCHEMA_VERSION';
-    private const SCHEMA_MIGRATION_PREFIX = __NAMESPACE__ . '\Schema';
+    private const SCHEMA_MIGRATION_PREFIX = __NAMESPACE__.'\Schema';
 
     /**
      * {@inheritDoc}
@@ -95,12 +95,12 @@ 
      */
     public function loadRoutes(Map $router): void
     {
-        $router->attach('', '', static function (Map $router): void {
+        $router->attach('', '', static function(Map $router): void {
 
-            $router->attach('', '/module-maj/admintasks', static function (Map $router): void {
+            $router->attach('', '/module-maj/admintasks', static function(Map $router): void {
                 $router->tokens(['enable' => '[01]']);
 
-                $router->attach('', '/admin', static function (Map $router): void {
+                $router->attach('', '/admin', static function(Map $router): void {
 
                     $router->extras([
                         'middleware' => [
@@ -109,7 +109,7 @@ 
                     ]);
                     $router->get(AdminConfigPage::class, '/config', AdminConfigPage::class);
 
-                    $router->attach('', '/tasks', static function (Map $router): void {
+                    $router->attach('', '/tasks', static function(Map $router): void {
 
                         $router->get(TasksList::class, '', TasksList::class);
                         $router->get(TaskEditPage::class, '/{task}', TaskEditPage::class);
@@ -151,7 +151,7 @@ 
      */
     public function bodyContent(): string
     {
-        return view($this->name() . '::snippet', [ 'url' => route(TaskTrigger::class) ]);
+        return view($this->name().'::snippet', ['url' => route(TaskTrigger::class)]);
     }
 
     /**

app/Module/AdminTasks/Tasks/HealthCheckEmailTask.php

Indentation +161 added lines, -161 removed lines

@@ -39,165 +39,165 @@
  */
 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';
-
-    private ?AdminTasksModule $module;
-    private HealthCheckService $healthcheck_service;
-    private EmailService $email_service;
-    private UserService $user_service;
-    private TreeService $tree_service;
-    private UpgradeService $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\Contracts\Tasks\TaskInterface::name()
-     */
-    public function name(): string
-    {
-        return I18N::translate('Healthcheck Email');
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\Tasks\TaskInterface::defaultFrequency()
-     */
-    public function defaultFrequency(): int
-    {
-        return 10080; // = 1 week = 7 * 24 * 60 min
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\Tasks\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\Contracts\Tasks\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\Contracts\Tasks\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';
+
+	private ?AdminTasksModule $module;
+	private HealthCheckService $healthcheck_service;
+	private EmailService $email_service;
+	private UserService $user_service;
+	private TreeService $tree_service;
+	private UpgradeService $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\Contracts\Tasks\TaskInterface::name()
+	 */
+	public function name(): string
+	{
+		return I18N::translate('Healthcheck Email');
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\Tasks\TaskInterface::defaultFrequency()
+	 */
+	public function defaultFrequency(): int
+	{
+		return 10080; // = 1 week = 7 * 24 * 60 min
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\Tasks\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\Contracts\Tasks\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\Contracts\Tasks\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');
                 }
             }

app/Helpers/functions.php

Indentation +9 added lines, -9 removed lines

@@ -28,15 +28,15 @@ 
  */
 function hook(string $hook_interface, callable $apply, $default = null)
 {
-    try {
-        $hook_collector = app(HookServiceInterface::class)->use($hook_interface);
-        if ($hook_collector !== null) {
-            return $apply($hook_collector);
-        }
-    } catch (BindingResolutionException $ex) {
-    }
+	try {
+		$hook_collector = app(HookServiceInterface::class)->use($hook_interface);
+		if ($hook_collector !== null) {
+			return $apply($hook_collector);
+		}
+	} catch (BindingResolutionException $ex) {
+	}
 
-    return $default;
+	return $default;
 }
 
 /**
@@ -48,5 +48,5 @@ 
  */
 function columnIndex(int $initial_index, Collection $new_column_indexes): int
 {
-    return $initial_index + $new_column_indexes->filter(fn(int $i) => $i <= $initial_index)->count();
+	return $initial_index + $new_column_indexes->filter(fn(int $i) => $i <= $initial_index)->count();
 }

app/Http/Middleware/AuthTreePreference.php

Indentation +32 added lines, -32 removed lines

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

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
         // Permissions are configured
         if (is_numeric($permission_level)) {
             // Logged in with the correct role?
-            if (Auth::accessLevel($tree, $user) <= (int) $permission_level) {
+            if (Auth::accessLevel($tree, $user) <= (int)$permission_level) {
                     return $handler->handle($request);
             }
 

app/Common/Hooks/AbstractHookCollector.php

Indentation +64 added lines, -64 removed lines

@@ -28,76 +28,76 @@
  */
 abstract class AbstractHookCollector implements HookCollectorInterface, HookInterface
 {
-    protected Collection $hooks;
-    private ModuleInterface $module;
+	protected Collection $hooks;
+	private ModuleInterface $module;
 
-    /**
-     * Constructor for AbstractHookCollector
-     *
-     * @param ModuleInterface $module
-     */
-    public function __construct(ModuleInterface $module)
-    {
-        $this->hooks = new Collection();
-        $this->module = $module;
-    }
+	/**
+	 * Constructor for AbstractHookCollector
+	 *
+	 * @param ModuleInterface $module
+	 */
+	public function __construct(ModuleInterface $module)
+	{
+		$this->hooks = new Collection();
+		$this->module = $module;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\Hooks\HookInterface::module()
-     */
-    public function module(): ModuleInterface
-    {
-        return $this->module;
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\Hooks\HookInterface::module()
+	 */
+	public function module(): ModuleInterface
+	{
+		return $this->module;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\Hooks\HookCollectorInterface::name()
-     */
-    public function name(): string
-    {
-        return $this->module->name() . '-' .
-            mb_substr(str_replace('collector', '', mb_strtolower((new ReflectionClass($this))->getShortName())), 0, 64);
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\Hooks\HookCollectorInterface::name()
+	 */
+	public function name(): string
+	{
+		return $this->module->name() . '-' .
+			mb_substr(str_replace('collector', '', mb_strtolower((new ReflectionClass($this))->getShortName())), 0, 64);
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\Hooks\HookCollectorInterface::title()
-     */
-    abstract public function title(): string;
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\Hooks\HookCollectorInterface::title()
+	 */
+	abstract public function title(): string;
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\Hooks\HookCollectorInterface::description()
-     */
-    abstract public function description(): string;
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\Hooks\HookCollectorInterface::description()
+	 */
+	abstract public function description(): string;
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\Hooks\HookCollectorInterface::hookInterface()
-     */
-    abstract public function hookInterface(): string;
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\Hooks\HookCollectorInterface::hookInterface()
+	 */
+	abstract public function hookInterface(): string;
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\Hooks\HookCollectorInterface::register()
-     */
-    public function register(HookInterface $hook_instance, int $order): void
-    {
-        if ($this->hooks->has($order)) {
-            $this->hooks->splice($order + 1, 0, [$hook_instance]);
-        } else {
-            $this->hooks->put($order, $hook_instance);
-        }
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\Hooks\HookCollectorInterface::register()
+	 */
+	public function register(HookInterface $hook_instance, int $order): void
+	{
+		if ($this->hooks->has($order)) {
+			$this->hooks->splice($order + 1, 0, [$hook_instance]);
+		} else {
+			$this->hooks->put($order, $hook_instance);
+		}
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\Hooks\HookCollectorInterface::hooks()
-     */
-    public function hooks(): Collection
-    {
-        return $this->hooks->sortKeys();
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\Hooks\HookCollectorInterface::hooks()
+	 */
+	public function hooks(): Collection
+	{
+		return $this->hooks->sortKeys();
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
      */
     public function name(): string
     {
-        return $this->module->name() . '-' .
+        return $this->module->name().'-'.
             mb_substr(str_replace('collector', '', mb_strtolower((new ReflectionClass($this))->getShortName())), 0, 64);
     }