jon48 / webtrees-lib

app/Module/WelcomeBlock/WelcomeBlockModule.php

Spacing +7 added lines, -7 removed lines

@@ -62,9 +62,9 @@ 
      */
     public function loadRoutes(Map $router): void
     {
-        $router->attach('', '', static function (Map $router): void {
+        $router->attach('', '', static function(Map $router): void {
 
-            $router->attach('', '/module-maj/welcomeblock/{block_id}', static function (Map $router): void {
+            $router->attach('', '/module-maj/welcomeblock/{block_id}', static function(Map $router): void {
                 $router->tokens(['block_id' => '\d+']);
                 $router->get(MatomoStats::class, '/matomostats', MatomoStats::class);
             });
@@ -94,7 +94,7 @@ 
         $fab_login_block_view = app(\Fisharebest\Webtrees\Module\LoginBlockModule::class)
             ->getBlock($tree, $block_id, ModuleBlockInterface::CONTEXT_EMBED);
 
-        $content = view($this->name() . '::block-embed', [
+        $content = view($this->name().'::block-embed', [
             'block_id'                  =>  $block_id,
             'fab_welcome_block_view'    =>  $fab_welcome_block_view,
             'fab_login_block_view'      =>  $fab_login_block_view,
@@ -130,7 +130,7 @@ 
      */
     public function editBlockConfiguration(Tree $tree, int $block_id): string
     {
-        return view($this->name() . '::config', $this->matomoSettings($block_id));
+        return view($this->name().'::config', $this->matomoSettings($block_id));
     }
 
     /**
@@ -162,9 +162,9 @@ 
         $this
             ->setBlockSetting($block_id, 'matomo_url', $matomo_url)
             ->setBlockSetting($block_id, 'matomo_token', $matomo_token)
-            ->setBlockSetting($block_id, 'matomo_siteid', (string) $matomo_siteid);
+            ->setBlockSetting($block_id, 'matomo_siteid', (string)$matomo_siteid);
 
-        Registry::cache()->file()->forget($this->name() . '-matomovisits-yearly-' . $block_id);
+        Registry::cache()->file()->forget($this->name().'-matomovisits-yearly-'.$block_id);
     }
 
     /**
@@ -190,7 +190,7 @@ 
             'matomo_enabled' => $this->isMatomoEnabled($block_id),
             'matomo_url' => $this->getBlockSetting($block_id, 'matomo_url'),
             'matomo_token' => $this->getBlockSetting($block_id, 'matomo_token'),
-            'matomo_siteid'  => (int) $this->getBlockSetting($block_id, 'matomo_siteid', '0')
+            'matomo_siteid'  => (int)$this->getBlockSetting($block_id, 'matomo_siteid', '0')
         ];
     }
 }

Indentation +159 added lines, -159 removed lines

@@ -34,163 +34,163 @@
  */
 class WelcomeBlockModule extends AbstractModule implements ModuleMyArtJaubInterface, ModuleBlockInterface
 {
-    use ModuleMyArtJaubTrait;
-    use ModuleBlockTrait;
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\AbstractModule::title()
-     */
-    public function title(): string
-    {
-        return /* I18N: Name of the “WelcomeBlock” module */ I18N::translate('MyArtJaub Welcome Block');
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\AbstractModule::description()
-     */
-    public function description(): string
-    {
-        //phpcs:ignore Generic.Files.LineLength.TooLong
-        return /* I18N: Description of the “WelcomeBlock” module */ I18N::translate('The MyArtJaub Welcome block welcomes the visitor to the site, allows a quick login to the site, and displays statistics on visits.');
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\ModuleMyArtJaubInterface::loadRoutes()
-     */
-    public function loadRoutes(Map $router): void
-    {
-        $router->attach('', '', static function (Map $router): void {
-
-            $router->attach('', '/module-maj/welcomeblock/{block_id}', static function (Map $router): void {
-                $router->tokens(['block_id' => '\d+']);
-                $router->get(MatomoStats::class, '/matomostats', MatomoStats::class);
-            });
-        });
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleCustomInterface::customModuleVersion()
-     */
-    public function customModuleVersion(): string
-    {
-        return '2.1.3-v.1';
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::getBlock()
-     *
-     * @param mixed[] $config
-     */
-    public function getBlock(Tree $tree, int $block_id, string $context, array $config = []): string
-    {
-        $fab_welcome_block_view = app(\Fisharebest\Webtrees\Module\WelcomeBlockModule::class)
-            ->getBlock($tree, $block_id, ModuleBlockInterface::CONTEXT_EMBED);
-
-        $fab_login_block_view = app(\Fisharebest\Webtrees\Module\LoginBlockModule::class)
-            ->getBlock($tree, $block_id, ModuleBlockInterface::CONTEXT_EMBED);
-
-        $content = view($this->name() . '::block-embed', [
-            'block_id'                  =>  $block_id,
-            'fab_welcome_block_view'    =>  $fab_welcome_block_view,
-            'fab_login_block_view'      =>  $fab_login_block_view,
-            'matomo_enabled'            =>  $this->isMatomoEnabled($block_id),
-            'js_script_url'             =>  $this->assetUrl('js/welcomeblock.min.js')
-        ]);
-
-        if ($context !== self::CONTEXT_EMBED) {
-            return view('modules/block-template', [
-                'block'      => Str::kebab($this->name()),
-                'id'         => $block_id,
-                'config_url' => $this->configUrl($tree, $context, $block_id),
-                'title'      => e($tree->title()),
-                'content'    => $content,
-            ]);
-        }
-
-        return $content;
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::isTreeBlock()
-     */
-    public function isTreeBlock(): bool
-    {
-        return true;
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::editBlockConfiguration()
-     */
-    public function editBlockConfiguration(Tree $tree, int $block_id): string
-    {
-        return view($this->name() . '::config', $this->matomoSettings($block_id));
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::saveBlockConfiguration()
-     */
-    public function saveBlockConfiguration(ServerRequestInterface $request, int $block_id): void
-    {
-        $matomo_enabled = Validator::parsedBody($request)->string('matomo_enabled', '') === 'yes';
-        $this->setBlockSetting($block_id, 'matomo_enabled', $matomo_enabled ? 'yes' : 'no');
-        if (!$matomo_enabled) {
-            return;
-        }
-
-        $matomo_url = trim(Validator::parsedBody($request)->string('matomo_url', ''));
-        if (filter_var($matomo_url, FILTER_VALIDATE_URL) === false) {
-            FlashMessages::addMessage(I18N::translate('The Matomo URL provided is not valid.'), 'danger');
-            return;
-        }
-
-        $matomo_siteid = Validator::parsedBody($request)->integer('matomo_siteid', -1);
-        if ($matomo_siteid === -1) {
-            FlashMessages::addMessage(I18N::translate('The Matomo Site ID provided is not valid.'), 'danger');
-            return;
-        }
-
-        $matomo_token = trim(Validator::parsedBody($request)->string('matomo_token', ''));
-
-        $this
-            ->setBlockSetting($block_id, 'matomo_url', $matomo_url)
-            ->setBlockSetting($block_id, 'matomo_token', $matomo_token)
-            ->setBlockSetting($block_id, 'matomo_siteid', (string) $matomo_siteid);
-
-        Registry::cache()->file()->forget($this->name() . '-matomovisits-yearly-' . $block_id);
-    }
-
-    /**
-     * Returns whether Matomo statistics is enabled for a specific MyArtJaub WelcomeBlock block
-     *
-     * @param int $block_id
-     * @return bool
-     */
-    public function isMatomoEnabled(int $block_id): bool
-    {
-        return $this->getBlockSetting($block_id, 'matomo_enabled', 'no') === 'yes';
-    }
-
-    /**
-     * Returns settings for retrieving Matomo statistics for a specific MyArtJaub WelcomeBlock block
-     *
-     * @param int $block_id
-     * @return array<string, mixed>
-     */
-    public function matomoSettings(int $block_id): array
-    {
-        return [
-            'matomo_enabled' => $this->isMatomoEnabled($block_id),
-            'matomo_url' => $this->getBlockSetting($block_id, 'matomo_url'),
-            'matomo_token' => $this->getBlockSetting($block_id, 'matomo_token'),
-            'matomo_siteid'  => (int) $this->getBlockSetting($block_id, 'matomo_siteid', '0')
-        ];
-    }
+	use ModuleMyArtJaubTrait;
+	use ModuleBlockTrait;
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\AbstractModule::title()
+	 */
+	public function title(): string
+	{
+		return /* I18N: Name of the “WelcomeBlock” module */ I18N::translate('MyArtJaub Welcome Block');
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\AbstractModule::description()
+	 */
+	public function description(): string
+	{
+		//phpcs:ignore Generic.Files.LineLength.TooLong
+		return /* I18N: Description of the “WelcomeBlock” module */ I18N::translate('The MyArtJaub Welcome block welcomes the visitor to the site, allows a quick login to the site, and displays statistics on visits.');
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Module\ModuleMyArtJaubInterface::loadRoutes()
+	 */
+	public function loadRoutes(Map $router): void
+	{
+		$router->attach('', '', static function (Map $router): void {
+
+			$router->attach('', '/module-maj/welcomeblock/{block_id}', static function (Map $router): void {
+				$router->tokens(['block_id' => '\d+']);
+				$router->get(MatomoStats::class, '/matomostats', MatomoStats::class);
+			});
+		});
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleCustomInterface::customModuleVersion()
+	 */
+	public function customModuleVersion(): string
+	{
+		return '2.1.3-v.1';
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::getBlock()
+	 *
+	 * @param mixed[] $config
+	 */
+	public function getBlock(Tree $tree, int $block_id, string $context, array $config = []): string
+	{
+		$fab_welcome_block_view = app(\Fisharebest\Webtrees\Module\WelcomeBlockModule::class)
+			->getBlock($tree, $block_id, ModuleBlockInterface::CONTEXT_EMBED);
+
+		$fab_login_block_view = app(\Fisharebest\Webtrees\Module\LoginBlockModule::class)
+			->getBlock($tree, $block_id, ModuleBlockInterface::CONTEXT_EMBED);
+
+		$content = view($this->name() . '::block-embed', [
+			'block_id'                  =>  $block_id,
+			'fab_welcome_block_view'    =>  $fab_welcome_block_view,
+			'fab_login_block_view'      =>  $fab_login_block_view,
+			'matomo_enabled'            =>  $this->isMatomoEnabled($block_id),
+			'js_script_url'             =>  $this->assetUrl('js/welcomeblock.min.js')
+		]);
+
+		if ($context !== self::CONTEXT_EMBED) {
+			return view('modules/block-template', [
+				'block'      => Str::kebab($this->name()),
+				'id'         => $block_id,
+				'config_url' => $this->configUrl($tree, $context, $block_id),
+				'title'      => e($tree->title()),
+				'content'    => $content,
+			]);
+		}
+
+		return $content;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::isTreeBlock()
+	 */
+	public function isTreeBlock(): bool
+	{
+		return true;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::editBlockConfiguration()
+	 */
+	public function editBlockConfiguration(Tree $tree, int $block_id): string
+	{
+		return view($this->name() . '::config', $this->matomoSettings($block_id));
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::saveBlockConfiguration()
+	 */
+	public function saveBlockConfiguration(ServerRequestInterface $request, int $block_id): void
+	{
+		$matomo_enabled = Validator::parsedBody($request)->string('matomo_enabled', '') === 'yes';
+		$this->setBlockSetting($block_id, 'matomo_enabled', $matomo_enabled ? 'yes' : 'no');
+		if (!$matomo_enabled) {
+			return;
+		}
+
+		$matomo_url = trim(Validator::parsedBody($request)->string('matomo_url', ''));
+		if (filter_var($matomo_url, FILTER_VALIDATE_URL) === false) {
+			FlashMessages::addMessage(I18N::translate('The Matomo URL provided is not valid.'), 'danger');
+			return;
+		}
+
+		$matomo_siteid = Validator::parsedBody($request)->integer('matomo_siteid', -1);
+		if ($matomo_siteid === -1) {
+			FlashMessages::addMessage(I18N::translate('The Matomo Site ID provided is not valid.'), 'danger');
+			return;
+		}
+
+		$matomo_token = trim(Validator::parsedBody($request)->string('matomo_token', ''));
+
+		$this
+			->setBlockSetting($block_id, 'matomo_url', $matomo_url)
+			->setBlockSetting($block_id, 'matomo_token', $matomo_token)
+			->setBlockSetting($block_id, 'matomo_siteid', (string) $matomo_siteid);
+
+		Registry::cache()->file()->forget($this->name() . '-matomovisits-yearly-' . $block_id);
+	}
+
+	/**
+	 * Returns whether Matomo statistics is enabled for a specific MyArtJaub WelcomeBlock block
+	 *
+	 * @param int $block_id
+	 * @return bool
+	 */
+	public function isMatomoEnabled(int $block_id): bool
+	{
+		return $this->getBlockSetting($block_id, 'matomo_enabled', 'no') === 'yes';
+	}
+
+	/**
+	 * Returns settings for retrieving Matomo statistics for a specific MyArtJaub WelcomeBlock block
+	 *
+	 * @param int $block_id
+	 * @return array<string, mixed>
+	 */
+	public function matomoSettings(int $block_id): array
+	{
+		return [
+			'matomo_enabled' => $this->isMatomoEnabled($block_id),
+			'matomo_url' => $this->getBlockSetting($block_id, 'matomo_url'),
+			'matomo_token' => $this->getBlockSetting($block_id, 'matomo_token'),
+			'matomo_siteid'  => (int) $this->getBlockSetting($block_id, 'matomo_siteid', '0')
+		];
+	}
 }

app/Module/PatronymicLineage/PatronymicLineageModule.php

Indentation +134 added lines, -134 removed lines

@@ -36,139 +36,139 @@
  * 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.0.11-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'] ?? '';
-
-        $xref = app(ServerRequestInterface::class)->getAttribute('xref', '');
-        if ($xref !== '' && ($individual = Registry::individualFactory()->make($xref, $tree)) !== null) {
-            $surname = $individual->getAllNames()[$individual->getPrimaryName()]['surname'];
-        }
-
-        if ($surname !== '') {
-            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,
-        string $surn,
-        string $salpha,
-        string $galpha,
-        bool $marnm,
-        bool $fams,
-        LocaleInterface $locale
-    ): Collection {
-        return parent::individuals($tree, $surn, $salpha, $galpha, $marnm, $fams, $locale);
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\IndividualListModule::surnames()
-     *
-     * 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 surnames(
-        Tree $tree,
-        string $surn,
-        string $salpha,
-        bool $marnm,
-        bool $fams,
-        LocaleInterface $locale
-    ): array {
-        return parent::surnames($tree, $surn, $salpha, $marnm, $fams, $locale);
-    }
+	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.0.11-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'] ?? '';
+
+		$xref = app(ServerRequestInterface::class)->getAttribute('xref', '');
+		if ($xref !== '' && ($individual = Registry::individualFactory()->make($xref, $tree)) !== null) {
+			$surname = $individual->getAllNames()[$individual->getPrimaryName()]['surname'];
+		}
+
+		if ($surname !== '') {
+			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,
+		string $surn,
+		string $salpha,
+		string $galpha,
+		bool $marnm,
+		bool $fams,
+		LocaleInterface $locale
+	): Collection {
+		return parent::individuals($tree, $surn, $salpha, $galpha, $marnm, $fams, $locale);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\IndividualListModule::surnames()
+	 *
+	 * 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 surnames(
+		Tree $tree,
+		string $surn,
+		string $salpha,
+		bool $marnm,
+		bool $fams,
+		LocaleInterface $locale
+	): array {
+		return parent::surnames($tree, $surn, $salpha, $marnm, $fams, $locale);
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -69,11 +69,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);
@@ -132,7 +132,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/LineageRootNode.php

Indentation +58 added lines, -58 removed lines

@@ -23,68 +23,68 @@
  */
 class LineageRootNode extends LineageNode
 {
-    /**
-     * @var Collection<string, int> $places Places for the lineage node
-     */
-    private $places;
+	/**
+	 * @var Collection<string, int> $places Places for the lineage node
+	 */
+	private $places;
 
-    /**
-     * @var int $nb_children Number of node childs
-     */
-    private $nb_children;
+	/**
+	 * @var int $nb_children Number of node childs
+	 */
+	private $nb_children;
 
-    /**
-     * Constructor for LineageRootNode
-     *
-     * @param Individual|null $node_indi
-     */
-    public function __construct(?Individual $node_indi = null)
-    {
-        parent::__construct($node_indi, $this);
-        $this->places = new Collection();
-        $this->nb_children = 0;
-    }
+	/**
+	 * Constructor for LineageRootNode
+	 *
+	 * @param Individual|null $node_indi
+	 */
+	public function __construct(?Individual $node_indi = null)
+	{
+		parent::__construct($node_indi, $this);
+		$this->places = new Collection();
+		$this->nb_children = 0;
+	}
 
-    /**
-     * Adds a place to the list of lineage's place
-     *
-     * @param Place $place
-     */
-    public function addPlace(Place $place): void
-    {
-        $place_name = $place->gedcomName();
-        if (mb_strlen($place_name) > 0) {
-            $this->places->put($place_name, $this->places->get($place_name, 0) + 1);
-        }
-    }
+	/**
+	 * Adds a place to the list of lineage's place
+	 *
+	 * @param Place $place
+	 */
+	public function addPlace(Place $place): void
+	{
+		$place_name = $place->gedcomName();
+		if (mb_strlen($place_name) > 0) {
+			$this->places->put($place_name, $this->places->get($place_name, 0) + 1);
+		}
+	}
 
-    /**
-     * Returns the number of child nodes.
-     * This number is more to be used as indication rather than an accurate one.
-     *
-     * @return int
-     */
-    public function numberChildNodes(): int
-    {
-        return $this->nb_children;
-    }
+	/**
+	 * Returns the number of child nodes.
+	 * This number is more to be used as indication rather than an accurate one.
+	 *
+	 * @return int
+	 */
+	public function numberChildNodes(): int
+	{
+		return $this->nb_children;
+	}
 
-    /**
-     * Increments the number of child nodes by one
-     *
-     */
-    public function incrementChildNodes(): void
-    {
-        $this->nb_children++;
-    }
+	/**
+	 * Increments the number of child nodes by one
+	 *
+	 */
+	public function incrementChildNodes(): void
+	{
+		$this->nb_children++;
+	}
 
-    /**
-     * Returns the list of place for the lineage
-     *
-     * @return Collection<string, int>
-     */
-    public function places(): Collection
-    {
-        return $this->places;
-    }
+	/**
+	 * Returns the list of place for the lineage
+	 *
+	 * @return Collection<string, int>
+	 */
+	public function places(): Collection
+	{
+		return $this->places;
+	}
 }

app/Module/AdminTasks/Schema/Migration0.php

Indentation +8 added lines, -8 removed lines

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

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

Indentation +44 added lines, -44 removed lines

@@ -31,58 +31,58 @@
  */
 class TaskEditPage implements RequestHandlerInterface
 {
-    use ViewResponseTrait;
+	use ViewResponseTrait;
 
-    private ?AdminTasksModule $module;
-    private TaskScheduleService $taskschedules_service;
+	private ?AdminTasksModule $module;
+	private TaskScheduleService $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;
-    }
+	/**
+	 * 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';
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		$this->layout = 'layouts/administration';
 
-        if ($this->module === null) {
-            throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
-        }
+		if ($this->module === null) {
+			throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
+		}
 
-        $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) {
-            throw new HttpNotFoundException(I18N::translate('The Task schedule could not be found.'));
-        }
+		if ($task_schedule === null) {
+			throw new HttpNotFoundException(I18N::translate('The Task schedule could not be found.'));
+		}
 
-        $task = $this->taskschedules_service->findTask($task_schedule->taskId());
+		$task = $this->taskschedules_service->findTask($task_schedule->taskId());
 
-        if ($task === null) {
-            throw new HttpNotFoundException(I18N::translate('The Task schedule could not be found.'));
-        }
+		if ($task === null) {
+			throw new HttpNotFoundException(I18N::translate('The Task schedule could not be found.'));
+		}
 
-        $has_task_config = $task instanceof ConfigurableTaskInterface;
-        /** @var \MyArtJaub\Webtrees\Contracts\Tasks\TaskInterface&\MyArtJaub\Webtrees\Contracts\Tasks\ConfigurableTaskInterface $task */
+		$has_task_config = $task instanceof ConfigurableTaskInterface;
+		/** @var \MyArtJaub\Webtrees\Contracts\Tasks\TaskInterface&\MyArtJaub\Webtrees\Contracts\Tasks\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) : ''
-        ]);
-    }
+		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) : ''
+		]);
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -76,9 +76,9 @@
         $has_task_config = $task instanceof ConfigurableTaskInterface;
         /** @var \MyArtJaub\Webtrees\Contracts\Tasks\TaskInterface&\MyArtJaub\Webtrees\Contracts\Tasks\ConfigurableTaskInterface $task */
 
-        return $this->viewResponse($this->module->name() . '::admin/tasks-edit', [
+        return $this->viewResponse($this->module->name().'::admin/tasks-edit', [
             'module'            =>  $this->module,
-            'title'             =>  I18N::translate('Edit the administrative task') . ' - ' . $task->name(),
+            'title'             =>  I18N::translate('Edit the administrative task').' - '.$task->name(),
             'task_schedule'     =>  $task_schedule,
             'task'              =>  $task,
             'has_task_config'   =>  $has_task_config,

app/Module/GeoDispersion/Views/GeoAnalysisMap.php

Indentation +113 added lines, -113 removed lines

@@ -32,117 +32,117 @@
  */
 class GeoAnalysisMap extends AbstractGeoAnalysisView
 {
-    private ?MapColorsConfig $colors_config = null;
-
-    public function type(): string
-    {
-        return I18N::translateContext('GEODISPERSION', 'Map');
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\GeoDispersion\Views\AbstractGeoAnalysisView::icon()
-     */
-    public function icon(ModuleInterface $module): string
-    {
-        return view($module->name() . '::icons/view-map', ['type' => $this->type()]);
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\GeoDispersion\Views\AbstractGeoAnalysisView::globalSettingsContent()
-     */
-    public function globalSettingsContent(ModuleInterface $module): string
-    {
-        return view($module->name() . '::admin/view-edit-map', [
-            'module_name'   =>  $module->name(),
-            'view'          =>  $this,
-            'colors'        =>  $this->colors(),
-            'map_adapters'  =>  app(MapAdapterDataService::class)->allForView($this, true)
-        ]);
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\GeoDispersion\Views\AbstractGeoAnalysisView::withGlobalSettingsUpdate()
-     * @return static
-     */
-    public function withGlobalSettingsUpdate(ServerRequestInterface $request): self
-    {
-        $default_color  = Validator::parsedBody($request)->string('view_map_color_default', '');
-        $stroke_color   = Validator::parsedBody($request)->string('view_map_color_stroke', '');
-        $maxvalue_color  = Validator::parsedBody($request)->string('view_map_color_maxvalue', '');
-        $hover_color  = Validator::parsedBody($request)->string('view_map_color_hover', '');
-
-        try {
-            return $this->withColors(new MapColorsConfig(
-                Hex::fromString($default_color),
-                Hex::fromString($stroke_color),
-                Hex::fromString($maxvalue_color),
-                Hex::fromString($hover_color)
-            ));
-        } catch (InvalidColorValue $ex) {
-        }
-
-        return $this;
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\GeoDispersion\Views\AbstractGeoAnalysisView::globalTabContent()
-     */
-    public function globalTabContent(GeoDispersionModule $module, GeoAnalysisResult $result, array $params): string
-    {
-        $map_adapters = app(MapAdapterDataService::class)->allForView($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);
-        }
-
-        if ($adapter_result === null) {
-            return view($module->name() . '::errors/tab-error', [
-                'message'   =>  I18N::translate('The map could not be loaded.'),
-            ]);
-        }
-
-        return view($module->name() . '::geoanalysisview-tab-glb-map', $params + [
-            'result'            =>  $adapter_result->geoAnalysisResult(),
-            'features'          =>  $adapter_result->features(),
-            'colors'            =>  $this->colors(),
-            'leaflet_config'    =>  app(LeafletJsService::class)->config(),
-            'js_script_url'     =>  $module->assetUrl('js/geodispersion.min.js')
-        ]);
-    }
-
-    /**
-     * 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)
-        );
-    }
-
-    /**
-     * Returns a map view with a new color scheme configuration
-     *
-     * @param MapColorsConfig $config
-     * @return static
-     */
-    public function withColors(?MapColorsConfig $config): self
-    {
-        $new = clone $this;
-        $new->colors_config = $config;
-        return $new;
-    }
+	private ?MapColorsConfig $colors_config = null;
+
+	public function type(): string
+	{
+		return I18N::translateContext('GEODISPERSION', 'Map');
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Module\GeoDispersion\Views\AbstractGeoAnalysisView::icon()
+	 */
+	public function icon(ModuleInterface $module): string
+	{
+		return view($module->name() . '::icons/view-map', ['type' => $this->type()]);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Module\GeoDispersion\Views\AbstractGeoAnalysisView::globalSettingsContent()
+	 */
+	public function globalSettingsContent(ModuleInterface $module): string
+	{
+		return view($module->name() . '::admin/view-edit-map', [
+			'module_name'   =>  $module->name(),
+			'view'          =>  $this,
+			'colors'        =>  $this->colors(),
+			'map_adapters'  =>  app(MapAdapterDataService::class)->allForView($this, true)
+		]);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Module\GeoDispersion\Views\AbstractGeoAnalysisView::withGlobalSettingsUpdate()
+	 * @return static
+	 */
+	public function withGlobalSettingsUpdate(ServerRequestInterface $request): self
+	{
+		$default_color  = Validator::parsedBody($request)->string('view_map_color_default', '');
+		$stroke_color   = Validator::parsedBody($request)->string('view_map_color_stroke', '');
+		$maxvalue_color  = Validator::parsedBody($request)->string('view_map_color_maxvalue', '');
+		$hover_color  = Validator::parsedBody($request)->string('view_map_color_hover', '');
+
+		try {
+			return $this->withColors(new MapColorsConfig(
+				Hex::fromString($default_color),
+				Hex::fromString($stroke_color),
+				Hex::fromString($maxvalue_color),
+				Hex::fromString($hover_color)
+			));
+		} catch (InvalidColorValue $ex) {
+		}
+
+		return $this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Module\GeoDispersion\Views\AbstractGeoAnalysisView::globalTabContent()
+	 */
+	public function globalTabContent(GeoDispersionModule $module, GeoAnalysisResult $result, array $params): string
+	{
+		$map_adapters = app(MapAdapterDataService::class)->allForView($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);
+		}
+
+		if ($adapter_result === null) {
+			return view($module->name() . '::errors/tab-error', [
+				'message'   =>  I18N::translate('The map could not be loaded.'),
+			]);
+		}
+
+		return view($module->name() . '::geoanalysisview-tab-glb-map', $params + [
+			'result'            =>  $adapter_result->geoAnalysisResult(),
+			'features'          =>  $adapter_result->features(),
+			'colors'            =>  $this->colors(),
+			'leaflet_config'    =>  app(LeafletJsService::class)->config(),
+			'js_script_url'     =>  $module->assetUrl('js/geodispersion.min.js')
+		]);
+	}
+
+	/**
+	 * 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)
+		);
+	}
+
+	/**
+	 * Returns a map view with a new color scheme configuration
+	 *
+	 * @param MapColorsConfig $config
+	 * @return static
+	 */
+	public function withColors(?MapColorsConfig $config): self
+	{
+		$new = clone $this;
+		$new->colors_config = $config;
+		return $new;
+	}
 }

Spacing +7 added lines, -8 removed lines

@@ -45,7 +45,7 @@ 
      */
     public function icon(ModuleInterface $module): string
     {
-        return view($module->name() . '::icons/view-map', ['type' => $this->type()]);
+        return view($module->name().'::icons/view-map', ['type' => $this->type()]);
     }
 
     /**
@@ -54,7 +54,7 @@ 
      */
     public function globalSettingsContent(ModuleInterface $module): string
     {
-        return view($module->name() . '::admin/view-edit-map', [
+        return view($module->name().'::admin/view-edit-map', [
             'module_name'   =>  $module->name(),
             'view'          =>  $this,
             'colors'        =>  $this->colors(),
@@ -71,8 +71,8 @@ 
     {
         $default_color  = Validator::parsedBody($request)->string('view_map_color_default', '');
         $stroke_color   = Validator::parsedBody($request)->string('view_map_color_stroke', '');
-        $maxvalue_color  = Validator::parsedBody($request)->string('view_map_color_maxvalue', '');
-        $hover_color  = Validator::parsedBody($request)->string('view_map_color_hover', '');
+        $maxvalue_color = Validator::parsedBody($request)->string('view_map_color_maxvalue', '');
+        $hover_color = Validator::parsedBody($request)->string('view_map_color_hover', '');
 
         try {
             return $this->withColors(new MapColorsConfig(
@@ -99,17 +99,16 @@ 
         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.'),
             ]);
         }
 
-        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(),

app/Module/GeoDispersion/Schema/Migration0.php

Indentation +8 added lines, -8 removed lines

@@ -21,12 +21,12 @@
  */
 class Migration0 implements MigrationInterface
 {
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Schema\MigrationInterface::upgrade()
-     */
-    public function upgrade(): void
-    {
-        // This migration has been superseded by migration 1.
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Schema\MigrationInterface::upgrade()
+	 */
+	public function upgrade(): void
+	{
+		// This migration has been superseded by migration 1.
+	}
 }

app/Module/GeoDispersion/Schema/Migration1.php

Indentation +37 added lines, -37 removed lines

@@ -23,41 +23,41 @@
  */
 class Migration1 implements MigrationInterface
 {
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Schema\MigrationInterface::upgrade()
-     */
-    public function upgrade(): void
-    {
-        $in_transaction = DB::connection()->getPdo()->inTransaction();
-
-        DB::schema()->create('maj_geodisp_views', static function (Blueprint $table): void {
-            $table->integer('majgv_id')->autoIncrement();
-            $table->integer('majgv_gedcom_id')->index();
-            $table->string('majgv_view_class', 255);
-            $table->enum('majgv_status', ['enabled', 'disabled'])->default('enabled');
-            $table->string('majgv_descr', 248);
-            $table->string('majgv_analysis', 255);
-            $table->tinyInteger('majgv_place_depth')->default(1);
-            $table->tinyInteger('majgv_top_places')->default(0);
-            $table->json('majgv_colors')->nullable();
-
-            $table->foreign('majgv_gedcom_id')->references('gedcom_id')->on('gedcom')->onDelete('cascade');
-        });
-
-        DB::schema()->create('maj_geodisp_mapviews', static function (Blueprint $table): void {
-            $table->integer('majgm_id')->autoIncrement();
-            $table->integer('majgm_majgv_id')->index();
-            $table->string('majgm_map_id', 127);
-            $table->string('majgm_mapper', 255);
-            $table->string('majgm_feature_prop', 31);
-            $table->json('majgm_config')->nullable();
-
-            $table->foreign('majgm_majgv_id')->references('majgv_id')->on('maj_geodisp_views')->onDelete('cascade');
-        });
-
-        if ($in_transaction && !DB::connection()->getPdo()->inTransaction()) {
-            DB::connection()->beginTransaction();
-        }
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Schema\MigrationInterface::upgrade()
+	 */
+	public function upgrade(): void
+	{
+		$in_transaction = DB::connection()->getPdo()->inTransaction();
+
+		DB::schema()->create('maj_geodisp_views', static function (Blueprint $table): void {
+			$table->integer('majgv_id')->autoIncrement();
+			$table->integer('majgv_gedcom_id')->index();
+			$table->string('majgv_view_class', 255);
+			$table->enum('majgv_status', ['enabled', 'disabled'])->default('enabled');
+			$table->string('majgv_descr', 248);
+			$table->string('majgv_analysis', 255);
+			$table->tinyInteger('majgv_place_depth')->default(1);
+			$table->tinyInteger('majgv_top_places')->default(0);
+			$table->json('majgv_colors')->nullable();
+
+			$table->foreign('majgv_gedcom_id')->references('gedcom_id')->on('gedcom')->onDelete('cascade');
+		});
+
+		DB::schema()->create('maj_geodisp_mapviews', static function (Blueprint $table): void {
+			$table->integer('majgm_id')->autoIncrement();
+			$table->integer('majgm_majgv_id')->index();
+			$table->string('majgm_map_id', 127);
+			$table->string('majgm_mapper', 255);
+			$table->string('majgm_feature_prop', 31);
+			$table->json('majgm_config')->nullable();
+
+			$table->foreign('majgm_majgv_id')->references('majgv_id')->on('maj_geodisp_views')->onDelete('cascade');
+		});
+
+		if ($in_transaction && !DB::connection()->getPdo()->inTransaction()) {
+			DB::connection()->beginTransaction();
+		}
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
     {
         $in_transaction = DB::connection()->getPdo()->inTransaction();
 
-        DB::schema()->create('maj_geodisp_views', static function (Blueprint $table): void {
+        DB::schema()->create('maj_geodisp_views', static function(Blueprint $table): void {
             $table->integer('majgv_id')->autoIncrement();
             $table->integer('majgv_gedcom_id')->index();
             $table->string('majgv_view_class', 255);
@@ -45,7 +45,7 @@ 
             $table->foreign('majgv_gedcom_id')->references('gedcom_id')->on('gedcom')->onDelete('cascade');
         });
 
-        DB::schema()->create('maj_geodisp_mapviews', static function (Blueprint $table): void {
+        DB::schema()->create('maj_geodisp_mapviews', static function(Blueprint $table): void {
             $table->integer('majgm_id')->autoIncrement();
             $table->integer('majgm_majgv_id')->index();
             $table->string('majgm_map_id', 127);

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

Indentation +39 added lines, -39 removed lines

@@ -32,48 +32,48 @@
  */
 class GeoAnalysisViewAddPage implements RequestHandlerInterface
 {
-    use ViewResponseTrait;
+	use ViewResponseTrait;
 
-    private ?GeoDispersionModule $module;
-    private GeoAnalysisService $geoanalysis_service;
-    private GeoAnalysisDataService $geoanalysis_data_service;
+	private ?GeoDispersionModule $module;
+	private GeoAnalysisService $geoanalysis_service;
+	private GeoAnalysisDataService $geoanalysis_data_service;
 
-    /**
-     * Constructor for GeoAnalysisViewAddPage Request Handler
-     *
-     * @param ModuleService $module_service
-     * @param GeoAnalysisService $geoanalysis_service
-     * @param GeoAnalysisDataService $geoanalysis_data_service
-     */
-    public function __construct(
-        ModuleService $module_service,
-        GeoAnalysisService $geoanalysis_service,
-        GeoAnalysisDataService $geoanalysis_data_service
-    ) {
-        $this->module = $module_service->findByInterface(GeoDispersionModule::class)->first();
-        $this->geoanalysis_service = $geoanalysis_service;
-        $this->geoanalysis_data_service = $geoanalysis_data_service;
-    }
+	/**
+	 * Constructor for GeoAnalysisViewAddPage Request Handler
+	 *
+	 * @param ModuleService $module_service
+	 * @param GeoAnalysisService $geoanalysis_service
+	 * @param GeoAnalysisDataService $geoanalysis_data_service
+	 */
+	public function __construct(
+		ModuleService $module_service,
+		GeoAnalysisService $geoanalysis_service,
+		GeoAnalysisDataService $geoanalysis_data_service
+	) {
+		$this->module = $module_service->findByInterface(GeoDispersionModule::class)->first();
+		$this->geoanalysis_service = $geoanalysis_service;
+		$this->geoanalysis_data_service = $geoanalysis_data_service;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        $this->layout = 'layouts/administration';
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		$this->layout = 'layouts/administration';
 
-        if ($this->module === null) {
-            throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
-        }
-        $tree = Validator::attributes($request)->tree();
+		if ($this->module === null) {
+			throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
+		}
+		$tree = Validator::attributes($request)->tree();
 
-        return $this->viewResponse($this->module->name() . '::admin/view-add', [
-            'module'        =>  $this->module,
-            'title'         =>  I18N::translate('Add a geographical dispersion analysis view'),
-            'tree'          =>  $tree,
-            'geoanalysis_list'  =>  $this->geoanalysis_service->all(),
-            'place_example'     =>  $this->geoanalysis_data_service->placeHierarchyExample($tree)
-        ]);
-    }
+		return $this->viewResponse($this->module->name() . '::admin/view-add', [
+			'module'        =>  $this->module,
+			'title'         =>  I18N::translate('Add a geographical dispersion analysis view'),
+			'tree'          =>  $tree,
+			'geoanalysis_list'  =>  $this->geoanalysis_service->all(),
+			'place_example'     =>  $this->geoanalysis_data_service->placeHierarchyExample($tree)
+		]);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
         }
         $tree = Validator::attributes($request)->tree();
 
-        return $this->viewResponse($this->module->name() . '::admin/view-add', [
+        return $this->viewResponse($this->module->name().'::admin/view-add', [
             'module'        =>  $this->module,
             'title'         =>  I18N::translate('Add a geographical dispersion analysis view'),
             'tree'          =>  $tree,