jon48 / webtrees-lib

app/Module/AdminTasks/Http/RequestHandlers/TaskTrigger.php

Indentation +31 added lines, -31 removed lines

@@ -30,41 +30,41 @@
  */
 class TaskTrigger implements RequestHandlerInterface
 {
-    private ?AdminTasksModule $module;
-    private TaskScheduleService $taskschedules_service;
+	private ?AdminTasksModule $module;
+	private TaskScheduleService $taskschedules_service;
 
-    /**
-     * Constructor for TaskTrigger request handler
-     * @param ModuleService $module_service
-     * @param TaskScheduleService $taskschedules_service
-     */
-    public function __construct(ModuleService $module_service, TaskScheduleService $taskschedules_service)
-    {
-        $this->module = $module_service->findByInterface(AdminTasksModule::class)->first();
-        $this->taskschedules_service = $taskschedules_service;
-    }
+	/**
+	 * Constructor for TaskTrigger request handler
+	 * @param ModuleService $module_service
+	 * @param TaskScheduleService $taskschedules_service
+	 */
+	public function __construct(ModuleService $module_service, TaskScheduleService $taskschedules_service)
+	{
+		$this->module = $module_service->findByInterface(AdminTasksModule::class)->first();
+		$this->taskschedules_service = $taskschedules_service;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        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.'));
+		}
 
-        $task_id = Validator::attributes($request)->string('task', '');
-        $token = $this->module->getPreference('MAJ_AT_FORCE_EXEC_TOKEN');
-        $force_token = Validator::queryParams($request)->string('force', '');
-        $force = $token !== '' &&  $token === $force_token;
+		$task_id = Validator::attributes($request)->string('task', '');
+		$token = $this->module->getPreference('MAJ_AT_FORCE_EXEC_TOKEN');
+		$force_token = Validator::queryParams($request)->string('force', '');
+		$force = $token !== '' &&  $token === $force_token;
 
-        $task_schedules = $this->taskschedules_service->findTasksToRun($force, $task_id);
+		$task_schedules = $this->taskschedules_service->findTasksToRun($force, $task_id);
 
-        foreach ($task_schedules as $task_schedule) {
-            $this->taskschedules_service->run($task_schedule, $force);
-        }
+		foreach ($task_schedules as $task_schedule) {
+			$this->taskschedules_service->run($task_schedule, $force);
+		}
 
-        return Registry::responseFactory()->response();
-    }
+		return Registry::responseFactory()->response();
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
         $task_id = Validator::attributes($request)->string('task', '');
         $token = $this->module->getPreference('MAJ_AT_FORCE_EXEC_TOKEN');
         $force_token = Validator::queryParams($request)->string('force', '');
-        $force = $token !== '' &&  $token === $force_token;
+        $force = $token !== '' && $token === $force_token;
 
         $task_schedules = $this->taskschedules_service->findTasksToRun($force, $task_id);
 

app/Module/AdminTasks/Http/RequestHandlers/TaskEditAction.php

Indentation +142 added lines, -142 removed lines

@@ -34,146 +34,146 @@
  */
 class TaskEditAction implements RequestHandlerInterface
 {
-    private ?AdminTasksModule $module;
-    private TaskScheduleService $taskschedules_service;
-
-    /**
-     * Constructor for TaskEditAction Request Handler
-     *
-     * @param ModuleService $module_service
-     * @param TaskScheduleService $taskschedules_service
-     */
-    public function __construct(ModuleService $module_service, TaskScheduleService $taskschedules_service)
-    {
-        $this->module = $module_service->findByInterface(AdminTasksModule::class)->first();
-        $this->taskschedules_service = $taskschedules_service;
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        if ($this->module === null) {
-            FlashMessages::addMessage(
-                I18N::translate('The attached module could not be found.'),
-                'danger'
-            );
-            return Registry::responseFactory()->redirect(AdminConfigPage::class);
-        }
-
-        $task_sched_id = Validator::attributes($request)->integer('task', -1);
-        $task_schedule = $this->taskschedules_service->find($task_sched_id);
-
-        if ($task_schedule === null) {
-            FlashMessages::addMessage(
-                I18N::translate('The task shedule with ID “%s” does not exist.', I18N::number($task_sched_id)),
-                'danger'
-            );
-            return Registry::responseFactory()->redirect(AdminConfigPage::class);
-        }
-
-        $success = $this->updateGeneralSettings($task_schedule, $request);
-        $success = $success && $this->updateSpecificSettings($task_schedule, $request);
-
-        if ($success) {
-            FlashMessages::addMessage(
-                I18N::translate('The scheduled task has been successfully updated.'),
-                'success'
-            );
-            //phpcs:ignore Generic.Files.LineLength.TooLong
-            Log::addConfigurationLog('Module ' . $this->module->title() . ' : Task Schedule “' . $task_schedule->id() . '” has been updated.');
-        }
-
-        return Registry::responseFactory()->redirect(AdminConfigPage::class);
-    }
-
-    /**
-     * Update general settings for the task, based on the request parameters
-     *
-     * @param TaskSchedule $task_schedule
-     * @param ServerRequestInterface $request
-     * @return bool
-     */
-    private function updateGeneralSettings(TaskSchedule $task_schedule, ServerRequestInterface $request): bool
-    {
-        if ($this->module === null) {
-            return false;
-        }
-
-        $frequency = Validator::parsedBody($request)->integer('frequency', 0);
-        if ($frequency > 0) {
-            $task_schedule->setFrequency($frequency);
-        } else {
-            FlashMessages::addMessage(I18N::translate('The frequency is not in a valid format.'), 'danger');
-        }
-
-        $is_limited = Validator::parsedBody($request)->boolean('is_limited', false);
-        $nb_occur = Validator::parsedBody($request)->integer('nb_occur', 1);
-        if ($is_limited) {
-            if ($nb_occur > 0) {
-                $task_schedule->setRemainingOccurrences($nb_occur);
-            } else {
-                FlashMessages::addMessage(
-                    I18N::translate('The number of remaining occurrences is not in a valid format.'),
-                    'danger'
-                );
-            }
-        } else {
-            $task_schedule->setRemainingOccurrences(0);
-        }
-
-        try {
-            $this->taskschedules_service->update($task_schedule);
-            return true;
-        } catch (Throwable $ex) {
-            Log::addErrorLog(
-                sprintf(
-                    'Error while updating the Task Schedule "%s". Exception: %s',
-                    $task_schedule->id(),
-                    $ex->getMessage()
-                )
-            );
-        }
-
-        FlashMessages::addMessage(I18N::translate('An error occured while updating the scheduled task.'), 'danger');
-        //@phpcs:ignore Generic.Files.LineLength.TooLong
-        Log::addConfigurationLog('Module ' . $this->module->title() . ' : Task Schedule “' . $task_schedule->id() . '” could not be updated. See error log.');
-        return false;
-    }
-
-    /**
-     * Update general settings for the task, based on the request parameters
-     *
-     * @param TaskSchedule $task_schedule
-     * @param ServerRequestInterface $request
-     * @return bool
-     */
-    private function updateSpecificSettings(TaskSchedule $task_schedule, ServerRequestInterface $request): bool
-    {
-        if ($this->module === null) {
-            return false;
-        }
-
-        $task = $this->taskschedules_service->findTask($task_schedule->taskId());
-        if ($task === null || !($task instanceof ConfigurableTaskInterface)) {
-            return true;
-        }
-
-        /** @var \MyArtJaub\Webtrees\Contracts\Tasks\TaskInterface&\MyArtJaub\Webtrees\Contracts\Tasks\ConfigurableTaskInterface $task */
-        if (!$task->updateConfig($request, $task_schedule)) {
-            FlashMessages::addMessage(
-                I18N::translate(
-                    'An error occured while updating the specific settings of administrative task “%s”.',
-                    $task->name()
-                ),
-                'danger'
-            );
-            //phpcs:ignore Generic.Files.LineLength.TooLong
-            Log::addConfigurationLog('Module ' . $this->module->title() . ' : AdminTask “' . $task->name() . '” specific settings could not be updated. See error log.');
-        }
-
-        return true;
-    }
+	private ?AdminTasksModule $module;
+	private TaskScheduleService $taskschedules_service;
+
+	/**
+	 * Constructor for TaskEditAction Request Handler
+	 *
+	 * @param ModuleService $module_service
+	 * @param TaskScheduleService $taskschedules_service
+	 */
+	public function __construct(ModuleService $module_service, TaskScheduleService $taskschedules_service)
+	{
+		$this->module = $module_service->findByInterface(AdminTasksModule::class)->first();
+		$this->taskschedules_service = $taskschedules_service;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		if ($this->module === null) {
+			FlashMessages::addMessage(
+				I18N::translate('The attached module could not be found.'),
+				'danger'
+			);
+			return Registry::responseFactory()->redirect(AdminConfigPage::class);
+		}
+
+		$task_sched_id = Validator::attributes($request)->integer('task', -1);
+		$task_schedule = $this->taskschedules_service->find($task_sched_id);
+
+		if ($task_schedule === null) {
+			FlashMessages::addMessage(
+				I18N::translate('The task shedule with ID “%s” does not exist.', I18N::number($task_sched_id)),
+				'danger'
+			);
+			return Registry::responseFactory()->redirect(AdminConfigPage::class);
+		}
+
+		$success = $this->updateGeneralSettings($task_schedule, $request);
+		$success = $success && $this->updateSpecificSettings($task_schedule, $request);
+
+		if ($success) {
+			FlashMessages::addMessage(
+				I18N::translate('The scheduled task has been successfully updated.'),
+				'success'
+			);
+			//phpcs:ignore Generic.Files.LineLength.TooLong
+			Log::addConfigurationLog('Module ' . $this->module->title() . ' : Task Schedule “' . $task_schedule->id() . '” has been updated.');
+		}
+
+		return Registry::responseFactory()->redirect(AdminConfigPage::class);
+	}
+
+	/**
+	 * Update general settings for the task, based on the request parameters
+	 *
+	 * @param TaskSchedule $task_schedule
+	 * @param ServerRequestInterface $request
+	 * @return bool
+	 */
+	private function updateGeneralSettings(TaskSchedule $task_schedule, ServerRequestInterface $request): bool
+	{
+		if ($this->module === null) {
+			return false;
+		}
+
+		$frequency = Validator::parsedBody($request)->integer('frequency', 0);
+		if ($frequency > 0) {
+			$task_schedule->setFrequency($frequency);
+		} else {
+			FlashMessages::addMessage(I18N::translate('The frequency is not in a valid format.'), 'danger');
+		}
+
+		$is_limited = Validator::parsedBody($request)->boolean('is_limited', false);
+		$nb_occur = Validator::parsedBody($request)->integer('nb_occur', 1);
+		if ($is_limited) {
+			if ($nb_occur > 0) {
+				$task_schedule->setRemainingOccurrences($nb_occur);
+			} else {
+				FlashMessages::addMessage(
+					I18N::translate('The number of remaining occurrences is not in a valid format.'),
+					'danger'
+				);
+			}
+		} else {
+			$task_schedule->setRemainingOccurrences(0);
+		}
+
+		try {
+			$this->taskschedules_service->update($task_schedule);
+			return true;
+		} catch (Throwable $ex) {
+			Log::addErrorLog(
+				sprintf(
+					'Error while updating the Task Schedule "%s". Exception: %s',
+					$task_schedule->id(),
+					$ex->getMessage()
+				)
+			);
+		}
+
+		FlashMessages::addMessage(I18N::translate('An error occured while updating the scheduled task.'), 'danger');
+		//@phpcs:ignore Generic.Files.LineLength.TooLong
+		Log::addConfigurationLog('Module ' . $this->module->title() . ' : Task Schedule “' . $task_schedule->id() . '” could not be updated. See error log.');
+		return false;
+	}
+
+	/**
+	 * Update general settings for the task, based on the request parameters
+	 *
+	 * @param TaskSchedule $task_schedule
+	 * @param ServerRequestInterface $request
+	 * @return bool
+	 */
+	private function updateSpecificSettings(TaskSchedule $task_schedule, ServerRequestInterface $request): bool
+	{
+		if ($this->module === null) {
+			return false;
+		}
+
+		$task = $this->taskschedules_service->findTask($task_schedule->taskId());
+		if ($task === null || !($task instanceof ConfigurableTaskInterface)) {
+			return true;
+		}
+
+		/** @var \MyArtJaub\Webtrees\Contracts\Tasks\TaskInterface&\MyArtJaub\Webtrees\Contracts\Tasks\ConfigurableTaskInterface $task */
+		if (!$task->updateConfig($request, $task_schedule)) {
+			FlashMessages::addMessage(
+				I18N::translate(
+					'An error occured while updating the specific settings of administrative task “%s”.',
+					$task->name()
+				),
+				'danger'
+			);
+			//phpcs:ignore Generic.Files.LineLength.TooLong
+			Log::addConfigurationLog('Module ' . $this->module->title() . ' : AdminTask “' . $task->name() . '” specific settings could not be updated. See error log.');
+		}
+
+		return true;
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -83,7 +83,7 @@ 
                 'success'
             );
             //phpcs:ignore Generic.Files.LineLength.TooLong
-            Log::addConfigurationLog('Module ' . $this->module->title() . ' : Task Schedule “' . $task_schedule->id() . '” has been updated.');
+            Log::addConfigurationLog('Module '.$this->module->title().' : Task Schedule “'.$task_schedule->id().'” has been updated.');
         }
 
         return Registry::responseFactory()->redirect(AdminConfigPage::class);
@@ -139,7 +139,7 @@ 
 
         FlashMessages::addMessage(I18N::translate('An error occured while updating the scheduled task.'), 'danger');
         //@phpcs:ignore Generic.Files.LineLength.TooLong
-        Log::addConfigurationLog('Module ' . $this->module->title() . ' : Task Schedule “' . $task_schedule->id() . '” could not be updated. See error log.');
+        Log::addConfigurationLog('Module '.$this->module->title().' : Task Schedule “'.$task_schedule->id().'” could not be updated. See error log.');
         return false;
     }
 
@@ -171,7 +171,7 @@ 
                 'danger'
             );
             //phpcs:ignore Generic.Files.LineLength.TooLong
-            Log::addConfigurationLog('Module ' . $this->module->title() . ' : AdminTask “' . $task->name() . '” specific settings could not be updated. See error log.');
+            Log::addConfigurationLog('Module '.$this->module->title().' : AdminTask “'.$task->name().'” specific settings could not be updated. See error log.');
         }
 
         return true;

app/Module/AdminTasks/Http/RequestHandlers/TokenGenerate.php

Indentation +30 added lines, -30 removed lines

@@ -30,34 +30,34 @@
  */
 class TokenGenerate implements RequestHandlerInterface
 {
-    private ?AdminTasksModule $module;
-    private TokenService $token_service;
-
-    /**
-     * Constructor for TokenGenerate request handler
-     *
-     * @param ModuleService $module_service
-     */
-    public function __construct(ModuleService $module_service, TokenService $token_service)
-    {
-        $this->module = $module_service->findByInterface(AdminTasksModule::class)->first();
-        $this->token_service = $token_service;
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        if ($this->module === null) {
-            throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
-        }
-
-        $token = $this->token_service->generateRandomToken();
-        $this->module->setPreference('MAJ_AT_FORCE_EXEC_TOKEN', $token);
-        Log::addConfigurationLog($this->module->title() . ' : New token generated.');
-
-        return Registry::responseFactory()->response(['token' => $token]);
-    }
+	private ?AdminTasksModule $module;
+	private TokenService $token_service;
+
+	/**
+	 * Constructor for TokenGenerate request handler
+	 *
+	 * @param ModuleService $module_service
+	 */
+	public function __construct(ModuleService $module_service, TokenService $token_service)
+	{
+		$this->module = $module_service->findByInterface(AdminTasksModule::class)->first();
+		$this->token_service = $token_service;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		if ($this->module === null) {
+			throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
+		}
+
+		$token = $this->token_service->generateRandomToken();
+		$this->module->setPreference('MAJ_AT_FORCE_EXEC_TOKEN', $token);
+		Log::addConfigurationLog($this->module->title() . ' : New token generated.');
+
+		return Registry::responseFactory()->response(['token' => $token]);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
 
         $token = $this->token_service->generateRandomToken();
         $this->module->setPreference('MAJ_AT_FORCE_EXEC_TOKEN', $token);
-        Log::addConfigurationLog($this->module->title() . ' : New token generated.');
+        Log::addConfigurationLog($this->module->title().' : New token generated.');
 
         return Registry::responseFactory()->response(['token' => $token]);
     }

app/Module/AdminTasks/Http/RequestHandlers/AdminConfigPage.php

Indentation +37 added lines, -37 removed lines

@@ -29,47 +29,47 @@
  */
 class AdminConfigPage implements RequestHandlerInterface
 {
-    use ViewResponseTrait;
+	use ViewResponseTrait;
 
-    private ?AdminTasksModule $module;
-    private TokenService $token_service;
+	private ?AdminTasksModule $module;
+	private TokenService $token_service;
 
-    /**
-     * Constructor for Admin Config request handler
-     *
-     * @param ModuleService $module_service
-     */
-    public function __construct(ModuleService $module_service, TokenService $token_service)
-    {
-        $this->module = $module_service->findByInterface(AdminTasksModule::class)->first();
-        $this->token_service = $token_service;
-    }
+	/**
+	 * Constructor for Admin Config request handler
+	 *
+	 * @param ModuleService $module_service
+	 */
+	public function __construct(ModuleService $module_service, TokenService $token_service)
+	{
+		$this->module = $module_service->findByInterface(AdminTasksModule::class)->first();
+		$this->token_service = $token_service;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        $this->layout = 'layouts/administration';
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		$this->layout = 'layouts/administration';
 
-        if ($this->module === null) {
-            throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
-        }
+		if ($this->module === null) {
+			throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
+		}
 
-        $token = $this->module->getPreference('MAJ_AT_FORCE_EXEC_TOKEN');
-        if ($token === '') {
-            $token = $this->token_service->generateRandomToken();
-            $this->module->setPreference('MAJ_AT_FORCE_EXEC_TOKEN', $token);
-        }
+		$token = $this->module->getPreference('MAJ_AT_FORCE_EXEC_TOKEN');
+		if ($token === '') {
+			$token = $this->token_service->generateRandomToken();
+			$this->module->setPreference('MAJ_AT_FORCE_EXEC_TOKEN', $token);
+		}
 
-        return $this->viewResponse($this->module->name() . '::admin/config', [
-            'title'             =>  $this->module->title(),
-            'trigger_token'     =>  $token,
-            'trigger_route'     =>  route(TaskTrigger::class, ['task' => '__TASKNAME__', 'force' => '__TOKEN__']),
-            'new_token_route'   =>  route(TokenGenerate::class),
-            'tasks_data_route'  =>  route(TasksList::class),
-            'js_script_url'     =>  $this->module->assetUrl('js/admintasks.min.js')
-        ]);
-    }
+		return $this->viewResponse($this->module->name() . '::admin/config', [
+			'title'             =>  $this->module->title(),
+			'trigger_token'     =>  $token,
+			'trigger_route'     =>  route(TaskTrigger::class, ['task' => '__TASKNAME__', 'force' => '__TOKEN__']),
+			'new_token_route'   =>  route(TokenGenerate::class),
+			'tasks_data_route'  =>  route(TasksList::class),
+			'js_script_url'     =>  $this->module->assetUrl('js/admintasks.min.js')
+		]);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
             $this->module->setPreference('MAJ_AT_FORCE_EXEC_TOKEN', $token);
         }
 
-        return $this->viewResponse($this->module->name() . '::admin/config', [
+        return $this->viewResponse($this->module->name().'::admin/config', [
             'title'             =>  $this->module->title(),
             'trigger_token'     =>  $token,
             'trigger_route'     =>  route(TaskTrigger::class, ['task' => '__TASKNAME__', 'force' => '__TOKEN__']),

app/Module/AdminTasks/Http/RequestHandlers/TaskStatusAction.php

Indentation +55 added lines, -55 removed lines

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

Spacing +3 added lines, -4 removed lines

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

app/Module/AdminTasks/Services/TaskScheduleService.php

Indentation +240 added lines, -240 removed lines

@@ -35,269 +35,269 @@
  */
 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;
+	/**
+	 * 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;
+	private ModuleService $module_service;
 
-    /**
-     * Constructor for TaskScheduleService
-     *
-     * @param ModuleService $module_service
-     */
-    public function __construct(ModuleService $module_service)
-    {
-        $this->module_service = $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());
+	/**
+	 * 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);
-                }
-            }
+		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_class) {
-                if (null !== $task = app($task_class)) {
-                    $this->insertTask($task_name, $task->defaultFrequency());
-                }
-            }
+			foreach ($available_tasks as $task_name => $task_class) {
+				if (null !== $task = app($task_class)) {
+					$this->insertTask($task_name, $task->defaultFrequency());
+				}
+			}
 
-            return $this->all(false, $include_disabled);
-        }
+			return $this->all(false, $include_disabled);
+		}
 
-        return $tasks_schedules;
-    }
+		return $tasks_schedules;
+	}
 
-    /**
-     * Returns tasks exposed through modules implementing ModuleTasksProviderInterface.
-     *
-     * @return Collection<string, string>
-     */
-    public function available(): Collection
-    {
-        return Registry::cache()->array()->remember(
-            'maj-available-admintasks',
-            function (): Collection {
-                /** @var Collection<string, string> $tasks */
-                $tasks = $this->module_service
-                    ->findByInterface(ModuleTasksProviderInterface::class)
-                    ->flatMap(fn(ModuleTasksProviderInterface $module) => $module->listTasks());
-                return $tasks;
-            }
-        );
-    }
+	/**
+	 * Returns tasks exposed through modules implementing ModuleTasksProviderInterface.
+	 *
+	 * @return Collection<string, string>
+	 */
+	public function available(): Collection
+	{
+		return Registry::cache()->array()->remember(
+			'maj-available-admintasks',
+			function (): Collection {
+				/** @var Collection<string, string> $tasks */
+				$tasks = $this->module_service
+					->findByInterface(ModuleTasksProviderInterface::class)
+					->flatMap(fn(ModuleTasksProviderInterface $module) => $module->listTasks());
+				return $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();
-    }
+	/**
+	 * 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;
-        }
+	/**
+	 * 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);
-    }
+		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()->toDateTimeString(),
-                'majat_last_result' =>  $task_schedule->wasLastRunSuccess(),
-                'majat_frequency'   =>  $task_schedule->frequency(),
-                'majat_nb_occur'    =>  $task_schedule->remainingOccurrences(),
-                'majat_running'     =>  $task_schedule->isRunning()
-            ]);
-    }
+	/**
+	 * 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()->toDateTimeString(),
+				'majat_last_result' =>  $task_schedule->wasLastRunSuccess(),
+				'majat_frequency'   =>  $task_schedule->frequency(),
+				'majat_nb_occur'    =>  $task_schedule->remainingOccurrences(),
+				'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();
-    }
+	/**
+	 * 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;
-    }
+	/**
+	 * 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 = ''): 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', '<=', CarbonImmutable::now('UTC')->subSeconds(self::TASK_TIME_OUT));
-            });
+	/**
+	 * 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 = ''): 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', '<=', CarbonImmutable::now('UTC')->subSeconds(self::TASK_TIME_OUT));
+			});
 
-        if (!$force) {
-            $query->where(function (Builder $query): void {
+		if (!$force) {
+			$query->where(function (Builder $query): void {
 
-                $query->where('majat_last_result', '=', 0)
-                    ->orWhereRaw('DATE_ADD(majat_last_run, INTERVAL majat_frequency MINUTE) <= NOW()');
-            });
-        }
+				$query->where('majat_last_result', '=', 0)
+					->orWhereRaw('DATE_ADD(majat_last_run, INTERVAL majat_frequency MINUTE) <= NOW()');
+			});
+		}
 
-        if ($task_id !== '') {
-            $query->where('majat_task_id', '=', $task_id);
-        }
+		if ($task_id !== '') {
+			$query->where('majat_task_id', '=', $task_id);
+		}
 
-        return $query->get()->map(self::rowMapper());
-    }
+		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();
+	/**
+	 * 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()->addMinutes($task_schedule->frequency())
-                    ->lessThan(CarbonImmutable::now('UTC'))
-            )
-        ) {
-            $task_schedule->setLastResult(false);
+		if (
+			!$task_schedule->isRunning() &&
+			($force ||
+				$task_schedule->lastRunTime()->addMinutes($task_schedule->frequency())
+					->lessThan(CarbonImmutable::now('UTC'))
+			)
+		) {
+			$task_schedule->setLastResult(false);
 
-            $task = $this->findTask($task_schedule->taskId());
-            if ($task !== null) {
-                $task_schedule->startRunning();
-                $this->update($task_schedule);
+			$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());
-                    }
-                }
+				$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(CarbonImmutable::now('UTC'));
-                    $task_schedule->decrementRemainingOccurrences();
-                }
-                $task_schedule->stopRunning();
-            }
-            $this->update($task_schedule);
-        }
-    }
+				if ($task_schedule->wasLastRunSuccess()) {
+					$task_schedule->setLastRunTime(CarbonImmutable::now('UTC'));
+					$task_schedule->decrementRemainingOccurrences();
+				}
+				$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',
-                CarbonImmutable::parse($row->majat_last_run, 'UTC'),
-                (bool) $row->majat_last_result,
-                (int) $row->majat_frequency,
-                (int) $row->majat_nb_occur,
-                (bool) $row->majat_running
-            );
-        };
-    }
+	/**
+	 * 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',
+				CarbonImmutable::parse($row->majat_last_run, 'UTC'),
+				(bool) $row->majat_last_result,
+				(int) $row->majat_frequency,
+				(int) $row->majat_nb_occur,
+				(bool) $row->majat_running
+			);
+		};
+	}
 }

Spacing +12 added lines, -12 removed lines

@@ -101,7 +101,7 @@ 
     {
         return Registry::cache()->array()->remember(
             'maj-available-admintasks',
-            function (): Collection {
+            function(): Collection {
                 /** @var Collection<string, string> $tasks */
                 $tasks = $this->module_service
                     ->findByInterface(ModuleTasksProviderInterface::class)
@@ -206,13 +206,13 @@ 
         $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', '<=', CarbonImmutable::now('UTC')->subSeconds(self::TASK_TIME_OUT));
             });
 
         if (!$force) {
-            $query->where(function (Builder $query): void {
+            $query->where(function(Builder $query): void {
 
                 $query->where('majat_last_result', '=', 0)
                     ->orWhereRaw('DATE_ADD(majat_last_run, INTERVAL majat_frequency MINUTE) <= NOW()');
@@ -264,9 +264,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());
                     }
                 }
 
@@ -287,16 +287,16 @@ 
      */
     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',
                 CarbonImmutable::parse($row->majat_last_run, 'UTC'),
-                (bool) $row->majat_last_result,
-                (int) $row->majat_frequency,
-                (int) $row->majat_nb_occur,
-                (bool) $row->majat_running
+                (bool)$row->majat_last_result,
+                (int)$row->majat_frequency,
+                (int)$row->majat_nb_occur,
+                (bool)$row->majat_running
             );
         };
     }

app/Module/GeoDispersion/Http/RequestHandlers/MapAdapterEditAction.php

Indentation +72 added lines, -72 removed lines

@@ -35,85 +35,85 @@
  */
 class MapAdapterEditAction implements RequestHandlerInterface
 {
-    private ?GeoDispersionModule $module;
-    private MapAdapterDataService $mapadapter_data_service;
-    private MapDefinitionsService $map_definition_service;
+	private ?GeoDispersionModule $module;
+	private MapAdapterDataService $mapadapter_data_service;
+	private MapDefinitionsService $map_definition_service;
 
-    /**
-     * Constructor for MapAdapterEditAction Request Handler
-     *
-     * @param ModuleService $module_service
-     * @param MapAdapterDataService $mapadapter_data_service
-     * @param MapDefinitionsService $map_definition_service
-     */
-    public function __construct(
-        ModuleService $module_service,
-        MapAdapterDataService $mapadapter_data_service,
-        MapDefinitionsService $map_definition_service
-    ) {
-        $this->module = $module_service->findByInterface(GeoDispersionModule::class)->first();
-        $this->mapadapter_data_service = $mapadapter_data_service;
-        $this->map_definition_service = $map_definition_service;
-    }
+	/**
+	 * Constructor for MapAdapterEditAction Request Handler
+	 *
+	 * @param ModuleService $module_service
+	 * @param MapAdapterDataService $mapadapter_data_service
+	 * @param MapDefinitionsService $map_definition_service
+	 */
+	public function __construct(
+		ModuleService $module_service,
+		MapAdapterDataService $mapadapter_data_service,
+		MapDefinitionsService $map_definition_service
+	) {
+		$this->module = $module_service->findByInterface(GeoDispersionModule::class)->first();
+		$this->mapadapter_data_service = $mapadapter_data_service;
+		$this->map_definition_service = $map_definition_service;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        $tree = Validator::attributes($request)->tree();
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		$tree = Validator::attributes($request)->tree();
 
-        if ($this->module === null) {
-            FlashMessages::addMessage(
-                I18N::translate('The attached module could not be found.'),
-                'danger'
-            );
-            return Registry::responseFactory()->redirect(AdminConfigPage::class, ['tree' => $tree->name()]);
-        }
+		if ($this->module === null) {
+			FlashMessages::addMessage(
+				I18N::translate('The attached module could not be found.'),
+				'danger'
+			);
+			return Registry::responseFactory()->redirect(AdminConfigPage::class, ['tree' => $tree->name()]);
+		}
 
-        $adapter_id = Validator::attributes($request)->integer('adapter_id', -1);
-        $map_adapter = $this->mapadapter_data_service->find($adapter_id);
+		$adapter_id = Validator::attributes($request)->integer('adapter_id', -1);
+		$map_adapter = $this->mapadapter_data_service->find($adapter_id);
 
-        $map = $this->map_definition_service->find(Validator::parsedBody($request)->string('map_adapter_map', ''));
-        $mapping_property   = Validator::parsedBody($request)->string('map_adapter_property_selected', '');
+		$map = $this->map_definition_service->find(Validator::parsedBody($request)->string('map_adapter_map', ''));
+		$mapping_property   = Validator::parsedBody($request)->string('map_adapter_property_selected', '');
 
-        $mapper = null;
-        try {
-            $mapper = app(Validator::parsedBody($request)->string('map_adapter_mapper', ''));
-        } catch (BindingResolutionException $ex) {
-        }
+		$mapper = null;
+		try {
+			$mapper = app(Validator::parsedBody($request)->string('map_adapter_mapper', ''));
+		} catch (BindingResolutionException $ex) {
+		}
 
-        if ($map_adapter === null || $map === null || $mapper === null || !($mapper instanceof PlaceMapperInterface)) {
-            FlashMessages::addMessage(
-                I18N::translate('The parameters for the map configuration are not valid.'),
-                'danger'
-            );
-            return Registry::responseFactory()->redirect(AdminConfigPage::class, ['tree' => $tree->name()]);
-        }
+		if ($map_adapter === null || $map === null || $mapper === null || !($mapper instanceof PlaceMapperInterface)) {
+			FlashMessages::addMessage(
+				I18N::translate('The parameters for the map configuration are not valid.'),
+				'danger'
+			);
+			return Registry::responseFactory()->redirect(AdminConfigPage::class, ['tree' => $tree->name()]);
+		}
 
-        $mapper->setConfig($mapper->config()->withConfigUpdate($request));
-        $new_map_adapter = $map_adapter->with($map, $mapper, $mapping_property);
-        try {
-            $this->mapadapter_data_service->update($new_map_adapter);
-            FlashMessages::addMessage(
-                I18N::translate('The map configuration has been successfully updated.'),
-                'success'
-            );
-            //phpcs:ignore Generic.Files.LineLength.TooLong
-            Log::addConfigurationLog('Module ' . $this->module->title() . ' : Map Adapter “' . $map_adapter->id() . '” has been updated.');
-        } catch (Throwable $ex) {
-            FlashMessages::addMessage(
-                I18N::translate('An error occured while updating the map configuration.'),
-                'danger'
-            );
-            //phpcs:ignore Generic.Files.LineLength.TooLong
-            Log::addErrorLog('Module ' . $this->module->title() . ' : Error when updating Map Adapter “' . $map_adapter->id() . '”: ' . $ex->getMessage());
-        }
+		$mapper->setConfig($mapper->config()->withConfigUpdate($request));
+		$new_map_adapter = $map_adapter->with($map, $mapper, $mapping_property);
+		try {
+			$this->mapadapter_data_service->update($new_map_adapter);
+			FlashMessages::addMessage(
+				I18N::translate('The map configuration has been successfully updated.'),
+				'success'
+			);
+			//phpcs:ignore Generic.Files.LineLength.TooLong
+			Log::addConfigurationLog('Module ' . $this->module->title() . ' : Map Adapter “' . $map_adapter->id() . '” has been updated.');
+		} catch (Throwable $ex) {
+			FlashMessages::addMessage(
+				I18N::translate('An error occured while updating the map configuration.'),
+				'danger'
+			);
+			//phpcs:ignore Generic.Files.LineLength.TooLong
+			Log::addErrorLog('Module ' . $this->module->title() . ' : Error when updating Map Adapter “' . $map_adapter->id() . '”: ' . $ex->getMessage());
+		}
 
-        return Registry::responseFactory()->redirect(MapAdapterEditPage::class, [
-            'tree' => $tree->name(),
-            'adapter_id' => $map_adapter->id()
-        ]);
-    }
+		return Registry::responseFactory()->redirect(MapAdapterEditPage::class, [
+			'tree' => $tree->name(),
+			'adapter_id' => $map_adapter->id()
+		]);
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -76,7 +76,7 @@ 
         $map_adapter = $this->mapadapter_data_service->find($adapter_id);
 
         $map = $this->map_definition_service->find(Validator::parsedBody($request)->string('map_adapter_map', ''));
-        $mapping_property   = Validator::parsedBody($request)->string('map_adapter_property_selected', '');
+        $mapping_property = Validator::parsedBody($request)->string('map_adapter_property_selected', '');
 
         $mapper = null;
         try {
@@ -101,14 +101,14 @@ 
                 'success'
             );
             //phpcs:ignore Generic.Files.LineLength.TooLong
-            Log::addConfigurationLog('Module ' . $this->module->title() . ' : Map Adapter “' . $map_adapter->id() . '” has been updated.');
+            Log::addConfigurationLog('Module '.$this->module->title().' : Map Adapter “'.$map_adapter->id().'” has been updated.');
         } catch (Throwable $ex) {
             FlashMessages::addMessage(
                 I18N::translate('An error occured while updating the map configuration.'),
                 'danger'
             );
             //phpcs:ignore Generic.Files.LineLength.TooLong
-            Log::addErrorLog('Module ' . $this->module->title() . ' : Error when updating Map Adapter “' . $map_adapter->id() . '”: ' . $ex->getMessage());
+            Log::addErrorLog('Module '.$this->module->title().' : Error when updating Map Adapter “'.$map_adapter->id().'”: '.$ex->getMessage());
         }
 
         return Registry::responseFactory()->redirect(MapAdapterEditPage::class, [

app/Module/GeoDispersion/Http/RequestHandlers/GeoAnalysisViewTabs.php

Indentation +46 added lines, -46 removed lines

@@ -31,58 +31,58 @@
  */
 class GeoAnalysisViewTabs implements RequestHandlerInterface
 {
-    private ?GeoDispersionModule $module;
-    private GeoAnalysisViewDataService $geoviewdata_service;
+	private ?GeoDispersionModule $module;
+	private GeoAnalysisViewDataService $geoviewdata_service;
 
-    /**
-     * Constructor for GeoAnalysisMapsList Request Handler
-     *
-     * @param ModuleService $module_service
-     */
-    public function __construct(
-        ModuleService $module_service,
-        GeoAnalysisViewDataService $geoviewdata_service
-    ) {
-        $this->module = $module_service->findByInterface(GeoDispersionModule::class)->first();
-        $this->geoviewdata_service = $geoviewdata_service;
-    }
+	/**
+	 * Constructor for GeoAnalysisMapsList Request Handler
+	 *
+	 * @param ModuleService $module_service
+	 */
+	public function __construct(
+		ModuleService $module_service,
+		GeoAnalysisViewDataService $geoviewdata_service
+	) {
+		$this->module = $module_service->findByInterface(GeoDispersionModule::class)->first();
+		$this->geoviewdata_service = $geoviewdata_service;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        if ($this->module === null) {
-            throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
-        }
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		if ($this->module === null) {
+			throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
+		}
 
-        $tree = Validator::attributes($request)->tree();
-        $view_id = Validator::attributes($request)->integer('view_id', -1);
+		$tree = Validator::attributes($request)->tree();
+		$view_id = Validator::attributes($request)->integer('view_id', -1);
 
-        $view = $this->geoviewdata_service->find($tree, $view_id);
+		$view = $this->geoviewdata_service->find($tree, $view_id);
 
-        if ($view === null) {
-            throw new HttpNotFoundException(I18N::translate('The requested dispersion analysis does not exist.'));
-        }
+		if ($view === null) {
+			throw new HttpNotFoundException(I18N::translate('The requested dispersion analysis does not exist.'));
+		}
 
-        $results = $view->analysis()->results($tree, $view->placesDepth());
+		$results = $view->analysis()->results($tree, $view->placesDepth());
 
-        $params = [
-            'module_name'   =>  $this->module->name(),
-            'tree'          =>  $tree,
-            'view'          =>  $view,
-            'items_descr'   =>  $view->analysis()->itemsDescription()
-        ];
-        $response = [
-            'global'    =>  view('layouts/ajax', [
-                'content' =>    $view->globalTabContent($this->module, $results->global(), $params)
-            ]),
-            'detailed'  => view('layouts/ajax', [
-                'content' =>    $view->detailedTabContent($this->module, $results->sortedDetailed(), $params)
-            ])
-        ];
+		$params = [
+			'module_name'   =>  $this->module->name(),
+			'tree'          =>  $tree,
+			'view'          =>  $view,
+			'items_descr'   =>  $view->analysis()->itemsDescription()
+		];
+		$response = [
+			'global'    =>  view('layouts/ajax', [
+				'content' =>    $view->globalTabContent($this->module, $results->global(), $params)
+			]),
+			'detailed'  => view('layouts/ajax', [
+				'content' =>    $view->detailedTabContent($this->module, $results->sortedDetailed(), $params)
+			])
+		];
 
-        return Registry::responseFactory()->response($response);
-    }
+		return Registry::responseFactory()->response($response);
+	}
 }

app/Module/GeoDispersion/Http/RequestHandlers/GeoAnalysisViewStatusAction.php

Indentation +54 added lines, -54 removed lines

@@ -32,65 +32,65 @@
  */
 class GeoAnalysisViewStatusAction implements RequestHandlerInterface
 {
-    private ?GeoDispersionModule $module;
-    private GeoAnalysisViewDataService $geoview_data_service;
+	private ?GeoDispersionModule $module;
+	private GeoAnalysisViewDataService $geoview_data_service;
 
-    /**
-     * Constructor for GeoAnalysisViewStatusAction Request Handler
-     *
-     * @param ModuleService $module_service
-     * @param GeoAnalysisViewDataService $geoview_data_service
-     */
-    public function __construct(ModuleService $module_service, GeoAnalysisViewDataService $geoview_data_service)
-    {
-        $this->module = $module_service->findByInterface(GeoDispersionModule::class)->first();
-        $this->geoview_data_service = $geoview_data_service;
-    }
+	/**
+	 * Constructor for GeoAnalysisViewStatusAction Request Handler
+	 *
+	 * @param ModuleService $module_service
+	 * @param GeoAnalysisViewDataService $geoview_data_service
+	 */
+	public function __construct(ModuleService $module_service, GeoAnalysisViewDataService $geoview_data_service)
+	{
+		$this->module = $module_service->findByInterface(GeoDispersionModule::class)->first();
+		$this->geoview_data_service = $geoview_data_service;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        $tree = Validator::attributes($request)->tree();
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		$tree = Validator::attributes($request)->tree();
 
-        if ($this->module === null) {
-            FlashMessages::addMessage(
-                I18N::translate('The attached module could not be found.'),
-                'danger'
-            );
-            return Registry::responseFactory()->redirect(AdminConfigPage::class, ['tree' => $tree->name()]);
-        }
+		if ($this->module === null) {
+			FlashMessages::addMessage(
+				I18N::translate('The attached module could not be found.'),
+				'danger'
+			);
+			return Registry::responseFactory()->redirect(AdminConfigPage::class, ['tree' => $tree->name()]);
+		}
 
-        $view_id = Validator::attributes($request)->integer('view_id', -1);
-        $view = $this->geoview_data_service->find($tree, $view_id, true);
+		$view_id = Validator::attributes($request)->integer('view_id', -1);
+		$view = $this->geoview_data_service->find($tree, $view_id, true);
 
-        if ($view === null) {
-            FlashMessages::addMessage(
-                I18N::translate('The view with ID “%s” does not exist.', I18N::number($view_id)),
-                'danger'
-            );
-            return Registry::responseFactory()->redirect(AdminConfigPage::class, ['tree' => $tree->name()]);
-        }
+		if ($view === null) {
+			FlashMessages::addMessage(
+				I18N::translate('The view with ID “%s” does not exist.', I18N::number($view_id)),
+				'danger'
+			);
+			return Registry::responseFactory()->redirect(AdminConfigPage::class, ['tree' => $tree->name()]);
+		}
 
-        try {
-            $this->geoview_data_service->updateStatus($view, Validator::attributes($request)->boolean('enable', false));
-            FlashMessages::addMessage(
-                I18N::translate('The geographical dispersion analysis view has been successfully updated.'),
-                'success'
-            );
-            //phpcs:ignore Generic.Files.LineLength.TooLong
-            Log::addConfigurationLog('Module ' . $this->module->title() . ' : View “' . $view->id() . '” has been updated.');
-        } catch (Throwable $ex) {
-            FlashMessages::addMessage(
-                I18N::translate('An error occured while updating the geographical dispersion analysis view.'),
-                'danger'
-            );
-            //phpcs:ignore Generic.Files.LineLength.TooLong
-            Log::addErrorLog('Module ' . $this->module->title() . ' : Error when updating view “' . $view->id() . '”: ' . $ex->getMessage());
-        }
+		try {
+			$this->geoview_data_service->updateStatus($view, Validator::attributes($request)->boolean('enable', false));
+			FlashMessages::addMessage(
+				I18N::translate('The geographical dispersion analysis view has been successfully updated.'),
+				'success'
+			);
+			//phpcs:ignore Generic.Files.LineLength.TooLong
+			Log::addConfigurationLog('Module ' . $this->module->title() . ' : View “' . $view->id() . '” has been updated.');
+		} catch (Throwable $ex) {
+			FlashMessages::addMessage(
+				I18N::translate('An error occured while updating the geographical dispersion analysis view.'),
+				'danger'
+			);
+			//phpcs:ignore Generic.Files.LineLength.TooLong
+			Log::addErrorLog('Module ' . $this->module->title() . ' : Error when updating view “' . $view->id() . '”: ' . $ex->getMessage());
+		}
 
-        return Registry::responseFactory()->redirect(AdminConfigPage::class, ['tree' => $tree->name()]);
-    }
+		return Registry::responseFactory()->redirect(AdminConfigPage::class, ['tree' => $tree->name()]);
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -81,14 +81,14 @@
                 'success'
             );
             //phpcs:ignore Generic.Files.LineLength.TooLong
-            Log::addConfigurationLog('Module ' . $this->module->title() . ' : View “' . $view->id() . '” has been updated.');
+            Log::addConfigurationLog('Module '.$this->module->title().' : View “'.$view->id().'” has been updated.');
         } catch (Throwable $ex) {
             FlashMessages::addMessage(
                 I18N::translate('An error occured while updating the geographical dispersion analysis view.'),
                 'danger'
             );
             //phpcs:ignore Generic.Files.LineLength.TooLong
-            Log::addErrorLog('Module ' . $this->module->title() . ' : Error when updating view “' . $view->id() . '”: ' . $ex->getMessage());
+            Log::addErrorLog('Module '.$this->module->title().' : Error when updating view “'.$view->id().'”: '.$ex->getMessage());
         }
 
         return Registry::responseFactory()->redirect(AdminConfigPage::class, ['tree' => $tree->name()]);