jon48 / webtrees-lib

app/Module/PatronymicLineage/Http/RequestHandlers/SurnamesList.php

Indentation +58 added lines, -58 removed lines

@@ -30,70 +30,70 @@
  */
 class SurnamesList implements RequestHandlerInterface
 {
-    use ViewResponseTrait;
+	use ViewResponseTrait;
 
-    private ?PatronymicLineageModule $module;
+	private ?PatronymicLineageModule $module;
 
-    /**
-     * Constructor for SurnamesList Request Handler
-     *
-     * @param ModuleService $module_service
-     */
-    public function __construct(ModuleService $module_service)
-    {
-        $this->module = $module_service->findByInterface(PatronymicLineageModule::class)->first();
-    }
+	/**
+	 * Constructor for SurnamesList Request Handler
+	 *
+	 * @param ModuleService $module_service
+	 */
+	public function __construct(ModuleService $module_service)
+	{
+		$this->module = $module_service->findByInterface(PatronymicLineageModule::class)->first();
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        if ($this->module === null) {
-            throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
-        }
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		if ($this->module === null) {
+			throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
+		}
 
-        $tree = Validator::attributes($request)->tree();
-        $initial = Validator::attributes($request)->string('alpha', '');
+		$tree = Validator::attributes($request)->tree();
+		$initial = Validator::attributes($request)->string('alpha', '');
 
-        $surname_data     = $this->module->surnameData($tree, false, false);
-        $all_surnames     = $this->module->allSurnames($surname_data);
-        $initials_list = array_filter(
-            $this->module->surnameInitials($surname_data),
-            static fn (string $x): bool => $x !== '@' && $x !== ',',
-            ARRAY_FILTER_USE_KEY
-        );
+		$surname_data     = $this->module->surnameData($tree, false, false);
+		$all_surnames     = $this->module->allSurnames($surname_data);
+		$initials_list = array_filter(
+			$this->module->surnameInitials($surname_data),
+			static fn (string $x): bool => $x !== '@' && $x !== ',',
+			ARRAY_FILTER_USE_KEY
+		);
 
-        $show_all = Validator::queryParams($request)->string('show_all', 'no') === 'yes';
+		$show_all = Validator::queryParams($request)->string('show_all', 'no') === 'yes';
 
-        if ($show_all) {
-            $title = I18N::translate('Patronymic Lineages') . ' — ' . I18N::translate('All');
-            $surnames = array_filter(
-                $all_surnames,
-                static fn (string $x): bool => $x !== '' && $x !== Individual::NOMEN_NESCIO,
-                ARRAY_FILTER_USE_KEY
-            );
-        } elseif (array_key_exists($initial, $initials_list)) {
-            $title = I18N::translate('Patronymic Lineages') . ' — ' . $initial;
-            $surnames = array_filter(
-                $all_surnames,
-                static fn (string $x): bool => I18N::language()->initialLetter($x) === $initial,
-                ARRAY_FILTER_USE_KEY
-            );
-        } else {
-            $title =  I18N::translate('Patronymic Lineages');
-            $surnames = [];
-        }
+		if ($show_all) {
+			$title = I18N::translate('Patronymic Lineages') . ' — ' . I18N::translate('All');
+			$surnames = array_filter(
+				$all_surnames,
+				static fn (string $x): bool => $x !== '' && $x !== Individual::NOMEN_NESCIO,
+				ARRAY_FILTER_USE_KEY
+			);
+		} elseif (array_key_exists($initial, $initials_list)) {
+			$title = I18N::translate('Patronymic Lineages') . ' — ' . $initial;
+			$surnames = array_filter(
+				$all_surnames,
+				static fn (string $x): bool => I18N::language()->initialLetter($x) === $initial,
+				ARRAY_FILTER_USE_KEY
+			);
+		} else {
+			$title =  I18N::translate('Patronymic Lineages');
+			$surnames = [];
+		}
 
-        return $this->viewResponse($this->module->name() . '::surnames-page', [
-            'title'         =>  $title,
-            'module'        =>  $this->module,
-            'tree'          =>  $tree,
-            'initials_list' =>  $initials_list,
-            'initial'       =>  $initial,
-            'show_all'      =>  $show_all ? 'yes' : 'no',
-            'surnames'      =>  $surnames
-        ]);
-    }
+		return $this->viewResponse($this->module->name() . '::surnames-page', [
+			'title'         =>  $title,
+			'module'        =>  $this->module,
+			'tree'          =>  $tree,
+			'initials_list' =>  $initials_list,
+			'initial'       =>  $initial,
+			'show_all'      =>  $show_all ? 'yes' : 'no',
+			'surnames'      =>  $surnames
+		]);
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -68,25 +68,25 @@
         $show_all = Validator::queryParams($request)->string('show_all', 'no') === 'yes';
 
         if ($show_all) {
-            $title = I18N::translate('Patronymic Lineages') . ' — ' . I18N::translate('All');
+            $title = I18N::translate('Patronymic Lineages').' — '.I18N::translate('All');
             $surnames = array_filter(
                 $all_surnames,
                 static fn (string $x): bool => $x !== '' && $x !== Individual::NOMEN_NESCIO,
                 ARRAY_FILTER_USE_KEY
             );
         } elseif (array_key_exists($initial, $initials_list)) {
-            $title = I18N::translate('Patronymic Lineages') . ' — ' . $initial;
+            $title = I18N::translate('Patronymic Lineages').' — '.$initial;
             $surnames = array_filter(
                 $all_surnames,
                 static fn (string $x): bool => I18N::language()->initialLetter($x) === $initial,
                 ARRAY_FILTER_USE_KEY
             );
         } else {
-            $title =  I18N::translate('Patronymic Lineages');
+            $title = I18N::translate('Patronymic Lineages');
             $surnames = [];
         }
 
-        return $this->viewResponse($this->module->name() . '::surnames-page', [
+        return $this->viewResponse($this->module->name().'::surnames-page', [
             'title'         =>  $title,
             'module'        =>  $this->module,
             'tree'          =>  $tree,

app/Module/PatronymicLineage/Http/RequestHandlers/LineagesPage.php

Indentation +71 added lines, -71 removed lines

@@ -32,75 +32,75 @@
  */
 class LineagesPage implements RequestHandlerInterface
 {
-    use ViewResponseTrait;
-
-    /**
-     * @var PatronymicLineageModule|null $module
-     */
-    private $module;
-
-    /**
-     * Constructor for LineagesPage Request handler
-     *
-     * @param ModuleService $module_service
-     */
-    public function __construct(ModuleService $module_service)
-    {
-        $this->module = $module_service->findByInterface(PatronymicLineageModule::class)->first();
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        if ($this->module === null) {
-            throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
-        }
-
-        $tree = Validator::attributes($request)->tree();
-        $surname_attr = Validator::attributes($request)->string('surname', '');
-        $surname = I18N::strtoupper(I18N::language()->normalize($surname_attr));
-
-        if ($surname_attr !== $surname) {
-            return Registry::responseFactory()
-                ->redirect(LineagesPage::class, ['tree' => $tree->name(), 'surname' => $surname]);
-        }
-
-        if ($surname === '' ||  $surname === Individual::NOMEN_NESCIO) {
-            return Registry::responseFactory()->redirect(SurnamesList::class, ['tree' => $tree->name()]);
-        }
-
-        $surn_initial = I18N::language()->initialLetter($surname);
-
-        $surname_data     = $this->module->surnameData($tree, false, false);
-        $all_surnames     = $this->module->allSurnames($surname_data);
-        $initials_list = array_filter(
-            $this->module->surnameInitials($surname_data),
-            static fn (string $x): bool => $x !== '@' && $x !== ',',
-            ARRAY_FILTER_USE_KEY
-        );
-
-        $surname_variants = array_keys($all_surnames[$surname] ?? [$surname => $surname]);
-        uasort($surname_variants, I18N::comparator());
-        $surname_legend = implode('/', $surname_variants);
-
-        $title = I18N::translate('Patronymic Lineages') . ' — ' . $surname_legend;
-
-        $lineages = app()->make(LineageBuilder::class, ['surname' => $surname])->buildLineages();
-
-        return $this->viewResponse($this->module->name() . '::lineages-page', [
-            'title'         =>  $title,
-            'module'        =>  $this->module,
-            'tree'          =>  $tree,
-            'initials_list' =>  $initials_list,
-            'initial'       =>  $surn_initial,
-            'show_all'      =>  'no',
-            'surname'       =>  $surname,
-            'surname_legend' =>  $surname_legend,
-            'lineages'      =>  $lineages,
-            'nb_lineages'   =>  $lineages !== null ? $lineages->count() : 0
-        ]);
-    }
+	use ViewResponseTrait;
+
+	/**
+	 * @var PatronymicLineageModule|null $module
+	 */
+	private $module;
+
+	/**
+	 * Constructor for LineagesPage Request handler
+	 *
+	 * @param ModuleService $module_service
+	 */
+	public function __construct(ModuleService $module_service)
+	{
+		$this->module = $module_service->findByInterface(PatronymicLineageModule::class)->first();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		if ($this->module === null) {
+			throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
+		}
+
+		$tree = Validator::attributes($request)->tree();
+		$surname_attr = Validator::attributes($request)->string('surname', '');
+		$surname = I18N::strtoupper(I18N::language()->normalize($surname_attr));
+
+		if ($surname_attr !== $surname) {
+			return Registry::responseFactory()
+				->redirect(LineagesPage::class, ['tree' => $tree->name(), 'surname' => $surname]);
+		}
+
+		if ($surname === '' ||  $surname === Individual::NOMEN_NESCIO) {
+			return Registry::responseFactory()->redirect(SurnamesList::class, ['tree' => $tree->name()]);
+		}
+
+		$surn_initial = I18N::language()->initialLetter($surname);
+
+		$surname_data     = $this->module->surnameData($tree, false, false);
+		$all_surnames     = $this->module->allSurnames($surname_data);
+		$initials_list = array_filter(
+			$this->module->surnameInitials($surname_data),
+			static fn (string $x): bool => $x !== '@' && $x !== ',',
+			ARRAY_FILTER_USE_KEY
+		);
+
+		$surname_variants = array_keys($all_surnames[$surname] ?? [$surname => $surname]);
+		uasort($surname_variants, I18N::comparator());
+		$surname_legend = implode('/', $surname_variants);
+
+		$title = I18N::translate('Patronymic Lineages') . ' — ' . $surname_legend;
+
+		$lineages = app()->make(LineageBuilder::class, ['surname' => $surname])->buildLineages();
+
+		return $this->viewResponse($this->module->name() . '::lineages-page', [
+			'title'         =>  $title,
+			'module'        =>  $this->module,
+			'tree'          =>  $tree,
+			'initials_list' =>  $initials_list,
+			'initial'       =>  $surn_initial,
+			'show_all'      =>  'no',
+			'surname'       =>  $surname,
+			'surname_legend' =>  $surname_legend,
+			'lineages'      =>  $lineages,
+			'nb_lineages'   =>  $lineages !== null ? $lineages->count() : 0
+		]);
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -68,7 +68,7 @@ 
                 ->redirect(LineagesPage::class, ['tree' => $tree->name(), 'surname' => $surname]);
         }
 
-        if ($surname === '' ||  $surname === Individual::NOMEN_NESCIO) {
+        if ($surname === '' || $surname === Individual::NOMEN_NESCIO) {
             return Registry::responseFactory()->redirect(SurnamesList::class, ['tree' => $tree->name()]);
         }
 
@@ -86,11 +86,11 @@ 
         uasort($surname_variants, I18N::comparator());
         $surname_legend = implode('/', $surname_variants);
 
-        $title = I18N::translate('Patronymic Lineages') . ' — ' . $surname_legend;
+        $title = I18N::translate('Patronymic Lineages').' — '.$surname_legend;
 
         $lineages = app()->make(LineageBuilder::class, ['surname' => $surname])->buildLineages();
 
-        return $this->viewResponse($this->module->name() . '::lineages-page', [
+        return $this->viewResponse($this->module->name().'::lineages-page', [
             'title'         =>  $title,
             'module'        =>  $this->module,
             'tree'          =>  $tree,

app/Module/PatronymicLineage/PatronymicLineageModule.php

Indentation +172 added lines, -172 removed lines

@@ -39,177 +39,177 @@
  * Display lineages of people with the same surname.
  */
 class PatronymicLineageModule extends IndividualListModule implements
-    ModuleMyArtJaubInterface,
-    ModuleListInterface,
-    ModuleGlobalInterface
+	ModuleMyArtJaubInterface,
+	ModuleListInterface,
+	ModuleGlobalInterface
 {
-    use ModuleMyArtJaubTrait;
-    use ModuleListTrait;
-    use ModuleGlobalTrait;
-
-     /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\AbstractModule::title()
-     */
-    public function title(): string
-    {
-        return /* I18N: Name of the “Patronymic lineage” module */ I18N::translate('Patronymic Lineages');
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\AbstractModule::description()
-     */
-    public function description(): string
-    {
-        //phpcs:ignore Generic.Files.LineLength.TooLong
-        return /* I18N: Description of the “Patronymic lineage” module */ I18N::translate('Display lineages of people holding the same surname.');
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\ModuleMyArtJaubInterface::loadRoutes()
-     */
-    public function loadRoutes(Map $router): void
-    {
-        $router->attach('', '', static function (Map $router): void {
-
-            $router->attach('', '/module-maj/lineages', static function (Map $router): void {
-
-                $router->attach('', '/Page', static function (Map $router): void {
-
-                    $router->get(SurnamesList::class, '/{tree}/list{/alpha}', SurnamesList::class);
-                    $router->get(LineagesPage::class, '/{tree}/lineage/{surname}', LineagesPage::class);
-                });
-            });
-        });
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleCustomInterface::customModuleVersion()
-     */
-    public function customModuleVersion(): string
-    {
-        return '2.1.18-v.1';
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleListInterface::listUrl()
-     *
-     * @param array<bool|int|string|array<mixed>|null> $parameters
-     */
-    public function listUrl(Tree $tree, array $parameters = []): string
-    {
-        $surname = $parameters['surname'] ?? null;
-        $surname = is_string($surname) ? $surname : null;
-
-        $request = app(ServerRequestInterface::class);
-
-        // If a surname is already in the query attribute, use it
-        if ($surname === null) {
-            $surname_attr =  Validator::attributes($request)->string('surname', '');
-            $surname_param =  Validator::queryParams($request)->string('surname', '');
-            $surname_body =  Validator::parsedBody($request)->string('surname', '');
-            $surname = $surname_attr !== '' ? $surname_attr : (
-                $surname_param !== '' ? $surname_param : (
-                $surname_body !== '' ? $surname_body : null
-            ));
-        }
-
-        // If nothing found, and on an individual page, use its name
-        $xref = Validator::attributes($request)->isXref()->string('xref', '');
-        if ($xref !== '') {
-            $individual = Registry::individualFactory()->make($xref, $tree);
-            if ($individual instanceof Individual && $individual->canShow()) {
-                $primary_name = $individual->getPrimaryName();
-                $surname ??= $individual->getAllNames()[$primary_name]['surn'] ?? null;
-            }
-        }
-
-        if (Str::length($surname ?? '') > 0 && $surname !== Individual::NOMEN_NESCIO) {
-            return route(LineagesPage::class, [
-                'tree'      =>  $tree->name(),
-                'surname'   =>  $surname
-            ] + $parameters);
-        }
-        return route(SurnamesList::class, ['tree'  =>  $tree->name() ] + $parameters);
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleListInterface::listMenuClass()
-     */
-    public function listMenuClass(): string
-    {
-        return 'menu-maj-patrolineage';
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleGlobalInterface::headContent()
-     */
-    public function headContent(): string
-    {
-        return '<link rel="stylesheet" href="' . e($this->moduleCssUrl()) . '">';
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\IndividualListModule::individuals()
-     *
-     * Implemented to set the visibility to public.
-     * This should probably be in a service, but this hack allows for reuse of mainstream code.
-     */
-    public function individuals(
-        Tree $tree,
-        array $surns_to_show,
-        string $galpha,
-        bool $marnm,
-        bool $fams
-    ): Collection {
-        return parent::individuals($tree, $surns_to_show, $galpha, $marnm, $fams);
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\IndividualListModule::surnameData()
-     *
-     * Implemented to set the visibility to public.
-     * This should probably be in a service, but this hack allows for reuse of mainstream code.
-     *
-     * @return array<object{n_surn:string,n_surname:string,total:int}>
-     */
-    public function surnameData(Tree $tree, bool $marnm, bool $fams): array
-    {
-        $reflectionMethod = new ReflectionMethod(IndividualListModule::class, 'surnameData');
-        $reflectionMethod->setAccessible(true);
-
-        return $reflectionMethod->invoke($this, $tree, $marnm, $fams);
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\IndividualListModule::allSurnames()
-     *
-     * Implemented to set the visibility to public.
-     * This should probably be in a service, but this hack allows for reuse of mainstream code.
-     */
-    public function allSurnames(array $surname_data): array
-    {
-        return parent::allSurnames($surname_data);
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\IndividualListModule::surnameInitials()
-     *
-     * Implemented to set the visibility to public.
-     * This should probably be in a service, but this hack allows for reuse of mainstream code.
-     */
-    public function surnameInitials(array $surname_data): array
-    {
-        return parent::surnameInitials($surname_data);
-    }
+	use ModuleMyArtJaubTrait;
+	use ModuleListTrait;
+	use ModuleGlobalTrait;
+
+	 /**
+	  * {@inheritDoc}
+	  * @see \Fisharebest\Webtrees\Module\AbstractModule::title()
+	  */
+	public function title(): string
+	{
+		return /* I18N: Name of the “Patronymic lineage” module */ I18N::translate('Patronymic Lineages');
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\AbstractModule::description()
+	 */
+	public function description(): string
+	{
+		//phpcs:ignore Generic.Files.LineLength.TooLong
+		return /* I18N: Description of the “Patronymic lineage” module */ I18N::translate('Display lineages of people holding the same surname.');
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Module\ModuleMyArtJaubInterface::loadRoutes()
+	 */
+	public function loadRoutes(Map $router): void
+	{
+		$router->attach('', '', static function (Map $router): void {
+
+			$router->attach('', '/module-maj/lineages', static function (Map $router): void {
+
+				$router->attach('', '/Page', static function (Map $router): void {
+
+					$router->get(SurnamesList::class, '/{tree}/list{/alpha}', SurnamesList::class);
+					$router->get(LineagesPage::class, '/{tree}/lineage/{surname}', LineagesPage::class);
+				});
+			});
+		});
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleCustomInterface::customModuleVersion()
+	 */
+	public function customModuleVersion(): string
+	{
+		return '2.1.18-v.1';
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleListInterface::listUrl()
+	 *
+	 * @param array<bool|int|string|array<mixed>|null> $parameters
+	 */
+	public function listUrl(Tree $tree, array $parameters = []): string
+	{
+		$surname = $parameters['surname'] ?? null;
+		$surname = is_string($surname) ? $surname : null;
+
+		$request = app(ServerRequestInterface::class);
+
+		// If a surname is already in the query attribute, use it
+		if ($surname === null) {
+			$surname_attr =  Validator::attributes($request)->string('surname', '');
+			$surname_param =  Validator::queryParams($request)->string('surname', '');
+			$surname_body =  Validator::parsedBody($request)->string('surname', '');
+			$surname = $surname_attr !== '' ? $surname_attr : (
+				$surname_param !== '' ? $surname_param : (
+				$surname_body !== '' ? $surname_body : null
+			));
+		}
+
+		// If nothing found, and on an individual page, use its name
+		$xref = Validator::attributes($request)->isXref()->string('xref', '');
+		if ($xref !== '') {
+			$individual = Registry::individualFactory()->make($xref, $tree);
+			if ($individual instanceof Individual && $individual->canShow()) {
+				$primary_name = $individual->getPrimaryName();
+				$surname ??= $individual->getAllNames()[$primary_name]['surn'] ?? null;
+			}
+		}
+
+		if (Str::length($surname ?? '') > 0 && $surname !== Individual::NOMEN_NESCIO) {
+			return route(LineagesPage::class, [
+				'tree'      =>  $tree->name(),
+				'surname'   =>  $surname
+			] + $parameters);
+		}
+		return route(SurnamesList::class, ['tree'  =>  $tree->name() ] + $parameters);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleListInterface::listMenuClass()
+	 */
+	public function listMenuClass(): string
+	{
+		return 'menu-maj-patrolineage';
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleGlobalInterface::headContent()
+	 */
+	public function headContent(): string
+	{
+		return '<link rel="stylesheet" href="' . e($this->moduleCssUrl()) . '">';
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\IndividualListModule::individuals()
+	 *
+	 * Implemented to set the visibility to public.
+	 * This should probably be in a service, but this hack allows for reuse of mainstream code.
+	 */
+	public function individuals(
+		Tree $tree,
+		array $surns_to_show,
+		string $galpha,
+		bool $marnm,
+		bool $fams
+	): Collection {
+		return parent::individuals($tree, $surns_to_show, $galpha, $marnm, $fams);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\IndividualListModule::surnameData()
+	 *
+	 * Implemented to set the visibility to public.
+	 * This should probably be in a service, but this hack allows for reuse of mainstream code.
+	 *
+	 * @return array<object{n_surn:string,n_surname:string,total:int}>
+	 */
+	public function surnameData(Tree $tree, bool $marnm, bool $fams): array
+	{
+		$reflectionMethod = new ReflectionMethod(IndividualListModule::class, 'surnameData');
+		$reflectionMethod->setAccessible(true);
+
+		return $reflectionMethod->invoke($this, $tree, $marnm, $fams);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\IndividualListModule::allSurnames()
+	 *
+	 * Implemented to set the visibility to public.
+	 * This should probably be in a service, but this hack allows for reuse of mainstream code.
+	 */
+	public function allSurnames(array $surname_data): array
+	{
+		return parent::allSurnames($surname_data);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\IndividualListModule::surnameInitials()
+	 *
+	 * Implemented to set the visibility to public.
+	 * This should probably be in a service, but this hack allows for reuse of mainstream code.
+	 */
+	public function surnameInitials(array $surname_data): array
+	{
+		return parent::surnameInitials($surname_data);
+	}
 }

Spacing +8 added lines, -8 removed lines

@@ -72,11 +72,11 @@ 
      */
     public function loadRoutes(Map $router): void
     {
-        $router->attach('', '', static function (Map $router): void {
+        $router->attach('', '', static function(Map $router): void {
 
-            $router->attach('', '/module-maj/lineages', static function (Map $router): void {
+            $router->attach('', '/module-maj/lineages', static function(Map $router): void {
 
-                $router->attach('', '/Page', static function (Map $router): void {
+                $router->attach('', '/Page', static function(Map $router): void {
 
                     $router->get(SurnamesList::class, '/{tree}/list{/alpha}', SurnamesList::class);
                     $router->get(LineagesPage::class, '/{tree}/lineage/{surname}', LineagesPage::class);
@@ -109,9 +109,9 @@ 
 
         // If a surname is already in the query attribute, use it
         if ($surname === null) {
-            $surname_attr =  Validator::attributes($request)->string('surname', '');
-            $surname_param =  Validator::queryParams($request)->string('surname', '');
-            $surname_body =  Validator::parsedBody($request)->string('surname', '');
+            $surname_attr = Validator::attributes($request)->string('surname', '');
+            $surname_param = Validator::queryParams($request)->string('surname', '');
+            $surname_body = Validator::parsedBody($request)->string('surname', '');
             $surname = $surname_attr !== '' ? $surname_attr : (
                 $surname_param !== '' ? $surname_param : (
                 $surname_body !== '' ? $surname_body : null
@@ -134,7 +134,7 @@ 
                 'surname'   =>  $surname
             ] + $parameters);
         }
-        return route(SurnamesList::class, ['tree'  =>  $tree->name() ] + $parameters);
+        return route(SurnamesList::class, ['tree'  =>  $tree->name()] + $parameters);
     }
 
     /**
@@ -152,7 +152,7 @@ 
      */
     public function headContent(): string
     {
-        return '<link rel="stylesheet" href="' . e($this->moduleCssUrl()) . '">';
+        return '<link rel="stylesheet" href="'.e($this->moduleCssUrl()).'">';
     }
 
     /**

app/Module/PatronymicLineage/Model/LineageBuilder.php

Indentation +216 added lines, -216 removed lines

@@ -28,220 +28,220 @@
  */
 class LineageBuilder
 {
-    private string $surname;
-    private Tree $tree;
-    private PatronymicLineageModule $patrolineage_module;
-
-    /**
-     * @var Collection<string, bool> $used_indis Individuals already processed
-     */
-    private Collection $used_indis;
-
-    /**
-     * Constructor for Lineage Builder
-     *
-     * @param string $surname Reference surname
-     * @param Tree $tree Gedcom tree
-     */
-    public function __construct(string $surname, Tree $tree, PatronymicLineageModule $patrolineage_module)
-    {
-        $this->surname = I18N::strtoupper(I18N::language()->normalize($surname));
-        $this->tree = $tree;
-        $this->patrolineage_module = $patrolineage_module;
-        $this->used_indis = new Collection();
-    }
-
-    /**
-     * Build all patronymic lineages for the reference surname.
-     *
-     * @return Collection<LineageRootNode>|NULL List of root patronymic lineages
-     */
-    public function buildLineages(): ?Collection
-    {
-        $surname_data = $this->patrolineage_module->surnameData($this->tree, false, false);
-        $all_surnames = $this->patrolineage_module->allSurnames($surname_data);
-        $surname_variants = array_keys($all_surnames[$this->surname] ?? []);
-
-        if (count($surname_variants) === 0) {
-            return null;
-        }
-
-        //Warning - the individuals method returns a clone of individuals objects. Cannot be used for object equality
-        $indis = $this->patrolineage_module->individuals(
-            $this->tree,
-            $surname_variants,
-            '',
-            false,
-            false
-        );
-
-        if (count($indis) === 0) {
-            return null;
-        }
-
-        $root_lineages = new Collection();
-
-        foreach ($indis as $indi) {
-            /** @var Individual $indi */
-            if ($this->used_indis->get($indi->xref(), false) === false) {
-                $indi_first = $this->getLineageRootIndividual($indi);
-                if ($indi_first !== null) {
-                    // The root lineage needs to be recreated from the Factory, to retrieve the proper object
-                    $indi_first = Registry::individualFactory()->make($indi_first->xref(), $this->tree);
-                }
-                if ($indi_first === null) {
-                    continue;
-                }
-                $this->used_indis->put($indi_first->xref(), true);
-                if ($indi_first->canShow()) {
-                    //Check if the root individual has brothers and sisters, without parents
-                    $indi_first_child_family = $indi_first->childFamilies()->first();
-                    if ($indi_first_child_family !== null) {
-                        $root_node = new LineageRootNode(null);
-                        $root_node->addFamily($indi_first_child_family);
-                    } else {
-                        $root_node = new LineageRootNode($indi_first);
-                    }
-                    $root_node = $this->buildLineage($root_node);
-                    $root_lineages->add($root_node);
-                }
-            }
-        }
-
-        return $root_lineages->sort(function (LineageRootNode $a, LineageRootNode $b) {
-            if ($a->numberChildNodes() === $b->numberChildNodes()) {
-                return 0;
-            }
-            return ($a->numberChildNodes() > $b->numberChildNodes()) ? -1 : 1;
-        })->values();
-    }
-
-    /**
-     * Retrieve the root individual, from any individual, by recursion.
-     * The Root individual is the individual without a father, or without a mother holding the same name.
-     *
-     * @param Individual $indi
-     * @return Individual|NULL Root individual
-     */
-    private function getLineageRootIndividual(Individual $indi): ?Individual
-    {
-        $child_families = $indi->childFamilies();
-        if ($this->used_indis->get($indi->xref(), false) !== false) {
-            return null;
-        }
-
-        foreach ($child_families as $child_family) {
-            /** @var Family $child_family */
-            $child_family->husband();
-            if (($husb = $child_family->husband()) !== null) {
-                if ($husb->isPendingAddition() && $husb->privatizeGedcom(Auth::PRIV_HIDE) === '') {
-                    return $indi;
-                }
-                return $this->getLineageRootIndividual($husb);
-            } elseif (($wife = $child_family->wife()) !== null) {
-                if (!($wife->isPendingAddition() && $wife->privatizeGedcom(Auth::PRIV_HIDE) === '')) {
-                    $indi_surname = $indi->getAllNames()[$indi->getPrimaryName()]['surname'];
-                    $wife_surname = $wife->getAllNames()[$wife->getPrimaryName()]['surname'];
-                    if (
-                        $indi->canShowName()
-                        && $wife->canShowName()
-                        && I18N::comparator()($indi_surname, $wife_surname) === 0
-                    ) {
-                            return $this->getLineageRootIndividual($wife);
-                    }
-                }
-                return $indi;
-            }
-        }
-        return $indi;
-    }
-
-    /**
-     * Computes descendent Lineage from a node.
-     * Uses recursion to build the lineage tree
-     *
-     * @param LineageNode $node
-     * @return LineageNode Computed lineage
-     */
-    private function buildLineage(LineageNode $node): LineageNode
-    {
-        $indi_surname = '';
-
-        $indi_node = $node->individual();
-        if ($indi_node !== null) {
-            if ($node->families()->count() === 0) {
-                foreach ($indi_node->spouseFamilies() as $spouse_family) {
-                    $node->addFamily($spouse_family);
-                }
-            }
-
-            $indi_surname = $indi_node->getAllNames()[$indi_node->getPrimaryName()]['surname'] ?? '';
-            $node->rootNode()->addPlace($indi_node->getBirthPlace());
-
-            //Tag the individual as used
-            $this->used_indis->put($indi_node->xref(), true);
-        }
-
-        foreach ($node->families() as $family_node) {
-            /** @var Family $spouse_family */
-            $spouse_family = $family_node->family;
-            $spouse_surname = '';
-            $spouse = null;
-            if (
-                $indi_node !== null &&
-                ($spouse = $spouse_family->spouse($indi_node)) !== null && $spouse->canShowName()
-            ) {
-                $spouse_surname = $spouse->getAllNames()[$spouse->getPrimaryName()]['surname'] ?? '';
-            }
-
-            $nb_children = $nb_natural = 0;
-
-            foreach ($spouse_family->children() as $child) {
-                if (!($child->isPendingAddition() && $child->privatizeGedcom(Auth::PRIV_HIDE) === '')) {
-                    $child_surname = $child->getAllNames()[$child->getPrimaryName()]['surname'] ?? '';
-
-                    $nb_children++;
-                    if ($indi_node !== null && $indi_node->sex() === 'F') { //If the root individual is the mother
-                        //Print only lineages of children with the same surname as their mother
-                        //(supposing they are natural children)
-                        /** @psalm-suppress RedundantCondition */
-                        if (
-                            $spouse === null ||
-                            ($spouse_surname !== '' && I18N::comparator()($child_surname, $spouse_surname) !== 0)
-                        ) {
-                            if (I18N::comparator()($child_surname, $indi_surname) === 0) {
-                                $nb_natural++;
-                                $node_child = new LineageNode($child, $node->rootNode());
-                                $node_child = $this->buildLineage($node_child);
-                                $node->addChild($spouse_family, $node_child);
-                            }
-                        }
-                    } else { //If the root individual is the father
-                        $nb_natural++;
-                        //Print if the children does not bear the same name as his mother
-                        //(and different from his father)
-                        if (
-                            mb_strlen($child_surname) === 0 ||
-                            mb_strlen($indi_surname) === 0 || mb_strlen($spouse_surname) === 0 ||
-                            I18N::comparator()($child_surname, $indi_surname) === 0 ||
-                            I18N::comparator()($child_surname, $spouse_surname) !== 0
-                        ) {
-                            $node_child = new LineageNode($child, $node->rootNode());
-                            $node_child = $this->buildLineage($node_child);
-                        } else {
-                            $node_child = new LineageNode($child, $node->rootNode(), $child_surname);
-                        }
-                        $node->addChild($spouse_family, $node_child);
-                    }
-                }
-            }
-
-            //Do not print other children
-            if (($nb_children - $nb_natural) > 0) {
-                $node->addChild($spouse_family, null);
-            }
-        }
-
-        return $node;
-    }
+	private string $surname;
+	private Tree $tree;
+	private PatronymicLineageModule $patrolineage_module;
+
+	/**
+	 * @var Collection<string, bool> $used_indis Individuals already processed
+	 */
+	private Collection $used_indis;
+
+	/**
+	 * Constructor for Lineage Builder
+	 *
+	 * @param string $surname Reference surname
+	 * @param Tree $tree Gedcom tree
+	 */
+	public function __construct(string $surname, Tree $tree, PatronymicLineageModule $patrolineage_module)
+	{
+		$this->surname = I18N::strtoupper(I18N::language()->normalize($surname));
+		$this->tree = $tree;
+		$this->patrolineage_module = $patrolineage_module;
+		$this->used_indis = new Collection();
+	}
+
+	/**
+	 * Build all patronymic lineages for the reference surname.
+	 *
+	 * @return Collection<LineageRootNode>|NULL List of root patronymic lineages
+	 */
+	public function buildLineages(): ?Collection
+	{
+		$surname_data = $this->patrolineage_module->surnameData($this->tree, false, false);
+		$all_surnames = $this->patrolineage_module->allSurnames($surname_data);
+		$surname_variants = array_keys($all_surnames[$this->surname] ?? []);
+
+		if (count($surname_variants) === 0) {
+			return null;
+		}
+
+		//Warning - the individuals method returns a clone of individuals objects. Cannot be used for object equality
+		$indis = $this->patrolineage_module->individuals(
+			$this->tree,
+			$surname_variants,
+			'',
+			false,
+			false
+		);
+
+		if (count($indis) === 0) {
+			return null;
+		}
+
+		$root_lineages = new Collection();
+
+		foreach ($indis as $indi) {
+			/** @var Individual $indi */
+			if ($this->used_indis->get($indi->xref(), false) === false) {
+				$indi_first = $this->getLineageRootIndividual($indi);
+				if ($indi_first !== null) {
+					// The root lineage needs to be recreated from the Factory, to retrieve the proper object
+					$indi_first = Registry::individualFactory()->make($indi_first->xref(), $this->tree);
+				}
+				if ($indi_first === null) {
+					continue;
+				}
+				$this->used_indis->put($indi_first->xref(), true);
+				if ($indi_first->canShow()) {
+					//Check if the root individual has brothers and sisters, without parents
+					$indi_first_child_family = $indi_first->childFamilies()->first();
+					if ($indi_first_child_family !== null) {
+						$root_node = new LineageRootNode(null);
+						$root_node->addFamily($indi_first_child_family);
+					} else {
+						$root_node = new LineageRootNode($indi_first);
+					}
+					$root_node = $this->buildLineage($root_node);
+					$root_lineages->add($root_node);
+				}
+			}
+		}
+
+		return $root_lineages->sort(function (LineageRootNode $a, LineageRootNode $b) {
+			if ($a->numberChildNodes() === $b->numberChildNodes()) {
+				return 0;
+			}
+			return ($a->numberChildNodes() > $b->numberChildNodes()) ? -1 : 1;
+		})->values();
+	}
+
+	/**
+	 * Retrieve the root individual, from any individual, by recursion.
+	 * The Root individual is the individual without a father, or without a mother holding the same name.
+	 *
+	 * @param Individual $indi
+	 * @return Individual|NULL Root individual
+	 */
+	private function getLineageRootIndividual(Individual $indi): ?Individual
+	{
+		$child_families = $indi->childFamilies();
+		if ($this->used_indis->get($indi->xref(), false) !== false) {
+			return null;
+		}
+
+		foreach ($child_families as $child_family) {
+			/** @var Family $child_family */
+			$child_family->husband();
+			if (($husb = $child_family->husband()) !== null) {
+				if ($husb->isPendingAddition() && $husb->privatizeGedcom(Auth::PRIV_HIDE) === '') {
+					return $indi;
+				}
+				return $this->getLineageRootIndividual($husb);
+			} elseif (($wife = $child_family->wife()) !== null) {
+				if (!($wife->isPendingAddition() && $wife->privatizeGedcom(Auth::PRIV_HIDE) === '')) {
+					$indi_surname = $indi->getAllNames()[$indi->getPrimaryName()]['surname'];
+					$wife_surname = $wife->getAllNames()[$wife->getPrimaryName()]['surname'];
+					if (
+						$indi->canShowName()
+						&& $wife->canShowName()
+						&& I18N::comparator()($indi_surname, $wife_surname) === 0
+					) {
+							return $this->getLineageRootIndividual($wife);
+					}
+				}
+				return $indi;
+			}
+		}
+		return $indi;
+	}
+
+	/**
+	 * Computes descendent Lineage from a node.
+	 * Uses recursion to build the lineage tree
+	 *
+	 * @param LineageNode $node
+	 * @return LineageNode Computed lineage
+	 */
+	private function buildLineage(LineageNode $node): LineageNode
+	{
+		$indi_surname = '';
+
+		$indi_node = $node->individual();
+		if ($indi_node !== null) {
+			if ($node->families()->count() === 0) {
+				foreach ($indi_node->spouseFamilies() as $spouse_family) {
+					$node->addFamily($spouse_family);
+				}
+			}
+
+			$indi_surname = $indi_node->getAllNames()[$indi_node->getPrimaryName()]['surname'] ?? '';
+			$node->rootNode()->addPlace($indi_node->getBirthPlace());
+
+			//Tag the individual as used
+			$this->used_indis->put($indi_node->xref(), true);
+		}
+
+		foreach ($node->families() as $family_node) {
+			/** @var Family $spouse_family */
+			$spouse_family = $family_node->family;
+			$spouse_surname = '';
+			$spouse = null;
+			if (
+				$indi_node !== null &&
+				($spouse = $spouse_family->spouse($indi_node)) !== null && $spouse->canShowName()
+			) {
+				$spouse_surname = $spouse->getAllNames()[$spouse->getPrimaryName()]['surname'] ?? '';
+			}
+
+			$nb_children = $nb_natural = 0;
+
+			foreach ($spouse_family->children() as $child) {
+				if (!($child->isPendingAddition() && $child->privatizeGedcom(Auth::PRIV_HIDE) === '')) {
+					$child_surname = $child->getAllNames()[$child->getPrimaryName()]['surname'] ?? '';
+
+					$nb_children++;
+					if ($indi_node !== null && $indi_node->sex() === 'F') { //If the root individual is the mother
+						//Print only lineages of children with the same surname as their mother
+						//(supposing they are natural children)
+						/** @psalm-suppress RedundantCondition */
+						if (
+							$spouse === null ||
+							($spouse_surname !== '' && I18N::comparator()($child_surname, $spouse_surname) !== 0)
+						) {
+							if (I18N::comparator()($child_surname, $indi_surname) === 0) {
+								$nb_natural++;
+								$node_child = new LineageNode($child, $node->rootNode());
+								$node_child = $this->buildLineage($node_child);
+								$node->addChild($spouse_family, $node_child);
+							}
+						}
+					} else { //If the root individual is the father
+						$nb_natural++;
+						//Print if the children does not bear the same name as his mother
+						//(and different from his father)
+						if (
+							mb_strlen($child_surname) === 0 ||
+							mb_strlen($indi_surname) === 0 || mb_strlen($spouse_surname) === 0 ||
+							I18N::comparator()($child_surname, $indi_surname) === 0 ||
+							I18N::comparator()($child_surname, $spouse_surname) !== 0
+						) {
+							$node_child = new LineageNode($child, $node->rootNode());
+							$node_child = $this->buildLineage($node_child);
+						} else {
+							$node_child = new LineageNode($child, $node->rootNode(), $child_surname);
+						}
+						$node->addChild($spouse_family, $node_child);
+					}
+				}
+			}
+
+			//Do not print other children
+			if (($nb_children - $nb_natural) > 0) {
+				$node->addChild($spouse_family, null);
+			}
+		}
+
+		return $node;
+	}
 }

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

Indentation +55 added lines, -55 removed lines

@@ -32,66 +32,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(HomePage::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(HomePage::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);
+	}
 }

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

Indentation +142 added lines, -142 removed lines

@@ -35,146 +35,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(HomePage::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(HomePage::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;
+	}
 }

app/Module/GeoDispersion/PlaceMappers/CoordinatesPlaceMapper.php

Indentation +180 added lines, -180 removed lines

@@ -36,184 +36,184 @@
  */
 class CoordinatesPlaceMapper implements PlaceMapperInterface
 {
-    use PlaceMapperTrait;
-
-    private ?GeometryEngine $geometry_engine = null;
-
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperInterface::title()
-     */
-    public function title(): string
-    {
-        return I18N::translate('Mapping on place coordinates');
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * {@internal The Place is associated to a Point only.
-     * PlaceLocation can calculate a BoundingBox.
-     * Using a BoundingBox could make the mapping more complex and potentially arbitary.
-     * Furthermore, when no coordinate is found for the place or its children, then it bubbles up to the parents.
-     * This could create the unwanted side effect of a very large area to consider}
-     *
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperInterface::map()
-     */
-    public function map(Place $place, string $feature_property): ?string
-    {
-        $location = new PlaceLocation($place->gedcomName());
-        $longitude = $location->longitude();
-        $latitude = $location->latitude();
-        if ($longitude === null || $latitude === null) {
-            return null;
-        }
-
-        $features_index = $this->featuresIndex();
-        if ($features_index === null) {
-            return null;
-        }
-
-        $place_point = Point::xy($longitude, $latitude, $features_index['SRID']);
-        $grid_box = $this->getGridCell(
-            $place_point,
-            $features_index['map_NE'],
-            $features_index['map_SW'],
-            $features_index['nb_columns']
-        );
-        if ($grid_box === null || !$this->setGeometryEngine() || $this->geometry_engine === null) {
-            return null;
-        }
-        $features = $features_index['grid'][$grid_box[0]][$grid_box[1]];
-        foreach ($features as $feature) {
-            $geometry = $feature->getGeometry();
-            if (
-                $geometry !== null && $place_point->SRID() === $geometry->SRID() &&
-                $this->geometry_engine->contains($geometry, $place_point)
-            ) {
-                return $feature->getProperty($feature_property);
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Return the XY coordinates in a bounded grid of the cell containing a specific point.
-     *
-     * @param Point $point Point to find
-     * @param Point $grid_NE North-East point of the bounded grid
-     * @param Point $grid_SW South-West point fo the bounded grid
-     * @param int $grid_columns Number of columns/rows in the grid
-     * @return int[]|NULL
-     */
-    protected function getGridCell(Point $point, Point $grid_NE, Point $grid_SW, int $grid_columns): ?array
-    {
-        list($x, $y) = [$point->x() ?? 0, $point->y() ?? 0];
-        list($x_max, $y_max) = [$grid_NE->x() ?? 0, $grid_NE->y() ?? 0];
-        list($x_min, $y_min) = [$grid_SW->x() ?? 0, $grid_SW->y() ?? 0];
-
-        $x_step = ($x_max - $x_min) / $grid_columns;
-        $y_step = ($y_max - $y_min) / $grid_columns;
-
-        if ($x_min <= $x && $x <= $x_max && $y_min <= $y && $y <= $y_max) {
-            return [
-                $x === $x_max ? $grid_columns - 1 : intval(($x - $x_min) / $x_step),
-                $y === $y_max ? $grid_columns - 1 : intval(($y - $y_min) / $y_step)
-            ];
-        }
-        return null;
-    }
-
-    /**
-     * Get an indexed array of the features of the map.
-     *
-     * {@internal The map is divided in a grid, each cell containing the features which bounding box overlaps that cell.
-     * The grid is computed once for each map, and cached.}
-     *
-     * @phpcs:ignore Generic.Files.LineLength.TooLong
-     * @return array{grid: array<int, array<int, \Brick\Geo\IO\GeoJSON\Feature[]>>, nb_columns: int, map_NE: \Brick\Geo\Point, map_SW: \Brick\Geo\Point, SRID: int}|NULL
-     */
-    protected function featuresIndex(): ?array
-    {
-        $cacheKey = $this->cacheKey();
-        if ($cacheKey === null) {
-            return null;
-        }
-        return Registry::cache()->array()->remember($cacheKey, function (): ?array {
-            $map_def = $this->data('map');
-            if (
-                !$this->setGeometryEngine()
-                || $map_def === null
-                || !($map_def instanceof MapDefinitionInterface)
-            ) {
-                return null;
-            }
-            $bounding_boxes = [];
-            $map_bounding_box = new BoundingBox();
-            $srid = 0;
-            foreach ($map_def->features() as $feature) {
-                $geometry = $feature->getGeometry();
-                if ($geometry === null) {
-                    continue;
-                }
-                $srid = $geometry->SRID();
-                $bounding_box = $geometry->getBoundingBox();
-                $bounding_boxes[] = [$feature, $bounding_box];
-                $map_bounding_box = $map_bounding_box->extendedWithBoundingBox($bounding_box);
-            }
-            $grid_columns = count($bounding_boxes);
-            $grid = array_fill(0, $grid_columns, array_fill(0, $grid_columns, []));
-            $map_NE = $map_bounding_box->getNorthEast();
-            $map_SW = $map_bounding_box->getSouthWest();
-            foreach ($bounding_boxes as $item) {
-                $grid_box_SW = $this->getGridCell($item[1]->getSouthWest(), $map_NE, $map_SW, $grid_columns) ?? [1, 1];
-                $grid_box_NE = $this->getGridCell($item[1]->getNorthEast(), $map_NE, $map_SW, $grid_columns) ?? [0, 0];
-                for ($i = $grid_box_SW[0]; $i <= $grid_box_NE[0]; $i++) {
-                    for ($j = $grid_box_SW[1]; $j <= $grid_box_NE[1]; $j++) {
-                        $grid[$i][$j][] = $item[0];
-                    }
-                }
-            }
-            return [
-                'grid'          =>  $grid,
-                'nb_columns'    =>  $grid_columns,
-                'map_NE'        =>  $map_NE,
-                'map_SW'        =>  $map_SW,
-                'SRID'          =>  $srid
-            ];
-        });
-    }
-
-    /**
-     * Set the Brick Geo Engine to use the database for geospatial computations.
-     * The engine is set only if it has not been set beforehand.
-     *
-     * @return bool
-     */
-    protected function setGeometryEngine(): bool
-    {
-        try {
-            if ($this->geometry_engine === null) {
-                $this->geometry_engine = new PDOEngine(DB::connection()->getPdo());
-            }
-            $point = Point::xy(1, 1);
-            return $this->geometry_engine->equals($point, $point);
-        } catch (Throwable $ex) {
-        }
-        return false;
-    }
-
-    /**
-     * Get the key to cache the indexed grid of features.
-     *
-     * @return string|NULL
-     */
-    protected function cacheKey(): ?string
-    {
-        $map_def = $this->data('map');
-        if ($map_def === null || !($map_def instanceof MapDefinitionInterface)) {
-            return null;
-        }
-        return spl_object_id($this) . '-map-' . $map_def->id();
-    }
+	use PlaceMapperTrait;
+
+	private ?GeometryEngine $geometry_engine = null;
+
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperInterface::title()
+	 */
+	public function title(): string
+	{
+		return I18N::translate('Mapping on place coordinates');
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * {@internal The Place is associated to a Point only.
+	 * PlaceLocation can calculate a BoundingBox.
+	 * Using a BoundingBox could make the mapping more complex and potentially arbitary.
+	 * Furthermore, when no coordinate is found for the place or its children, then it bubbles up to the parents.
+	 * This could create the unwanted side effect of a very large area to consider}
+	 *
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperInterface::map()
+	 */
+	public function map(Place $place, string $feature_property): ?string
+	{
+		$location = new PlaceLocation($place->gedcomName());
+		$longitude = $location->longitude();
+		$latitude = $location->latitude();
+		if ($longitude === null || $latitude === null) {
+			return null;
+		}
+
+		$features_index = $this->featuresIndex();
+		if ($features_index === null) {
+			return null;
+		}
+
+		$place_point = Point::xy($longitude, $latitude, $features_index['SRID']);
+		$grid_box = $this->getGridCell(
+			$place_point,
+			$features_index['map_NE'],
+			$features_index['map_SW'],
+			$features_index['nb_columns']
+		);
+		if ($grid_box === null || !$this->setGeometryEngine() || $this->geometry_engine === null) {
+			return null;
+		}
+		$features = $features_index['grid'][$grid_box[0]][$grid_box[1]];
+		foreach ($features as $feature) {
+			$geometry = $feature->getGeometry();
+			if (
+				$geometry !== null && $place_point->SRID() === $geometry->SRID() &&
+				$this->geometry_engine->contains($geometry, $place_point)
+			) {
+				return $feature->getProperty($feature_property);
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Return the XY coordinates in a bounded grid of the cell containing a specific point.
+	 *
+	 * @param Point $point Point to find
+	 * @param Point $grid_NE North-East point of the bounded grid
+	 * @param Point $grid_SW South-West point fo the bounded grid
+	 * @param int $grid_columns Number of columns/rows in the grid
+	 * @return int[]|NULL
+	 */
+	protected function getGridCell(Point $point, Point $grid_NE, Point $grid_SW, int $grid_columns): ?array
+	{
+		list($x, $y) = [$point->x() ?? 0, $point->y() ?? 0];
+		list($x_max, $y_max) = [$grid_NE->x() ?? 0, $grid_NE->y() ?? 0];
+		list($x_min, $y_min) = [$grid_SW->x() ?? 0, $grid_SW->y() ?? 0];
+
+		$x_step = ($x_max - $x_min) / $grid_columns;
+		$y_step = ($y_max - $y_min) / $grid_columns;
+
+		if ($x_min <= $x && $x <= $x_max && $y_min <= $y && $y <= $y_max) {
+			return [
+				$x === $x_max ? $grid_columns - 1 : intval(($x - $x_min) / $x_step),
+				$y === $y_max ? $grid_columns - 1 : intval(($y - $y_min) / $y_step)
+			];
+		}
+		return null;
+	}
+
+	/**
+	 * Get an indexed array of the features of the map.
+	 *
+	 * {@internal The map is divided in a grid, each cell containing the features which bounding box overlaps that cell.
+	 * The grid is computed once for each map, and cached.}
+	 *
+	 * @phpcs:ignore Generic.Files.LineLength.TooLong
+	 * @return array{grid: array<int, array<int, \Brick\Geo\IO\GeoJSON\Feature[]>>, nb_columns: int, map_NE: \Brick\Geo\Point, map_SW: \Brick\Geo\Point, SRID: int}|NULL
+	 */
+	protected function featuresIndex(): ?array
+	{
+		$cacheKey = $this->cacheKey();
+		if ($cacheKey === null) {
+			return null;
+		}
+		return Registry::cache()->array()->remember($cacheKey, function (): ?array {
+			$map_def = $this->data('map');
+			if (
+				!$this->setGeometryEngine()
+				|| $map_def === null
+				|| !($map_def instanceof MapDefinitionInterface)
+			) {
+				return null;
+			}
+			$bounding_boxes = [];
+			$map_bounding_box = new BoundingBox();
+			$srid = 0;
+			foreach ($map_def->features() as $feature) {
+				$geometry = $feature->getGeometry();
+				if ($geometry === null) {
+					continue;
+				}
+				$srid = $geometry->SRID();
+				$bounding_box = $geometry->getBoundingBox();
+				$bounding_boxes[] = [$feature, $bounding_box];
+				$map_bounding_box = $map_bounding_box->extendedWithBoundingBox($bounding_box);
+			}
+			$grid_columns = count($bounding_boxes);
+			$grid = array_fill(0, $grid_columns, array_fill(0, $grid_columns, []));
+			$map_NE = $map_bounding_box->getNorthEast();
+			$map_SW = $map_bounding_box->getSouthWest();
+			foreach ($bounding_boxes as $item) {
+				$grid_box_SW = $this->getGridCell($item[1]->getSouthWest(), $map_NE, $map_SW, $grid_columns) ?? [1, 1];
+				$grid_box_NE = $this->getGridCell($item[1]->getNorthEast(), $map_NE, $map_SW, $grid_columns) ?? [0, 0];
+				for ($i = $grid_box_SW[0]; $i <= $grid_box_NE[0]; $i++) {
+					for ($j = $grid_box_SW[1]; $j <= $grid_box_NE[1]; $j++) {
+						$grid[$i][$j][] = $item[0];
+					}
+				}
+			}
+			return [
+				'grid'          =>  $grid,
+				'nb_columns'    =>  $grid_columns,
+				'map_NE'        =>  $map_NE,
+				'map_SW'        =>  $map_SW,
+				'SRID'          =>  $srid
+			];
+		});
+	}
+
+	/**
+	 * Set the Brick Geo Engine to use the database for geospatial computations.
+	 * The engine is set only if it has not been set beforehand.
+	 *
+	 * @return bool
+	 */
+	protected function setGeometryEngine(): bool
+	{
+		try {
+			if ($this->geometry_engine === null) {
+				$this->geometry_engine = new PDOEngine(DB::connection()->getPdo());
+			}
+			$point = Point::xy(1, 1);
+			return $this->geometry_engine->equals($point, $point);
+		} catch (Throwable $ex) {
+		}
+		return false;
+	}
+
+	/**
+	 * Get the key to cache the indexed grid of features.
+	 *
+	 * @return string|NULL
+	 */
+	protected function cacheKey(): ?string
+	{
+		$map_def = $this->data('map');
+		if ($map_def === null || !($map_def instanceof MapDefinitionInterface)) {
+			return null;
+		}
+		return spl_object_id($this) . '-map-' . $map_def->id();
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -139,7 +139,7 @@ 
         if ($cacheKey === null) {
             return null;
         }
-        return Registry::cache()->array()->remember($cacheKey, function (): ?array {
+        return Registry::cache()->array()->remember($cacheKey, function(): ?array {
             $map_def = $this->data('map');
             if (
                 !$this->setGeometryEngine()
@@ -214,6 +214,6 @@ 
         if ($map_def === null || !($map_def instanceof MapDefinitionInterface)) {
             return null;
         }
-        return spl_object_id($this) . '-map-' . $map_def->id();
+        return spl_object_id($this).'-map-'.$map_def->id();
     }
 }

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

Indentation +72 added lines, -72 removed lines

@@ -36,85 +36,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(HomePage::class, ['tree' => $tree->name()]);
-        }
+		if ($this->module === null) {
+			FlashMessages::addMessage(
+				I18N::translate('The attached module could not be found.'),
+				'danger'
+			);
+			return Registry::responseFactory()->redirect(HomePage::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()
+		]);
+	}
 }

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

Indentation +65 added lines, -65 removed lines

@@ -36,77 +36,77 @@
  */
 class MapAdapterDeleteInvalidAction implements RequestHandlerInterface
 {
-    private ?GeoDispersionModule $module;
-    private GeoAnalysisViewDataService $geoview_data_service;
-    private MapAdapterDataService $mapadapter_data_service;
+	private ?GeoDispersionModule $module;
+	private GeoAnalysisViewDataService $geoview_data_service;
+	private MapAdapterDataService $mapadapter_data_service;
 
-    /**
-     * Constructor for MapAdapterDeleteInvalidAction Request Handler
-     *
-     * @param ModuleService $module_service
-     * @param GeoAnalysisViewDataService $geoview_data_service
-     * @param MapAdapterDataService $mapadapter_data_service
-     */
-    public function __construct(
-        ModuleService $module_service,
-        GeoAnalysisViewDataService $geoview_data_service,
-        MapAdapterDataService $mapadapter_data_service
-    ) {
-        $this->module = $module_service->findByInterface(GeoDispersionModule::class)->first();
-        $this->geoview_data_service = $geoview_data_service;
-        $this->mapadapter_data_service = $mapadapter_data_service;
-    }
+	/**
+	 * Constructor for MapAdapterDeleteInvalidAction Request Handler
+	 *
+	 * @param ModuleService $module_service
+	 * @param GeoAnalysisViewDataService $geoview_data_service
+	 * @param MapAdapterDataService $mapadapter_data_service
+	 */
+	public function __construct(
+		ModuleService $module_service,
+		GeoAnalysisViewDataService $geoview_data_service,
+		MapAdapterDataService $mapadapter_data_service
+	) {
+		$this->module = $module_service->findByInterface(GeoDispersionModule::class)->first();
+		$this->geoview_data_service = $geoview_data_service;
+		$this->mapadapter_data_service = $mapadapter_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(HomePage::class, ['tree' => $tree->name()]);
-        }
+		if ($this->module === null) {
+			FlashMessages::addMessage(
+				I18N::translate('The attached module could not be found.'),
+				'danger'
+			);
+			return Registry::responseFactory()->redirect(HomePage::class, ['tree' => $tree->name()]);
+		}
 
-        $view_id = Validator::attributes($request)->integer('view_id', -1);
-        $view = $this->geoview_data_service->find($tree, $view_id);
+		$view_id = Validator::attributes($request)->integer('view_id', -1);
+		$view = $this->geoview_data_service->find($tree, $view_id);
 
-        if ($view === null || !($view instanceof GeoAnalysisMap)) {
-            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 || !($view instanceof GeoAnalysisMap)) {
+			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()]);
+		}
 
-        /** @var \Illuminate\Support\Collection<int> $valid_map_adapters */
-        $valid_map_adapters = $this->mapadapter_data_service
-            ->allForView($view)
-            ->map(fn(GeoAnalysisMapAdapter $map_adapter): int => $map_adapter->id());
+		/** @var \Illuminate\Support\Collection<int> $valid_map_adapters */
+		$valid_map_adapters = $this->mapadapter_data_service
+			->allForView($view)
+			->map(fn(GeoAnalysisMapAdapter $map_adapter): int => $map_adapter->id());
 
-        try {
-            $this->mapadapter_data_service->deleteInvalid($view, $valid_map_adapters);
-            FlashMessages::addMessage(
-                I18N::translate('The invalid map configurations have been successfully deleted.'),
-                'success'
-            );
-        } catch (Throwable $ex) {
-            FlashMessages::addMessage(
-                I18N::translate('An error occured while deleting the invalid map configurations.'),
-                'danger'
-            );
-            //phpcs:ignore Generic.Files.LineLength.TooLong
-            Log::addConfigurationLog('Module ' . $this->module->title() . ' : Error when deleting invalid map configurations: ' . $ex->getMessage());
-        }
+		try {
+			$this->mapadapter_data_service->deleteInvalid($view, $valid_map_adapters);
+			FlashMessages::addMessage(
+				I18N::translate('The invalid map configurations have been successfully deleted.'),
+				'success'
+			);
+		} catch (Throwable $ex) {
+			FlashMessages::addMessage(
+				I18N::translate('An error occured while deleting the invalid map configurations.'),
+				'danger'
+			);
+			//phpcs:ignore Generic.Files.LineLength.TooLong
+			Log::addConfigurationLog('Module ' . $this->module->title() . ' : Error when deleting invalid map configurations: ' . $ex->getMessage());
+		}
 
-        return Registry::responseFactory()->redirect(GeoAnalysisViewEditPage::class, [
-            'tree'      => $tree->name(),
-            'view_id'   => $view_id
-        ]);
-    }
+		return Registry::responseFactory()->redirect(GeoAnalysisViewEditPage::class, [
+			'tree'      => $tree->name(),
+			'view_id'   => $view_id
+		]);
+	}
 }