jon48 / webtrees-lib

app/Module/WelcomeBlock/WelcomeBlockModule.php

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/AdminTasks/AdminTasksModule.php

Indentation +122 added lines, -122 removed lines

@@ -41,127 +41,127 @@
  * Allow for tasks to be run on a (nearly-)regular schedule
  */
 class AdminTasksModule extends AbstractModule implements
-    ModuleMyArtJaubInterface,
-    ModuleConfigInterface,
-    ModuleGlobalInterface,
-    ModuleTasksProviderInterface
+	ModuleMyArtJaubInterface,
+	ModuleConfigInterface,
+	ModuleGlobalInterface,
+	ModuleTasksProviderInterface
 {
-    use ModuleMyArtJaubTrait {
-        boot as traitBoot;
-    }
-    use ModuleConfigTrait;
-    use ModuleGlobalTrait;
-
-    //How to update the database schema for this module
-    private const SCHEMA_TARGET_VERSION   = 2;
-    private const SCHEMA_SETTING_NAME     = 'MAJ_ADMTASKS_SCHEMA_VERSION';
-    private const SCHEMA_MIGRATION_PREFIX = __NAMESPACE__ . '\Schema';
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\AbstractModule::title()
-     */
-    public function title(): string
-    {
-        return I18N::translate('Administration Tasks');
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\AbstractModule::description()
-     */
-    public function description(): string
-    {
-        return I18N::translate('Manage and run nearly-scheduled administration tasks.');
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\AbstractModule::boot()
-     */
-    public function boot(): void
-    {
-        $this->traitBoot();
-        app(MigrationService::class)->updateSchema(
-            self::SCHEMA_MIGRATION_PREFIX,
-            self::SCHEMA_SETTING_NAME,
-            self::SCHEMA_TARGET_VERSION
-        );
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\ModuleMyArtJaubInterface::loadRoutes()
-     */
-    public function loadRoutes(Map $router): void
-    {
-        $router->attach('', '', static function (Map $router): void {
-
-            $router->attach('', '/module-maj/admintasks', static function (Map $router): void {
-                $router->tokens(['enable' => '[01]']);
-
-                $router->attach('', '/admin', static function (Map $router): void {
-
-                    $router->extras([
-                        'middleware' => [
-                            AuthAdministrator::class,
-                        ],
-                    ]);
-                    $router->get(AdminConfigPage::class, '/config', AdminConfigPage::class);
-
-                    $router->attach('', '/tasks', static function (Map $router): void {
-
-                        $router->get(TasksList::class, '', TasksList::class);
-                        $router->get(TaskEditPage::class, '/{task}', TaskEditPage::class);
-                        $router->post(TaskEditAction::class, '/{task}', TaskEditAction::class);
-                        $router->get(TaskStatusAction::class, '/{task}/status/{enable}', TaskStatusAction::class);
-                    });
-                });
-
-                $router->get(TaskTrigger::class, '/trigger{/task}', TaskTrigger::class)
-                    ->allows(RequestMethodInterface::METHOD_POST);
-
-                $router->post(TokenGenerate::class, '/token', TokenGenerate::class)
-                    ->extras(['middleware' => [AuthAdministrator::class]]);
-            });
-        });
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleCustomInterface::customModuleLatestVersion()
-     */
-    public function customModuleVersion(): string
-    {
-        return '2.1.3-v.1';
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleConfigInterface::getConfigLink()
-     */
-    public function getConfigLink(): string
-    {
-        return route(AdminConfigPage::class);
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleGlobalInterface::bodyContent()
-     */
-    public function bodyContent(): string
-    {
-        return view($this->name() . '::snippet', [ 'url' => route(TaskTrigger::class) ]);
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see ModuleTasksProviderInterface::listTasks()
-     */
-    public function listTasks(): array
-    {
-        return [
-            'maj-healthcheck' => HealthCheckEmailTask::class
-        ];
-    }
+	use ModuleMyArtJaubTrait {
+		boot as traitBoot;
+	}
+	use ModuleConfigTrait;
+	use ModuleGlobalTrait;
+
+	//How to update the database schema for this module
+	private const SCHEMA_TARGET_VERSION   = 2;
+	private const SCHEMA_SETTING_NAME     = 'MAJ_ADMTASKS_SCHEMA_VERSION';
+	private const SCHEMA_MIGRATION_PREFIX = __NAMESPACE__ . '\Schema';
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\AbstractModule::title()
+	 */
+	public function title(): string
+	{
+		return I18N::translate('Administration Tasks');
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\AbstractModule::description()
+	 */
+	public function description(): string
+	{
+		return I18N::translate('Manage and run nearly-scheduled administration tasks.');
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\AbstractModule::boot()
+	 */
+	public function boot(): void
+	{
+		$this->traitBoot();
+		app(MigrationService::class)->updateSchema(
+			self::SCHEMA_MIGRATION_PREFIX,
+			self::SCHEMA_SETTING_NAME,
+			self::SCHEMA_TARGET_VERSION
+		);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Module\ModuleMyArtJaubInterface::loadRoutes()
+	 */
+	public function loadRoutes(Map $router): void
+	{
+		$router->attach('', '', static function (Map $router): void {
+
+			$router->attach('', '/module-maj/admintasks', static function (Map $router): void {
+				$router->tokens(['enable' => '[01]']);
+
+				$router->attach('', '/admin', static function (Map $router): void {
+
+					$router->extras([
+						'middleware' => [
+							AuthAdministrator::class,
+						],
+					]);
+					$router->get(AdminConfigPage::class, '/config', AdminConfigPage::class);
+
+					$router->attach('', '/tasks', static function (Map $router): void {
+
+						$router->get(TasksList::class, '', TasksList::class);
+						$router->get(TaskEditPage::class, '/{task}', TaskEditPage::class);
+						$router->post(TaskEditAction::class, '/{task}', TaskEditAction::class);
+						$router->get(TaskStatusAction::class, '/{task}/status/{enable}', TaskStatusAction::class);
+					});
+				});
+
+				$router->get(TaskTrigger::class, '/trigger{/task}', TaskTrigger::class)
+					->allows(RequestMethodInterface::METHOD_POST);
+
+				$router->post(TokenGenerate::class, '/token', TokenGenerate::class)
+					->extras(['middleware' => [AuthAdministrator::class]]);
+			});
+		});
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleCustomInterface::customModuleLatestVersion()
+	 */
+	public function customModuleVersion(): string
+	{
+		return '2.1.3-v.1';
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleConfigInterface::getConfigLink()
+	 */
+	public function getConfigLink(): string
+	{
+		return route(AdminConfigPage::class);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleGlobalInterface::bodyContent()
+	 */
+	public function bodyContent(): string
+	{
+		return view($this->name() . '::snippet', [ 'url' => route(TaskTrigger::class) ]);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see ModuleTasksProviderInterface::listTasks()
+	 */
+	public function listTasks(): array
+	{
+		return [
+			'maj-healthcheck' => HealthCheckEmailTask::class
+		];
+	}
 }

app/Module/Certificates/Elements/SourceCertificate.php

Indentation +52 added lines, -52 removed lines

@@ -28,61 +28,61 @@
  */
 class SourceCertificate extends AbstractElement
 {
-    protected CertificatesModule $module;
-    protected CertificateFilesystemService $certif_filesystem;
-    protected UrlObfuscatorService $url_obfuscator_service;
+	protected CertificatesModule $module;
+	protected CertificateFilesystemService $certif_filesystem;
+	protected UrlObfuscatorService $url_obfuscator_service;
 
-    /**
-     * Constructor for SourceCertificate element
-     *
-     * @param string $label
-     * @param CertificatesModule $module
-     * @param CertificateFilesystemService $certif_filesystem
-     * @param UrlObfuscatorService $url_obfuscator_service
-     */
-    public function __construct(
-        string $label,
-        CertificatesModule $module,
-        CertificateFilesystemService $certif_filesystem = null,
-        UrlObfuscatorService $url_obfuscator_service = null
-    ) {
-        parent::__construct($label, null);
-        $this->module = $module;
-        $this->certif_filesystem = $certif_filesystem ?? app(CertificateFilesystemService::class);
-        $this->url_obfuscator_service = $url_obfuscator_service ?? app(UrlObfuscatorService::class);
-    }
+	/**
+	 * Constructor for SourceCertificate element
+	 *
+	 * @param string $label
+	 * @param CertificatesModule $module
+	 * @param CertificateFilesystemService $certif_filesystem
+	 * @param UrlObfuscatorService $url_obfuscator_service
+	 */
+	public function __construct(
+		string $label,
+		CertificatesModule $module,
+		CertificateFilesystemService $certif_filesystem = null,
+		UrlObfuscatorService $url_obfuscator_service = null
+	) {
+		parent::__construct($label, null);
+		$this->module = $module;
+		$this->certif_filesystem = $certif_filesystem ?? app(CertificateFilesystemService::class);
+		$this->url_obfuscator_service = $url_obfuscator_service ?? app(UrlObfuscatorService::class);
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Elements\AbstractElement::canonical()
-     */
-    public function canonical(string $value): string
-    {
-        return strtr($value, '\\', '/');
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Elements\AbstractElement::canonical()
+	 */
+	public function canonical(string $value): string
+	{
+		return strtr($value, '\\', '/');
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Elements\AbstractElement::edit()
-     */
-    public function edit(string $id, string $name, string $value, Tree $tree): string
-    {
-        list($city, $file) = explode('/', $this->canonical($value), 2) + ['', ''];
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Elements\AbstractElement::edit()
+	 */
+	public function edit(string $id, string $name, string $value, Tree $tree): string
+	{
+		list($city, $file) = explode('/', $this->canonical($value), 2) + ['', ''];
 
-        $cities = array_map(function (string $item): array {
-            return [$this->url_obfuscator_service->obfuscate($item), $item];
-        }, $this->certif_filesystem->cities($tree));
+		$cities = array_map(function (string $item): array {
+			return [$this->url_obfuscator_service->obfuscate($item), $item];
+		}, $this->certif_filesystem->cities($tree));
 
-        return view($this->module->name() . '::components/edit-certificate', [
-            'module_name'   =>  $this->module->name(),
-            'tree'          =>  $tree,
-            'id'            =>  $id,
-            'name'          =>  $name,
-            'cities'        =>  $cities,
-            'value'         =>  $this->canonical($value),
-            'value_city'    =>  $city,
-            'value_file'    =>  $file,
-            'js_script_url' =>  $this->module->assetUrl('js/certificates.min.js')
-        ]);
-    }
+		return view($this->module->name() . '::components/edit-certificate', [
+			'module_name'   =>  $this->module->name(),
+			'tree'          =>  $tree,
+			'id'            =>  $id,
+			'name'          =>  $name,
+			'cities'        =>  $cities,
+			'value'         =>  $this->canonical($value),
+			'value_city'    =>  $city,
+			'value_file'    =>  $file,
+			'js_script_url' =>  $this->module->assetUrl('js/certificates.min.js')
+		]);
+	}
 }

app/Module/WelcomeBlock/Services/MatomoStatsService.php

Indentation +100 added lines, -100 removed lines

@@ -29,113 +29,113 @@
  */
 class MatomoStatsService
 {
-    protected ?HandlerStack $handler = null;
+	protected ?HandlerStack $handler = null;
 
-    /**
-     * Set or get the http handler for the service
-     *
-     * @param HandlerStack $handler
-     * @return HandlerStack
-     */
-    public function httpHandler(HandlerStack $handler = null): HandlerStack
-    {
-        if ($this->handler === null) {
-            $this->handler = HandlerStack::create();
-        }
-        if ($handler !== null) {
-            $this->handler = $handler;
-        }
-        return $this->handler;
-    }
+	/**
+	 * Set or get the http handler for the service
+	 *
+	 * @param HandlerStack $handler
+	 * @return HandlerStack
+	 */
+	public function httpHandler(HandlerStack $handler = null): HandlerStack
+	{
+		if ($this->handler === null) {
+			$this->handler = HandlerStack::create();
+		}
+		if ($handler !== null) {
+			$this->handler = $handler;
+		}
+		return $this->handler;
+	}
 
-    /**
-     * Returns the number of visits for the current year (up to the day before).
-     * That statistic is cached for the day, to avoid unecessary calls to Matomo API.
-     *
-     * @param WelcomeBlockModule $module
-     * @param int $block_id
-     * @return int|NULL
-     */
-    public function visitsThisYear(WelcomeBlockModule $module, int $block_id): ?int
-    {
-        return Registry::cache()->file()->remember(
-            $module->name() . '-matomovisits-yearly-' . $block_id,
-            function () use ($module, $block_id): ?int {
-                $visits_year = $this->visits($module, $block_id, 'year');
-                if ($visits_year === null) {
-                    return null;
-                }
-                $visits_today = (int) $this->visits($module, $block_id, 'day');
+	/**
+	 * Returns the number of visits for the current year (up to the day before).
+	 * That statistic is cached for the day, to avoid unecessary calls to Matomo API.
+	 *
+	 * @param WelcomeBlockModule $module
+	 * @param int $block_id
+	 * @return int|NULL
+	 */
+	public function visitsThisYear(WelcomeBlockModule $module, int $block_id): ?int
+	{
+		return Registry::cache()->file()->remember(
+			$module->name() . '-matomovisits-yearly-' . $block_id,
+			function () use ($module, $block_id): ?int {
+				$visits_year = $this->visits($module, $block_id, 'year');
+				if ($visits_year === null) {
+					return null;
+				}
+				$visits_today = (int) $this->visits($module, $block_id, 'day');
 
-                return $visits_year - $visits_today;
-            },
-            Carbon::now()->addDay()->startOfDay()->diffInSeconds(Carbon::now()) // Valid until midnight
-        );
-    }
+				return $visits_year - $visits_today;
+			},
+			Carbon::now()->addDay()->startOfDay()->diffInSeconds(Carbon::now()) // Valid until midnight
+		);
+	}
 
-    /**
-     * Returns the number of visits for the current day.
-     *
-     * @param WelcomeBlockModule $module
-     * @param int $block_id
-     * @return int|NULL
-     */
-    public function visitsToday(WelcomeBlockModule $module, int $block_id): ?int
-    {
-        return Registry::cache()->array()->remember(
-            $module->name() . '-matomovisits-daily-' . $block_id,
-            function () use ($module, $block_id): ?int {
-                return $this->visits($module, $block_id, 'day');
-            }
-        );
-    }
+	/**
+	 * Returns the number of visits for the current day.
+	 *
+	 * @param WelcomeBlockModule $module
+	 * @param int $block_id
+	 * @return int|NULL
+	 */
+	public function visitsToday(WelcomeBlockModule $module, int $block_id): ?int
+	{
+		return Registry::cache()->array()->remember(
+			$module->name() . '-matomovisits-daily-' . $block_id,
+			function () use ($module, $block_id): ?int {
+				return $this->visits($module, $block_id, 'day');
+			}
+		);
+	}
 
-    /**
-     * Invoke the Matomo API to retrieve the number of visits over a period.
-     *
-     * @param WelcomeBlockModule $module
-     * @param int $block_id
-     * @param string $period
-     * @return int|NULL
-     */
-    protected function visits(WelcomeBlockModule $module, int $block_id, string $period): ?int
-    {
-        $settings = $module->matomoSettings($block_id);
+	/**
+	 * Invoke the Matomo API to retrieve the number of visits over a period.
+	 *
+	 * @param WelcomeBlockModule $module
+	 * @param int $block_id
+	 * @param string $period
+	 * @return int|NULL
+	 */
+	protected function visits(WelcomeBlockModule $module, int $block_id, string $period): ?int
+	{
+		$settings = $module->matomoSettings($block_id);
 
-        if (
-            $settings['matomo_enabled'] === true
-            && mb_strlen($settings['matomo_url']) > 0
-            && mb_strlen($settings['matomo_token']) > 0
-            && $settings['matomo_siteid'] > 0
-        ) {
-            try {
-                $http_client = new Client([
-                    RequestOptions::TIMEOUT => 30,
-                    'handler'   => $this->handler
-                ]);
+		if (
+			$settings['matomo_enabled'] === true
+			&& mb_strlen($settings['matomo_url']) > 0
+			&& mb_strlen($settings['matomo_token']) > 0
+			&& $settings['matomo_siteid'] > 0
+		) {
+			try {
+				$http_client = new Client([
+					RequestOptions::TIMEOUT => 30,
+					'handler'   => $this->handler
+				]);
 
-                $response = $http_client->get($settings['matomo_url'], [
-                    'query' =>  [
-                        'module'    =>  'API',
-                        'method'    =>  'VisitsSummary.getVisits',
-                        'idSite'    =>  $settings['matomo_siteid'],
-                        'period'    =>  $period,
-                        'date'      =>  'today',
-                        'token_auth' =>  $settings['matomo_token'],
-                        'format'    =>  'json'
-                    ]
-                ]);
+				$response = $http_client->get($settings['matomo_url'], [
+					'query' =>  [
+						'module'    =>  'API',
+						'method'    =>  'VisitsSummary.getVisits',
+						'idSite'    =>  $settings['matomo_siteid'],
+						'period'    =>  $period,
+						'date'      =>  'today',
+						'token_auth' =>  $settings['matomo_token'],
+						'format'    =>  'json'
+					]
+				]);
 
-                if ($response->getStatusCode() === StatusCodeInterface::STATUS_OK) {
-                    $result = json_decode((string) $response->getBody(), true)['value'] ?? null;
-                    if ($result !== null) {
-                        return (int)$result;
-                    }
-                }
-            } catch (GuzzleException $ex) {
-            }
-        }
+				if ($response->getStatusCode() === StatusCodeInterface::STATUS_OK) {
+					$result = json_decode((string) $response->getBody(), true)['value'] ?? null;
+					if ($result !== null) {
+						return (int)$result;
+					}
+				}
+			} catch (GuzzleException $ex) {
+			}
+		}
 
-        return null;
-    }
+		return null;
+	}
 }

app/Module/Sosa/Services/SosaStatisticsService.php

Indentation +528 added lines, -528 removed lines

@@ -29,539 +29,539 @@
  */
 class SosaStatisticsService
 {
-    private UserInterface $user;
-    private Tree $tree;
-
-    /**
-     * Constructor for Sosa Statistics Service
-     *
-     * @param Tree $tree
-     * @param UserInterface $user
-     */
-    public function __construct(Tree $tree, UserInterface $user)
-    {
-        $this->tree = $tree;
-        $this->user = $user;
-    }
-
-    /**
-     * Check if PDO support the queries used in Sosa statistics.
-     *
-     * SQLite does not support RIGHT and FULL JOIN, and POWER/SQRT require a specific compilation flag.
-     *
-     * @return bool
-     */
-    public function isPdoSupported(): bool
-    {
-        return DB::connection()->getDriverName() !== 'sqlite';
-    }
-
-    /**
-     * Return the root individual for the reference tree and user.
-     *
-     * @return Individual|NULL
-     */
-    public function rootIndividual(): ?Individual
-    {
-        $root_indi_id = $this->tree->getUserPreference($this->user, 'MAJ_SOSA_ROOT_ID');
-        return Registry::individualFactory()->make($root_indi_id, $this->tree);
-    }
-
-    /**
-     * Get the highest generation for the reference tree and user.
-     *
-     * @return int
-     */
-    public function maxGeneration(): int
-    {
-        return (int) DB::table('maj_sosa')
-            ->where('majs_gedcom_id', '=', $this->tree->id())
-            ->where('majs_user_id', '=', $this->user->id())
-            ->max('majs_gen');
-    }
-
-    /**
-     * Get the total count of individuals in the tree.
-     *
-     * @return int
-     */
-    public function totalIndividuals(): int
-    {
-        return DB::table('individuals')
-            ->where('i_file', '=', $this->tree->id())
-            ->count();
-    }
-
-    /**
-     * Get the total count of Sosa ancestors for all generations
-     *
-     * @return int
-     */
-    public function totalAncestors(): int
-    {
-        return DB::table('maj_sosa')
-            ->where('majs_gedcom_id', '=', $this->tree->id())
-            ->where('majs_user_id', '=', $this->user->id())
-            ->count();
-    }
-
-    /**
-     * Get the total count of Sosa ancestors for a generation
-     *
-     * @return int
-     */
-    public function totalAncestorsAtGeneration(int $gen): int
-    {
-        return DB::table('maj_sosa')
-            ->where('majs_gedcom_id', '=', $this->tree->id())
-            ->where('majs_user_id', '=', $this->user->id())
-            ->where('majs_gen', '=', $gen)
-            ->count();
-    }
-
-    /**
-     * Get the total count of distinct Sosa ancestors for all generations
-     *
-     * @return int
-     */
-    public function totalDistinctAncestors(): int
-    {
-        return DB::table('maj_sosa')
-            ->where('majs_gedcom_id', '=', $this->tree->id())
-            ->where('majs_user_id', '=', $this->user->id())
-            ->distinct()
-            ->count('majs_i_id');
-    }
-
-    /**
-     * Get the mean generation time, as the slope of the linear regression of birth years vs generations
-     *
-     * @return float
-     */
-    public function meanGenerationTime(): float
-    {
-        $row = DB::table('maj_sosa')
-            ->where('majs_gedcom_id', '=', $this->tree->id())
-            ->where('majs_user_id', '=', $this->user->id())
-            ->whereNotNull('majs_birth_year')
-            ->selectRaw('COUNT(majs_sosa) AS n')
-            ->selectRaw('SUM(majs_gen * majs_birth_year) AS sum_xy')
-            ->selectRaw('SUM(majs_gen) AS sum_x')
-            ->selectRaw('SUM(majs_birth_year) AS sum_y')
-            ->selectRaw('SUM(majs_gen * majs_gen) AS sum_x2')
-            ->get()->first();
-
-        $denom = $row->n * $row->sum_x2 - pow($row->sum_x, 2);
-        return ((int) $row->n === 0 || $denom === 0) ? 0 :
-            -($row->n * $row->sum_xy - $row->sum_x * $row->sum_y) / $denom;
-    }
-
-    /**
-     * Get the statistic array detailed by generation.
-     * Statistics for each generation are:
-     *  - The number of Sosa in generation
-     *  - The number of Sosa up to generation
-     *  - The number of distinct Sosa up to generation
-     *  - The year of the first birth in generation
-     *  - The year of the first estimated birth in generation
-     *  - The year of the last birth in generation
-     *  - The year of the last estimated birth in generation
-     *  - The average year of birth in generation
-     *
-     * @return array<int, array<string, int|null>> Statistics array
-     */
-    public function statisticsByGenerations(): array
-    {
-        $stats_by_gen = $this->statisticsByGenerationBasicData();
-        $cumul_stats_by_gen = $this->statisticsByGenerationCumulativeData();
-
-        $statistics_by_gen = [];
-        foreach ($stats_by_gen as $gen => $stats_gen) {
-            $statistics_by_gen[(int) $stats_gen->gen] = array(
-                'sosaCount'             =>  (int) $stats_gen->total_sosa,
-                'sosaTotalCount'        =>  (int) $cumul_stats_by_gen[$gen]->total_cumul,
-                'diffSosaTotalCount'    =>  (int) $cumul_stats_by_gen[$gen]->total_distinct_cumul,
-                'firstBirth'            =>  $stats_gen->first_year,
-                'firstEstimatedBirth'   =>  $stats_gen->first_est_year,
-                'lastBirth'             =>  $stats_gen->last_year,
-                'lastEstimatedBirth'    =>  $stats_gen->last_est_year
-            );
-        }
-
-        return $statistics_by_gen;
-    }
-
-    /**
-     * Returns the basic statistics data by generation.
-     *
-     * @return Collection<int, \stdClass>
-     */
-    private function statisticsByGenerationBasicData(): Collection
-    {
-        return DB::table('maj_sosa')
-            ->where('majs_gedcom_id', '=', $this->tree->id())
-            ->where('majs_user_id', '=', $this->user->id())
-            ->groupBy('majs_gen')
-            ->orderBy('majs_gen', 'asc')
-            ->select('majs_gen AS gen')
-            ->selectRaw('COUNT(majs_sosa) AS total_sosa')
-            ->selectRaw('MIN(majs_birth_year) AS first_year')
-            ->selectRaw('MIN(majs_birth_year_est) AS first_est_year')
-            ->selectRaw('MAX(majs_birth_year) AS last_year')
-            ->selectRaw('MAX(majs_birth_year_est) AS last_est_year')
-            ->get()->keyBy('gen');
-    }
-
-    /**
-     * Returns the cumulative statistics data by generation
-     *
-     * @return Collection<int, \stdClass>
-     */
-    private function statisticsByGenerationCumulativeData(): Collection
-    {
-        $list_gen = DB::table('maj_sosa')->select('majs_gen')->distinct()
-            ->where('majs_gedcom_id', '=', $this->tree->id())
-            ->where('majs_user_id', '=', $this->user->id());
-
-        return DB::table('maj_sosa')
-            ->joinSub($list_gen, 'list_gen', function (JoinClause $join): void {
-                $join->on('maj_sosa.majs_gen', '<=', 'list_gen.majs_gen')
-                ->where('majs_gedcom_id', '=', $this->tree->id())
-                ->where('majs_user_id', '=', $this->user->id());
-            })
-            ->groupBy('list_gen.majs_gen')
-            ->select('list_gen.majs_gen AS gen')
-            ->selectRaw('COUNT(majs_i_id) AS total_cumul')
-            ->selectRaw('COUNT(DISTINCT majs_i_id) AS total_distinct_cumul')
-            ->selectRaw('1 - COUNT(DISTINCT majs_i_id) / COUNT(majs_i_id) AS pedi_collapse_simple')
-            ->get()->keyBy('gen');
-    }
-
-    /**
-     * Returns the pedigree collapse improved calculation by generation.
-     *
-     * Format:
-     *  - key : generation
-     *  - values:
-     *      - pedi_collapse_roots : pedigree collapse of ancestor roots for the generation
-     *      - pedi_collapse_xgen : pedigree cross-generation shrinkage for the generation
-     *
-     * @return array<int, array<string, float>>
-     */
-    public function pedigreeCollapseByGenerationData(): array
-    {
-        if (!$this->isPdoSupported()) {
-            return [];
-        }
-
-        $table_prefix = DB::connection()->getTablePrefix();
-
-        $list_gen = DB::table('maj_sosa')->select('majs_gen')->distinct()
-            ->where('majs_gedcom_id', '=', $this->tree->id())
-            ->where('majs_user_id', '=', $this->user->id());
-
-        /* Compute the contributions of nodes of previous generations to the current generation */
-        $root_ancestors_contributions = DB::table('maj_sosa AS sosa')
-            ->select(['list_gen.majs_gen AS gen', 'sosa.majs_gedcom_id', 'sosa.majs_user_id'])
-            ->addSelect(['sosa.majs_i_id', 'sosa.majs_gen'])
-            ->selectRaw(
-                '(CASE ' .
-                    ' WHEN ' . $table_prefix . 'sosa_fat.majs_i_id IS NULL' .
-                    ' THEN POWER(2, ' . $table_prefix . 'list_gen.majs_gen - ' . $table_prefix . 'sosa.majs_gen - 1)' .
-                    ' ELSE 0 ' .
-                ' END)' .
-                ' + (CASE ' .
-                    ' WHEN ' . $table_prefix . 'sosa_mot.majs_i_id IS NULL' .
-                    ' THEN POWER(2, ' . $table_prefix . 'list_gen.majs_gen - ' . $table_prefix . 'sosa.majs_gen - 1)' .
-                    ' ELSE 0 ' .
-                ' END) contrib'
-            )
-            ->joinSub($list_gen, 'list_gen', function (JoinClause $join): void {
-                $join->on('sosa.majs_gen', '<', 'list_gen.majs_gen')
-                    ->where('majs_gedcom_id', '=', $this->tree->id())
-                    ->where('majs_user_id', '=', $this->user->id());
-            })
-            ->leftJoin('maj_sosa AS sosa_fat', function (JoinClause $join) use ($table_prefix): void {
-                // Link to sosa's father
-                $join->whereRaw($table_prefix . 'sosa_fat.majs_sosa = 2 * ' . $table_prefix . 'sosa.majs_sosa')
-                    ->where('sosa_fat.majs_gedcom_id', '=', $this->tree->id())
-                    ->where('sosa_fat.majs_user_id', '=', $this->user->id());
-            })
-            ->leftJoin('maj_sosa AS sosa_mot', function (JoinClause $join) use ($table_prefix): void {
-                // Link to sosa's mother
-                $join->whereRaw($table_prefix . 'sosa_mot.majs_sosa = 2 * ' . $table_prefix . 'sosa.majs_sosa + 1')
-                    ->where('sosa_mot.majs_gedcom_id', '=', $this->tree->id())
-                    ->where('sosa_mot.majs_user_id', '=', $this->user->id());
-            })
-            ->where('sosa.majs_gedcom_id', '=', $this->tree->id())
-            ->where('sosa.majs_user_id', '=', $this->user->id())
-            ->where(function (Builder $query): void {
-                $query->whereNull('sosa_fat.majs_i_id')
-                ->orWhereNull('sosa_mot.majs_i_id');
-            });
-
-        /* Identify nodes in the generations with ancestors who are also in the same generation.
+	private UserInterface $user;
+	private Tree $tree;
+
+	/**
+	 * Constructor for Sosa Statistics Service
+	 *
+	 * @param Tree $tree
+	 * @param UserInterface $user
+	 */
+	public function __construct(Tree $tree, UserInterface $user)
+	{
+		$this->tree = $tree;
+		$this->user = $user;
+	}
+
+	/**
+	 * Check if PDO support the queries used in Sosa statistics.
+	 *
+	 * SQLite does not support RIGHT and FULL JOIN, and POWER/SQRT require a specific compilation flag.
+	 *
+	 * @return bool
+	 */
+	public function isPdoSupported(): bool
+	{
+		return DB::connection()->getDriverName() !== 'sqlite';
+	}
+
+	/**
+	 * Return the root individual for the reference tree and user.
+	 *
+	 * @return Individual|NULL
+	 */
+	public function rootIndividual(): ?Individual
+	{
+		$root_indi_id = $this->tree->getUserPreference($this->user, 'MAJ_SOSA_ROOT_ID');
+		return Registry::individualFactory()->make($root_indi_id, $this->tree);
+	}
+
+	/**
+	 * Get the highest generation for the reference tree and user.
+	 *
+	 * @return int
+	 */
+	public function maxGeneration(): int
+	{
+		return (int) DB::table('maj_sosa')
+			->where('majs_gedcom_id', '=', $this->tree->id())
+			->where('majs_user_id', '=', $this->user->id())
+			->max('majs_gen');
+	}
+
+	/**
+	 * Get the total count of individuals in the tree.
+	 *
+	 * @return int
+	 */
+	public function totalIndividuals(): int
+	{
+		return DB::table('individuals')
+			->where('i_file', '=', $this->tree->id())
+			->count();
+	}
+
+	/**
+	 * Get the total count of Sosa ancestors for all generations
+	 *
+	 * @return int
+	 */
+	public function totalAncestors(): int
+	{
+		return DB::table('maj_sosa')
+			->where('majs_gedcom_id', '=', $this->tree->id())
+			->where('majs_user_id', '=', $this->user->id())
+			->count();
+	}
+
+	/**
+	 * Get the total count of Sosa ancestors for a generation
+	 *
+	 * @return int
+	 */
+	public function totalAncestorsAtGeneration(int $gen): int
+	{
+		return DB::table('maj_sosa')
+			->where('majs_gedcom_id', '=', $this->tree->id())
+			->where('majs_user_id', '=', $this->user->id())
+			->where('majs_gen', '=', $gen)
+			->count();
+	}
+
+	/**
+	 * Get the total count of distinct Sosa ancestors for all generations
+	 *
+	 * @return int
+	 */
+	public function totalDistinctAncestors(): int
+	{
+		return DB::table('maj_sosa')
+			->where('majs_gedcom_id', '=', $this->tree->id())
+			->where('majs_user_id', '=', $this->user->id())
+			->distinct()
+			->count('majs_i_id');
+	}
+
+	/**
+	 * Get the mean generation time, as the slope of the linear regression of birth years vs generations
+	 *
+	 * @return float
+	 */
+	public function meanGenerationTime(): float
+	{
+		$row = DB::table('maj_sosa')
+			->where('majs_gedcom_id', '=', $this->tree->id())
+			->where('majs_user_id', '=', $this->user->id())
+			->whereNotNull('majs_birth_year')
+			->selectRaw('COUNT(majs_sosa) AS n')
+			->selectRaw('SUM(majs_gen * majs_birth_year) AS sum_xy')
+			->selectRaw('SUM(majs_gen) AS sum_x')
+			->selectRaw('SUM(majs_birth_year) AS sum_y')
+			->selectRaw('SUM(majs_gen * majs_gen) AS sum_x2')
+			->get()->first();
+
+		$denom = $row->n * $row->sum_x2 - pow($row->sum_x, 2);
+		return ((int) $row->n === 0 || $denom === 0) ? 0 :
+			-($row->n * $row->sum_xy - $row->sum_x * $row->sum_y) / $denom;
+	}
+
+	/**
+	 * Get the statistic array detailed by generation.
+	 * Statistics for each generation are:
+	 *  - The number of Sosa in generation
+	 *  - The number of Sosa up to generation
+	 *  - The number of distinct Sosa up to generation
+	 *  - The year of the first birth in generation
+	 *  - The year of the first estimated birth in generation
+	 *  - The year of the last birth in generation
+	 *  - The year of the last estimated birth in generation
+	 *  - The average year of birth in generation
+	 *
+	 * @return array<int, array<string, int|null>> Statistics array
+	 */
+	public function statisticsByGenerations(): array
+	{
+		$stats_by_gen = $this->statisticsByGenerationBasicData();
+		$cumul_stats_by_gen = $this->statisticsByGenerationCumulativeData();
+
+		$statistics_by_gen = [];
+		foreach ($stats_by_gen as $gen => $stats_gen) {
+			$statistics_by_gen[(int) $stats_gen->gen] = array(
+				'sosaCount'             =>  (int) $stats_gen->total_sosa,
+				'sosaTotalCount'        =>  (int) $cumul_stats_by_gen[$gen]->total_cumul,
+				'diffSosaTotalCount'    =>  (int) $cumul_stats_by_gen[$gen]->total_distinct_cumul,
+				'firstBirth'            =>  $stats_gen->first_year,
+				'firstEstimatedBirth'   =>  $stats_gen->first_est_year,
+				'lastBirth'             =>  $stats_gen->last_year,
+				'lastEstimatedBirth'    =>  $stats_gen->last_est_year
+			);
+		}
+
+		return $statistics_by_gen;
+	}
+
+	/**
+	 * Returns the basic statistics data by generation.
+	 *
+	 * @return Collection<int, \stdClass>
+	 */
+	private function statisticsByGenerationBasicData(): Collection
+	{
+		return DB::table('maj_sosa')
+			->where('majs_gedcom_id', '=', $this->tree->id())
+			->where('majs_user_id', '=', $this->user->id())
+			->groupBy('majs_gen')
+			->orderBy('majs_gen', 'asc')
+			->select('majs_gen AS gen')
+			->selectRaw('COUNT(majs_sosa) AS total_sosa')
+			->selectRaw('MIN(majs_birth_year) AS first_year')
+			->selectRaw('MIN(majs_birth_year_est) AS first_est_year')
+			->selectRaw('MAX(majs_birth_year) AS last_year')
+			->selectRaw('MAX(majs_birth_year_est) AS last_est_year')
+			->get()->keyBy('gen');
+	}
+
+	/**
+	 * Returns the cumulative statistics data by generation
+	 *
+	 * @return Collection<int, \stdClass>
+	 */
+	private function statisticsByGenerationCumulativeData(): Collection
+	{
+		$list_gen = DB::table('maj_sosa')->select('majs_gen')->distinct()
+			->where('majs_gedcom_id', '=', $this->tree->id())
+			->where('majs_user_id', '=', $this->user->id());
+
+		return DB::table('maj_sosa')
+			->joinSub($list_gen, 'list_gen', function (JoinClause $join): void {
+				$join->on('maj_sosa.majs_gen', '<=', 'list_gen.majs_gen')
+				->where('majs_gedcom_id', '=', $this->tree->id())
+				->where('majs_user_id', '=', $this->user->id());
+			})
+			->groupBy('list_gen.majs_gen')
+			->select('list_gen.majs_gen AS gen')
+			->selectRaw('COUNT(majs_i_id) AS total_cumul')
+			->selectRaw('COUNT(DISTINCT majs_i_id) AS total_distinct_cumul')
+			->selectRaw('1 - COUNT(DISTINCT majs_i_id) / COUNT(majs_i_id) AS pedi_collapse_simple')
+			->get()->keyBy('gen');
+	}
+
+	/**
+	 * Returns the pedigree collapse improved calculation by generation.
+	 *
+	 * Format:
+	 *  - key : generation
+	 *  - values:
+	 *      - pedi_collapse_roots : pedigree collapse of ancestor roots for the generation
+	 *      - pedi_collapse_xgen : pedigree cross-generation shrinkage for the generation
+	 *
+	 * @return array<int, array<string, float>>
+	 */
+	public function pedigreeCollapseByGenerationData(): array
+	{
+		if (!$this->isPdoSupported()) {
+			return [];
+		}
+
+		$table_prefix = DB::connection()->getTablePrefix();
+
+		$list_gen = DB::table('maj_sosa')->select('majs_gen')->distinct()
+			->where('majs_gedcom_id', '=', $this->tree->id())
+			->where('majs_user_id', '=', $this->user->id());
+
+		/* Compute the contributions of nodes of previous generations to the current generation */
+		$root_ancestors_contributions = DB::table('maj_sosa AS sosa')
+			->select(['list_gen.majs_gen AS gen', 'sosa.majs_gedcom_id', 'sosa.majs_user_id'])
+			->addSelect(['sosa.majs_i_id', 'sosa.majs_gen'])
+			->selectRaw(
+				'(CASE ' .
+					' WHEN ' . $table_prefix . 'sosa_fat.majs_i_id IS NULL' .
+					' THEN POWER(2, ' . $table_prefix . 'list_gen.majs_gen - ' . $table_prefix . 'sosa.majs_gen - 1)' .
+					' ELSE 0 ' .
+				' END)' .
+				' + (CASE ' .
+					' WHEN ' . $table_prefix . 'sosa_mot.majs_i_id IS NULL' .
+					' THEN POWER(2, ' . $table_prefix . 'list_gen.majs_gen - ' . $table_prefix . 'sosa.majs_gen - 1)' .
+					' ELSE 0 ' .
+				' END) contrib'
+			)
+			->joinSub($list_gen, 'list_gen', function (JoinClause $join): void {
+				$join->on('sosa.majs_gen', '<', 'list_gen.majs_gen')
+					->where('majs_gedcom_id', '=', $this->tree->id())
+					->where('majs_user_id', '=', $this->user->id());
+			})
+			->leftJoin('maj_sosa AS sosa_fat', function (JoinClause $join) use ($table_prefix): void {
+				// Link to sosa's father
+				$join->whereRaw($table_prefix . 'sosa_fat.majs_sosa = 2 * ' . $table_prefix . 'sosa.majs_sosa')
+					->where('sosa_fat.majs_gedcom_id', '=', $this->tree->id())
+					->where('sosa_fat.majs_user_id', '=', $this->user->id());
+			})
+			->leftJoin('maj_sosa AS sosa_mot', function (JoinClause $join) use ($table_prefix): void {
+				// Link to sosa's mother
+				$join->whereRaw($table_prefix . 'sosa_mot.majs_sosa = 2 * ' . $table_prefix . 'sosa.majs_sosa + 1')
+					->where('sosa_mot.majs_gedcom_id', '=', $this->tree->id())
+					->where('sosa_mot.majs_user_id', '=', $this->user->id());
+			})
+			->where('sosa.majs_gedcom_id', '=', $this->tree->id())
+			->where('sosa.majs_user_id', '=', $this->user->id())
+			->where(function (Builder $query): void {
+				$query->whereNull('sosa_fat.majs_i_id')
+				->orWhereNull('sosa_mot.majs_i_id');
+			});
+
+		/* Identify nodes in the generations with ancestors who are also in the same generation.
          * This is the vertical/generational collapse that will reduce the number or roots.
          */
-        $non_roots_ancestors = DB::table('maj_sosa AS sosa')
-            ->select(['sosa.majs_gen', 'sosa.majs_gedcom_id', 'sosa.majs_user_id', 'sosa.majs_sosa'])
-            ->selectRaw('MAX(' . $table_prefix . 'sosa_anc.majs_sosa) - MIN(' . $table_prefix . 'sosa_anc.majs_sosa)' .
-                ' AS full_ancestors')
-            ->join('maj_sosa AS sosa_anc', function (JoinClause $join) use ($table_prefix): void {
-                $join->on('sosa.majs_gen', '<', 'sosa_anc.majs_gen')
-                    ->whereRaw('FLOOR(' . $table_prefix . 'sosa_anc.majs_sosa / POWER(2, ' .
-                        $table_prefix . 'sosa_anc.majs_gen - ' . $table_prefix . 'sosa.majs_gen)) = ' .
-                        $table_prefix . 'sosa.majs_sosa')
-                    ->where('sosa_anc.majs_gedcom_id', '=', $this->tree->id())
-                    ->where('sosa_anc.majs_user_id', '=', $this->user->id());
-            })
-            ->where('sosa.majs_gedcom_id', '=', $this->tree->id())
-            ->where('sosa.majs_user_id', '=', $this->user->id())
-            ->whereIn('sosa_anc.majs_i_id', function (Builder $query) use ($table_prefix): void {
-                $query->from('maj_sosa AS sosa_gen')
-                ->select('sosa_gen.majs_i_id')->distinct()
-                ->where('sosa_gen.majs_gedcom_id', '=', $this->tree->id())
-                ->where('sosa_gen.majs_user_id', '=', $this->user->id())
-                ->whereRaw($table_prefix . 'sosa_gen.majs_gen = ' . $table_prefix . 'sosa.majs_gen');
-            })
-            ->groupBy(['sosa.majs_gen', 'sosa.majs_gedcom_id', 'sosa.majs_user_id',
-                'sosa.majs_sosa', 'sosa.majs_i_id']);
-
-        /* Compute the contribution of the nodes in the generation,
+		$non_roots_ancestors = DB::table('maj_sosa AS sosa')
+			->select(['sosa.majs_gen', 'sosa.majs_gedcom_id', 'sosa.majs_user_id', 'sosa.majs_sosa'])
+			->selectRaw('MAX(' . $table_prefix . 'sosa_anc.majs_sosa) - MIN(' . $table_prefix . 'sosa_anc.majs_sosa)' .
+				' AS full_ancestors')
+			->join('maj_sosa AS sosa_anc', function (JoinClause $join) use ($table_prefix): void {
+				$join->on('sosa.majs_gen', '<', 'sosa_anc.majs_gen')
+					->whereRaw('FLOOR(' . $table_prefix . 'sosa_anc.majs_sosa / POWER(2, ' .
+						$table_prefix . 'sosa_anc.majs_gen - ' . $table_prefix . 'sosa.majs_gen)) = ' .
+						$table_prefix . 'sosa.majs_sosa')
+					->where('sosa_anc.majs_gedcom_id', '=', $this->tree->id())
+					->where('sosa_anc.majs_user_id', '=', $this->user->id());
+			})
+			->where('sosa.majs_gedcom_id', '=', $this->tree->id())
+			->where('sosa.majs_user_id', '=', $this->user->id())
+			->whereIn('sosa_anc.majs_i_id', function (Builder $query) use ($table_prefix): void {
+				$query->from('maj_sosa AS sosa_gen')
+				->select('sosa_gen.majs_i_id')->distinct()
+				->where('sosa_gen.majs_gedcom_id', '=', $this->tree->id())
+				->where('sosa_gen.majs_user_id', '=', $this->user->id())
+				->whereRaw($table_prefix . 'sosa_gen.majs_gen = ' . $table_prefix . 'sosa.majs_gen');
+			})
+			->groupBy(['sosa.majs_gen', 'sosa.majs_gedcom_id', 'sosa.majs_user_id',
+				'sosa.majs_sosa', 'sosa.majs_i_id']);
+
+		/* Compute the contribution of the nodes in the generation,
          * excluding the nodes with ancestors in the same generation.
          * Nodes with a parent missing are not excluded to cater for the missing one.
          */
-        $known_ancestors_contributions = DB::table('maj_sosa AS sosa')
-            ->select(['sosa.majs_gen AS gen', 'sosa.majs_gedcom_id', 'sosa.majs_user_id'])
-            ->addSelect(['sosa.majs_i_id', 'sosa.majs_gen'])
-            ->selectRaw('1 AS contrib')
-            ->leftJoinSub($non_roots_ancestors, 'nonroot', function (JoinClause $join): void {
-                $join->on('sosa.majs_gen', '=', 'nonroot.majs_gen')
-                    ->on('sosa.majs_sosa', '=', 'nonroot.majs_sosa')
-                    ->where('nonroot.full_ancestors', '>', 0)
-                    ->where('nonroot.majs_gedcom_id', '=', $this->tree->id())
-                    ->where('nonroot.majs_user_id', '=', $this->user->id());
-            })
-            ->where('sosa.majs_gedcom_id', '=', $this->tree->id())
-            ->where('sosa.majs_user_id', '=', $this->user->id())
-            ->whereNull('nonroot.majs_sosa');
-
-        /* Aggregate both queries, and calculate the sum of contributions by generation roots.
+		$known_ancestors_contributions = DB::table('maj_sosa AS sosa')
+			->select(['sosa.majs_gen AS gen', 'sosa.majs_gedcom_id', 'sosa.majs_user_id'])
+			->addSelect(['sosa.majs_i_id', 'sosa.majs_gen'])
+			->selectRaw('1 AS contrib')
+			->leftJoinSub($non_roots_ancestors, 'nonroot', function (JoinClause $join): void {
+				$join->on('sosa.majs_gen', '=', 'nonroot.majs_gen')
+					->on('sosa.majs_sosa', '=', 'nonroot.majs_sosa')
+					->where('nonroot.full_ancestors', '>', 0)
+					->where('nonroot.majs_gedcom_id', '=', $this->tree->id())
+					->where('nonroot.majs_user_id', '=', $this->user->id());
+			})
+			->where('sosa.majs_gedcom_id', '=', $this->tree->id())
+			->where('sosa.majs_user_id', '=', $this->user->id())
+			->whereNull('nonroot.majs_sosa');
+
+		/* Aggregate both queries, and calculate the sum of contributions by generation roots.
          * Exclude as well nodes that already appear in lower generations, as their branche has already been reduced.
          */
-        $ancestors_contributions_sum = DB::connection()->query()
-            ->fromSub($root_ancestors_contributions->unionAll($known_ancestors_contributions), 'sosa_contribs')
-            ->select(['sosa_contribs.gen', 'sosa_contribs.majs_gedcom_id', 'sosa_contribs.majs_user_id'])
-            ->addSelect(['sosa_contribs.majs_i_id', 'sosa_contribs.contrib'])
-            ->selectRaw('COUNT(' . $table_prefix . 'sosa_contribs.majs_i_id) * ' .
-                $table_prefix . 'sosa_contribs.contrib AS totalContrib')
-            ->leftJoin('maj_sosa AS sosa_low', function (JoinClause $join): void {
-                $join->on('sosa_low.majs_gen', '<', 'sosa_contribs.majs_gen')
-                    ->on('sosa_low.majs_i_id', '=', 'sosa_contribs.majs_i_id')
-                    ->where('sosa_low.majs_gedcom_id', '=', $this->tree->id())
-                    ->where('sosa_low.majs_user_id', '=', $this->user->id());
-            })
-            ->whereNull('sosa_low.majs_sosa')
-            ->groupBy(['sosa_contribs.gen', 'sosa_contribs.majs_gedcom_id', 'sosa_contribs.majs_user_id',
-                'sosa_contribs.majs_i_id', 'sosa_contribs.contrib']);
-
-        // Aggregate all generation roots to compute root and generation pedigree collapse
-        $pedi_collapse_coll = DB::connection()->query()->fromSub($ancestors_contributions_sum, 'sosa_contribs_sum')
-            ->select(['gen'])->selectRaw('SUM(contrib), SUM(totalContrib)')
-            ->selectRaw('1 - SUM(contrib) / SUM(totalContrib) AS pedi_collapse_roots')  // Roots/horizontal collapse
-            ->selectRaw('1 - SUM(totalContrib) / POWER ( 2, gen - 1) AS pedi_collapse_xgen') // Crossgeneration collapse
-            ->groupBy(['gen', 'majs_gedcom_id', 'majs_user_id'])
-            ->orderBy('gen')
-            ->get();
-
-        $pedi_collapse_by_gen = [];
-        foreach ($pedi_collapse_coll as $collapse_gen) {
-            $pedi_collapse_by_gen[(int) $collapse_gen->gen] = array(
-                'pedi_collapse_roots'   =>  (float) $collapse_gen->pedi_collapse_roots,
-                'pedi_collapse_xgen'   =>  (float) $collapse_gen->pedi_collapse_xgen
-            );
-        }
-        return $pedi_collapse_by_gen;
-    }
-
-    /**
-     * Return a Collection of the mean generation depth and deviation for all Sosa ancestors at a given generation.
-     * Sosa 1 is of generation 1.
-     *
-     * Mean generation depth and deviation are calculated based on the works of Marie-Héléne Cazes and Pierre Cazes,
-     * published in Population (French Edition), Vol. 51, No. 1 (Jan. - Feb., 1996), pp. 117-140
-     * http://kintip.net/index.php?option=com_jdownloads&task=download.send&id=9&catid=4&m=0
-     *
-     * Format:
-     *  - key : sosa number of the ancestor
-     *  - values:
-     *      - root_ancestor_id : ID of the ancestor
-     *      - mean_gen_depth : Mean generation depth
-     *      - stddev_gen_depth : Standard deviation of generation depth
-     *
-     * @param int $gen Sosa generation
-     * @return Collection<int, \stdClass>
-     */
-    public function generationDepthStatsAtGeneration(int $gen): Collection
-    {
-        if (!$this->isPdoSupported()) {
-            return collect();
-        }
-
-        $table_prefix = DB::connection()->getTablePrefix();
-        $missing_ancestors_by_gen = DB::table('maj_sosa AS sosa')
-            ->selectRaw($table_prefix . 'sosa.majs_gen - ? AS majs_gen_norm', [$gen])
-            ->selectRaw('FLOOR(((' . $table_prefix . 'sosa.majs_sosa / POW(2, ' . $table_prefix . 'sosa.majs_gen -1 )) - 1) * POWER(2, ? - 1)) + POWER(2, ? - 1) AS root_ancestor', [$gen, $gen])   //@phpcs:ignore Generic.Files.LineLength.TooLong
-            ->selectRaw('SUM(CASE WHEN ' . $table_prefix . 'sosa_fat.majs_i_id IS NULL AND ' . $table_prefix . 'sosa_mot.majs_i_id IS NULL THEN 1 ELSE 0 END) AS full_root_count')  //@phpcs:ignore Generic.Files.LineLength.TooLong
-            ->selectRaw('SUM(CASE WHEN ' . $table_prefix . 'sosa_fat.majs_i_id IS NULL AND ' . $table_prefix . 'sosa_mot.majs_i_id IS NULL THEN 0 ELSE 1 END) As semi_root_count')  //@phpcs:ignore Generic.Files.LineLength.TooLong
-            ->leftJoin('maj_sosa AS sosa_fat', function (JoinClause $join) use ($table_prefix): void {
-                // Link to sosa's father
-                $join->whereRaw($table_prefix . 'sosa_fat.majs_sosa = 2 * ' . $table_prefix . 'sosa.majs_sosa')
-                ->where('sosa_fat.majs_gedcom_id', '=', $this->tree->id())
-                ->where('sosa_fat.majs_user_id', '=', $this->user->id());
-            })
-            ->leftJoin('maj_sosa AS sosa_mot', function (JoinClause $join) use ($table_prefix): void {
-                // Link to sosa's mother
-                $join->whereRaw($table_prefix . 'sosa_mot.majs_sosa = 2 * ' . $table_prefix . 'sosa.majs_sosa + 1')
-                ->where('sosa_mot.majs_gedcom_id', '=', $this->tree->id())
-                ->where('sosa_mot.majs_user_id', '=', $this->user->id());
-            })
-            ->where('sosa.majs_gedcom_id', '=', $this->tree->id())
-            ->where('sosa.majs_user_id', '=', $this->user->id())
-            ->where('sosa.majs_gen', '>=', $gen)
-            ->where(function (Builder $query): void {
-                $query->whereNull('sosa_fat.majs_i_id')
-                    ->orWhereNull('sosa_mot.majs_i_id');
-            })
-            ->groupBy(['sosa.majs_gen', 'root_ancestor']);
-
-        return DB::table('maj_sosa AS sosa_list')
-            ->select(['stats_by_gen.root_ancestor AS root_ancestor_sosa', 'sosa_list.majs_i_id as root_ancestor_id'])
-            ->selectRaw('1 + SUM( (majs_gen_norm) * ( 2 * full_root_count + semi_root_count) /  (2 * POWER(2, majs_gen_norm))) AS mean_gen_depth')  //@phpcs:ignore Generic.Files.LineLength.TooLong
-            ->selectRaw(' SQRT(' .
-                '   SUM(POWER(majs_gen_norm, 2) * ( 2 * full_root_count + semi_root_count) /  (2 * POWER(2, majs_gen_norm)))' .     //@phpcs:ignore Generic.Files.LineLength.TooLong
-                '   - POWER( SUM( (majs_gen_norm) * ( 2 * full_root_count + semi_root_count) /  (2 * POWER(2, majs_gen_norm))), 2)' .       //@phpcs:ignore Generic.Files.LineLength.TooLong
-                ' ) AS stddev_gen_depth')
-            ->joinSub($missing_ancestors_by_gen, 'stats_by_gen', function (JoinClause $join): void {
-                $join->on('sosa_list.majs_sosa', '=', 'stats_by_gen.root_ancestor')
-                    ->where('sosa_list.majs_gedcom_id', '=', $this->tree->id())
-                    ->where('sosa_list.majs_user_id', '=', $this->user->id());
-            })
-            ->groupBy(['stats_by_gen.root_ancestor', 'sosa_list.majs_i_id'])
-            ->orderBy('stats_by_gen.root_ancestor')
-            ->get()->keyBy('root_ancestor_sosa');
-    }
-
-    /**
-     * Return a collection of the most duplicated root Sosa ancestors.
-     * The number of ancestors to return is limited by the parameter $limit.
-     * If several individuals are tied when reaching the limit, none of them are returned,
-     * which means that there can be less individuals returned than requested.
-     *
-     * Format:
-     *  - value:
-     *      - sosa_i_id : sosa individual
-     *      - sosa_count: number of duplications of the ancestor (e.g. 3 if it appears 3 times)
-     *
-     * @param int $limit
-     * @return Collection<\stdClass>
-     */
-    public function topMultipleAncestorsWithNoTies(int $limit): Collection
-    {
-        $table_prefix = DB::connection()->getTablePrefix();
-        $multiple_ancestors = DB::table('maj_sosa AS sosa')
-            ->select('sosa.majs_i_id AS sosa_i_id')
-            ->selectRaw('COUNT(' . $table_prefix . 'sosa.majs_sosa) AS sosa_count')
-            ->leftJoin('maj_sosa AS sosa_fat', function (JoinClause $join) use ($table_prefix): void {
-                // Link to sosa's father
-                $join->whereRaw($table_prefix . 'sosa_fat.majs_sosa = 2 * ' . $table_prefix . 'sosa.majs_sosa')
-                    ->where('sosa_fat.majs_gedcom_id', '=', $this->tree->id())
-                    ->where('sosa_fat.majs_user_id', '=', $this->user->id());
-            })
-            ->leftJoin('maj_sosa AS sosa_mot', function (JoinClause $join) use ($table_prefix): void {
-                // Link to sosa's mother
-                $join->whereRaw($table_prefix . 'sosa_mot.majs_sosa = 2 * ' . $table_prefix . 'sosa.majs_sosa + 1')
-                ->where('sosa_mot.majs_gedcom_id', '=', $this->tree->id())
-                ->where('sosa_mot.majs_user_id', '=', $this->user->id());
-            })
-            ->where('sosa.majs_gedcom_id', '=', $this->tree->id())
-            ->where('sosa.majs_user_id', '=', $this->user->id())
-            ->whereNull('sosa_fat.majs_sosa')   // We keep only root individuals, i.e. those with no father or mother
-            ->whereNull('sosa_mot.majs_sosa')
-            ->groupBy('sosa.majs_i_id')
-            ->havingRaw('COUNT(' . $table_prefix . 'sosa.majs_sosa) > 1')    // Limit to the duplicate sosas.
-            ->orderByRaw('COUNT(' . $table_prefix . 'sosa.majs_sosa) DESC, MIN(' . $table_prefix . 'sosa.majs_sosa) ASC')   //@phpcs:ignore Generic.Files.LineLength.TooLong
-            ->limit($limit + 1)     // We want to select one more than required, for ties
-            ->get();
-
-        if ($multiple_ancestors->count() > $limit) {
-            $last_count = $multiple_ancestors->last()->sosa_count;
-            $multiple_ancestors = $multiple_ancestors->reject(
-                fn (stdClass $element): bool => $element->sosa_count ===  $last_count
-            );
-        }
-        return $multiple_ancestors;
-    }
-
-    /**
-     * Return a computed array of statistics about the dispersion of ancestors across the ancestors
-     * at a specified generation.
-     *
-     * Format:
-     *  - key : rank of the ancestor in generation G for which exclusive ancestors have been found
-     *          For instance 3 represent the maternal grand father
-     *          0 is used for shared ancestors
-     *  - values:
-     *      - branches: same as key
-     *      - majs_i_id: xref of the ancestor at rank key in generation G, or null for shared ancestors
-     *      - count_indi: number of ancestors exclusively in the ancestors of the ancestor at rank key
-     *
-     * For instance a result at generation 3 could be :
-     * [
-     *  0 => { branches: 0, majs_i_id: X1, count_indi: 12 } -> 12 ancestors are shared by the grand-parents
-     *  1 => { branches: 1, majs_i_id: X2, count_indi: 32 } -> 32 ancestors are exclusive to the paternal grand-father
-     *  2 => { branches: 2, majs_i_id: X3, count_indi: 25 } -> 25 ancestors are exclusive to the paternal grand-mother
-     *  3 => { branches: 3, majs_i_id: X4, count_indi: 12 } -> 12 ancestors are exclusive to the maternal grand-father
-     *  4 => { branches: 4, majs_i_id: X5, count_indi: 30 } -> 30 ancestors are exclusive to the maternal grand-mother
-     * ]
-     *
-     * @param int $gen
-     * @return Collection<int, \stdClass>
-     */
-    public function ancestorsDispersionForGeneration(int $gen): Collection
-    {
-        if (!$this->isPdoSupported()) {
-            return collect();
-        }
-
-        $ancestors_branches = DB::table('maj_sosa')
-            ->select('majs_i_id AS i_id')
-            ->selectRaw('FLOOR(majs_sosa / POW(2, (majs_gen - ?))) - POW(2, ? -1) + 1 AS branch', [$gen, $gen])
-            ->where('majs_gedcom_id', '=', $this->tree->id())
-            ->where('majs_user_id', '=', $this->user->id())
-            ->where('majs_gen', '>=', $gen)
-            ->groupBy('majs_i_id', 'branch');
-
-        $consolidated_ancestors_branches = DB::table('maj_sosa')
-            ->fromSub($ancestors_branches, 'indi_branch')
-            ->select('i_id')
-            ->selectRaw('CASE WHEN COUNT(branch) > 1 THEN 0 ELSE MIN(branch) END AS branches')
-            ->groupBy('i_id');
-
-        return DB::table('maj_sosa')
-            ->rightJoinSub(
-                $consolidated_ancestors_branches,
-                'indi_branch_consolidated',
-                function (JoinClause $join) use ($gen): void {
-                    $join->where('maj_sosa.majs_gedcom_id', '=', $this->tree->id())
-                        ->where('maj_sosa.majs_user_id', '=', $this->user->id())
-                        ->where('branches', '>', 0)
-                        ->whereRaw('majs_sosa = POW(2, ? - 1) + branches - 1', [$gen]);
-                }
-            )
-            ->select(['branches', 'majs_i_id'])
-            ->selectRaw('COUNT(i_id) AS count_indi')
-            ->groupBy(['branches', 'majs_i_id'])
-            ->get()->keyBy('branches');
-    }
+		$ancestors_contributions_sum = DB::connection()->query()
+			->fromSub($root_ancestors_contributions->unionAll($known_ancestors_contributions), 'sosa_contribs')
+			->select(['sosa_contribs.gen', 'sosa_contribs.majs_gedcom_id', 'sosa_contribs.majs_user_id'])
+			->addSelect(['sosa_contribs.majs_i_id', 'sosa_contribs.contrib'])
+			->selectRaw('COUNT(' . $table_prefix . 'sosa_contribs.majs_i_id) * ' .
+				$table_prefix . 'sosa_contribs.contrib AS totalContrib')
+			->leftJoin('maj_sosa AS sosa_low', function (JoinClause $join): void {
+				$join->on('sosa_low.majs_gen', '<', 'sosa_contribs.majs_gen')
+					->on('sosa_low.majs_i_id', '=', 'sosa_contribs.majs_i_id')
+					->where('sosa_low.majs_gedcom_id', '=', $this->tree->id())
+					->where('sosa_low.majs_user_id', '=', $this->user->id());
+			})
+			->whereNull('sosa_low.majs_sosa')
+			->groupBy(['sosa_contribs.gen', 'sosa_contribs.majs_gedcom_id', 'sosa_contribs.majs_user_id',
+				'sosa_contribs.majs_i_id', 'sosa_contribs.contrib']);
+
+		// Aggregate all generation roots to compute root and generation pedigree collapse
+		$pedi_collapse_coll = DB::connection()->query()->fromSub($ancestors_contributions_sum, 'sosa_contribs_sum')
+			->select(['gen'])->selectRaw('SUM(contrib), SUM(totalContrib)')
+			->selectRaw('1 - SUM(contrib) / SUM(totalContrib) AS pedi_collapse_roots')  // Roots/horizontal collapse
+			->selectRaw('1 - SUM(totalContrib) / POWER ( 2, gen - 1) AS pedi_collapse_xgen') // Crossgeneration collapse
+			->groupBy(['gen', 'majs_gedcom_id', 'majs_user_id'])
+			->orderBy('gen')
+			->get();
+
+		$pedi_collapse_by_gen = [];
+		foreach ($pedi_collapse_coll as $collapse_gen) {
+			$pedi_collapse_by_gen[(int) $collapse_gen->gen] = array(
+				'pedi_collapse_roots'   =>  (float) $collapse_gen->pedi_collapse_roots,
+				'pedi_collapse_xgen'   =>  (float) $collapse_gen->pedi_collapse_xgen
+			);
+		}
+		return $pedi_collapse_by_gen;
+	}
+
+	/**
+	 * Return a Collection of the mean generation depth and deviation for all Sosa ancestors at a given generation.
+	 * Sosa 1 is of generation 1.
+	 *
+	 * Mean generation depth and deviation are calculated based on the works of Marie-Héléne Cazes and Pierre Cazes,
+	 * published in Population (French Edition), Vol. 51, No. 1 (Jan. - Feb., 1996), pp. 117-140
+	 * http://kintip.net/index.php?option=com_jdownloads&task=download.send&id=9&catid=4&m=0
+	 *
+	 * Format:
+	 *  - key : sosa number of the ancestor
+	 *  - values:
+	 *      - root_ancestor_id : ID of the ancestor
+	 *      - mean_gen_depth : Mean generation depth
+	 *      - stddev_gen_depth : Standard deviation of generation depth
+	 *
+	 * @param int $gen Sosa generation
+	 * @return Collection<int, \stdClass>
+	 */
+	public function generationDepthStatsAtGeneration(int $gen): Collection
+	{
+		if (!$this->isPdoSupported()) {
+			return collect();
+		}
+
+		$table_prefix = DB::connection()->getTablePrefix();
+		$missing_ancestors_by_gen = DB::table('maj_sosa AS sosa')
+			->selectRaw($table_prefix . 'sosa.majs_gen - ? AS majs_gen_norm', [$gen])
+			->selectRaw('FLOOR(((' . $table_prefix . 'sosa.majs_sosa / POW(2, ' . $table_prefix . 'sosa.majs_gen -1 )) - 1) * POWER(2, ? - 1)) + POWER(2, ? - 1) AS root_ancestor', [$gen, $gen])   //@phpcs:ignore Generic.Files.LineLength.TooLong
+			->selectRaw('SUM(CASE WHEN ' . $table_prefix . 'sosa_fat.majs_i_id IS NULL AND ' . $table_prefix . 'sosa_mot.majs_i_id IS NULL THEN 1 ELSE 0 END) AS full_root_count')  //@phpcs:ignore Generic.Files.LineLength.TooLong
+			->selectRaw('SUM(CASE WHEN ' . $table_prefix . 'sosa_fat.majs_i_id IS NULL AND ' . $table_prefix . 'sosa_mot.majs_i_id IS NULL THEN 0 ELSE 1 END) As semi_root_count')  //@phpcs:ignore Generic.Files.LineLength.TooLong
+			->leftJoin('maj_sosa AS sosa_fat', function (JoinClause $join) use ($table_prefix): void {
+				// Link to sosa's father
+				$join->whereRaw($table_prefix . 'sosa_fat.majs_sosa = 2 * ' . $table_prefix . 'sosa.majs_sosa')
+				->where('sosa_fat.majs_gedcom_id', '=', $this->tree->id())
+				->where('sosa_fat.majs_user_id', '=', $this->user->id());
+			})
+			->leftJoin('maj_sosa AS sosa_mot', function (JoinClause $join) use ($table_prefix): void {
+				// Link to sosa's mother
+				$join->whereRaw($table_prefix . 'sosa_mot.majs_sosa = 2 * ' . $table_prefix . 'sosa.majs_sosa + 1')
+				->where('sosa_mot.majs_gedcom_id', '=', $this->tree->id())
+				->where('sosa_mot.majs_user_id', '=', $this->user->id());
+			})
+			->where('sosa.majs_gedcom_id', '=', $this->tree->id())
+			->where('sosa.majs_user_id', '=', $this->user->id())
+			->where('sosa.majs_gen', '>=', $gen)
+			->where(function (Builder $query): void {
+				$query->whereNull('sosa_fat.majs_i_id')
+					->orWhereNull('sosa_mot.majs_i_id');
+			})
+			->groupBy(['sosa.majs_gen', 'root_ancestor']);
+
+		return DB::table('maj_sosa AS sosa_list')
+			->select(['stats_by_gen.root_ancestor AS root_ancestor_sosa', 'sosa_list.majs_i_id as root_ancestor_id'])
+			->selectRaw('1 + SUM( (majs_gen_norm) * ( 2 * full_root_count + semi_root_count) /  (2 * POWER(2, majs_gen_norm))) AS mean_gen_depth')  //@phpcs:ignore Generic.Files.LineLength.TooLong
+			->selectRaw(' SQRT(' .
+				'   SUM(POWER(majs_gen_norm, 2) * ( 2 * full_root_count + semi_root_count) /  (2 * POWER(2, majs_gen_norm)))' .     //@phpcs:ignore Generic.Files.LineLength.TooLong
+				'   - POWER( SUM( (majs_gen_norm) * ( 2 * full_root_count + semi_root_count) /  (2 * POWER(2, majs_gen_norm))), 2)' .       //@phpcs:ignore Generic.Files.LineLength.TooLong
+				' ) AS stddev_gen_depth')
+			->joinSub($missing_ancestors_by_gen, 'stats_by_gen', function (JoinClause $join): void {
+				$join->on('sosa_list.majs_sosa', '=', 'stats_by_gen.root_ancestor')
+					->where('sosa_list.majs_gedcom_id', '=', $this->tree->id())
+					->where('sosa_list.majs_user_id', '=', $this->user->id());
+			})
+			->groupBy(['stats_by_gen.root_ancestor', 'sosa_list.majs_i_id'])
+			->orderBy('stats_by_gen.root_ancestor')
+			->get()->keyBy('root_ancestor_sosa');
+	}
+
+	/**
+	 * Return a collection of the most duplicated root Sosa ancestors.
+	 * The number of ancestors to return is limited by the parameter $limit.
+	 * If several individuals are tied when reaching the limit, none of them are returned,
+	 * which means that there can be less individuals returned than requested.
+	 *
+	 * Format:
+	 *  - value:
+	 *      - sosa_i_id : sosa individual
+	 *      - sosa_count: number of duplications of the ancestor (e.g. 3 if it appears 3 times)
+	 *
+	 * @param int $limit
+	 * @return Collection<\stdClass>
+	 */
+	public function topMultipleAncestorsWithNoTies(int $limit): Collection
+	{
+		$table_prefix = DB::connection()->getTablePrefix();
+		$multiple_ancestors = DB::table('maj_sosa AS sosa')
+			->select('sosa.majs_i_id AS sosa_i_id')
+			->selectRaw('COUNT(' . $table_prefix . 'sosa.majs_sosa) AS sosa_count')
+			->leftJoin('maj_sosa AS sosa_fat', function (JoinClause $join) use ($table_prefix): void {
+				// Link to sosa's father
+				$join->whereRaw($table_prefix . 'sosa_fat.majs_sosa = 2 * ' . $table_prefix . 'sosa.majs_sosa')
+					->where('sosa_fat.majs_gedcom_id', '=', $this->tree->id())
+					->where('sosa_fat.majs_user_id', '=', $this->user->id());
+			})
+			->leftJoin('maj_sosa AS sosa_mot', function (JoinClause $join) use ($table_prefix): void {
+				// Link to sosa's mother
+				$join->whereRaw($table_prefix . 'sosa_mot.majs_sosa = 2 * ' . $table_prefix . 'sosa.majs_sosa + 1')
+				->where('sosa_mot.majs_gedcom_id', '=', $this->tree->id())
+				->where('sosa_mot.majs_user_id', '=', $this->user->id());
+			})
+			->where('sosa.majs_gedcom_id', '=', $this->tree->id())
+			->where('sosa.majs_user_id', '=', $this->user->id())
+			->whereNull('sosa_fat.majs_sosa')   // We keep only root individuals, i.e. those with no father or mother
+			->whereNull('sosa_mot.majs_sosa')
+			->groupBy('sosa.majs_i_id')
+			->havingRaw('COUNT(' . $table_prefix . 'sosa.majs_sosa) > 1')    // Limit to the duplicate sosas.
+			->orderByRaw('COUNT(' . $table_prefix . 'sosa.majs_sosa) DESC, MIN(' . $table_prefix . 'sosa.majs_sosa) ASC')   //@phpcs:ignore Generic.Files.LineLength.TooLong
+			->limit($limit + 1)     // We want to select one more than required, for ties
+			->get();
+
+		if ($multiple_ancestors->count() > $limit) {
+			$last_count = $multiple_ancestors->last()->sosa_count;
+			$multiple_ancestors = $multiple_ancestors->reject(
+				fn (stdClass $element): bool => $element->sosa_count ===  $last_count
+			);
+		}
+		return $multiple_ancestors;
+	}
+
+	/**
+	 * Return a computed array of statistics about the dispersion of ancestors across the ancestors
+	 * at a specified generation.
+	 *
+	 * Format:
+	 *  - key : rank of the ancestor in generation G for which exclusive ancestors have been found
+	 *          For instance 3 represent the maternal grand father
+	 *          0 is used for shared ancestors
+	 *  - values:
+	 *      - branches: same as key
+	 *      - majs_i_id: xref of the ancestor at rank key in generation G, or null for shared ancestors
+	 *      - count_indi: number of ancestors exclusively in the ancestors of the ancestor at rank key
+	 *
+	 * For instance a result at generation 3 could be :
+	 * [
+	 *  0 => { branches: 0, majs_i_id: X1, count_indi: 12 } -> 12 ancestors are shared by the grand-parents
+	 *  1 => { branches: 1, majs_i_id: X2, count_indi: 32 } -> 32 ancestors are exclusive to the paternal grand-father
+	 *  2 => { branches: 2, majs_i_id: X3, count_indi: 25 } -> 25 ancestors are exclusive to the paternal grand-mother
+	 *  3 => { branches: 3, majs_i_id: X4, count_indi: 12 } -> 12 ancestors are exclusive to the maternal grand-father
+	 *  4 => { branches: 4, majs_i_id: X5, count_indi: 30 } -> 30 ancestors are exclusive to the maternal grand-mother
+	 * ]
+	 *
+	 * @param int $gen
+	 * @return Collection<int, \stdClass>
+	 */
+	public function ancestorsDispersionForGeneration(int $gen): Collection
+	{
+		if (!$this->isPdoSupported()) {
+			return collect();
+		}
+
+		$ancestors_branches = DB::table('maj_sosa')
+			->select('majs_i_id AS i_id')
+			->selectRaw('FLOOR(majs_sosa / POW(2, (majs_gen - ?))) - POW(2, ? -1) + 1 AS branch', [$gen, $gen])
+			->where('majs_gedcom_id', '=', $this->tree->id())
+			->where('majs_user_id', '=', $this->user->id())
+			->where('majs_gen', '>=', $gen)
+			->groupBy('majs_i_id', 'branch');
+
+		$consolidated_ancestors_branches = DB::table('maj_sosa')
+			->fromSub($ancestors_branches, 'indi_branch')
+			->select('i_id')
+			->selectRaw('CASE WHEN COUNT(branch) > 1 THEN 0 ELSE MIN(branch) END AS branches')
+			->groupBy('i_id');
+
+		return DB::table('maj_sosa')
+			->rightJoinSub(
+				$consolidated_ancestors_branches,
+				'indi_branch_consolidated',
+				function (JoinClause $join) use ($gen): void {
+					$join->where('maj_sosa.majs_gedcom_id', '=', $this->tree->id())
+						->where('maj_sosa.majs_user_id', '=', $this->user->id())
+						->where('branches', '>', 0)
+						->whereRaw('majs_sosa = POW(2, ? - 1) + branches - 1', [$gen]);
+				}
+			)
+			->select(['branches', 'majs_i_id'])
+			->selectRaw('COUNT(i_id) AS count_indi')
+			->groupBy(['branches', 'majs_i_id'])
+			->get()->keyBy('branches');
+	}
 }

app/Module/Hooks/HooksModule.php

Indentation +101 added lines, -101 removed lines

@@ -42,106 +42,106 @@
  * Provide entry points to extend core webtrees code.
  */
 class HooksModule extends AbstractModule implements
-    ModuleMyArtJaubInterface,
-    ModuleConfigInterface,
-    ModuleHookSubscriberInterface
+	ModuleMyArtJaubInterface,
+	ModuleConfigInterface,
+	ModuleHookSubscriberInterface
 {
-    use ModuleMyArtJaubTrait {
-        boot as traitBoot;
-    }
-    use ModuleConfigTrait;
-
-    // How to update the database schema for this module
-    private const SCHEMA_TARGET_VERSION   = 2;
-    private const SCHEMA_SETTING_NAME     = 'MAJ_HOOKS_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 “Hooks” module */ I18N::translate('Hooks');
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\AbstractModule::description()
-     */
-    public function description(): string
-    {
-        return /* I18N: Description of the “Hooks” module */ I18N::translate('Implements hooks management.');
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\AbstractModule::boot()
-     */
-    public function boot(): void
-    {
-        $this->traitBoot();
-        app()->bind(HookServiceInterface::class, HookService::class);
-        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/hooks', static function (Map $router): void {
-
-                $router->attach('', '/config/admin', static function (Map $router): void {
-
-                    $router->get(AdminConfigPage::class, '', AdminConfigPage::class);
-                    $router->get(ModulesHooksPage::class, '/{hook_name}', ModulesHooksPage::class);
-                    $router->post(ModulesHooksAction::class, '/{hook_name}', ModulesHooksAction::class);
-                });
-            });
-        });
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleCustomInterface::customModuleVersion()
-     */
-    public function customModuleVersion(): string
-    {
-        return '2.1.6-v.1';
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleConfigInterface::getConfigLink()
-     */
-    public function getConfigLink(): string
-    {
-        return route(AdminConfigPage::class);
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\Hooks\ModuleHookSubscriberInterface::listSubscribedHooks()
-     */
-    public function listSubscribedHooks(): array
-    {
-        return [
-            app()->makeWith(FactSourceTextExtenderCollector::class, ['module' => $this]),
-            app()->makeWith(FamilyDatatablesExtenderCollector::class, ['module' => $this]),
-            app()->makeWith(IndividualDatatablesExtenderCollector::class, ['module' => $this]),
-            app()->makeWith(NameAccordionExtenderCollector::class, ['module' => $this]),
-            app()->makeWith(RecordNameTextExtenderCollector::class, ['module' => $this]),
-            app()->makeWith(SosaFamilyDatatablesExtenderCollector::class, ['module' => $this]),
-            app()->makeWith(SosaIndividualDatatablesExtenderCollector::class, ['module' => $this]),
-            app()->makeWith(SosaMissingDatatablesExtenderCollector::class, ['module' => $this])
-        ];
-    }
+	use ModuleMyArtJaubTrait {
+		boot as traitBoot;
+	}
+	use ModuleConfigTrait;
+
+	// How to update the database schema for this module
+	private const SCHEMA_TARGET_VERSION   = 2;
+	private const SCHEMA_SETTING_NAME     = 'MAJ_HOOKS_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 “Hooks” module */ I18N::translate('Hooks');
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\AbstractModule::description()
+	 */
+	public function description(): string
+	{
+		return /* I18N: Description of the “Hooks” module */ I18N::translate('Implements hooks management.');
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\AbstractModule::boot()
+	 */
+	public function boot(): void
+	{
+		$this->traitBoot();
+		app()->bind(HookServiceInterface::class, HookService::class);
+		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/hooks', static function (Map $router): void {
+
+				$router->attach('', '/config/admin', static function (Map $router): void {
+
+					$router->get(AdminConfigPage::class, '', AdminConfigPage::class);
+					$router->get(ModulesHooksPage::class, '/{hook_name}', ModulesHooksPage::class);
+					$router->post(ModulesHooksAction::class, '/{hook_name}', ModulesHooksAction::class);
+				});
+			});
+		});
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleCustomInterface::customModuleVersion()
+	 */
+	public function customModuleVersion(): string
+	{
+		return '2.1.6-v.1';
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleConfigInterface::getConfigLink()
+	 */
+	public function getConfigLink(): string
+	{
+		return route(AdminConfigPage::class);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\Hooks\ModuleHookSubscriberInterface::listSubscribedHooks()
+	 */
+	public function listSubscribedHooks(): array
+	{
+		return [
+			app()->makeWith(FactSourceTextExtenderCollector::class, ['module' => $this]),
+			app()->makeWith(FamilyDatatablesExtenderCollector::class, ['module' => $this]),
+			app()->makeWith(IndividualDatatablesExtenderCollector::class, ['module' => $this]),
+			app()->makeWith(NameAccordionExtenderCollector::class, ['module' => $this]),
+			app()->makeWith(RecordNameTextExtenderCollector::class, ['module' => $this]),
+			app()->makeWith(SosaFamilyDatatablesExtenderCollector::class, ['module' => $this]),
+			app()->makeWith(SosaIndividualDatatablesExtenderCollector::class, ['module' => $this]),
+			app()->makeWith(SosaMissingDatatablesExtenderCollector::class, ['module' => $this])
+		];
+	}
 }

app/Module/IsSourced/Hooks/IsSourcedStatusHook.php

Indentation +45 added lines, -45 removed lines

@@ -25,53 +25,53 @@
  */
 class IsSourcedStatusHook implements RecordNameTextExtenderInterface
 {
-    private ModuleInterface $module;
-    private SourceStatusService $source_status_service;
+	private ModuleInterface $module;
+	private SourceStatusService $source_status_service;
 
-    /**
-     * Constructor for IsSourcedStatusHook
-     *
-     * @param ModuleInterface $module
-     * @param SourceStatusService $source_status_service
-     */
-    public function __construct(ModuleInterface $module, SourceStatusService $source_status_service)
-    {
-        $this->module = $module;
-        $this->source_status_service = $source_status_service;
-    }
+	/**
+	 * Constructor for IsSourcedStatusHook
+	 *
+	 * @param ModuleInterface $module
+	 * @param SourceStatusService $source_status_service
+	 */
+	public function __construct(ModuleInterface $module, SourceStatusService $source_status_service)
+	{
+		$this->module = $module;
+		$this->source_status_service = $source_status_service;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\Hooks\HookInterface::module()
-     */
-    public function module(): ModuleInterface
-    {
-        return $this->module;
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\Hooks\HookInterface::module()
+	 */
+	public function module(): ModuleInterface
+	{
+		return $this->module;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\Hooks\RecordNameTextExtenderInterface::recordNamePrepend()
-     */
-    public function recordNamePrepend(GedcomRecord $record, bool $use_long = false, string $size = ''): string
-    {
-        return '';
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\Hooks\RecordNameTextExtenderInterface::recordNamePrepend()
+	 */
+	public function recordNamePrepend(GedcomRecord $record, bool $use_long = false, string $size = ''): string
+	{
+		return '';
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\Hooks\RecordNameTextExtenderInterface::recordNameAppend()
-     */
-    public function recordNameAppend(GedcomRecord $record, bool $use_long = false, string $size = ''): string
-    {
-        if ($use_long && $record instanceof Individual) {
-            return view($this->module()->name() . '::hooks/name-append', [
-                'module_name'           =>  $this->module()->name(),
-                'source_status_service' =>  $this->source_status_service,
-                'individual'            =>  $record,
-                'size_style'            =>  $size
-            ]);
-        }
-        return '';
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\Hooks\RecordNameTextExtenderInterface::recordNameAppend()
+	 */
+	public function recordNameAppend(GedcomRecord $record, bool $use_long = false, string $size = ''): string
+	{
+		if ($use_long && $record instanceof Individual) {
+			return view($this->module()->name() . '::hooks/name-append', [
+				'module_name'           =>  $this->module()->name(),
+				'source_status_service' =>  $this->source_status_service,
+				'individual'            =>  $record,
+				'size_style'            =>  $size
+			]);
+		}
+		return '';
+	}
 }

app/Common/GeoDispersion/Config/GenericPlaceMapperConfig.php

Indentation +93 added lines, -93 removed lines

@@ -25,106 +25,106 @@
  */
 class GenericPlaceMapperConfig implements PlaceMapperConfigInterface
 {
-    /** @var array<string, mixed> $config */
-    private array $config = [];
+	/** @var array<string, mixed> $config */
+	private array $config = [];
 
-    /**
-     * Get the generic mapper's config
-     *
-     * @return array<string, mixed>
-     */
-    public function config(): array
-    {
-        return $this->config;
-    }
+	/**
+	 * Get the generic mapper's config
+	 *
+	 * @return array<string, mixed>
+	 */
+	public function config(): array
+	{
+		return $this->config;
+	}
 
-    /**
-     * Set the generic mapper's config
-     *
-     * @param array<string, mixed> $config
-     * @return $this
-     */
-    public function setConfig(array $config): self
-    {
-        $this->config = $config;
-        return $this;
-    }
+	/**
+	 * Set the generic mapper's config
+	 *
+	 * @param array<string, mixed> $config
+	 * @return $this
+	 */
+	public function setConfig(array $config): self
+	{
+		$this->config = $config;
+		return $this;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperConfigInterface::get()
-     */
-    public function get(string $key, $default = null)
-    {
-        return $this->config[$key] ?? $default;
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperConfigInterface::get()
+	 */
+	public function get(string $key, $default = null)
+	{
+		return $this->config[$key] ?? $default;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperConfigInterface::has()
-     */
-    public function has(string $key): bool
-    {
-        return key_exists($key, $this->config);
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperConfigInterface::has()
+	 */
+	public function has(string $key): bool
+	{
+		return key_exists($key, $this->config);
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \JsonSerializable::jsonSerialize()
-     */
-    #[\ReturnTypeWillChange]
-    public function jsonSerialize()
-    {
-        return [
-            'class'     =>  get_class($this),
-            'config'    =>  $this->jsonSerializeConfig()
-        ];
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \JsonSerializable::jsonSerialize()
+	 */
+	#[\ReturnTypeWillChange]
+	public function jsonSerialize()
+	{
+		return [
+			'class'     =>  get_class($this),
+			'config'    =>  $this->jsonSerializeConfig()
+		];
+	}
 
-    /**
-     * Returns a representation of the mapper config compatible with Json serialisation
-     *
-     * @return mixed
-     */
-    public function jsonSerializeConfig()
-    {
-        return $this->config;
-    }
+	/**
+	 * Returns a representation of the mapper config compatible with Json serialisation
+	 *
+	 * @return mixed
+	 */
+	public function jsonSerializeConfig()
+	{
+		return $this->config;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperConfigInterface::jsonDeserialize()
-     *
-     * @param mixed $config
-     * @return $this
-     */
-    public function jsonDeserialize($config): self
-    {
-        if (is_string($config)) {
-            return $this->jsonDeserialize((array) json_decode($config));
-        }
-        if (is_array($config)) {
-            return $this->setConfig($config);
-        }
-        return $this;
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperConfigInterface::jsonDeserialize()
+	 *
+	 * @param mixed $config
+	 * @return $this
+	 */
+	public function jsonDeserialize($config): self
+	{
+		if (is_string($config)) {
+			return $this->jsonDeserialize((array) json_decode($config));
+		}
+		if (is_array($config)) {
+			return $this->setConfig($config);
+		}
+		return $this;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperConfigInterface::configContent()
-     */
-    public function configContent(ModuleInterface $module, Tree $tree): string
-    {
-        return '';
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperConfigInterface::configContent()
+	 */
+	public function configContent(ModuleInterface $module, Tree $tree): string
+	{
+		return '';
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperConfigInterface::withConfigUpdate()
-     * @return $this
-     */
-    public function withConfigUpdate(ServerRequestInterface $request): self
-    {
-        return $this;
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperConfigInterface::withConfigUpdate()
+	 * @return $this
+	 */
+	public function withConfigUpdate(ServerRequestInterface $request): self
+	{
+		return $this;
+	}
 }

app/Common/GeoDispersion/Config/NullPlaceMapperConfig.php

Indentation +53 added lines, -53 removed lines

@@ -26,62 +26,62 @@
  */
 class NullPlaceMapperConfig implements PlaceMapperConfigInterface
 {
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperConfigInterface::get()
-     */
-    public function get(string $key, $default = null)
-    {
-        return $default;
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperConfigInterface::get()
+	 */
+	public function get(string $key, $default = null)
+	{
+		return $default;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperConfigInterface::has()
-     */
-    public function has(string $key): bool
-    {
-        return false;
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperConfigInterface::has()
+	 */
+	public function has(string $key): bool
+	{
+		return false;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperConfigInterface::jsonDeserialize()
-     *
-     * @param mixed $config
-     * @return $this
-     */
-    public function jsonDeserialize($config): self
-    {
-        return $this;
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperConfigInterface::jsonDeserialize()
+	 *
+	 * @param mixed $config
+	 * @return $this
+	 */
+	public function jsonDeserialize($config): self
+	{
+		return $this;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see JsonSerializable::jsonSerialize()
-     */
-    #[\ReturnTypeWillChange]
-    public function jsonSerialize()
-    {
-        return [];
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see JsonSerializable::jsonSerialize()
+	 */
+	#[\ReturnTypeWillChange]
+	public function jsonSerialize()
+	{
+		return [];
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperConfigInterface::configContent()
-     */
-    public function configContent(ModuleInterface $module, Tree $tree): string
-    {
-        return '';
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperConfigInterface::configContent()
+	 */
+	public function configContent(ModuleInterface $module, Tree $tree): string
+	{
+		return '';
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperConfigInterface::withConfigUpdate()
-     * @return $this
-     */
-    public function withConfigUpdate(ServerRequestInterface $request): self
-    {
-        return $this;
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperConfigInterface::withConfigUpdate()
+	 * @return $this
+	 */
+	public function withConfigUpdate(ServerRequestInterface $request): self
+	{
+		return $this;
+	}
 }