jon48 / webtrees-lib

src/Webtrees/Contracts/GeoDispersion/ModulePlaceMapperProviderInterface.php

Indentation +6 added lines, -6 removed lines

@@ -19,10 +19,10 @@
  */
 interface ModulePlaceMapperProviderInterface
 {
-    /**
-     * List place mappers provided by the module as an array.
-     *
-     * @return string[] List of place mappers
-     */
-    public function listPlaceMappers(): array;
+	/**
+	 * List place mappers provided by the module as an array.
+	 *
+	 * @return string[] List of place mappers
+	 */
+	public function listPlaceMappers(): array;
 }

src/Webtrees/Contracts/GeoDispersion/MapViewConfigInterface.php

Indentation +20 added lines, -20 removed lines

@@ -18,26 +18,26 @@
  */
 interface MapViewConfigInterface
 {
-    /**
-     * Get the feature property to be used for mapping the map feature with the analysis results
-     * 
-     * @return string
-     */
-    function mapMappingProperty(): string;
+	/**
+	 * Get the feature property to be used for mapping the map feature with the analysis results
+	 * 
+	 * @return string
+	 */
+	function mapMappingProperty(): string;
 
-    /**
-     * Get the config of the mapper associated with the map view
-     * 
-     * @return PlaceMapperConfigInterface
-     */
-    function mapperConfig(): PlaceMapperConfigInterface;
+	/**
+	 * Get the config of the mapper associated with the map view
+	 * 
+	 * @return PlaceMapperConfigInterface
+	 */
+	function mapperConfig(): PlaceMapperConfigInterface;
     
-    /**
-     * Get a MapViewConfigInterface object with the new properties
-     * 
-     * @param string $mapping_property
-     * @param PlaceMapperConfigInterface $mapper_config
-     * @return self
-     */
-    function with(string $mapping_property, PlaceMapperConfigInterface $mapper_config): self;
+	/**
+	 * Get a MapViewConfigInterface object with the new properties
+	 * 
+	 * @param string $mapping_property
+	 * @param PlaceMapperConfigInterface $mapper_config
+	 * @return self
+	 */
+	function with(string $mapping_property, PlaceMapperConfigInterface $mapper_config): self;
 }
\ No newline at end of file

src/Webtrees/Contracts/GeoDispersion/ModuleGeoAnalysisProviderInterface.php

Indentation +6 added lines, -6 removed lines

@@ -20,10 +20,10 @@
 interface ModuleGeoAnalysisProviderInterface
 {
 
-    /**
-     * List geographical analyses provided by the module as an array.
-     *
-     * @return string[] List of geographical analyses
-     */
-    public function listGeoAnalyses(): array;
+	/**
+	 * List geographical analyses provided by the module as an array.
+	 *
+	 * @return string[] List of geographical analyses
+	 */
+	public function listGeoAnalyses(): array;
 }

src/Webtrees/Contracts/GeoDispersion/PlaceMapperInterface.php

Indentation +44 added lines, -44 removed lines

@@ -21,54 +21,54 @@
  */
 interface PlaceMapperInterface
 {
-    /**
-     * Get the Place mapper title
-     * 
-     * @return string
-     */
-    function title(): string;
+	/**
+	 * Get the Place mapper title
+	 * 
+	 * @return string
+	 */
+	function title(): string;
     
-    /**
-     * Boot the Place mapper
-     */
-    function boot(): void;
+	/**
+	 * Boot the Place mapper
+	 */
+	function boot(): void;
     
-    /**
-     * Get the configuration associated to the mapper
-     * 
-     * @return PlaceMapperConfigInterface
-     */
-    function config(): PlaceMapperConfigInterface;
+	/**
+	 * Get the configuration associated to the mapper
+	 * 
+	 * @return PlaceMapperConfigInterface
+	 */
+	function config(): PlaceMapperConfigInterface;
     
-    /**
-     * Set the configured associated to the mapper
-     * 
-     * @param PlaceMapperConfigInterface $config
-     */
-    function setConfig(PlaceMapperConfigInterface $config): void;
+	/**
+	 * Set the configured associated to the mapper
+	 * 
+	 * @param PlaceMapperConfigInterface $config
+	 */
+	function setConfig(PlaceMapperConfigInterface $config): void;
     
-    /**
-     * Get the data associated to the mapper, for a specific key
-     * 
-     * @param string $key
-     * @return null|mixed
-     */
-    function data(string $key);
+	/**
+	 * Get the data associated to the mapper, for a specific key
+	 * 
+	 * @param string $key
+	 * @return null|mixed
+	 */
+	function data(string $key);
     
-    /**
-     * Set the data associated to the mapper, for a specific key
-     * 
-     * @param string $key
-     * @param mixed $data
-     */
-    function setData(string $key, $data): void;
+	/**
+	 * Set the data associated to the mapper, for a specific key
+	 * 
+	 * @param string $key
+	 * @param mixed $data
+	 */
+	function setData(string $key, $data): void;
     
-    /**
-     * Return the property value of the feature identifying a place in a GeoJson map.
-     * 
-     * @param Place $place
-     * @param string $feature_property
-     * @return string|NULL
-     */
-    function map(Place $place, string $feature_property) : ?string;
+	/**
+	 * Return the property value of the feature identifying a place in a GeoJson map.
+	 * 
+	 * @param Place $place
+	 * @param string $feature_property
+	 * @return string|NULL
+	 */
+	function map(Place $place, string $feature_property) : ?string;
 }
\ No newline at end of file

src/Webtrees/Contracts/GeoDispersion/PlaceMapperConfigInterface.php

Indentation +37 added lines, -37 removed lines

@@ -23,45 +23,45 @@
  */
 interface PlaceMapperConfigInterface extends JsonSerializable
 {
-    /**
-     * Deserialise the mapper configuration from a string or an array
-     * 
-     * @param mixed $config
-     * @return self
-     */
-    function jsonDeserialize($config): self;
+	/**
+	 * Deserialise the mapper configuration from a string or an array
+	 * 
+	 * @param mixed $config
+	 * @return self
+	 */
+	function jsonDeserialize($config): self;
     
-    /**
-     * Check if the configuration contains a specific key
-     * 
-     * @param string $key
-     * @return bool
-     */
-    function has(string $key): bool;
+	/**
+	 * Check if the configuration contains a specific key
+	 * 
+	 * @param string $key
+	 * @return bool
+	 */
+	function has(string $key): bool;
     
-    /**
-     * Return the configuration associated with a key, or a default value if none found.
-     * 
-     * @param string $key
-     * @param mixed|null $default
-     * @return mixed|null
-     */
-    function get(string $key, $default = null);
+	/**
+	 * Return the configuration associated with a key, or a default value if none found.
+	 * 
+	 * @param string $key
+	 * @param mixed|null $default
+	 * @return mixed|null
+	 */
+	function get(string $key, $default = null);
     
-    /**
-     * Return the content of the mapper configuration section of the config page 
-     * 
-     * @param ModuleInterface $module
-     * @param Tree $tree
-     * @return string
-     */
-    function configContent(ModuleInterface $module, Tree $tree): string;
+	/**
+	 * Return the content of the mapper configuration section of the config page 
+	 * 
+	 * @param ModuleInterface $module
+	 * @param Tree $tree
+	 * @return string
+	 */
+	function configContent(ModuleInterface $module, Tree $tree): string;
     
-    /**
-     * Return a PlaceMapperConfigInterface object updated according to its mapper configuration rules 
-     * 
-     * @param ServerRequestInterface $request
-     * @return self
-     */
-    function withConfigUpdate(ServerRequestInterface $request): self;
+	/**
+	 * Return a PlaceMapperConfigInterface object updated according to its mapper configuration rules 
+	 * 
+	 * @param ServerRequestInterface $request
+	 * @return self
+	 */
+	function withConfigUpdate(ServerRequestInterface $request): self;
 }
\ No newline at end of file

src/Webtrees/Module/WelcomeBlock/WelcomeBlockModule.php

Indentation +155 added lines, -155 removed lines

@@ -33,159 +33,159 @@
  */
 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.0.11-v.2';
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::getBlock()
-     */
-    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'      => $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
-    {
-        $params = (array) $request->getParsedBody();
-
-        $matomo_enabled = $params['matomo_enabled'] == 'yes';
-        $this->setBlockSetting($block_id, 'matomo_enabled', $matomo_enabled ? 'yes' : 'no');
-        if (!$matomo_enabled) {
-            return;
-        }
-
-        if (filter_var($params['matomo_url'], FILTER_VALIDATE_URL) === false) {
-            FlashMessages::addMessage(I18N::translate('The Matomo URL provided is not valid.'), 'danger');
-            return;
-        }
-
-        if (filter_var($params['matomo_siteid'], FILTER_VALIDATE_INT) === false) {
-            FlashMessages::addMessage(I18N::translate('The Matomo Site ID provided is not valid.'), 'danger');
-            return;
-        }
-
-        $this
-            ->setBlockSetting($block_id, 'matomo_url', trim($params['matomo_url']))
-            ->setBlockSetting($block_id, 'matomo_token', trim($params['matomo_token']))
-            ->setBlockSetting($block_id, 'matomo_siteid', $params['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.0.11-v.2';
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::getBlock()
+	 */
+	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'      => $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
+	{
+		$params = (array) $request->getParsedBody();
+
+		$matomo_enabled = $params['matomo_enabled'] == 'yes';
+		$this->setBlockSetting($block_id, 'matomo_enabled', $matomo_enabled ? 'yes' : 'no');
+		if (!$matomo_enabled) {
+			return;
+		}
+
+		if (filter_var($params['matomo_url'], FILTER_VALIDATE_URL) === false) {
+			FlashMessages::addMessage(I18N::translate('The Matomo URL provided is not valid.'), 'danger');
+			return;
+		}
+
+		if (filter_var($params['matomo_siteid'], FILTER_VALIDATE_INT) === false) {
+			FlashMessages::addMessage(I18N::translate('The Matomo Site ID provided is not valid.'), 'danger');
+			return;
+		}
+
+		$this
+			->setBlockSetting($block_id, 'matomo_url', trim($params['matomo_url']))
+			->setBlockSetting($block_id, 'matomo_token', trim($params['matomo_token']))
+			->setBlockSetting($block_id, 'matomo_siteid', $params['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')
+		];
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -61,9 +61,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);
             });
@@ -91,7 +91,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,
@@ -127,7 +127,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));
     }
 
     /**
@@ -136,7 +136,7 @@ 
      */
     public function saveBlockConfiguration(ServerRequestInterface $request, int $block_id): void
     {
-        $params = (array) $request->getParsedBody();
+        $params = (array)$request->getParsedBody();
 
         $matomo_enabled = $params['matomo_enabled'] == 'yes';
         $this->setBlockSetting($block_id, 'matomo_enabled', $matomo_enabled ? 'yes' : 'no');
@@ -159,7 +159,7 @@ 
             ->setBlockSetting($block_id, 'matomo_token', trim($params['matomo_token']))
             ->setBlockSetting($block_id, 'matomo_siteid', $params['matomo_siteid']);
 
-        Registry::cache()->file()->forget($this->name() . '-matomovisits-yearly-' . $block_id);
+        Registry::cache()->file()->forget($this->name().'-matomovisits-yearly-'.$block_id);
     }
 
     /**
@@ -185,7 +185,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')
         ];
     }
 }

src/Webtrees/Module/Sosa/SosaModule.php

Indentation +250 added lines, -250 removed lines

@@ -54,256 +54,256 @@
  * Identify and produce statistics about Sosa ancestors
  */
 class SosaModule extends AbstractModule implements
-    ModuleMyArtJaubInterface,
-    ModuleGlobalInterface,
-    ModuleMenuInterface,
-    ModuleSidebarInterface,
-    ModuleGeoAnalysisProviderInterface
+	ModuleMyArtJaubInterface,
+	ModuleGlobalInterface,
+	ModuleMenuInterface,
+	ModuleSidebarInterface,
+	ModuleGeoAnalysisProviderInterface
 {
-    use ModuleMyArtJaubTrait {
-        boot as traitBoot;
-    }
-    use ModuleGlobalTrait;
-    use ModuleMenuTrait;
-    use ModuleSidebarTrait;
-
-    // How to update the database schema for this module
-    private const SCHEMA_TARGET_VERSION   = 3;
-    private const SCHEMA_SETTING_NAME     = 'MAJ_SOSA_SCHEMA_VERSION';
-    private const SCHEMA_MIGRATION_PREFIX = __NAMESPACE__ . '\Schema';
+	use ModuleMyArtJaubTrait {
+		boot as traitBoot;
+	}
+	use ModuleGlobalTrait;
+	use ModuleMenuTrait;
+	use ModuleSidebarTrait;
+
+	// How to update the database schema for this module
+	private const SCHEMA_TARGET_VERSION   = 3;
+	private const SCHEMA_SETTING_NAME     = 'MAJ_SOSA_SCHEMA_VERSION';
+	private const SCHEMA_MIGRATION_PREFIX = __NAMESPACE__ . '\Schema';
 /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\AbstractModule::title()
-     */
-    public function title(): string
-    {
-        return /* I18N: Name of the “Sosa” module */ I18N::translate('Sosa');
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\AbstractModule::description()
-     */
-    public function description(): string
-    {
-        //phpcs:ignore Generic.Files.LineLength.TooLong
-        return /* I18N: Description of the “Sosa” module */ I18N::translate('Calculate and display Sosa ancestors of the root person.');
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\AbstractModule::boot()
-     */
-    public function boot(): void
-    {
-        $this->traitBoot();
-        app(MigrationService::class)->updateSchema(
-            self::SCHEMA_MIGRATION_PREFIX,
-            self::SCHEMA_SETTING_NAME,
-            self::SCHEMA_TARGET_VERSION
-        );
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\ModuleMyArtJaubInterface::loadRoutes()
-     */
-    public function loadRoutes(Map $router): void
-    {
-        $router->attach('', '', static function (Map $router): void {
-
-            $router->attach('', '/module-maj/sosa', static function (Map $router): void {
-
-                $router->attach('', '/list', static function (Map $router): void {
-                    $router->tokens(['gen' => '\d+']);
-                    $router->get(AncestorsList::class, '/ancestors/{tree}{/gen}', AncestorsList::class);
-                    $router->get(AncestorsListIndividual::class, '/ancestors/{tree}/{gen}/tab/individuals', AncestorsListIndividual::class);    //phpcs:ignore Generic.Files.LineLength.TooLong
-                    $router->get(AncestorsListFamily::class, '/ancestors/{tree}/{gen}/tab/families', AncestorsListFamily::class);   //phpcs:ignore Generic.Files.LineLength.TooLong
-                    $router->get(MissingAncestorsList::class, '/missing/{tree}{/gen}', MissingAncestorsList::class);
-                });
-
-                $router->attach('', '/statistics/{tree}', static function (Map $router): void {
-
-                    $router->get(SosaStatistics::class, '', SosaStatistics::class);
-                    $router->get(PedigreeCollapseData::class, '/pedigreecollapse', PedigreeCollapseData::class);
-                });
-
-                $router->attach('', '/config/{tree}', static function (Map $router): void {
-
-                    $router->get(SosaConfig::class, '', SosaConfig::class);
-                    $router->post(SosaConfigAction::class, '', SosaConfigAction::class);
-                    $router->get(SosaComputeModal::class, '/compute/{xref}', SosaComputeModal::class);
-                    $router->post(SosaComputeAction::class, '/compute', SosaComputeAction::class);
-                });
-            });
-        });
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleCustomInterface::customModuleVersion()
-     */
-    public function customModuleVersion(): string
-    {
-        return '2.1.0-v.1';
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleMenuInterface::defaultMenuOrder()
-     */
-    public function defaultMenuOrder(): int
-    {
-        return 7;
-    }
-
-    /**
-     * {@inhericDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleMenuInterface::getMenu()
-     */
-    public function getMenu(Tree $tree): ?Menu
-    {
-        $menu = new Menu(I18N::translate('Sosa Statistics'));
-        $menu->setClass('menu-maj-sosa');
-        $menu->setSubmenus([
-            new Menu(
-                I18N::translate('Sosa Ancestors'),
-                route(AncestorsList::class, ['tree' => $tree->name()]),
-                'menu-maj-sosa-list',
-                ['rel' => 'nofollow']
-            ),
-            new Menu(
-                I18N::translate('Missing Ancestors'),
-                route(MissingAncestorsList::class, ['tree' => $tree->name()]),
-                'menu-maj-sosa-missing',
-                ['rel' => 'nofollow']
-            ),
-            new Menu(
-                I18N::translate('Sosa Statistics'),
-                route(SosaStatistics::class, ['tree' => $tree->name()]),
-                'menu-maj-sosa-stats'
-            )
-        ]);
-
-        if (Auth::check()) {
-            $menu->addSubmenu(new Menu(
-                I18N::translate('Sosa Configuration'),
-                route(SosaConfig::class, ['tree' => $tree->name()]),
-                'menu-maj-sosa-config'
-            ));
-
-            /** @var ServerRequestInterface $request */
-            $request = app(ServerRequestInterface::class);
-            $route = $request->getAttribute('route');
-            assert($route instanceof Route);
-
-            $root_indi_id = $tree->getUserPreference(Auth::user(), 'MAJ_SOSA_ROOT_ID');
-
-            if ($route->name === IndividualPage::class && mb_strlen($root_indi_id) > 0) {
-                $xref = $request->getAttribute('xref');
-                assert(is_string($xref));
-
-                $menu->addSubmenu(new Menu(
-                    I18N::translate('Complete Sosas'),
-                    '#',
-                    'menu-maj-sosa-compute',
-                    [
-                        'rel'           => 'nofollow',
-                        'data-href'     => route(SosaComputeModal::class, ['tree' => $tree->name(), 'xref' => $xref]),
-                        'data-target'   => '#wt-ajax-modal',
-                        'data-toggle'   => 'modal',
-                        'data-backdrop' => 'static'
-                    ]
-                ));
-            }
-        }
-
-        return $menu;
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleGlobalInterface::headContent()
-     */
-    public function headContent(): string
-    {
-        return '<link rel="stylesheet" href="' . e($this->moduleCssUrl()) . '">';
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleGlobalInterface::bodyContent()
-     */
-    public function bodyContent(): string
-    {
-        return '<script src="' . $this->assetUrl('js/sosa.min.js') . '"></script>';
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleSidebarInterface::sidebarTitle()
-     */
-    public function sidebarTitle(): string
-    {
-        $request = app(ServerRequestInterface::class);
-        $xref = $request->getAttribute('xref');
-        $tree = $request->getAttribute('tree');
-        $user = Auth::check() ? Auth::user() : new DefaultUser();
-
-        $individual = Registry::individualFactory()->make($xref, $tree);
-
-        return view($this->name() . '::sidebar/title', [
-            'module_name'   =>  $this->name(),
-            'sosa_numbers'  =>  app(SosaRecordsService::class)->sosaNumbers($tree, $user, $individual)
-        ]);
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleSidebarInterface::getSidebarContent()
-     */
-    public function getSidebarContent(Individual $individual): string
-    {
-        $sosa_root_xref = $individual->tree()->getUserPreference(Auth::user(), 'MAJ_SOSA_ROOT_ID');
-        $sosa_root = Registry::individualFactory()->make($sosa_root_xref, $individual->tree());
-        $user = Auth::check() ? Auth::user() : new DefaultUser();
-
-        return view($this->name() . '::sidebar/content', [
-            'sosa_ancestor' =>  $individual,
-            'sosa_root'     =>  $sosa_root,
-            'sosa_numbers'  =>  app(SosaRecordsService::class)->sosaNumbers($individual->tree(), $user, $individual)
-        ]);
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleSidebarInterface::hasSidebarContent()
-     */
-    public function hasSidebarContent(Individual $individual): bool
-    {
-        $user = Auth::check() ? Auth::user() : new DefaultUser();
-
-        return app(SosaRecordsService::class)
-            ->sosaNumbers($individual->tree(), $user, $individual)->count() > 0;
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleSidebarInterface::defaultSidebarOrder()
-     */
-    public function defaultSidebarOrder(): int
-    {
-        return 1;
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\ModuleGeoAnalysisProviderInterface::listGeoAnalyses()
-     */
-    public function listGeoAnalyses(): array
-    {
-        return [
-            SosaByGenerationGeoAnalysis::class
-        ];
-    }
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\AbstractModule::title()
+	 */
+	public function title(): string
+	{
+		return /* I18N: Name of the “Sosa” module */ I18N::translate('Sosa');
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\AbstractModule::description()
+	 */
+	public function description(): string
+	{
+		//phpcs:ignore Generic.Files.LineLength.TooLong
+		return /* I18N: Description of the “Sosa” module */ I18N::translate('Calculate and display Sosa ancestors of the root person.');
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\AbstractModule::boot()
+	 */
+	public function boot(): void
+	{
+		$this->traitBoot();
+		app(MigrationService::class)->updateSchema(
+			self::SCHEMA_MIGRATION_PREFIX,
+			self::SCHEMA_SETTING_NAME,
+			self::SCHEMA_TARGET_VERSION
+		);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Module\ModuleMyArtJaubInterface::loadRoutes()
+	 */
+	public function loadRoutes(Map $router): void
+	{
+		$router->attach('', '', static function (Map $router): void {
+
+			$router->attach('', '/module-maj/sosa', static function (Map $router): void {
+
+				$router->attach('', '/list', static function (Map $router): void {
+					$router->tokens(['gen' => '\d+']);
+					$router->get(AncestorsList::class, '/ancestors/{tree}{/gen}', AncestorsList::class);
+					$router->get(AncestorsListIndividual::class, '/ancestors/{tree}/{gen}/tab/individuals', AncestorsListIndividual::class);    //phpcs:ignore Generic.Files.LineLength.TooLong
+					$router->get(AncestorsListFamily::class, '/ancestors/{tree}/{gen}/tab/families', AncestorsListFamily::class);   //phpcs:ignore Generic.Files.LineLength.TooLong
+					$router->get(MissingAncestorsList::class, '/missing/{tree}{/gen}', MissingAncestorsList::class);
+				});
+
+				$router->attach('', '/statistics/{tree}', static function (Map $router): void {
+
+					$router->get(SosaStatistics::class, '', SosaStatistics::class);
+					$router->get(PedigreeCollapseData::class, '/pedigreecollapse', PedigreeCollapseData::class);
+				});
+
+				$router->attach('', '/config/{tree}', static function (Map $router): void {
+
+					$router->get(SosaConfig::class, '', SosaConfig::class);
+					$router->post(SosaConfigAction::class, '', SosaConfigAction::class);
+					$router->get(SosaComputeModal::class, '/compute/{xref}', SosaComputeModal::class);
+					$router->post(SosaComputeAction::class, '/compute', SosaComputeAction::class);
+				});
+			});
+		});
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleCustomInterface::customModuleVersion()
+	 */
+	public function customModuleVersion(): string
+	{
+		return '2.1.0-v.1';
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleMenuInterface::defaultMenuOrder()
+	 */
+	public function defaultMenuOrder(): int
+	{
+		return 7;
+	}
+
+	/**
+	 * {@inhericDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleMenuInterface::getMenu()
+	 */
+	public function getMenu(Tree $tree): ?Menu
+	{
+		$menu = new Menu(I18N::translate('Sosa Statistics'));
+		$menu->setClass('menu-maj-sosa');
+		$menu->setSubmenus([
+			new Menu(
+				I18N::translate('Sosa Ancestors'),
+				route(AncestorsList::class, ['tree' => $tree->name()]),
+				'menu-maj-sosa-list',
+				['rel' => 'nofollow']
+			),
+			new Menu(
+				I18N::translate('Missing Ancestors'),
+				route(MissingAncestorsList::class, ['tree' => $tree->name()]),
+				'menu-maj-sosa-missing',
+				['rel' => 'nofollow']
+			),
+			new Menu(
+				I18N::translate('Sosa Statistics'),
+				route(SosaStatistics::class, ['tree' => $tree->name()]),
+				'menu-maj-sosa-stats'
+			)
+		]);
+
+		if (Auth::check()) {
+			$menu->addSubmenu(new Menu(
+				I18N::translate('Sosa Configuration'),
+				route(SosaConfig::class, ['tree' => $tree->name()]),
+				'menu-maj-sosa-config'
+			));
+
+			/** @var ServerRequestInterface $request */
+			$request = app(ServerRequestInterface::class);
+			$route = $request->getAttribute('route');
+			assert($route instanceof Route);
+
+			$root_indi_id = $tree->getUserPreference(Auth::user(), 'MAJ_SOSA_ROOT_ID');
+
+			if ($route->name === IndividualPage::class && mb_strlen($root_indi_id) > 0) {
+				$xref = $request->getAttribute('xref');
+				assert(is_string($xref));
+
+				$menu->addSubmenu(new Menu(
+					I18N::translate('Complete Sosas'),
+					'#',
+					'menu-maj-sosa-compute',
+					[
+						'rel'           => 'nofollow',
+						'data-href'     => route(SosaComputeModal::class, ['tree' => $tree->name(), 'xref' => $xref]),
+						'data-target'   => '#wt-ajax-modal',
+						'data-toggle'   => 'modal',
+						'data-backdrop' => 'static'
+					]
+				));
+			}
+		}
+
+		return $menu;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleGlobalInterface::headContent()
+	 */
+	public function headContent(): string
+	{
+		return '<link rel="stylesheet" href="' . e($this->moduleCssUrl()) . '">';
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleGlobalInterface::bodyContent()
+	 */
+	public function bodyContent(): string
+	{
+		return '<script src="' . $this->assetUrl('js/sosa.min.js') . '"></script>';
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleSidebarInterface::sidebarTitle()
+	 */
+	public function sidebarTitle(): string
+	{
+		$request = app(ServerRequestInterface::class);
+		$xref = $request->getAttribute('xref');
+		$tree = $request->getAttribute('tree');
+		$user = Auth::check() ? Auth::user() : new DefaultUser();
+
+		$individual = Registry::individualFactory()->make($xref, $tree);
+
+		return view($this->name() . '::sidebar/title', [
+			'module_name'   =>  $this->name(),
+			'sosa_numbers'  =>  app(SosaRecordsService::class)->sosaNumbers($tree, $user, $individual)
+		]);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleSidebarInterface::getSidebarContent()
+	 */
+	public function getSidebarContent(Individual $individual): string
+	{
+		$sosa_root_xref = $individual->tree()->getUserPreference(Auth::user(), 'MAJ_SOSA_ROOT_ID');
+		$sosa_root = Registry::individualFactory()->make($sosa_root_xref, $individual->tree());
+		$user = Auth::check() ? Auth::user() : new DefaultUser();
+
+		return view($this->name() . '::sidebar/content', [
+			'sosa_ancestor' =>  $individual,
+			'sosa_root'     =>  $sosa_root,
+			'sosa_numbers'  =>  app(SosaRecordsService::class)->sosaNumbers($individual->tree(), $user, $individual)
+		]);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleSidebarInterface::hasSidebarContent()
+	 */
+	public function hasSidebarContent(Individual $individual): bool
+	{
+		$user = Auth::check() ? Auth::user() : new DefaultUser();
+
+		return app(SosaRecordsService::class)
+			->sosaNumbers($individual->tree(), $user, $individual)->count() > 0;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleSidebarInterface::defaultSidebarOrder()
+	 */
+	public function defaultSidebarOrder(): int
+	{
+		return 1;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\ModuleGeoAnalysisProviderInterface::listGeoAnalyses()
+	 */
+	public function listGeoAnalyses(): array
+	{
+		return [
+			SosaByGenerationGeoAnalysis::class
+		];
+	}
 }

Spacing +12 added lines, -12 removed lines

@@ -70,7 +70,7 @@ 
     // How to update the database schema for this module
     private const SCHEMA_TARGET_VERSION   = 3;
     private const SCHEMA_SETTING_NAME     = 'MAJ_SOSA_SCHEMA_VERSION';
-    private const SCHEMA_MIGRATION_PREFIX = __NAMESPACE__ . '\Schema';
+    private const SCHEMA_MIGRATION_PREFIX = __NAMESPACE__.'\Schema';
 /**
      * {@inheritDoc}
      * @see \Fisharebest\Webtrees\Module\AbstractModule::title()
@@ -110,25 +110,25 @@ 
      */
     public function loadRoutes(Map $router): void
     {
-        $router->attach('', '', static function (Map $router): void {
+        $router->attach('', '', static function(Map $router): void {
 
-            $router->attach('', '/module-maj/sosa', static function (Map $router): void {
+            $router->attach('', '/module-maj/sosa', static function(Map $router): void {
 
-                $router->attach('', '/list', static function (Map $router): void {
+                $router->attach('', '/list', static function(Map $router): void {
                     $router->tokens(['gen' => '\d+']);
                     $router->get(AncestorsList::class, '/ancestors/{tree}{/gen}', AncestorsList::class);
-                    $router->get(AncestorsListIndividual::class, '/ancestors/{tree}/{gen}/tab/individuals', AncestorsListIndividual::class);    //phpcs:ignore Generic.Files.LineLength.TooLong
-                    $router->get(AncestorsListFamily::class, '/ancestors/{tree}/{gen}/tab/families', AncestorsListFamily::class);   //phpcs:ignore Generic.Files.LineLength.TooLong
+                    $router->get(AncestorsListIndividual::class, '/ancestors/{tree}/{gen}/tab/individuals', AncestorsListIndividual::class); //phpcs:ignore Generic.Files.LineLength.TooLong
+                    $router->get(AncestorsListFamily::class, '/ancestors/{tree}/{gen}/tab/families', AncestorsListFamily::class); //phpcs:ignore Generic.Files.LineLength.TooLong
                     $router->get(MissingAncestorsList::class, '/missing/{tree}{/gen}', MissingAncestorsList::class);
                 });
 
-                $router->attach('', '/statistics/{tree}', static function (Map $router): void {
+                $router->attach('', '/statistics/{tree}', static function(Map $router): void {
 
                     $router->get(SosaStatistics::class, '', SosaStatistics::class);
                     $router->get(PedigreeCollapseData::class, '/pedigreecollapse', PedigreeCollapseData::class);
                 });
 
-                $router->attach('', '/config/{tree}', static function (Map $router): void {
+                $router->attach('', '/config/{tree}', static function(Map $router): void {
 
                     $router->get(SosaConfig::class, '', SosaConfig::class);
                     $router->post(SosaConfigAction::class, '', SosaConfigAction::class);
@@ -227,7 +227,7 @@ 
      */
     public function headContent(): string
     {
-        return '<link rel="stylesheet" href="' . e($this->moduleCssUrl()) . '">';
+        return '<link rel="stylesheet" href="'.e($this->moduleCssUrl()).'">';
     }
 
     /**
@@ -236,7 +236,7 @@ 
      */
     public function bodyContent(): string
     {
-        return '<script src="' . $this->assetUrl('js/sosa.min.js') . '"></script>';
+        return '<script src="'.$this->assetUrl('js/sosa.min.js').'"></script>';
     }
 
     /**
@@ -252,7 +252,7 @@ 
 
         $individual = Registry::individualFactory()->make($xref, $tree);
 
-        return view($this->name() . '::sidebar/title', [
+        return view($this->name().'::sidebar/title', [
             'module_name'   =>  $this->name(),
             'sosa_numbers'  =>  app(SosaRecordsService::class)->sosaNumbers($tree, $user, $individual)
         ]);
@@ -268,7 +268,7 @@ 
         $sosa_root = Registry::individualFactory()->make($sosa_root_xref, $individual->tree());
         $user = Auth::check() ? Auth::user() : new DefaultUser();
 
-        return view($this->name() . '::sidebar/content', [
+        return view($this->name().'::sidebar/content', [
             'sosa_ancestor' =>  $individual,
             'sosa_root'     =>  $sosa_root,
             'sosa_numbers'  =>  app(SosaRecordsService::class)->sosaNumbers($individual->tree(), $user, $individual)

src/Webtrees/Module/Sosa/GeoAnalyses/SosaByGenerationGeoAnalysis.php

Indentation +97 added lines, -97 removed lines

@@ -31,101 +31,101 @@
  */
 class SosaByGenerationGeoAnalysis implements GeoAnalysisInterface
 {
-    private SosaRecordsService $records_service;
-
-    /**
-     * Constructor for SosaByGenerationGeoAnalysis
-     *
-     * @param SosaRecordsService $records_service
-     */
-    public function __construct(SosaRecordsService $records_service)
-    {
-        $this->records_service = $records_service;
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\GeoAnalysisInterface::title()
-     */
-    public function title(): string
-    {
-        return I18N::translate('Sosa ancestors places by generation');
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\GeoAnalysisInterface::itemsDescription()
-     */
-    public function itemsDescription(): callable
-    {
-        return fn(int $count): string => I18N::plural('ancestor', 'ancestors', $count);
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\GeoAnalysisInterface::results()
-     */
-    public function results(Tree $tree, int $depth): GeoAnalysisResults
-    {
-        $results = new GeoAnalysisResults();
-
-        $unique_ancestors = $this->records_service
-            ->listAncestors($tree, Auth::user())
-            ->uniqueStrict(fn(stdClass $item): string => $item->majs_i_id);
-
-        foreach ($unique_ancestors as $item) {
-            $ancestor = Registry::individualFactory()->make($item->majs_i_id, $tree);
-            if ($ancestor === null || !$ancestor->canShow()) {
-                continue;
-            }
-            $generation = $this->records_service->generation((int) $item->majs_sosa);
-            $significantplace = new GeoAnalysisPlace($tree, null, $depth);
-            foreach ($this->significantPlaces($ancestor) as $place) {
-                $significantplace = new GeoAnalysisPlace($tree, $place, $depth, true);
-                if ($significantplace->isKnown()) {
-                    break;
-                }
-            }
-            $results->addPlace($significantplace);
-            $results->addPlaceInCategory(
-                I18N::translate('Generation %s', I18N::number($generation)),
-                $generation,
-                $significantplace
-            );
-        }
-
-        return $results;
-    }
-
-    /**
-     * Returns significant places in order of priority for an individual
-     *
-     * @param Individual $individual
-     * @return Generator<\Fisharebest\Webtrees\Place>
-     */
-    protected function significantPlaces(Individual $individual): Generator
-    {
-        yield $individual->getBirthPlace();
-
-        /** @var \Fisharebest\Webtrees\Fact $fact */
-        foreach ($individual->facts(['RESI']) as $fact) {
-            yield $fact->place();
-        }
-
-        yield $individual->getDeathPlace();
-
-        /** @var \Fisharebest\Webtrees\Family $family */
-        foreach ($individual->childFamilies() as $family) {
-            foreach ($family->facts(['RESI']) as $fact) {
-                yield $fact->place();
-            }
-        }
-
-        /** @var \Fisharebest\Webtrees\Family $family */
-        foreach ($individual->spouseFamilies() as $family) {
-            foreach ($family->facts(['RESI']) as $fact) {
-                yield $fact->place();
-            }
-        }
-    }
+	private SosaRecordsService $records_service;
+
+	/**
+	 * Constructor for SosaByGenerationGeoAnalysis
+	 *
+	 * @param SosaRecordsService $records_service
+	 */
+	public function __construct(SosaRecordsService $records_service)
+	{
+		$this->records_service = $records_service;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\GeoAnalysisInterface::title()
+	 */
+	public function title(): string
+	{
+		return I18N::translate('Sosa ancestors places by generation');
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\GeoAnalysisInterface::itemsDescription()
+	 */
+	public function itemsDescription(): callable
+	{
+		return fn(int $count): string => I18N::plural('ancestor', 'ancestors', $count);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\GeoAnalysisInterface::results()
+	 */
+	public function results(Tree $tree, int $depth): GeoAnalysisResults
+	{
+		$results = new GeoAnalysisResults();
+
+		$unique_ancestors = $this->records_service
+			->listAncestors($tree, Auth::user())
+			->uniqueStrict(fn(stdClass $item): string => $item->majs_i_id);
+
+		foreach ($unique_ancestors as $item) {
+			$ancestor = Registry::individualFactory()->make($item->majs_i_id, $tree);
+			if ($ancestor === null || !$ancestor->canShow()) {
+				continue;
+			}
+			$generation = $this->records_service->generation((int) $item->majs_sosa);
+			$significantplace = new GeoAnalysisPlace($tree, null, $depth);
+			foreach ($this->significantPlaces($ancestor) as $place) {
+				$significantplace = new GeoAnalysisPlace($tree, $place, $depth, true);
+				if ($significantplace->isKnown()) {
+					break;
+				}
+			}
+			$results->addPlace($significantplace);
+			$results->addPlaceInCategory(
+				I18N::translate('Generation %s', I18N::number($generation)),
+				$generation,
+				$significantplace
+			);
+		}
+
+		return $results;
+	}
+
+	/**
+	 * Returns significant places in order of priority for an individual
+	 *
+	 * @param Individual $individual
+	 * @return Generator<\Fisharebest\Webtrees\Place>
+	 */
+	protected function significantPlaces(Individual $individual): Generator
+	{
+		yield $individual->getBirthPlace();
+
+		/** @var \Fisharebest\Webtrees\Fact $fact */
+		foreach ($individual->facts(['RESI']) as $fact) {
+			yield $fact->place();
+		}
+
+		yield $individual->getDeathPlace();
+
+		/** @var \Fisharebest\Webtrees\Family $family */
+		foreach ($individual->childFamilies() as $family) {
+			foreach ($family->facts(['RESI']) as $fact) {
+				yield $fact->place();
+			}
+		}
+
+		/** @var \Fisharebest\Webtrees\Family $family */
+		foreach ($individual->spouseFamilies() as $family) {
+			foreach ($family->facts(['RESI']) as $fact) {
+				yield $fact->place();
+			}
+		}
+	}
 }

src/Webtrees/Module/GeoDispersion/GeoDispersionModule.php

Indentation +180 added lines, -180 removed lines

@@ -58,185 +58,185 @@
  * Geographical Dispersion Module.
  */
 class GeoDispersionModule extends AbstractModule implements
-    ModuleMyArtJaubInterface,
-    ModuleChartInterface,
-    ModuleConfigInterface,
-    ModuleGlobalInterface,
-    ModuleGeoAnalysisProviderInterface,
-    ModulePlaceMapperProviderInterface
+	ModuleMyArtJaubInterface,
+	ModuleChartInterface,
+	ModuleConfigInterface,
+	ModuleGlobalInterface,
+	ModuleGeoAnalysisProviderInterface,
+	ModulePlaceMapperProviderInterface
 {
-    use ModuleMyArtJaubTrait {
-        boot as traitBoot;
-    }
-    use ModuleChartTrait;
-    use ModuleConfigTrait;
-    use ModuleGlobalTrait;
-
-    // How to update the database schema for this module
-    private const SCHEMA_TARGET_VERSION   = 2;
-    private const SCHEMA_SETTING_NAME     = 'MAJ_GEODISP_SCHEMA_VERSION';
-    private const SCHEMA_MIGRATION_PREFIX = __NAMESPACE__ . '\Schema';
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\AbstractModule::title()
-     */
-    public function title(): string
-    {
-        return /* I18N: Name of the “GeoDispersion” module */ I18N::translate('Geographical Dispersion');
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\AbstractModule::description()
-     */
-    public function description(): string
-    {
-        //phpcs:ignore Generic.Files.LineLength.TooLong
-        return /* I18N: Description of the “GeoDispersion” module */ I18N::translate('Perform and display geographical dispersion analysis');
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\AbstractModule::boot()
-     */
-    public function boot(): void
-    {
-        $this->traitBoot();
-        app(MigrationService::class)->updateSchema(
-            self::SCHEMA_MIGRATION_PREFIX,
-            self::SCHEMA_SETTING_NAME,
-            self::SCHEMA_TARGET_VERSION
-        );
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleCustomInterface::customModuleVersion()
-     */
-    public function customModuleVersion(): string
-    {
-        return '2.1.0-v.1';
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\ModuleMyArtJaubInterface::loadRoutes()
-     */
-    public function loadRoutes(Map $router): void
-    {
-        $router->attach('', '', static function (Map $router): void {
-
-            $router->attach('', '/module-maj/geodispersion', static function (Map $router): void {
-                $router->attach('', '/admin', static function (Map $router): void {
-                    $router->get(AdminConfigPage::class, '/config{/tree}', AdminConfigPage::class);
-
-                    $router->attach('', '/analysis-views/{tree}', static function (Map $router): void {
-                        $router->tokens(['view_id' => '\d+', 'enable' => '[01]']);
-                        $router->extras([
-                            'middleware' => [
-                                AuthManager::class,
-                            ],
-                        ]);
-                        $router->get(GeoAnalysisViewListData::class, '', GeoAnalysisViewListData::class);
-
-                        $router->get(GeoAnalysisViewAddPage::class, '/add', GeoAnalysisViewAddPage::class);
-                        $router->post(GeoAnalysisViewAddAction::class, '/add', GeoAnalysisViewAddAction::class);
-                        $router->get(GeoAnalysisViewEditPage::class, '/{view_id}', GeoAnalysisViewEditPage::class);
-                        $router->post(GeoAnalysisViewEditAction::class, '/{view_id}', GeoAnalysisViewEditAction::class);
-                        //phpcs:disable Generic.Files.LineLength.TooLong
-                        $router->get(GeoAnalysisViewStatusAction::class, '/{view_id}/status/{enable}', GeoAnalysisViewStatusAction::class);
-                        $router->get(GeoAnalysisViewDeleteAction::class, '/{view_id}/delete', GeoAnalysisViewDeleteAction::class);
-                        //phpcs:enable
-                    });
-
-                    $router->attach('', '/map-adapters/{tree}', static function (Map $router): void {
-                        $router->tokens(['adapter_id' => '\d+', 'view_id' => '\d+']);
-                        $router->extras([
-                            'middleware' => [
-                                AuthManager::class,
-                            ],
-                        ]);
-
-                        $router->get(MapAdapterAddPage::class, '/add/{view_id}', MapAdapterAddPage::class);
-                        $router->post(MapAdapterAddAction::class, '/add/{view_id}', MapAdapterAddAction::class);
-                        $router->get(MapAdapterEditPage::class, '/{adapter_id}', MapAdapterEditPage::class);
-                        $router->post(MapAdapterEditAction::class, '/{adapter_id}', MapAdapterEditAction::class);
-                        //phpcs:disable Generic.Files.LineLength.TooLong
-                        $router->get(MapAdapterDeleteAction::class, '/{adapter_id}/delete', MapAdapterDeleteAction::class);
-                        $router->get(MapAdapterMapperConfig::class, '/mapper/config{/adapter_id}', MapAdapterMapperConfig::class);
-                        //phpcs:enable
-                    });
-
-                    //phpcs:ignore Generic.Files.LineLength.TooLong
-                    $router->get(MapFeaturePropertyData::class, '/map/feature-properties{/map_id}', MapFeaturePropertyData::class);
-                });
-
-                $router->get(GeoAnalysisViewsList::class, '/list/{tree}', GeoAnalysisViewsList::class);
-
-                $router->attach('', '/analysisview/{tree}/{view_id}', static function (Map $router): void {
-                    $router->tokens(['view_id' => '\d+']);
-                    $router->get(GeoAnalysisViewPage::class, '', GeoAnalysisViewPage::class);
-                    $router->get(GeoAnalysisViewTabs::class, '/tabs', GeoAnalysisViewTabs::class);
-                });
-            });
-        });
-    }
-
-    public function getConfigLink(): string
-    {
-        return route(AdminConfigPage::class);
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleChartInterface::chartUrl()
-     */
-    public function chartUrl(Individual $individual, array $parameters = []): string
-    {
-        return route(GeoAnalysisViewsList::class, ['tree' => $individual->tree()->name()] + $parameters);
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleChartInterface::chartMenuClass()
-     */
-    public function chartMenuClass(): string
-    {
-        return 'menu-maj-geodispersion';
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleGlobalInterface::headContent()
-     */
-    public function headContent(): string
-    {
-        return '<link rel="stylesheet" href="' . e($this->moduleCssUrl()) . '">';
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\ModulePlaceMapperProviderInterface::listPlaceMappers()
-     */
-    public function listPlaceMappers(): array
-    {
-        return [
-            CoordinatesPlaceMapper::class,
-            SimplePlaceMapper::class,
-            SimpleTopFilteredPlaceMapper::class
-        ];
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\ModuleGeoAnalysisProviderInterface::listGeoAnalyses()
-     */
-    public function listGeoAnalyses(): array
-    {
-        return [
-            AllEventsByCenturyGeoAnalysis::class,
-            AllEventsByTypeGeoAnalysis::class
-        ];
-    }
+	use ModuleMyArtJaubTrait {
+		boot as traitBoot;
+	}
+	use ModuleChartTrait;
+	use ModuleConfigTrait;
+	use ModuleGlobalTrait;
+
+	// How to update the database schema for this module
+	private const SCHEMA_TARGET_VERSION   = 2;
+	private const SCHEMA_SETTING_NAME     = 'MAJ_GEODISP_SCHEMA_VERSION';
+	private const SCHEMA_MIGRATION_PREFIX = __NAMESPACE__ . '\Schema';
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\AbstractModule::title()
+	 */
+	public function title(): string
+	{
+		return /* I18N: Name of the “GeoDispersion” module */ I18N::translate('Geographical Dispersion');
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\AbstractModule::description()
+	 */
+	public function description(): string
+	{
+		//phpcs:ignore Generic.Files.LineLength.TooLong
+		return /* I18N: Description of the “GeoDispersion” module */ I18N::translate('Perform and display geographical dispersion analysis');
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\AbstractModule::boot()
+	 */
+	public function boot(): void
+	{
+		$this->traitBoot();
+		app(MigrationService::class)->updateSchema(
+			self::SCHEMA_MIGRATION_PREFIX,
+			self::SCHEMA_SETTING_NAME,
+			self::SCHEMA_TARGET_VERSION
+		);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleCustomInterface::customModuleVersion()
+	 */
+	public function customModuleVersion(): string
+	{
+		return '2.1.0-v.1';
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Module\ModuleMyArtJaubInterface::loadRoutes()
+	 */
+	public function loadRoutes(Map $router): void
+	{
+		$router->attach('', '', static function (Map $router): void {
+
+			$router->attach('', '/module-maj/geodispersion', static function (Map $router): void {
+				$router->attach('', '/admin', static function (Map $router): void {
+					$router->get(AdminConfigPage::class, '/config{/tree}', AdminConfigPage::class);
+
+					$router->attach('', '/analysis-views/{tree}', static function (Map $router): void {
+						$router->tokens(['view_id' => '\d+', 'enable' => '[01]']);
+						$router->extras([
+							'middleware' => [
+								AuthManager::class,
+							],
+						]);
+						$router->get(GeoAnalysisViewListData::class, '', GeoAnalysisViewListData::class);
+
+						$router->get(GeoAnalysisViewAddPage::class, '/add', GeoAnalysisViewAddPage::class);
+						$router->post(GeoAnalysisViewAddAction::class, '/add', GeoAnalysisViewAddAction::class);
+						$router->get(GeoAnalysisViewEditPage::class, '/{view_id}', GeoAnalysisViewEditPage::class);
+						$router->post(GeoAnalysisViewEditAction::class, '/{view_id}', GeoAnalysisViewEditAction::class);
+						//phpcs:disable Generic.Files.LineLength.TooLong
+						$router->get(GeoAnalysisViewStatusAction::class, '/{view_id}/status/{enable}', GeoAnalysisViewStatusAction::class);
+						$router->get(GeoAnalysisViewDeleteAction::class, '/{view_id}/delete', GeoAnalysisViewDeleteAction::class);
+						//phpcs:enable
+					});
+
+					$router->attach('', '/map-adapters/{tree}', static function (Map $router): void {
+						$router->tokens(['adapter_id' => '\d+', 'view_id' => '\d+']);
+						$router->extras([
+							'middleware' => [
+								AuthManager::class,
+							],
+						]);
+
+						$router->get(MapAdapterAddPage::class, '/add/{view_id}', MapAdapterAddPage::class);
+						$router->post(MapAdapterAddAction::class, '/add/{view_id}', MapAdapterAddAction::class);
+						$router->get(MapAdapterEditPage::class, '/{adapter_id}', MapAdapterEditPage::class);
+						$router->post(MapAdapterEditAction::class, '/{adapter_id}', MapAdapterEditAction::class);
+						//phpcs:disable Generic.Files.LineLength.TooLong
+						$router->get(MapAdapterDeleteAction::class, '/{adapter_id}/delete', MapAdapterDeleteAction::class);
+						$router->get(MapAdapterMapperConfig::class, '/mapper/config{/adapter_id}', MapAdapterMapperConfig::class);
+						//phpcs:enable
+					});
+
+					//phpcs:ignore Generic.Files.LineLength.TooLong
+					$router->get(MapFeaturePropertyData::class, '/map/feature-properties{/map_id}', MapFeaturePropertyData::class);
+				});
+
+				$router->get(GeoAnalysisViewsList::class, '/list/{tree}', GeoAnalysisViewsList::class);
+
+				$router->attach('', '/analysisview/{tree}/{view_id}', static function (Map $router): void {
+					$router->tokens(['view_id' => '\d+']);
+					$router->get(GeoAnalysisViewPage::class, '', GeoAnalysisViewPage::class);
+					$router->get(GeoAnalysisViewTabs::class, '/tabs', GeoAnalysisViewTabs::class);
+				});
+			});
+		});
+	}
+
+	public function getConfigLink(): string
+	{
+		return route(AdminConfigPage::class);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleChartInterface::chartUrl()
+	 */
+	public function chartUrl(Individual $individual, array $parameters = []): string
+	{
+		return route(GeoAnalysisViewsList::class, ['tree' => $individual->tree()->name()] + $parameters);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleChartInterface::chartMenuClass()
+	 */
+	public function chartMenuClass(): string
+	{
+		return 'menu-maj-geodispersion';
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleGlobalInterface::headContent()
+	 */
+	public function headContent(): string
+	{
+		return '<link rel="stylesheet" href="' . e($this->moduleCssUrl()) . '">';
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\ModulePlaceMapperProviderInterface::listPlaceMappers()
+	 */
+	public function listPlaceMappers(): array
+	{
+		return [
+			CoordinatesPlaceMapper::class,
+			SimplePlaceMapper::class,
+			SimpleTopFilteredPlaceMapper::class
+		];
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\ModuleGeoAnalysisProviderInterface::listGeoAnalyses()
+	 */
+	public function listGeoAnalyses(): array
+	{
+		return [
+			AllEventsByCenturyGeoAnalysis::class,
+			AllEventsByTypeGeoAnalysis::class
+		];
+	}
 }

Spacing +8 added lines, -8 removed lines

@@ -75,7 +75,7 @@ 
     // How to update the database schema for this module
     private const SCHEMA_TARGET_VERSION   = 2;
     private const SCHEMA_SETTING_NAME     = 'MAJ_GEODISP_SCHEMA_VERSION';
-    private const SCHEMA_MIGRATION_PREFIX = __NAMESPACE__ . '\Schema';
+    private const SCHEMA_MIGRATION_PREFIX = __NAMESPACE__.'\Schema';
 
     /**
      * {@inheritDoc}
@@ -125,13 +125,13 @@ 
      */
     public function loadRoutes(Map $router): void
     {
-        $router->attach('', '', static function (Map $router): void {
+        $router->attach('', '', static function(Map $router): void {
 
-            $router->attach('', '/module-maj/geodispersion', static function (Map $router): void {
-                $router->attach('', '/admin', static function (Map $router): void {
+            $router->attach('', '/module-maj/geodispersion', static function(Map $router): void {
+                $router->attach('', '/admin', static function(Map $router): void {
                     $router->get(AdminConfigPage::class, '/config{/tree}', AdminConfigPage::class);
 
-                    $router->attach('', '/analysis-views/{tree}', static function (Map $router): void {
+                    $router->attach('', '/analysis-views/{tree}', static function(Map $router): void {
                         $router->tokens(['view_id' => '\d+', 'enable' => '[01]']);
                         $router->extras([
                             'middleware' => [
@@ -150,7 +150,7 @@ 
                         //phpcs:enable
                     });
 
-                    $router->attach('', '/map-adapters/{tree}', static function (Map $router): void {
+                    $router->attach('', '/map-adapters/{tree}', static function(Map $router): void {
                         $router->tokens(['adapter_id' => '\d+', 'view_id' => '\d+']);
                         $router->extras([
                             'middleware' => [
@@ -174,7 +174,7 @@ 
 
                 $router->get(GeoAnalysisViewsList::class, '/list/{tree}', GeoAnalysisViewsList::class);
 
-                $router->attach('', '/analysisview/{tree}/{view_id}', static function (Map $router): void {
+                $router->attach('', '/analysisview/{tree}/{view_id}', static function(Map $router): void {
                     $router->tokens(['view_id' => '\d+']);
                     $router->get(GeoAnalysisViewPage::class, '', GeoAnalysisViewPage::class);
                     $router->get(GeoAnalysisViewTabs::class, '/tabs', GeoAnalysisViewTabs::class);
@@ -212,7 +212,7 @@ 
      */
     public function headContent(): string
     {
-        return '<link rel="stylesheet" href="' . e($this->moduleCssUrl()) . '">';
+        return '<link rel="stylesheet" href="'.e($this->moduleCssUrl()).'">';
     }
 
     /**