jon48 / webtrees-lib

src/Webtrees/Module/GeoDispersion/Views/GeoAnalysisTable.php

Indentation +22 added lines, -22 removed lines

@@ -20,27 +20,27 @@
 
 class GeoAnalysisTable extends AbstractGeoAnalysisView
 {
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\GeoDispersion\Views\AbstractGeoAnalysisView::icon()
-     */
-    public function icon(ModuleInterface $module): string
-    {
-        return view($module->name() . '::icons/view-table');
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Module\GeoDispersion\Views\AbstractGeoAnalysisView::icon()
+	 */
+	public function icon(ModuleInterface $module): string
+	{
+		return view($module->name() . '::icons/view-table');
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\GeoDispersion\Views\AbstractGeoAnalysisView::globalTabContent()
-     */
-    public function globalTabContent(
-        ModuleInterface $module,
-        GeoAnalysisResult $result,
-        GeoAnalysisViewDataService $geoview_data_service,
-        array $params
-    ): string {
-        return view($module->name() . '::geoanalysisview-tab-glb-table', $params + [
-            'result'    =>  $result
-        ]);
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Module\GeoDispersion\Views\AbstractGeoAnalysisView::globalTabContent()
+	 */
+	public function globalTabContent(
+		ModuleInterface $module,
+		GeoAnalysisResult $result,
+		GeoAnalysisViewDataService $geoview_data_service,
+		array $params
+	): string {
+		return view($module->name() . '::geoanalysisview-tab-glb-table', $params + [
+			'result'    =>  $result
+		]);
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -26,7 +26,7 @@ 
      */
     public function icon(ModuleInterface $module): string
     {
-        return view($module->name() . '::icons/view-table');
+        return view($module->name().'::icons/view-table');
     }
 
     /**
@@ -39,7 +39,7 @@ 
         GeoAnalysisViewDataService $geoview_data_service,
         array $params
     ): string {
-        return view($module->name() . '::geoanalysisview-tab-glb-table', $params + [
+        return view($module->name().'::geoanalysisview-tab-glb-table', $params + [
             'result'    =>  $result
         ]);
     }

src/Webtrees/Module/GeoDispersion/Views/GeoAnalysisMap.php

Indentation +73 added lines, -73 removed lines

@@ -26,85 +26,85 @@
  */
 class GeoAnalysisMap extends AbstractGeoAnalysisView
 {
-    private ?MapColorsConfig $colors_config = null;
+	private ?MapColorsConfig $colors_config = null;
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\GeoDispersion\Views\AbstractGeoAnalysisView::icon()
-     */
-    public function icon(ModuleInterface $module): string
-    {
-        return view($module->name() . '::icons/view-map');
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Module\GeoDispersion\Views\AbstractGeoAnalysisView::icon()
+	 */
+	public function icon(ModuleInterface $module): string
+	{
+		return view($module->name() . '::icons/view-map');
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\GeoDispersion\Views\AbstractGeoAnalysisView::globalTabContent()
-     */
-    public function globalTabContent(
-        ModuleInterface $module,
-        GeoAnalysisResult $result,
-        GeoAnalysisViewDataService $geoview_data_service,
-        array $params
-    ): string {
-        $map_adapters = $geoview_data_service->mapAdapters($this);
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Module\GeoDispersion\Views\AbstractGeoAnalysisView::globalTabContent()
+	 */
+	public function globalTabContent(
+		ModuleInterface $module,
+		GeoAnalysisResult $result,
+		GeoAnalysisViewDataService $geoview_data_service,
+		array $params
+	): string {
+		$map_adapters = $geoview_data_service->mapAdapters($this);
 
-        $adapter_result = null;
-        foreach ($map_adapters as $map_adapter) {
-            $adapter_result_tmp = $map_adapter->convert($result);
-            $adapter_result = $adapter_result === null ?
-                $adapter_result_tmp :
-                $adapter_result->merge($adapter_result_tmp);
-        }
+		$adapter_result = null;
+		foreach ($map_adapters as $map_adapter) {
+			$adapter_result_tmp = $map_adapter->convert($result);
+			$adapter_result = $adapter_result === null ?
+				$adapter_result_tmp :
+				$adapter_result->merge($adapter_result_tmp);
+		}
 
-        if ($adapter_result === null) {
-            return view($module->name() . '::errors/tab-error', [
-                'message'   =>  I18N::translate('The map could not be loaded.'),
-            ]);
-        }
+		if ($adapter_result === null) {
+			return view($module->name() . '::errors/tab-error', [
+				'message'   =>  I18N::translate('The map could not be loaded.'),
+			]);
+		}
 
-        //phpcs:disable Generic.Files.LineLength.TooLong
-        $basemap_provider = [
-            'url'    => 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
-            'options' => [
-                'attribution' => '<a href="https://www.openstreetmap.org/copyright">&copy; OpenStreetMap</a> contributors',
-                'max_zoom'    => 19
-            ]
-        ];
-        //phpcs:enable
+		//phpcs:disable Generic.Files.LineLength.TooLong
+		$basemap_provider = [
+			'url'    => 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+			'options' => [
+				'attribution' => '<a href="https://www.openstreetmap.org/copyright">&copy; OpenStreetMap</a> contributors',
+				'max_zoom'    => 19
+			]
+		];
+		//phpcs:enable
 
-        return view($module->name() . '::geoanalysisview-tab-glb-map', $params + [
-            'result'            =>  $adapter_result->geoAnalysisResult(),
-            'features'          =>  $adapter_result->features(),
-            'colors'            =>  $this->colors(),
-            'basemap_provider'  =>  $basemap_provider
-        ]);
-    }
+		return view($module->name() . '::geoanalysisview-tab-glb-map', $params + [
+			'result'            =>  $adapter_result->geoAnalysisResult(),
+			'features'          =>  $adapter_result->features(),
+			'colors'            =>  $this->colors(),
+			'basemap_provider'  =>  $basemap_provider
+		]);
+	}
 
-    /**
-     * Get the color scheme configuration for the map view
-     *
-     * @return MapColorsConfig
-     */
-    public function colors(): MapColorsConfig
-    {
-        return $this->colors_config ?? new MapColorsConfig(
-            new Rgb(245, 245, 245),
-            new Rgb(213, 213, 213),
-            new Rgb(4, 147, 171),
-            new Rgb(255, 102, 0)
-        );
-    }
+	/**
+	 * Get the color scheme configuration for the map view
+	 *
+	 * @return MapColorsConfig
+	 */
+	public function colors(): MapColorsConfig
+	{
+		return $this->colors_config ?? new MapColorsConfig(
+			new Rgb(245, 245, 245),
+			new Rgb(213, 213, 213),
+			new Rgb(4, 147, 171),
+			new Rgb(255, 102, 0)
+		);
+	}
 
-    /**
-     * Set the color scheme configuration for the map view
-     *
-     * @param MapColorsConfig $config
-     * @return self
-     */
-    public function setColors(?MapColorsConfig $config): self
-    {
-        $this->colors_config = $config;
-        return $this;
-    }
+	/**
+	 * Set the color scheme configuration for the map view
+	 *
+	 * @param MapColorsConfig $config
+	 * @return self
+	 */
+	public function setColors(?MapColorsConfig $config): self
+	{
+		$this->colors_config = $config;
+		return $this;
+	}
 }

Spacing +4 added lines, -5 removed lines

@@ -34,7 +34,7 @@ 
      */
     public function icon(ModuleInterface $module): string
     {
-        return view($module->name() . '::icons/view-map');
+        return view($module->name().'::icons/view-map');
     }
 
     /**
@@ -53,12 +53,11 @@ 
         foreach ($map_adapters as $map_adapter) {
             $adapter_result_tmp = $map_adapter->convert($result);
             $adapter_result = $adapter_result === null ?
-                $adapter_result_tmp :
-                $adapter_result->merge($adapter_result_tmp);
+                $adapter_result_tmp : $adapter_result->merge($adapter_result_tmp);
         }
 
         if ($adapter_result === null) {
-            return view($module->name() . '::errors/tab-error', [
+            return view($module->name().'::errors/tab-error', [
                 'message'   =>  I18N::translate('The map could not be loaded.'),
             ]);
         }
@@ -73,7 +72,7 @@ 
         ];
         //phpcs:enable
 
-        return view($module->name() . '::geoanalysisview-tab-glb-map', $params + [
+        return view($module->name().'::geoanalysisview-tab-glb-map', $params + [
             'result'            =>  $adapter_result->geoAnalysisResult(),
             'features'          =>  $adapter_result->features(),
             'colors'            =>  $this->colors(),

src/Webtrees/Module/GeoDispersion/Views/AbstractGeoAnalysisView.php

Indentation +157 added lines, -157 removed lines

@@ -26,161 +26,161 @@
  */
 abstract class AbstractGeoAnalysisView
 {
-    private int $id;
-    private Tree $tree;
-    private bool $enabled;
-    private string $description;
-    private GeoAnalysisInterface $geoanalysis;
-    private int $depth;
-    private int $detailed_top_places;
-    private bool $use_flags;
-
-    /**
-     * Constructor for AbstractGeoAnalysisView
-     *
-     * @param int $id
-     * @param Tree $tree
-     * @param bool $enabled
-     * @param string $description
-     * @param GeoAnalysisInterface $geoanalysis
-     * @param int $depth
-     * @param int $detailed_top_places
-     * @param bool $use_flags
-     */
-    final public function __construct(
-        int $id,
-        Tree $tree,
-        bool $enabled,
-        string $description,
-        GeoAnalysisInterface $geoanalysis,
-        int $depth,
-        int $detailed_top_places = 0,
-        bool $use_flags = false
-    ) {
-        $this->id = $id;
-        $this->tree = $tree;
-        $this->enabled = $enabled;
-        $this->description = $description;
-        $this->geoanalysis = $geoanalysis;
-        $this->depth = $depth;
-        $this->detailed_top_places = $detailed_top_places;
-        $this->use_flags = $use_flags;
-    }
-
-    /**
-     * Get the view ID
-     *
-     * @return int
-     */
-    public function id(): int
-    {
-        return $this->id;
-    }
-
-    /**
-     * Get the icon for the view type
-     *
-     * @param ModuleInterface $module
-     * @return string
-     */
-    abstract public function icon(ModuleInterface $module): string;
-
-    /**
-     * Returns the content of the view global tab
-     *
-     * @param ModuleInterface $module
-     * @param GeoAnalysisResult $result
-     * @param GeoAnalysisViewDataService $geoview_data_service
-     * @param array $params
-     * @return string
-     */
-    abstract public function globalTabContent(
-        ModuleInterface $module,
-        GeoAnalysisResult $result,
-        GeoAnalysisViewDataService $geoview_data_service,
-        array $params
-    ): string;
-
-    /**
-     * Returns the content of the view detailed tab
-     *
-     * @param ModuleInterface $module
-     * @param Collection $results
-     * @param array $params
-     * @return string
-     */
-    public function detailedTabContent(ModuleInterface $module, Collection $results, array $params): string
-    {
-        return view($module->name() . '::geoanalysisview-tab-detailed', $params + [ 'results'   =>  $results ]);
-    }
-
-    /**
-     * Get the tree to which the view belongs
-     *
-     * @return Tree
-     */
-    public function tree(): Tree
-    {
-        return $this->tree;
-    }
-
-    /**
-     * Get the description of the view
-     *
-     * @return string
-     */
-    public function description(): string
-    {
-        return $this->description;
-    }
-
-    /**
-     * Get whether the view is enabled
-     *
-     * @return bool
-     */
-    public function isEnabled(): bool
-    {
-        return $this->enabled;
-    }
-
-    /**
-     * Get the geographical dispersion analysis for the view
-     *
-     * @return GeoAnalysisInterface
-     */
-    public function analysis(): GeoAnalysisInterface
-    {
-        return $this->geoanalysis;
-    }
-
-    /**
-     * Get the place hierarchy depth for the view
-     *
-     * @return int
-     */
-    public function placesDepth(): int
-    {
-        return $this->depth;
-    }
-
-    /**
-     * Get the number of places to display in the detailed tab
-     *
-     * @return int
-     */
-    public function numberTopPlaces(): int
-    {
-        return $this->detailed_top_places;
-    }
-
-    /**
-     * Get whether flags should be used in the detailed tab
-     *
-     * @return bool
-     */
-    public function useFlags(): bool
-    {
-        return $this->use_flags;
-    }
+	private int $id;
+	private Tree $tree;
+	private bool $enabled;
+	private string $description;
+	private GeoAnalysisInterface $geoanalysis;
+	private int $depth;
+	private int $detailed_top_places;
+	private bool $use_flags;
+
+	/**
+	 * Constructor for AbstractGeoAnalysisView
+	 *
+	 * @param int $id
+	 * @param Tree $tree
+	 * @param bool $enabled
+	 * @param string $description
+	 * @param GeoAnalysisInterface $geoanalysis
+	 * @param int $depth
+	 * @param int $detailed_top_places
+	 * @param bool $use_flags
+	 */
+	final public function __construct(
+		int $id,
+		Tree $tree,
+		bool $enabled,
+		string $description,
+		GeoAnalysisInterface $geoanalysis,
+		int $depth,
+		int $detailed_top_places = 0,
+		bool $use_flags = false
+	) {
+		$this->id = $id;
+		$this->tree = $tree;
+		$this->enabled = $enabled;
+		$this->description = $description;
+		$this->geoanalysis = $geoanalysis;
+		$this->depth = $depth;
+		$this->detailed_top_places = $detailed_top_places;
+		$this->use_flags = $use_flags;
+	}
+
+	/**
+	 * Get the view ID
+	 *
+	 * @return int
+	 */
+	public function id(): int
+	{
+		return $this->id;
+	}
+
+	/**
+	 * Get the icon for the view type
+	 *
+	 * @param ModuleInterface $module
+	 * @return string
+	 */
+	abstract public function icon(ModuleInterface $module): string;
+
+	/**
+	 * Returns the content of the view global tab
+	 *
+	 * @param ModuleInterface $module
+	 * @param GeoAnalysisResult $result
+	 * @param GeoAnalysisViewDataService $geoview_data_service
+	 * @param array $params
+	 * @return string
+	 */
+	abstract public function globalTabContent(
+		ModuleInterface $module,
+		GeoAnalysisResult $result,
+		GeoAnalysisViewDataService $geoview_data_service,
+		array $params
+	): string;
+
+	/**
+	 * Returns the content of the view detailed tab
+	 *
+	 * @param ModuleInterface $module
+	 * @param Collection $results
+	 * @param array $params
+	 * @return string
+	 */
+	public function detailedTabContent(ModuleInterface $module, Collection $results, array $params): string
+	{
+		return view($module->name() . '::geoanalysisview-tab-detailed', $params + [ 'results'   =>  $results ]);
+	}
+
+	/**
+	 * Get the tree to which the view belongs
+	 *
+	 * @return Tree
+	 */
+	public function tree(): Tree
+	{
+		return $this->tree;
+	}
+
+	/**
+	 * Get the description of the view
+	 *
+	 * @return string
+	 */
+	public function description(): string
+	{
+		return $this->description;
+	}
+
+	/**
+	 * Get whether the view is enabled
+	 *
+	 * @return bool
+	 */
+	public function isEnabled(): bool
+	{
+		return $this->enabled;
+	}
+
+	/**
+	 * Get the geographical dispersion analysis for the view
+	 *
+	 * @return GeoAnalysisInterface
+	 */
+	public function analysis(): GeoAnalysisInterface
+	{
+		return $this->geoanalysis;
+	}
+
+	/**
+	 * Get the place hierarchy depth for the view
+	 *
+	 * @return int
+	 */
+	public function placesDepth(): int
+	{
+		return $this->depth;
+	}
+
+	/**
+	 * Get the number of places to display in the detailed tab
+	 *
+	 * @return int
+	 */
+	public function numberTopPlaces(): int
+	{
+		return $this->detailed_top_places;
+	}
+
+	/**
+	 * Get whether flags should be used in the detailed tab
+	 *
+	 * @return bool
+	 */
+	public function useFlags(): bool
+	{
+		return $this->use_flags;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -111,7 +111,7 @@
      */
     public function detailedTabContent(ModuleInterface $module, Collection $results, array $params): string
     {
-        return view($module->name() . '::geoanalysisview-tab-detailed', $params + [ 'results'   =>  $results ]);
+        return view($module->name().'::geoanalysisview-tab-detailed', $params + ['results'   =>  $results]);
     }
 
     /**

src/Webtrees/Module/AdminTasks/AdminTasksModule.php

Indentation +121 added lines, -121 removed lines

@@ -41,126 +41,126 @@
  * 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->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.0.11-v.2';
-    }
-
-    /**
-     * {@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 \MyArtJaub\Webtrees\Module\AdminTasks\Contracts\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->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.0.11-v.2';
+	}
+
+	/**
+	 * {@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 \MyArtJaub\Webtrees\Module\AdminTasks\Contracts\ModuleTasksProviderInterface::listTasks()
+	 */
+	public function listTasks(): array
+	{
+		return [
+			'maj-healthcheck' => HealthCheckEmailTask::class
+		];
+	}
 }

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

Indentation +61 added lines, -61 removed lines

@@ -31,65 +31,65 @@
  */
 class TaskEditPage implements RequestHandlerInterface
 {
-    use ViewResponseTrait;
-
-    /**
-     * @var AdminTasksModule|null $module
-     */
-    private $module;
-
-    /**
-     * @var TaskScheduleService $taskschedules_service
-     */
-    private $taskschedules_service;
-
-    /**
-     * Constructor for TaskEditPage 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
-    {
-        $this->layout = 'layouts/administration';
-
-        if ($this->module === null) {
-            throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
-        }
-
-        $task_sched_id = (int) $request->getAttribute('task');
-        $task_schedule = $this->taskschedules_service->find($task_sched_id);
-
-        if ($task_schedule === null) {
-            throw new HttpNotFoundException(I18N::translate('The Task schedule could not be found.'));
-        }
-
-        $task = $this->taskschedules_service->findTask($task_schedule->taskId());
-
-        if ($task === null) {
-            throw new HttpNotFoundException(I18N::translate('The Task schedule could not be found.'));
-        }
-
-        $has_task_config = $task instanceof ConfigurableTaskInterface;
-        /** @var TaskInterface&ConfigurableTaskInterface $task */
-
-        return $this->viewResponse($this->module->name() . '::admin/tasks-edit', [
-            'module'            =>  $this->module,
-            'title'             =>  I18N::translate('Edit the administrative task') . ' - ' . $task->name(),
-            'task_schedule'     =>  $task_schedule,
-            'task'              =>  $task,
-            'has_task_config'   =>  $has_task_config,
-            'task_config_view'  =>  $has_task_config ? $task->configView($request) : ''
-        ]);
-    }
+	use ViewResponseTrait;
+
+	/**
+	 * @var AdminTasksModule|null $module
+	 */
+	private $module;
+
+	/**
+	 * @var TaskScheduleService $taskschedules_service
+	 */
+	private $taskschedules_service;
+
+	/**
+	 * Constructor for TaskEditPage 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
+	{
+		$this->layout = 'layouts/administration';
+
+		if ($this->module === null) {
+			throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
+		}
+
+		$task_sched_id = (int) $request->getAttribute('task');
+		$task_schedule = $this->taskschedules_service->find($task_sched_id);
+
+		if ($task_schedule === null) {
+			throw new HttpNotFoundException(I18N::translate('The Task schedule could not be found.'));
+		}
+
+		$task = $this->taskschedules_service->findTask($task_schedule->taskId());
+
+		if ($task === null) {
+			throw new HttpNotFoundException(I18N::translate('The Task schedule could not be found.'));
+		}
+
+		$has_task_config = $task instanceof ConfigurableTaskInterface;
+		/** @var TaskInterface&ConfigurableTaskInterface $task */
+
+		return $this->viewResponse($this->module->name() . '::admin/tasks-edit', [
+			'module'            =>  $this->module,
+			'title'             =>  I18N::translate('Edit the administrative task') . ' - ' . $task->name(),
+			'task_schedule'     =>  $task_schedule,
+			'task'              =>  $task,
+			'has_task_config'   =>  $has_task_config,
+			'task_config_view'  =>  $has_task_config ? $task->configView($request) : ''
+		]);
+	}
 }

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

Indentation +31 added lines, -31 removed lines

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

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

Indentation +109 added lines, -109 removed lines

@@ -31,113 +31,113 @@
  */
 class TasksList implements RequestHandlerInterface
 {
-    /**
-     * @var AdminTasksModule|null $module
-     */
-    private $module;
-
-    /**
-     * @var TaskScheduleService $taskschedules_service
-     */
-    private $taskschedules_service;
-
-    /**
-     * @var DatatablesService $datatables_service
-     */
-    private $datatables_service;
-
-    /**
-     * Constructor for TasksList Request Handler
-     *
-     * @param ModuleService $module_service
-     * @param TaskScheduleService $taskschedules_service
-     * @param DatatablesService $datatables_service
-     */
-    public function __construct(
-        ModuleService $module_service,
-        TaskScheduleService $taskschedules_service,
-        DatatablesService $datatables_service
-    ) {
-        $this->module = $module_service->findByInterface(AdminTasksModule::class)->first();
-        $this->taskschedules_service = $taskschedules_service;
-        $this->datatables_service = $datatables_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.'));
-        }
-
-        $task_schedules = $this->taskschedules_service->all(true, true)
-            ->map(function (TaskSchedule $value): array {
-
-                $row = $value->toArray();
-                $task = $this->taskschedules_service->findTask($row['task_id']);
-                $row['task_name'] = $task !== null ? $task->name() : I18N::translate('Task not found');
-                return $row;
-            });
-
-        $search_columns = ['task_name'];
-        $sort_columns   = ['task_name', 'enabled', 'last_run'];
-
-        $callback = function (array $row): array {
-            if ($this->module === null) {
-                return [];
-            }
-
-            $row['frequency']->setLocale(I18N::locale()->code());
-
-            $task_options_params = [
-                'task_sched_id' => $row['id'],
-                'task_sched_enabled' => $row['enabled'],
-                'task_edit_route' => route(TaskEditPage::class, ['task' => $row['id']]),
-                'task_status_route' => route(TaskStatusAction::class, [
-                    'task' => $row['id'],
-                    'enable' => $row['enabled'] ? 0 : 1
-                ])
-            ];
-
-            $task_run_params = [
-                'task_sched_id' => $row['id'],
-                'run_route' => route(TaskTrigger::class, [
-                    'task'  =>  $row['task_id'],
-                    'force' =>  $this->module->getPreference('MAJ_AT_FORCE_EXEC_TOKEN')
-                ])
-            ];
-
-            $module_name = $this->module->name();
-            $datum = [
-                view($module_name . '::admin/tasks-table-options', $task_options_params),
-                view($module_name . '::components/yes-no-icons', ['yes' => $row['enabled']]),
-                '<span dir="auto">' . e($row['task_name']) . '</span>',
-                $row['last_run']->unix() === 0 ?
-                view('components/datetime', ['timestamp' => $row['last_run']]) :
-                view('components/datetime-diff', ['timestamp' => $row['last_run']]),
-                view($module_name . '::components/yes-no-icons', ['yes' => $row['last_result']]),
-                '<span dir="auto">' . e($row['frequency']->cascade()->forHumans()) . '</span>',
-                $row['nb_occurrences'] > 0 ? I18N::number($row['nb_occurrences']) : I18N::translate('Unlimited'),
-                view($module_name . '::components/yes-no-icons', [
-                    'yes' => $row['is_running'],
-                    'text_yes' => I18N::translate('Running'),
-                    'text_no' => I18N::translate('Not running')
-                ]),
-                view($module_name . '::admin/tasks-table-run', $task_run_params)
-            ];
-
-            return $datum;
-        };
-
-        return $this->datatables_service->handleCollection(
-            $request,
-            $task_schedules,
-            $search_columns,
-            $sort_columns,
-            $callback
-        );
-    }
+	/**
+	 * @var AdminTasksModule|null $module
+	 */
+	private $module;
+
+	/**
+	 * @var TaskScheduleService $taskschedules_service
+	 */
+	private $taskschedules_service;
+
+	/**
+	 * @var DatatablesService $datatables_service
+	 */
+	private $datatables_service;
+
+	/**
+	 * Constructor for TasksList Request Handler
+	 *
+	 * @param ModuleService $module_service
+	 * @param TaskScheduleService $taskschedules_service
+	 * @param DatatablesService $datatables_service
+	 */
+	public function __construct(
+		ModuleService $module_service,
+		TaskScheduleService $taskschedules_service,
+		DatatablesService $datatables_service
+	) {
+		$this->module = $module_service->findByInterface(AdminTasksModule::class)->first();
+		$this->taskschedules_service = $taskschedules_service;
+		$this->datatables_service = $datatables_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.'));
+		}
+
+		$task_schedules = $this->taskschedules_service->all(true, true)
+			->map(function (TaskSchedule $value): array {
+
+				$row = $value->toArray();
+				$task = $this->taskschedules_service->findTask($row['task_id']);
+				$row['task_name'] = $task !== null ? $task->name() : I18N::translate('Task not found');
+				return $row;
+			});
+
+		$search_columns = ['task_name'];
+		$sort_columns   = ['task_name', 'enabled', 'last_run'];
+
+		$callback = function (array $row): array {
+			if ($this->module === null) {
+				return [];
+			}
+
+			$row['frequency']->setLocale(I18N::locale()->code());
+
+			$task_options_params = [
+				'task_sched_id' => $row['id'],
+				'task_sched_enabled' => $row['enabled'],
+				'task_edit_route' => route(TaskEditPage::class, ['task' => $row['id']]),
+				'task_status_route' => route(TaskStatusAction::class, [
+					'task' => $row['id'],
+					'enable' => $row['enabled'] ? 0 : 1
+				])
+			];
+
+			$task_run_params = [
+				'task_sched_id' => $row['id'],
+				'run_route' => route(TaskTrigger::class, [
+					'task'  =>  $row['task_id'],
+					'force' =>  $this->module->getPreference('MAJ_AT_FORCE_EXEC_TOKEN')
+				])
+			];
+
+			$module_name = $this->module->name();
+			$datum = [
+				view($module_name . '::admin/tasks-table-options', $task_options_params),
+				view($module_name . '::components/yes-no-icons', ['yes' => $row['enabled']]),
+				'<span dir="auto">' . e($row['task_name']) . '</span>',
+				$row['last_run']->unix() === 0 ?
+				view('components/datetime', ['timestamp' => $row['last_run']]) :
+				view('components/datetime-diff', ['timestamp' => $row['last_run']]),
+				view($module_name . '::components/yes-no-icons', ['yes' => $row['last_result']]),
+				'<span dir="auto">' . e($row['frequency']->cascade()->forHumans()) . '</span>',
+				$row['nb_occurrences'] > 0 ? I18N::number($row['nb_occurrences']) : I18N::translate('Unlimited'),
+				view($module_name . '::components/yes-no-icons', [
+					'yes' => $row['is_running'],
+					'text_yes' => I18N::translate('Running'),
+					'text_no' => I18N::translate('Not running')
+				]),
+				view($module_name . '::admin/tasks-table-run', $task_run_params)
+			];
+
+			return $datum;
+		};
+
+		return $this->datatables_service->handleCollection(
+			$request,
+			$task_schedules,
+			$search_columns,
+			$sort_columns,
+			$callback
+		);
+	}
 }

Spacing +10 added lines, -11 removed lines

@@ -74,7 +74,7 @@ 
         }
 
         $task_schedules = $this->taskschedules_service->all(true, true)
-            ->map(function (TaskSchedule $value): array {
+            ->map(function(TaskSchedule $value): array {
 
                 $row = $value->toArray();
                 $task = $this->taskschedules_service->findTask($row['task_id']);
@@ -85,7 +85,7 @@ 
         $search_columns = ['task_name'];
         $sort_columns   = ['task_name', 'enabled', 'last_run'];
 
-        $callback = function (array $row): array {
+        $callback = function(array $row): array {
             if ($this->module === null) {
                 return [];
             }
@@ -112,21 +112,20 @@ 
 
             $module_name = $this->module->name();
             $datum = [
-                view($module_name . '::admin/tasks-table-options', $task_options_params),
-                view($module_name . '::components/yes-no-icons', ['yes' => $row['enabled']]),
-                '<span dir="auto">' . e($row['task_name']) . '</span>',
+                view($module_name.'::admin/tasks-table-options', $task_options_params),
+                view($module_name.'::components/yes-no-icons', ['yes' => $row['enabled']]),
+                '<span dir="auto">'.e($row['task_name']).'</span>',
                 $row['last_run']->unix() === 0 ?
-                view('components/datetime', ['timestamp' => $row['last_run']]) :
-                view('components/datetime-diff', ['timestamp' => $row['last_run']]),
-                view($module_name . '::components/yes-no-icons', ['yes' => $row['last_result']]),
-                '<span dir="auto">' . e($row['frequency']->cascade()->forHumans()) . '</span>',
+                view('components/datetime', ['timestamp' => $row['last_run']]) : view('components/datetime-diff', ['timestamp' => $row['last_run']]),
+                view($module_name.'::components/yes-no-icons', ['yes' => $row['last_result']]),
+                '<span dir="auto">'.e($row['frequency']->cascade()->forHumans()).'</span>',
                 $row['nb_occurrences'] > 0 ? I18N::number($row['nb_occurrences']) : I18N::translate('Unlimited'),
-                view($module_name . '::components/yes-no-icons', [
+                view($module_name.'::components/yes-no-icons', [
                     'yes' => $row['is_running'],
                     'text_yes' => I18N::translate('Running'),
                     'text_no' => I18N::translate('Not running')
                 ]),
-                view($module_name . '::admin/tasks-table-run', $task_run_params)
+                view($module_name.'::admin/tasks-table-run', $task_run_params)
             ];
 
             return $datum;

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

Indentation +37 added lines, -37 removed lines

@@ -28,48 +28,48 @@
  */
 class TaskTrigger implements RequestHandlerInterface
 {
-    /**
-     * @var AdminTasksModule|null $module
-     */
-    private $module;
+	/**
+	 * @var AdminTasksModule|null $module
+	 */
+	private $module;
 
-    /**
-     * @var TaskScheduleService $taskschedules_service
-     */
-    private $taskschedules_service;
+	/**
+	 * @var TaskScheduleService $taskschedules_service
+	 */
+	private $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 = $request->getAttribute('task');
-        $token = $this->module->getPreference('MAJ_AT_FORCE_EXEC_TOKEN');
-        $force_token = $request->getQueryParams()['force'] ?? '';
-        $force = $token == $force_token;
+		$task_id = $request->getAttribute('task');
+		$token = $this->module->getPreference('MAJ_AT_FORCE_EXEC_TOKEN');
+		$force_token = $request->getQueryParams()['force'] ?? '';
+		$force = $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 response();
-    }
+		return response();
+	}
 }

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

Indentation +154 added lines, -154 removed lines

@@ -34,158 +34,158 @@
  */
 class TaskEditAction implements RequestHandlerInterface
 {
-    /**
-     * @var AdminTasksModule|null $module
-     */
-    private $module;
-
-    /**
-     * @var TaskScheduleService $taskschedules_service
-     */
-    private $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
-    {
-        $admin_config_route = route(AdminConfigPage::class);
-
-        if ($this->module === null) {
-            FlashMessages::addMessage(
-                I18N::translate('The attached module could not be found.'),
-                'danger'
-            );
-            return redirect($admin_config_route);
-        }
-
-        $task_sched_id = (int) $request->getAttribute('task');
-        $task_schedule = $this->taskschedules_service->find($task_sched_id);
-
-        if ($task_schedule === null) {
-            FlashMessages::addMessage(
-                I18N::translate('The task shedule with ID “%d” does not exist.', I18N::number($task_sched_id)),
-                'danger'
-            );
-            return redirect($admin_config_route);
-        }
-
-        $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 redirect($admin_config_route);
-    }
-
-    /**
-     * 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;
-        }
-
-        $params = (array) $request->getParsedBody();
-
-        $frequency = (int) $params['frequency'];
-        if ($frequency > 0) {
-            $task_schedule->setFrequency(CarbonInterval::minutes($frequency));
-        } else {
-            FlashMessages::addMessage(I18N::translate('The frequency is not in a valid format'), 'danger');
-        }
-
-        $is_limited = (bool) $params['is_limited'];
-        $nb_occur = (int) $params['nb_occur'];
-
-        if ($is_limited) {
-            if ($nb_occur > 0) {
-                $task_schedule->setRemainingOccurences($nb_occur);
-            } else {
-                FlashMessages::addMessage(
-                    I18N::translate('The number of remaining occurences is not in a valid format'),
-                    'danger'
-                );
-            }
-        } else {
-            $task_schedule->setRemainingOccurences(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 TaskInterface&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;
-    }
+	/**
+	 * @var AdminTasksModule|null $module
+	 */
+	private $module;
+
+	/**
+	 * @var TaskScheduleService $taskschedules_service
+	 */
+	private $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
+	{
+		$admin_config_route = route(AdminConfigPage::class);
+
+		if ($this->module === null) {
+			FlashMessages::addMessage(
+				I18N::translate('The attached module could not be found.'),
+				'danger'
+			);
+			return redirect($admin_config_route);
+		}
+
+		$task_sched_id = (int) $request->getAttribute('task');
+		$task_schedule = $this->taskschedules_service->find($task_sched_id);
+
+		if ($task_schedule === null) {
+			FlashMessages::addMessage(
+				I18N::translate('The task shedule with ID “%d” does not exist.', I18N::number($task_sched_id)),
+				'danger'
+			);
+			return redirect($admin_config_route);
+		}
+
+		$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 redirect($admin_config_route);
+	}
+
+	/**
+	 * 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;
+		}
+
+		$params = (array) $request->getParsedBody();
+
+		$frequency = (int) $params['frequency'];
+		if ($frequency > 0) {
+			$task_schedule->setFrequency(CarbonInterval::minutes($frequency));
+		} else {
+			FlashMessages::addMessage(I18N::translate('The frequency is not in a valid format'), 'danger');
+		}
+
+		$is_limited = (bool) $params['is_limited'];
+		$nb_occur = (int) $params['nb_occur'];
+
+		if ($is_limited) {
+			if ($nb_occur > 0) {
+				$task_schedule->setRemainingOccurences($nb_occur);
+			} else {
+				FlashMessages::addMessage(
+					I18N::translate('The number of remaining occurences is not in a valid format'),
+					'danger'
+				);
+			}
+		} else {
+			$task_schedule->setRemainingOccurences(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 TaskInterface&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 +8 added lines, -8 removed lines

@@ -72,7 +72,7 @@ 
             return redirect($admin_config_route);
         }
 
-        $task_sched_id = (int) $request->getAttribute('task');
+        $task_sched_id = (int)$request->getAttribute('task');
         $task_schedule = $this->taskschedules_service->find($task_sched_id);
 
         if ($task_schedule === null) {
@@ -92,7 +92,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 redirect($admin_config_route);
@@ -111,17 +111,17 @@ 
             return false;
         }
 
-        $params = (array) $request->getParsedBody();
+        $params = (array)$request->getParsedBody();
 
-        $frequency = (int) $params['frequency'];
+        $frequency = (int)$params['frequency'];
         if ($frequency > 0) {
             $task_schedule->setFrequency(CarbonInterval::minutes($frequency));
         } else {
             FlashMessages::addMessage(I18N::translate('The frequency is not in a valid format'), 'danger');
         }
 
-        $is_limited = (bool) $params['is_limited'];
-        $nb_occur = (int) $params['nb_occur'];
+        $is_limited = (bool)$params['is_limited'];
+        $nb_occur = (int)$params['nb_occur'];
 
         if ($is_limited) {
             if ($nb_occur > 0) {
@@ -151,7 +151,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;
     }
 
@@ -183,7 +183,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;