jon48 / webtrees-lib

app/Contracts/Tasks/TaskInterface.php

Indentation +19 added lines, -19 removed lines

@@ -19,25 +19,25 @@
  */
 interface TaskInterface
 {
-    /**
-     * Display name of the task
-     *
-     * @return string
-     */
-    public function name(): string;
+	/**
+	 * Display name of the task
+	 *
+	 * @return string
+	 */
+	public function name(): string;
     
-    /**
-     * Return the default frequency for the execution of the task, in minutes.
-     *
-     * @return int Frequency for the execution of the task
-     */
-    public function defaultFrequency(): int;
+	/**
+	 * Return the default frequency for the execution of the task, in minutes.
+	 *
+	 * @return int Frequency for the execution of the task
+	 */
+	public function defaultFrequency(): int;
     
-    /**
-     * Run the task's actions, and return whether the execution has been successful.
-     *
-     * @param TaskSchedule $task_schedule
-     * @return bool Has the execution been a success
-     */
-    public function run(TaskSchedule $task_schedule): bool;
+	/**
+	 * Run the task's actions, and return whether the execution has been successful.
+	 *
+	 * @param TaskSchedule $task_schedule
+	 * @return bool Has the execution been a success
+	 */
+	public function run(TaskSchedule $task_schedule): bool;
 }

app/Contracts/Tasks/ConfigurableTaskInterface.php

Indentation +15 added lines, -15 removed lines

@@ -22,20 +22,20 @@
 interface ConfigurableTaskInterface
 {
     
-    /**
-     * Returns the HTML code to display the specific task configuration.
-     *
-     * @param ServerRequestInterface $request
-     * @return string HTML code
-     */
-    public function configView(ServerRequestInterface $request): string;
+	/**
+	 * Returns the HTML code to display the specific task configuration.
+	 *
+	 * @param ServerRequestInterface $request
+	 * @return string HTML code
+	 */
+	public function configView(ServerRequestInterface $request): string;
  
-    /**
-     * Update the specific configuration of the task.
-     *
-     * @param ServerRequestInterface $request
-     * @param TaskSchedule $task_schedule
-     * @return bool Result of the update
-     */
-    public function updateConfig(ServerRequestInterface $request, TaskSchedule $task_schedule): bool;
+	/**
+	 * Update the specific configuration of the task.
+	 *
+	 * @param ServerRequestInterface $request
+	 * @param TaskSchedule $task_schedule
+	 * @return bool Result of the update
+	 */
+	public function updateConfig(ServerRequestInterface $request, TaskSchedule $task_schedule): bool;
 }

app/Contracts/Tasks/ModuleTasksProviderInterface.php

Indentation +7 added lines, -7 removed lines

@@ -20,11 +20,11 @@
 interface ModuleTasksProviderInterface
 {
     
-    /**
-     * List tasks provided by the module as an associative array.
-     * They keys are used as task IDs for storage and reference.
-     *
-     * @return array<string, string> List of tasks
-     */
-    public function listTasks(): array;
+	/**
+	 * List tasks provided by the module as an associative array.
+	 * They keys are used as task IDs for storage and reference.
+	 *
+	 * @return array<string, string> List of tasks
+	 */
+	public function listTasks(): array;
 }

app/Module/PatronymicLineage/PatronymicLineageModule.php

Indentation +95 added lines, -95 removed lines

@@ -34,100 +34,100 @@
  * Display lineages of people with the same surname.
  */
 class PatronymicLineageModule extends IndividualListModule implements
-    ModuleMyArtJaubInterface,
-    ModuleListInterface,
-    ModuleGlobalInterface
+	ModuleMyArtJaubInterface,
+	ModuleListInterface,
+	ModuleGlobalInterface
 {
-    use ModuleMyArtJaubTrait;
-    use ModuleListTrait;
-    use ModuleGlobalTrait;
-
-     /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\AbstractModule::title()
-     */
-    public function title(): string
-    {
-        return /* I18N: Name of the “Patronymic lineage” module */ I18N::translate('Patronymic Lineages');
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\AbstractModule::description()
-     */
-    public function description(): string
-    {
-        //phpcs:ignore Generic.Files.LineLength.TooLong
-        return /* I18N: Description of the “Patronymic lineage” module */ I18N::translate('Display lineages of people holding the same surname.');
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\ModuleMyArtJaubInterface::loadRoutes()
-     */
-    public function loadRoutes(Map $router): void
-    {
-        $router->attach('', '', static function (Map $router): void {
-
-            $router->attach('', '/module-maj/lineages', static function (Map $router): void {
-
-                $router->attach('', '/Page', static function (Map $router): void {
-
-                    $router->get(SurnamesList::class, '/{tree}/list{/alpha}', SurnamesList::class);
-                    $router->get(LineagesPage::class, '/{tree}/lineage/{surname}', LineagesPage::class);
-                });
-            });
-        });
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleCustomInterface::customModuleVersion()
-     */
-    public function customModuleVersion(): string
-    {
-        return '2.0.11-v.1';
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleListInterface::listUrl()
-     */
-    public function listUrl(Tree $tree, array $parameters = []): string
-    {
-        $surname = $parameters['surname'] ?? '';
-
-        $xref = app(ServerRequestInterface::class)->getAttribute('xref', '');
-        if ($xref !== '' && ($individual = Registry::individualFactory()->make($xref, $tree)) !== null) {
-            $surname = $individual->getAllNames()[$individual->getPrimaryName()]['surname'];
-        }
-
-        if ($surname !== '') {
-            return route(LineagesPage::class, [
-                'tree'      =>  $tree->name(),
-                'surname'   =>  $surname
-            ] + $parameters);
-        }
-        return route(SurnamesList::class, [
-            'tree'  =>  $tree->name()
-        ] + $parameters);
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleListInterface::listMenuClass()
-     */
-    public function listMenuClass(): string
-    {
-        return 'menu-maj-patrolineage';
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleGlobalInterface::headContent()
-     */
-    public function headContent(): string
-    {
-        return '<link rel="stylesheet" href="' . e($this->moduleCssUrl()) . '">';
-    }
+	use ModuleMyArtJaubTrait;
+	use ModuleListTrait;
+	use ModuleGlobalTrait;
+
+	 /**
+	  * {@inheritDoc}
+	  * @see \Fisharebest\Webtrees\Module\AbstractModule::title()
+	  */
+	public function title(): string
+	{
+		return /* I18N: Name of the “Patronymic lineage” module */ I18N::translate('Patronymic Lineages');
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\AbstractModule::description()
+	 */
+	public function description(): string
+	{
+		//phpcs:ignore Generic.Files.LineLength.TooLong
+		return /* I18N: Description of the “Patronymic lineage” module */ I18N::translate('Display lineages of people holding the same surname.');
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Module\ModuleMyArtJaubInterface::loadRoutes()
+	 */
+	public function loadRoutes(Map $router): void
+	{
+		$router->attach('', '', static function (Map $router): void {
+
+			$router->attach('', '/module-maj/lineages', static function (Map $router): void {
+
+				$router->attach('', '/Page', static function (Map $router): void {
+
+					$router->get(SurnamesList::class, '/{tree}/list{/alpha}', SurnamesList::class);
+					$router->get(LineagesPage::class, '/{tree}/lineage/{surname}', LineagesPage::class);
+				});
+			});
+		});
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleCustomInterface::customModuleVersion()
+	 */
+	public function customModuleVersion(): string
+	{
+		return '2.0.11-v.1';
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleListInterface::listUrl()
+	 */
+	public function listUrl(Tree $tree, array $parameters = []): string
+	{
+		$surname = $parameters['surname'] ?? '';
+
+		$xref = app(ServerRequestInterface::class)->getAttribute('xref', '');
+		if ($xref !== '' && ($individual = Registry::individualFactory()->make($xref, $tree)) !== null) {
+			$surname = $individual->getAllNames()[$individual->getPrimaryName()]['surname'];
+		}
+
+		if ($surname !== '') {
+			return route(LineagesPage::class, [
+				'tree'      =>  $tree->name(),
+				'surname'   =>  $surname
+			] + $parameters);
+		}
+		return route(SurnamesList::class, [
+			'tree'  =>  $tree->name()
+		] + $parameters);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleListInterface::listMenuClass()
+	 */
+	public function listMenuClass(): string
+	{
+		return 'menu-maj-patrolineage';
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleGlobalInterface::headContent()
+	 */
+	public function headContent(): string
+	{
+		return '<link rel="stylesheet" href="' . e($this->moduleCssUrl()) . '">';
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -61,11 +61,11 @@ 
      */
     public function loadRoutes(Map $router): void
     {
-        $router->attach('', '', static function (Map $router): void {
+        $router->attach('', '', static function(Map $router): void {
 
-            $router->attach('', '/module-maj/lineages', static function (Map $router): void {
+            $router->attach('', '/module-maj/lineages', static function(Map $router): void {
 
-                $router->attach('', '/Page', static function (Map $router): void {
+                $router->attach('', '/Page', static function(Map $router): void {
 
                     $router->get(SurnamesList::class, '/{tree}/list{/alpha}', SurnamesList::class);
                     $router->get(LineagesPage::class, '/{tree}/lineage/{surname}', LineagesPage::class);
@@ -122,6 +122,6 @@ 
      */
     public function headContent(): string
     {
-        return '<link rel="stylesheet" href="' . e($this->moduleCssUrl()) . '">';
+        return '<link rel="stylesheet" href="'.e($this->moduleCssUrl()).'">';
     }
 }

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

Indentation +65 added lines, -65 removed lines

@@ -31,69 +31,69 @@
  */
 class LineagesPage implements RequestHandlerInterface
 {
-    use ViewResponseTrait;
-
-    /**
-     * @var PatronymicLineageModule|null $module
-     */
-    private $module;
-
-    /**
-     * @var IndividualListModule|null $indilist_module
-     */
-    private $indilist_module;
-
-    /**
-     * Constructor for LineagesPage Request handler
-     *
-     * @param ModuleService $module_service
-     */
-    public function __construct(ModuleService $module_service)
-    {
-        $this->module = $module_service->findByInterface(PatronymicLineageModule::class)->first();
-        $this->indilist_module = $module_service->findByInterface(IndividualListModule::class)->first();
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        if ($this->module === null) {
-            throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
-        }
-
-        if ($this->indilist_module === null) {
-            throw new HttpNotFoundException(I18N::translate('There is no module to handle individual lists.'));
-        }
-
-        $tree = $request->getAttribute('tree');
-        assert($tree instanceof Tree);
-
-        $surname = $request->getAttribute('surname');
-
-        $initial = mb_substr($surname, 0, 1);
-        $initials_list = collect($this->indilist_module->surnameAlpha($tree, false, false, I18N::locale()))
-            ->reject(function (int $count, string $initial): bool {
-
-                return $initial === '@' || $initial === ',';
-            });
-
-        $title = I18N::translate('Patronymic Lineages') . ' — ' . $surname;
-
-        $lineages = app()->make(LineageBuilder::class, ['surname' => $surname])->buildLineages();
-
-        return $this->viewResponse($this->module->name() . '::lineages-page', [
-            'title'         =>  $title,
-            'module'        =>  $this->module,
-            'tree'          =>  $tree,
-            'initials_list' =>  $initials_list,
-            'initial'       =>  $initial,
-            'show_all'      =>  'no',
-            'surname'       =>  $surname,
-            'lineages'      =>  $lineages,
-            'nb_lineages'   =>  $lineages !== null ? $lineages->count() : 0
-        ]);
-    }
+	use ViewResponseTrait;
+
+	/**
+	 * @var PatronymicLineageModule|null $module
+	 */
+	private $module;
+
+	/**
+	 * @var IndividualListModule|null $indilist_module
+	 */
+	private $indilist_module;
+
+	/**
+	 * Constructor for LineagesPage Request handler
+	 *
+	 * @param ModuleService $module_service
+	 */
+	public function __construct(ModuleService $module_service)
+	{
+		$this->module = $module_service->findByInterface(PatronymicLineageModule::class)->first();
+		$this->indilist_module = $module_service->findByInterface(IndividualListModule::class)->first();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		if ($this->module === null) {
+			throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
+		}
+
+		if ($this->indilist_module === null) {
+			throw new HttpNotFoundException(I18N::translate('There is no module to handle individual lists.'));
+		}
+
+		$tree = $request->getAttribute('tree');
+		assert($tree instanceof Tree);
+
+		$surname = $request->getAttribute('surname');
+
+		$initial = mb_substr($surname, 0, 1);
+		$initials_list = collect($this->indilist_module->surnameAlpha($tree, false, false, I18N::locale()))
+			->reject(function (int $count, string $initial): bool {
+
+				return $initial === '@' || $initial === ',';
+			});
+
+		$title = I18N::translate('Patronymic Lineages') . ' — ' . $surname;
+
+		$lineages = app()->make(LineageBuilder::class, ['surname' => $surname])->buildLineages();
+
+		return $this->viewResponse($this->module->name() . '::lineages-page', [
+			'title'         =>  $title,
+			'module'        =>  $this->module,
+			'tree'          =>  $tree,
+			'initials_list' =>  $initials_list,
+			'initial'       =>  $initial,
+			'show_all'      =>  'no',
+			'surname'       =>  $surname,
+			'lineages'      =>  $lineages,
+			'nb_lineages'   =>  $lineages !== null ? $lineages->count() : 0
+		]);
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -75,16 +75,16 @@
 
         $initial = mb_substr($surname, 0, 1);
         $initials_list = collect($this->indilist_module->surnameAlpha($tree, false, false, I18N::locale()))
-            ->reject(function (int $count, string $initial): bool {
+            ->reject(function(int $count, string $initial): bool {
 
                 return $initial === '@' || $initial === ',';
             });
 
-        $title = I18N::translate('Patronymic Lineages') . ' — ' . $surname;
+        $title = I18N::translate('Patronymic Lineages').' — '.$surname;
 
         $lineages = app()->make(LineageBuilder::class, ['surname' => $surname])->buildLineages();
 
-        return $this->viewResponse($this->module->name() . '::lineages-page', [
+        return $this->viewResponse($this->module->name().'::lineages-page', [
             'title'         =>  $title,
             'module'        =>  $this->module,
             'tree'          =>  $tree,

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

Indentation +70 added lines, -70 removed lines

@@ -30,74 +30,74 @@
  */
 class SurnamesList implements RequestHandlerInterface
 {
-    use ViewResponseTrait;
-
-    /**
-     * @var PatronymicLineageModule|null $module
-     */
-    private $module;
-
-    /**
-     * @var IndividualListModule|null $indilist_module
-     */
-    private $indilist_module;
-
-    /**
-     * Constructor for SurnamesList Request Handler
-     *
-     * @param ModuleService $module_service
-     */
-    public function __construct(ModuleService $module_service)
-    {
-        $this->module = $module_service->findByInterface(PatronymicLineageModule::class)->first();
-        $this->indilist_module = $module_service->findByInterface(IndividualListModule::class)->first();
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        if ($this->module === null) {
-            throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
-        }
-
-        if ($this->indilist_module === null) {
-            throw new HttpNotFoundException(I18N::translate('There is no module to handle individual lists.'));
-        }
-
-        $tree = $request->getAttribute('tree');
-        assert($tree instanceof Tree);
-
-        $initial = $request->getAttribute('alpha');
-        $initials_list = collect($this->indilist_module->surnameAlpha($tree, false, false, I18N::locale()))
-            ->reject(function (int $count, string $initial): bool {
-
-                return $initial === '@' || $initial === ',';
-            });
-
-        $show_all = $request->getQueryParams()['show_all'] ?? 'no';
-
-        if ($show_all === 'yes') {
-            $title = I18N::translate('Patronymic Lineages') . ' — ' . I18N::translate('All');
-            $surnames = $this->indilist_module->surnames($tree, '', '', false, false, I18N::locale());
-        } elseif ($initial !== null && mb_strlen($initial) == 1) {
-            $title = I18N::translate('Patronymic Lineages') . ' — ' . $initial;
-            $surnames = $this->indilist_module->surnames($tree, '', $initial, false, false, I18N::locale());
-        } else {
-            $title =  I18N::translate('Patronymic Lineages');
-            $surnames = [];
-        }
-
-        return $this->viewResponse($this->module->name() . '::surnames-page', [
-            'title'         =>  $title,
-            'module'        =>  $this->module,
-            'tree'          =>  $tree,
-            'initials_list' =>  $initials_list,
-            'initial'       =>  $initial,
-            'show_all'      =>  $show_all,
-            'surnames'      =>  $surnames
-        ]);
-    }
+	use ViewResponseTrait;
+
+	/**
+	 * @var PatronymicLineageModule|null $module
+	 */
+	private $module;
+
+	/**
+	 * @var IndividualListModule|null $indilist_module
+	 */
+	private $indilist_module;
+
+	/**
+	 * Constructor for SurnamesList Request Handler
+	 *
+	 * @param ModuleService $module_service
+	 */
+	public function __construct(ModuleService $module_service)
+	{
+		$this->module = $module_service->findByInterface(PatronymicLineageModule::class)->first();
+		$this->indilist_module = $module_service->findByInterface(IndividualListModule::class)->first();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		if ($this->module === null) {
+			throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
+		}
+
+		if ($this->indilist_module === null) {
+			throw new HttpNotFoundException(I18N::translate('There is no module to handle individual lists.'));
+		}
+
+		$tree = $request->getAttribute('tree');
+		assert($tree instanceof Tree);
+
+		$initial = $request->getAttribute('alpha');
+		$initials_list = collect($this->indilist_module->surnameAlpha($tree, false, false, I18N::locale()))
+			->reject(function (int $count, string $initial): bool {
+
+				return $initial === '@' || $initial === ',';
+			});
+
+		$show_all = $request->getQueryParams()['show_all'] ?? 'no';
+
+		if ($show_all === 'yes') {
+			$title = I18N::translate('Patronymic Lineages') . ' — ' . I18N::translate('All');
+			$surnames = $this->indilist_module->surnames($tree, '', '', false, false, I18N::locale());
+		} elseif ($initial !== null && mb_strlen($initial) == 1) {
+			$title = I18N::translate('Patronymic Lineages') . ' — ' . $initial;
+			$surnames = $this->indilist_module->surnames($tree, '', $initial, false, false, I18N::locale());
+		} else {
+			$title =  I18N::translate('Patronymic Lineages');
+			$surnames = [];
+		}
+
+		return $this->viewResponse($this->module->name() . '::surnames-page', [
+			'title'         =>  $title,
+			'module'        =>  $this->module,
+			'tree'          =>  $tree,
+			'initials_list' =>  $initials_list,
+			'initial'       =>  $initial,
+			'show_all'      =>  $show_all,
+			'surnames'      =>  $surnames
+		]);
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -72,7 +72,7 @@ 
 
         $initial = $request->getAttribute('alpha');
         $initials_list = collect($this->indilist_module->surnameAlpha($tree, false, false, I18N::locale()))
-            ->reject(function (int $count, string $initial): bool {
+            ->reject(function(int $count, string $initial): bool {
 
                 return $initial === '@' || $initial === ',';
             });
@@ -80,17 +80,17 @@ 
         $show_all = $request->getQueryParams()['show_all'] ?? 'no';
 
         if ($show_all === 'yes') {
-            $title = I18N::translate('Patronymic Lineages') . ' — ' . I18N::translate('All');
+            $title = I18N::translate('Patronymic Lineages').' — '.I18N::translate('All');
             $surnames = $this->indilist_module->surnames($tree, '', '', false, false, I18N::locale());
         } elseif ($initial !== null && mb_strlen($initial) == 1) {
-            $title = I18N::translate('Patronymic Lineages') . ' — ' . $initial;
+            $title = I18N::translate('Patronymic Lineages').' — '.$initial;
             $surnames = $this->indilist_module->surnames($tree, '', $initial, false, false, I18N::locale());
         } else {
-            $title =  I18N::translate('Patronymic Lineages');
+            $title = I18N::translate('Patronymic Lineages');
             $surnames = [];
         }
 
-        return $this->viewResponse($this->module->name() . '::surnames-page', [
+        return $this->viewResponse($this->module->name().'::surnames-page', [
             'title'         =>  $title,
             'module'        =>  $this->module,
             'tree'          =>  $tree,

app/Module/PatronymicLineage/Model/LineageNode.php

Spacing +2 added lines, -2 removed lines

@@ -68,7 +68,7 @@ 
     public function addFamily(Family $fams): object
     {
         if (!$this->linked_fams->has($fams->xref())) {
-            $this->linked_fams->put($fams->xref(), (object) [
+            $this->linked_fams->put($fams->xref(), (object)[
                 'family'   =>  $fams,
                 'children' =>  new Collection()
             ]);
@@ -135,6 +135,6 @@ 
      */
     public function hasFollowUpSurname(): bool
     {
-        return mb_strlen($this->followUpSurname()) > 0 ;
+        return mb_strlen($this->followUpSurname()) > 0;
     }
 }

Indentation +93 added lines, -93 removed lines

@@ -25,106 +25,106 @@
 class LineageNode
 {
 
-    /**
-     * @var Collection<string, stdClass>  $linked_fams Spouse families linked to the node
-     */
-    private Collection $linked_fams;
+	/**
+	 * @var Collection<string, stdClass>  $linked_fams Spouse families linked to the node
+	 */
+	private Collection $linked_fams;
 
-    private ?Individual $node_indi;
-    private LineageRootNode $root_node;
-    private ?string $alt_surname;
+	private ?Individual $node_indi;
+	private LineageRootNode $root_node;
+	private ?string $alt_surname;
 
-    /**
-     * Constructor for Lineage node
-     *
-     * @param Individual $node_indi Main individual
-     * @param LineageRootNode $root_node Node of the lineage root
-     * @param null|string $alt_surname Follow-up surname
-     */
-    public function __construct(?Individual $node_indi = null, LineageRootNode $root_node, $alt_surname = null)
-    {
-        $this->node_indi = $node_indi;
-        $this->root_node = $root_node;
-        $this->alt_surname = $alt_surname;
-        $this->linked_fams = new Collection();
-    }
+	/**
+	 * Constructor for Lineage node
+	 *
+	 * @param Individual $node_indi Main individual
+	 * @param LineageRootNode $root_node Node of the lineage root
+	 * @param null|string $alt_surname Follow-up surname
+	 */
+	public function __construct(?Individual $node_indi = null, LineageRootNode $root_node, $alt_surname = null)
+	{
+		$this->node_indi = $node_indi;
+		$this->root_node = $root_node;
+		$this->alt_surname = $alt_surname;
+		$this->linked_fams = new Collection();
+	}
 
-    /**
-     * Add a spouse family to the node
-     *
-     * @param Family $fams
-     * @return stdClass
-     */
-    public function addFamily(Family $fams): object
-    {
-        if (!$this->linked_fams->has($fams->xref())) {
-            $this->linked_fams->put($fams->xref(), (object) [
-                'family'   =>  $fams,
-                'children' =>  new Collection()
-            ]);
-        }
-        return $this->linked_fams->get($fams->xref());
-    }
+	/**
+	 * Add a spouse family to the node
+	 *
+	 * @param Family $fams
+	 * @return stdClass
+	 */
+	public function addFamily(Family $fams): object
+	{
+		if (!$this->linked_fams->has($fams->xref())) {
+			$this->linked_fams->put($fams->xref(), (object) [
+				'family'   =>  $fams,
+				'children' =>  new Collection()
+			]);
+		}
+		return $this->linked_fams->get($fams->xref());
+	}
 
-    /**
-     * Add a child LineageNode to the node
-     *
-     * @param Family $fams
-     * @param LineageNode $child
-     */
-    public function addChild(Family $fams, LineageNode $child = null): void
-    {
-        $this->addFamily($fams)->children->push($child);
-        $this->root_node->incrementChildNodes();
-    }
+	/**
+	 * Add a child LineageNode to the node
+	 *
+	 * @param Family $fams
+	 * @param LineageNode $child
+	 */
+	public function addChild(Family $fams, LineageNode $child = null): void
+	{
+		$this->addFamily($fams)->children->push($child);
+		$this->root_node->incrementChildNodes();
+	}
 
-    /**
-     * Returns the node individual
-     *
-     * @return Individual|NULL
-     */
-    public function individual(): ?Individual
-    {
-        return $this->node_indi;
-    }
+	/**
+	 * Returns the node individual
+	 *
+	 * @return Individual|NULL
+	 */
+	public function individual(): ?Individual
+	{
+		return $this->node_indi;
+	}
 
-    /**
-     * Returns the lineage root node individual
-     *
-     * @return LineageRootNode
-     */
-    public function rootNode(): LineageRootNode
-    {
-        return $this->root_node;
-    }
+	/**
+	 * Returns the lineage root node individual
+	 *
+	 * @return LineageRootNode
+	 */
+	public function rootNode(): LineageRootNode
+	{
+		return $this->root_node;
+	}
 
-    /**
-     * Returns the spouse families linked to the node
-     *
-     * @return Collection<string, \stdClass>
-     */
-    public function families(): Collection
-    {
-        return $this->linked_fams;
-    }
+	/**
+	 * Returns the spouse families linked to the node
+	 *
+	 * @return Collection<string, \stdClass>
+	 */
+	public function families(): Collection
+	{
+		return $this->linked_fams;
+	}
 
-    /**
-     * Returns the follow-up surname
-     *
-     * @return string
-     */
-    public function followUpSurname(): string
-    {
-        return $this->alt_surname ?? '';
-    }
+	/**
+	 * Returns the follow-up surname
+	 *
+	 * @return string
+	 */
+	public function followUpSurname(): string
+	{
+		return $this->alt_surname ?? '';
+	}
 
-    /**
-     * Indicates whether the node has a follow up surname
-     *
-     * @return boolean
-     */
-    public function hasFollowUpSurname(): bool
-    {
-        return mb_strlen($this->followUpSurname()) > 0 ;
-    }
+	/**
+	 * Indicates whether the node has a follow up surname
+	 *
+	 * @return boolean
+	 */
+	public function hasFollowUpSurname(): bool
+	{
+		return mb_strlen($this->followUpSurname()) > 0 ;
+	}
 }

app/Module/PatronymicLineage/Model/LineageRootNode.php

Indentation +58 added lines, -58 removed lines

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

app/Module/PatronymicLineage/Model/LineageBuilder.php

Spacing +1 added lines, -1 removed lines

@@ -107,7 +107,7 @@
             }
         }
       
-        return $root_lineages->sort(function (LineageRootNode $a, LineageRootNode $b) {
+        return $root_lineages->sort(function(LineageRootNode $a, LineageRootNode $b) {
 
             if ($a->numberChildNodes() == $b->numberChildNodes()) {
                 return 0;

Indentation +206 added lines, -206 removed lines

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