jon48 / webtrees-lib

app/Module/GeoDispersion/PlaceMappers/Config/FilteredTopPlaceMapperConfig.php

Indentation +99 added lines, -99 removed lines

@@ -29,111 +29,111 @@
  */
 class FilteredTopPlaceMapperConfig extends GenericPlaceMapperConfig
 {
-    private TreeService $tree_service;
+	private TreeService $tree_service;
 
-    /**
-     * FilteredTopPlaceMapperConfig
-     *
-     * @param TreeService $tree_service
-     */
-    public function __construct(TreeService $tree_service)
-    {
-        $this->tree_service = $tree_service;
-    }
+	/**
+	 * FilteredTopPlaceMapperConfig
+	 *
+	 * @param TreeService $tree_service
+	 */
+	public function __construct(TreeService $tree_service)
+	{
+		$this->tree_service = $tree_service;
+	}
 
-    /**
-     * Get the configured Top Places to filter on
-     *
-     * @return Collection<Place>
-     */
-    public function topPlaces(): Collection
-    {
-        return collect($this->get('topPlaces', []))
-            ->filter(
-                /** @psalm-suppress MissingClosureParamType */
-                fn($item): bool => $item instanceof Place
-            );
-    }
+	/**
+	 * Get the configured Top Places to filter on
+	 *
+	 * @return Collection<Place>
+	 */
+	public function topPlaces(): Collection
+	{
+		return collect($this->get('topPlaces', []))
+			->filter(
+				/** @psalm-suppress MissingClosureParamType */
+				fn($item): bool => $item instanceof Place
+			);
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Common\GeoDispersion\Config\GenericPlaceMapperConfig::jsonSerializeConfig()
-     */
-    public function jsonSerializeConfig()
-    {
-        return [
-            'topPlaces' => $this->topPlaces()
-                ->map(fn(Place $place): array => [ $place->tree()->id(), $place->gedcomName() ])
-                ->toArray()
-        ];
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Common\GeoDispersion\Config\GenericPlaceMapperConfig::jsonSerializeConfig()
+	 */
+	public function jsonSerializeConfig()
+	{
+		return [
+			'topPlaces' => $this->topPlaces()
+				->map(fn(Place $place): array => [ $place->tree()->id(), $place->gedcomName() ])
+				->toArray()
+		];
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Common\GeoDispersion\Config\GenericPlaceMapperConfig::jsonDeserialize()
-     *
-     * @param mixed $config
-     * @return $this
-     */
-    public function jsonDeserialize($config): self
-    {
-        if (is_string($config)) {
-            return $this->jsonDeserialize(json_decode($config));
-        }
-        if (is_array($config)) {
-            $this->setConfig([
-                'topPlaces' => collect($config['topPlaces'] ?? [])
-                    ->filter(
-                        /** @psalm-suppress MissingClosureParamType */
-                        fn($item): bool => is_array($item) && count($item) === 2
-                    )->map(function (array $item): ?Place {
-                        try {
-                            return new Place($item[1], $this->tree_service->find($item[0]));
-                        } catch (RuntimeException $ex) {
-                            return null;
-                        }
-                    })
-                    ->filter()
-                    ->toArray()
-                ]);
-        }
-        return $this;
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Common\GeoDispersion\Config\GenericPlaceMapperConfig::jsonDeserialize()
+	 *
+	 * @param mixed $config
+	 * @return $this
+	 */
+	public function jsonDeserialize($config): self
+	{
+		if (is_string($config)) {
+			return $this->jsonDeserialize(json_decode($config));
+		}
+		if (is_array($config)) {
+			$this->setConfig([
+				'topPlaces' => collect($config['topPlaces'] ?? [])
+					->filter(
+						/** @psalm-suppress MissingClosureParamType */
+						fn($item): bool => is_array($item) && count($item) === 2
+					)->map(function (array $item): ?Place {
+						try {
+							return new Place($item[1], $this->tree_service->find($item[0]));
+						} catch (RuntimeException $ex) {
+							return null;
+						}
+					})
+					->filter()
+					->toArray()
+				]);
+		}
+		return $this;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Common\GeoDispersion\Config\GenericPlaceMapperConfig::configContent()
-     */
-    public function configContent(ModuleInterface $module, Tree $tree): string
-    {
-        return view($module->name() . '::mappers/filtered-top-config', [
-            'tree'          =>  $tree,
-            'top_places'    =>  $this->topPlaces()
-        ]);
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Common\GeoDispersion\Config\GenericPlaceMapperConfig::configContent()
+	 */
+	public function configContent(ModuleInterface $module, Tree $tree): string
+	{
+		return view($module->name() . '::mappers/filtered-top-config', [
+			'tree'          =>  $tree,
+			'top_places'    =>  $this->topPlaces()
+		]);
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Common\GeoDispersion\Config\GenericPlaceMapperConfig::withConfigUpdate()
-     * @return $this
-     */
-    public function withConfigUpdate(ServerRequestInterface $request): self
-    {
-        $tree = Validator::attributes($request)->treeOptional();
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Common\GeoDispersion\Config\GenericPlaceMapperConfig::withConfigUpdate()
+	 * @return $this
+	 */
+	public function withConfigUpdate(ServerRequestInterface $request): self
+	{
+		$tree = Validator::attributes($request)->treeOptional();
 
-        if ($tree === null) {
-            return $this;
-        }
+		if ($tree === null) {
+			return $this;
+		}
 
-        $top_places = Validator::parsedBody($request)->array('mapper_filt_top_places');
-        $config = ['topPlaces' => []];
-        foreach ($top_places as $top_place_id) {
-            $place = Place::find((int) $top_place_id, $tree);
-            if (mb_strlen($place->gedcomName()) > 0) {
-                $config['topPlaces'][] = $place;
-            }
-        }
-        $this->setConfig($config);
-        return $this;
-    }
+		$top_places = Validator::parsedBody($request)->array('mapper_filt_top_places');
+		$config = ['topPlaces' => []];
+		foreach ($top_places as $top_place_id) {
+			$place = Place::find((int) $top_place_id, $tree);
+			if (mb_strlen($place->gedcomName()) > 0) {
+				$config['topPlaces'][] = $place;
+			}
+		}
+		$this->setConfig($config);
+		return $this;
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -63,7 +63,7 @@ 
     {
         return [
             'topPlaces' => $this->topPlaces()
-                ->map(fn(Place $place): array => [ $place->tree()->id(), $place->gedcomName() ])
+                ->map(fn(Place $place): array => [$place->tree()->id(), $place->gedcomName()])
                 ->toArray()
         ];
     }
@@ -86,7 +86,7 @@ 
                     ->filter(
                         /** @psalm-suppress MissingClosureParamType */
                         fn($item): bool => is_array($item) && count($item) === 2
-                    )->map(function (array $item): ?Place {
+                    )->map(function(array $item): ?Place {
                         try {
                             return new Place($item[1], $this->tree_service->find($item[0]));
                         } catch (RuntimeException $ex) {
@@ -106,7 +106,7 @@ 
      */
     public function configContent(ModuleInterface $module, Tree $tree): string
     {
-        return view($module->name() . '::mappers/filtered-top-config', [
+        return view($module->name().'::mappers/filtered-top-config', [
             'tree'          =>  $tree,
             'top_places'    =>  $this->topPlaces()
         ]);
@@ -128,7 +128,7 @@ 
         $top_places = Validator::parsedBody($request)->array('mapper_filt_top_places');
         $config = ['topPlaces' => []];
         foreach ($top_places as $top_place_id) {
-            $place = Place::find((int) $top_place_id, $tree);
+            $place = Place::find((int)$top_place_id, $tree);
             if (mb_strlen($place->gedcomName()) > 0) {
                 $config['topPlaces'][] = $place;
             }

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

Indentation +47 added lines, -47 removed lines

@@ -31,59 +31,59 @@
  */
 class SurnamesList implements RequestHandlerInterface
 {
-    use ViewResponseTrait;
+	use ViewResponseTrait;
 
-    private ?PatronymicLineageModule $module;
+	private ?PatronymicLineageModule $module;
 
-    /**
-     * Constructor for SurnamesList Request Handler
-     *
-     * @param ModuleService $module_service
-     */
-    public function __construct(ModuleService $module_service)
-    {
-        $this->module = $module_service->findByInterface(PatronymicLineageModule::class)->first();
-    }
+	/**
+	 * Constructor for SurnamesList Request Handler
+	 *
+	 * @param ModuleService $module_service
+	 */
+	public function __construct(ModuleService $module_service)
+	{
+		$this->module = $module_service->findByInterface(PatronymicLineageModule::class)->first();
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        if ($this->module === null) {
-            throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
-        }
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		if ($this->module === null) {
+			throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
+		}
 
-        $tree = Validator::attributes($request)->tree();
-        $initial = Validator::attributes($request)->string('alpha', '');
+		$tree = Validator::attributes($request)->tree();
+		$initial = Validator::attributes($request)->string('alpha', '');
 
-        $initials_list = collect($this->module->surnameAlpha($tree, false, false, I18N::locale()))
-            ->reject(function (int $count, string $initial): bool {
-                return $initial === '@' || $initial === ',';
-            });
+		$initials_list = collect($this->module->surnameAlpha($tree, false, false, I18N::locale()))
+			->reject(function (int $count, string $initial): bool {
+				return $initial === '@' || $initial === ',';
+			});
 
-        $show_all = Validator::queryParams($request)->string('show_all', 'no');
+		$show_all = Validator::queryParams($request)->string('show_all', 'no');
 
-        if ($show_all === 'yes') {
-            $title = I18N::translate('Patronymic Lineages') . ' — ' . I18N::translate('All');
-            $surnames = $this->module->surnames($tree, '', '', false, false, I18N::locale());
-        } elseif (mb_strlen($initial) === 1) {
-            $title = I18N::translate('Patronymic Lineages') . ' — ' . $initial;
-            $surnames = $this->module->surnames($tree, '', $initial, false, false, I18N::locale());
-        } else {
-            $title =  I18N::translate('Patronymic Lineages');
-            $surnames = [];
-        }
+		if ($show_all === 'yes') {
+			$title = I18N::translate('Patronymic Lineages') . ' — ' . I18N::translate('All');
+			$surnames = $this->module->surnames($tree, '', '', false, false, I18N::locale());
+		} elseif (mb_strlen($initial) === 1) {
+			$title = I18N::translate('Patronymic Lineages') . ' — ' . $initial;
+			$surnames = $this->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
-        ]);
-    }
+		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

@@ -59,24 +59,24 @@
         $initial = Validator::attributes($request)->string('alpha', '');
 
         $initials_list = collect($this->module->surnameAlpha($tree, false, false, I18N::locale()))
-            ->reject(function (int $count, string $initial): bool {
+            ->reject(function(int $count, string $initial): bool {
                 return $initial === '@' || $initial === ',';
             });
 
         $show_all = Validator::queryParams($request)->string('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->module->surnames($tree, '', '', false, false, I18N::locale());
         } elseif (mb_strlen($initial) === 1) {
-            $title = I18N::translate('Patronymic Lineages') . ' — ' . $initial;
+            $title = I18N::translate('Patronymic Lineages').' — '.$initial;
             $surnames = $this->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/LineageBuilder.php

Indentation +209 added lines, -209 removed lines

@@ -28,213 +28,213 @@
  */
 class LineageBuilder
 {
-    private string $surname;
-    private Tree $tree;
-    private PatronymicLineageModule $patrolineage_module;
-
-    /**
-     * @var Collection<string, bool> $used_indis Individuals already processed
-     */
-    private Collection $used_indis;
-
-    /**
-     * Constructor for Lineage Builder
-     *
-     * @param string $surname Reference surname
-     * @param Tree $tree Gedcom tree
-     */
-    public function __construct(string $surname, Tree $tree, PatronymicLineageModule $patrolineage_module)
-    {
-        $this->surname = $surname;
-        $this->tree = $tree;
-        $this->patrolineage_module = $patrolineage_module;
-        $this->used_indis = new Collection();
-    }
-
-    /**
-     * Build all patronymic lineages for the reference surname.
-     *
-     * @return Collection<LineageRootNode>|NULL List of root patronymic lineages
-     */
-    public function buildLineages(): ?Collection
-    {
-        $indis = $this->patrolineage_module->individuals(
-            $this->tree,
-            $this->surname,
-            '',
-            '',
-            false,
-            false,
-            I18N::locale()
-        );
-        //Warning - the individuals method 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;
-        })->values();
-    }
-
-    /**
-     * Retrieve the root individual, from any individual, by recursion.
-     * The Root individual is the individual without a father, or without a mother holding the same name.
-     *
-     * @param Individual $indi
-     * @return Individual|NULL Root individual
-     */
-    private function getLineageRootIndividual(Individual $indi): ?Individual
-    {
-        $child_families = $indi->childFamilies();
-        if ($this->used_indis->get($indi->xref(), false) !== false) {
-            return null;
-        }
-
-        foreach ($child_families as $child_family) {
-            /** @var Family $child_family */
-            $child_family->husband();
-            if (($husb = $child_family->husband()) !== null) {
-                if ($husb->isPendingAddition() && $husb->privatizeGedcom(Auth::PRIV_HIDE) === '') {
-                    return $indi;
-                }
-                return $this->getLineageRootIndividual($husb);
-            } elseif (($wife = $child_family->wife()) !== null) {
-                if (!($wife->isPendingAddition() && $wife->privatizeGedcom(Auth::PRIV_HIDE) === '')) {
-                    $indi_surname = $indi->getAllNames()[$indi->getPrimaryName()]['surname'];
-                    $wife_surname = $wife->getAllNames()[$wife->getPrimaryName()]['surname'];
-                    if (
-                        $indi->canShowName()
-                        && $wife->canShowName()
-                        && I18N::comparator()($indi_surname, $wife_surname) === 0
-                    ) {
-                            return $this->getLineageRootIndividual($wife);
-                    }
-                }
-                return $indi;
-            }
-        }
-        return $indi;
-    }
-
-    /**
-     * Computes descendent Lineage from a node.
-     * Uses recursion to build the lineage tree
-     *
-     * @param LineageNode $node
-     * @return LineageNode Computed lineage
-     */
-    private function buildLineage(LineageNode $node): LineageNode
-    {
-        $indi_surname = '';
-
-        $indi_node = $node->individual();
-        if ($indi_node !== null) {
-            if ($node->families()->count() === 0) {
-                foreach ($indi_node->spouseFamilies() as $spouse_family) {
-                    $node->addFamily($spouse_family);
-                }
-            }
-
-            $indi_surname = $indi_node->getAllNames()[$indi_node->getPrimaryName()]['surname'] ?? '';
-            $node->rootNode()->addPlace($indi_node->getBirthPlace());
-
-            //Tag the individual as used
-            $this->used_indis->put($indi_node->xref(), true);
-        }
-
-        foreach ($node->families() as $family_node) {
-            /** @var Family $spouse_family */
-            $spouse_family = $family_node->family;
-            $spouse_surname = '';
-            $spouse = null;
-            if (
-                $indi_node !== null &&
-                ($spouse = $spouse_family->spouse($indi_node)) !== null && $spouse->canShowName()
-            ) {
-                $spouse_surname = $spouse->getAllNames()[$spouse->getPrimaryName()]['surname'] ?? '';
-            }
-
-            $nb_children = $nb_natural = 0;
-
-            foreach ($spouse_family->children() as $child) {
-                if (!($child->isPendingAddition() && $child->privatizeGedcom(Auth::PRIV_HIDE) === '')) {
-                    $child_surname = $child->getAllNames()[$child->getPrimaryName()]['surname'] ?? '';
-
-                    $nb_children++;
-                    if ($indi_node !== null && $indi_node->sex() === 'F') { //If the root individual is the mother
-                        //Print only lineages of children with the same surname as their mother
-                        //(supposing they are natural children)
-                        /** @psalm-suppress RedundantCondition */
-                        if (
-                            $spouse === null ||
-                            ($spouse_surname !== '' && I18N::comparator()($child_surname, $spouse_surname) != 0)
-                        ) {
-                            if (I18N::comparator()($child_surname, $indi_surname) === 0) {
-                                $nb_natural++;
-                                $node_child = new LineageNode($child, $node->rootNode());
-                                $node_child = $this->buildLineage($node_child);
-                                $node->addChild($spouse_family, $node_child);
-                            }
-                        }
-                    } else { //If the root individual is the father
-                        $nb_natural++;
-                        //Print if the children does not bear the same name as his mother
-                        //(and different from his father)
-                        if (
-                            mb_strlen($child_surname) === 0 ||
-                            mb_strlen($indi_surname) === 0 || mb_strlen($spouse_surname) === 0 ||
-                            I18N::comparator()($child_surname, $indi_surname) === 0 ||
-                            I18N::comparator()($child_surname, $spouse_surname) != 0
-                        ) {
-                            $node_child = new LineageNode($child, $node->rootNode());
-                            $node_child = $this->buildLineage($node_child);
-                        } else {
-                            $node_child = new LineageNode($child, $node->rootNode(), $child_surname);
-                        }
-                        $node->addChild($spouse_family, $node_child);
-                    }
-                }
-            }
-
-            //Do not print other children
-            if (($nb_children - $nb_natural) > 0) {
-                $node->addChild($spouse_family, null);
-            }
-        }
-
-        return $node;
-    }
+	private string $surname;
+	private Tree $tree;
+	private PatronymicLineageModule $patrolineage_module;
+
+	/**
+	 * @var Collection<string, bool> $used_indis Individuals already processed
+	 */
+	private Collection $used_indis;
+
+	/**
+	 * Constructor for Lineage Builder
+	 *
+	 * @param string $surname Reference surname
+	 * @param Tree $tree Gedcom tree
+	 */
+	public function __construct(string $surname, Tree $tree, PatronymicLineageModule $patrolineage_module)
+	{
+		$this->surname = $surname;
+		$this->tree = $tree;
+		$this->patrolineage_module = $patrolineage_module;
+		$this->used_indis = new Collection();
+	}
+
+	/**
+	 * Build all patronymic lineages for the reference surname.
+	 *
+	 * @return Collection<LineageRootNode>|NULL List of root patronymic lineages
+	 */
+	public function buildLineages(): ?Collection
+	{
+		$indis = $this->patrolineage_module->individuals(
+			$this->tree,
+			$this->surname,
+			'',
+			'',
+			false,
+			false,
+			I18N::locale()
+		);
+		//Warning - the individuals method 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;
+		})->values();
+	}
+
+	/**
+	 * Retrieve the root individual, from any individual, by recursion.
+	 * The Root individual is the individual without a father, or without a mother holding the same name.
+	 *
+	 * @param Individual $indi
+	 * @return Individual|NULL Root individual
+	 */
+	private function getLineageRootIndividual(Individual $indi): ?Individual
+	{
+		$child_families = $indi->childFamilies();
+		if ($this->used_indis->get($indi->xref(), false) !== false) {
+			return null;
+		}
+
+		foreach ($child_families as $child_family) {
+			/** @var Family $child_family */
+			$child_family->husband();
+			if (($husb = $child_family->husband()) !== null) {
+				if ($husb->isPendingAddition() && $husb->privatizeGedcom(Auth::PRIV_HIDE) === '') {
+					return $indi;
+				}
+				return $this->getLineageRootIndividual($husb);
+			} elseif (($wife = $child_family->wife()) !== null) {
+				if (!($wife->isPendingAddition() && $wife->privatizeGedcom(Auth::PRIV_HIDE) === '')) {
+					$indi_surname = $indi->getAllNames()[$indi->getPrimaryName()]['surname'];
+					$wife_surname = $wife->getAllNames()[$wife->getPrimaryName()]['surname'];
+					if (
+						$indi->canShowName()
+						&& $wife->canShowName()
+						&& I18N::comparator()($indi_surname, $wife_surname) === 0
+					) {
+							return $this->getLineageRootIndividual($wife);
+					}
+				}
+				return $indi;
+			}
+		}
+		return $indi;
+	}
+
+	/**
+	 * Computes descendent Lineage from a node.
+	 * Uses recursion to build the lineage tree
+	 *
+	 * @param LineageNode $node
+	 * @return LineageNode Computed lineage
+	 */
+	private function buildLineage(LineageNode $node): LineageNode
+	{
+		$indi_surname = '';
+
+		$indi_node = $node->individual();
+		if ($indi_node !== null) {
+			if ($node->families()->count() === 0) {
+				foreach ($indi_node->spouseFamilies() as $spouse_family) {
+					$node->addFamily($spouse_family);
+				}
+			}
+
+			$indi_surname = $indi_node->getAllNames()[$indi_node->getPrimaryName()]['surname'] ?? '';
+			$node->rootNode()->addPlace($indi_node->getBirthPlace());
+
+			//Tag the individual as used
+			$this->used_indis->put($indi_node->xref(), true);
+		}
+
+		foreach ($node->families() as $family_node) {
+			/** @var Family $spouse_family */
+			$spouse_family = $family_node->family;
+			$spouse_surname = '';
+			$spouse = null;
+			if (
+				$indi_node !== null &&
+				($spouse = $spouse_family->spouse($indi_node)) !== null && $spouse->canShowName()
+			) {
+				$spouse_surname = $spouse->getAllNames()[$spouse->getPrimaryName()]['surname'] ?? '';
+			}
+
+			$nb_children = $nb_natural = 0;
+
+			foreach ($spouse_family->children() as $child) {
+				if (!($child->isPendingAddition() && $child->privatizeGedcom(Auth::PRIV_HIDE) === '')) {
+					$child_surname = $child->getAllNames()[$child->getPrimaryName()]['surname'] ?? '';
+
+					$nb_children++;
+					if ($indi_node !== null && $indi_node->sex() === 'F') { //If the root individual is the mother
+						//Print only lineages of children with the same surname as their mother
+						//(supposing they are natural children)
+						/** @psalm-suppress RedundantCondition */
+						if (
+							$spouse === null ||
+							($spouse_surname !== '' && I18N::comparator()($child_surname, $spouse_surname) != 0)
+						) {
+							if (I18N::comparator()($child_surname, $indi_surname) === 0) {
+								$nb_natural++;
+								$node_child = new LineageNode($child, $node->rootNode());
+								$node_child = $this->buildLineage($node_child);
+								$node->addChild($spouse_family, $node_child);
+							}
+						}
+					} else { //If the root individual is the father
+						$nb_natural++;
+						//Print if the children does not bear the same name as his mother
+						//(and different from his father)
+						if (
+							mb_strlen($child_surname) === 0 ||
+							mb_strlen($indi_surname) === 0 || mb_strlen($spouse_surname) === 0 ||
+							I18N::comparator()($child_surname, $indi_surname) === 0 ||
+							I18N::comparator()($child_surname, $spouse_surname) != 0
+						) {
+							$node_child = new LineageNode($child, $node->rootNode());
+							$node_child = $this->buildLineage($node_child);
+						} else {
+							$node_child = new LineageNode($child, $node->rootNode(), $child_surname);
+						}
+						$node->addChild($spouse_family, $node_child);
+					}
+				}
+			}
+
+			//Do not print other children
+			if (($nb_children - $nb_natural) > 0) {
+				$node->addChild($spouse_family, null);
+			}
+		}
+
+		return $node;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -101,7 +101,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;
             }

app/Module/Certificates/Http/RequestHandlers/CertificatePage.php

Indentation +75 added lines, -75 removed lines

@@ -35,79 +35,79 @@
  */
 class CertificatePage implements RequestHandlerInterface
 {
-    use ViewResponseTrait;
-
-    /**
-     * @var CertificatesModule|null $module
-     */
-    private $module;
-
-    /**
-     * @var CertificateFilesystemService $certif_filesystem
-     */
-    private $certif_filesystem;
-
-    /**
-     * @var CertificateDataService $certif_data_service
-     */
-    private $certif_data_service;
-
-    /**
-     * @var UrlObfuscatorService $url_obfuscator_service
-     */
-    private $url_obfuscator_service;
-
-
-    /**
-     * Constructor for CertificatePage Request Handler
-     *
-     * @param ModuleService $module_service
-     * @param CertificateFilesystemService $certif_filesystem
-     * @param CertificateDataService $certif_data_service
-     * @param UrlObfuscatorService $url_obfuscator_service
-     */
-    public function __construct(
-        ModuleService $module_service,
-        CertificateFilesystemService $certif_filesystem,
-        CertificateDataService $certif_data_service,
-        UrlObfuscatorService $url_obfuscator_service
-    ) {
-        $this->module = $module_service->findByInterface(CertificatesModule::class)->first();
-        $this->certif_filesystem = $certif_filesystem;
-        $this->certif_data_service = $certif_data_service;
-        $this->url_obfuscator_service = $url_obfuscator_service;
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        if ($this->module === null) {
-            throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
-        }
-
-        $tree = Validator::attributes($request)->tree();
-
-        $certif_path = Validator::attributes($request)->string('cid', '');
-        if ($certif_path !== '' && $this->url_obfuscator_service->tryDeobfuscate($certif_path)) {
-            $certificate = $this->certif_filesystem->certificate($tree, $certif_path);
-        }
-
-        if (!isset($certificate)) {
-            FlashMessages::addMessage('The requested certificate is not valid.');
-            return Registry::responseFactory()->redirect(TreePage::class, ['tree' => $tree->name()]);
-        }
-
-        return $this->viewResponse($this->module->name() . '::certificate-page', [
-            'title'                     =>  I18N::translate('Certificate - %s', $certificate->name()),
-            'tree'                      =>  $tree,
-            'module_name'               =>  $this->module->name(),
-            'certificate'               =>  $certificate,
-            'url_obfuscator_service'    =>  $this->url_obfuscator_service,
-            'linked_individuals'        =>  $this->certif_data_service->linkedIndividuals($certificate),
-            'linked_families'           =>  $this->certif_data_service->linkedFamilies($certificate)
-        ]);
-    }
+	use ViewResponseTrait;
+
+	/**
+	 * @var CertificatesModule|null $module
+	 */
+	private $module;
+
+	/**
+	 * @var CertificateFilesystemService $certif_filesystem
+	 */
+	private $certif_filesystem;
+
+	/**
+	 * @var CertificateDataService $certif_data_service
+	 */
+	private $certif_data_service;
+
+	/**
+	 * @var UrlObfuscatorService $url_obfuscator_service
+	 */
+	private $url_obfuscator_service;
+
+
+	/**
+	 * Constructor for CertificatePage Request Handler
+	 *
+	 * @param ModuleService $module_service
+	 * @param CertificateFilesystemService $certif_filesystem
+	 * @param CertificateDataService $certif_data_service
+	 * @param UrlObfuscatorService $url_obfuscator_service
+	 */
+	public function __construct(
+		ModuleService $module_service,
+		CertificateFilesystemService $certif_filesystem,
+		CertificateDataService $certif_data_service,
+		UrlObfuscatorService $url_obfuscator_service
+	) {
+		$this->module = $module_service->findByInterface(CertificatesModule::class)->first();
+		$this->certif_filesystem = $certif_filesystem;
+		$this->certif_data_service = $certif_data_service;
+		$this->url_obfuscator_service = $url_obfuscator_service;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		if ($this->module === null) {
+			throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
+		}
+
+		$tree = Validator::attributes($request)->tree();
+
+		$certif_path = Validator::attributes($request)->string('cid', '');
+		if ($certif_path !== '' && $this->url_obfuscator_service->tryDeobfuscate($certif_path)) {
+			$certificate = $this->certif_filesystem->certificate($tree, $certif_path);
+		}
+
+		if (!isset($certificate)) {
+			FlashMessages::addMessage('The requested certificate is not valid.');
+			return Registry::responseFactory()->redirect(TreePage::class, ['tree' => $tree->name()]);
+		}
+
+		return $this->viewResponse($this->module->name() . '::certificate-page', [
+			'title'                     =>  I18N::translate('Certificate - %s', $certificate->name()),
+			'tree'                      =>  $tree,
+			'module_name'               =>  $this->module->name(),
+			'certificate'               =>  $certificate,
+			'url_obfuscator_service'    =>  $this->url_obfuscator_service,
+			'linked_individuals'        =>  $this->certif_data_service->linkedIndividuals($certificate),
+			'linked_families'           =>  $this->certif_data_service->linkedFamilies($certificate)
+		]);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -100,7 +100,7 @@
             return Registry::responseFactory()->redirect(TreePage::class, ['tree' => $tree->name()]);
         }
 
-        return $this->viewResponse($this->module->name() . '::certificate-page', [
+        return $this->viewResponse($this->module->name().'::certificate-page', [
             'title'                     =>  I18N::translate('Certificate - %s', $certificate->name()),
             'tree'                      =>  $tree,
             'module_name'               =>  $this->module->name(),

app/Module/MiscExtensions/Http/RequestHandlers/AdminConfigAction.php

Indentation +41 added lines, -41 removed lines

@@ -29,50 +29,50 @@
  */
 class AdminConfigAction implements RequestHandlerInterface
 {
-    private ?MiscExtensionsModule $module;
+	private ?MiscExtensionsModule $module;
 
-    /**
-     * Constructor for AdminConfigPage Request Handler
-     *
-     * @param ModuleService $module_service
-     */
-    public function __construct(ModuleService $module_service)
-    {
-        $this->module = $module_service->findByInterface(MiscExtensionsModule::class)->first();
-    }
+	/**
+	 * Constructor for AdminConfigPage Request Handler
+	 *
+	 * @param ModuleService $module_service
+	 */
+	public function __construct(ModuleService $module_service)
+	{
+		$this->module = $module_service->findByInterface(MiscExtensionsModule::class)->first();
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        if ($this->module === null) {
-            FlashMessages::addMessage(
-                I18N::translate('The attached module could not be found.'),
-                'danger'
-            );
-            return Registry::responseFactory()->redirect(AdminConfigPage::class);
-        }
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		if ($this->module === null) {
+			FlashMessages::addMessage(
+				I18N::translate('The attached module could not be found.'),
+				'danger'
+			);
+			return Registry::responseFactory()->redirect(AdminConfigPage::class);
+		}
 
-        $this->module->setPreference(
-            'MAJ_TITLE_PREFIX',
-            Validator::parsedBody($request)->string('MAJ_TITLE_PREFIX', '')
-        );
-        $this->module->setPreference(
-            'MAJ_DISPLAY_CNIL',
-            Validator::parsedBody($request)->string('MAJ_DISPLAY_CNIL', '')
-        );
-        $this->module->setPreference(
-            'MAJ_CNIL_REFERENCE',
-            Validator::parsedBody($request)->string('MAJ_CNIL_REFERENCE', '')
-        );
+		$this->module->setPreference(
+			'MAJ_TITLE_PREFIX',
+			Validator::parsedBody($request)->string('MAJ_TITLE_PREFIX', '')
+		);
+		$this->module->setPreference(
+			'MAJ_DISPLAY_CNIL',
+			Validator::parsedBody($request)->string('MAJ_DISPLAY_CNIL', '')
+		);
+		$this->module->setPreference(
+			'MAJ_CNIL_REFERENCE',
+			Validator::parsedBody($request)->string('MAJ_CNIL_REFERENCE', '')
+		);
 
-        FlashMessages::addMessage(
-            I18N::translate('The preferences for the module “%s” have been updated.', $this->module->title()),
-            'success'
-        );
+		FlashMessages::addMessage(
+			I18N::translate('The preferences for the module “%s” have been updated.', $this->module->title()),
+			'success'
+		);
 
-        return Registry::responseFactory()->redirect(AdminConfigPage::class);
-    }
+		return Registry::responseFactory()->redirect(AdminConfigPage::class);
+	}
 }

app/Module/Hooks/Http/RequestHandlers/ModulesHooksAction.php

Indentation +46 added lines, -46 removed lines

@@ -31,58 +31,58 @@
  */
 class ModulesHooksAction extends AbstractModuleComponentAction
 {
-    protected HookService $hook_service;
+	protected HookService $hook_service;
 
-    /**
-     * Constructor for ModulesHooksAction Request Handler
-     *
-     * @param ModuleService $module_service
-     * @param TreeService $tree_service
-     * @param HookService $hook_service
-     */
-    public function __construct(ModuleService $module_service, TreeService $tree_service, HookService $hook_service)
-    {
-        parent::__construct($module_service, $tree_service);
-        $this->hook_service = $hook_service;
-    }
+	/**
+	 * Constructor for ModulesHooksAction Request Handler
+	 *
+	 * @param ModuleService $module_service
+	 * @param TreeService $tree_service
+	 * @param HookService $hook_service
+	 */
+	public function __construct(ModuleService $module_service, TreeService $tree_service, HookService $hook_service)
+	{
+		parent::__construct($module_service, $tree_service);
+		$this->hook_service = $hook_service;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        $hook_name = Validator::attributes($request)->string('hook_name', '');
-        $hook_collector = $this->hook_service->find($hook_name, true);
-        if ($hook_collector === null) {
-            FlashMessages::addMessage(I18N::translate('The hook with name “%s” does not exist.', $hook_name), 'danger');
-            return Registry::responseFactory()->redirect(AdminConfigPage::class);
-        }
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		$hook_name = Validator::attributes($request)->string('hook_name', '');
+		$hook_collector = $this->hook_service->find($hook_name, true);
+		if ($hook_collector === null) {
+			FlashMessages::addMessage(I18N::translate('The hook with name “%s” does not exist.', $hook_name), 'danger');
+			return Registry::responseFactory()->redirect(AdminConfigPage::class);
+		}
 
-        foreach ($hook_collector->hooks() as $hook) {
-            $this->updateStatus(get_class($hook->module()), $request);
-        }
+		foreach ($hook_collector->hooks() as $hook) {
+			$this->updateStatus(get_class($hook->module()), $request);
+		}
 
-        $this->updateHookOrder($hook_collector, $request);
+		$this->updateHookOrder($hook_collector, $request);
 
-        FlashMessages::addMessage(I18N::translate('The hook preferences have been updated.'), 'success');
+		FlashMessages::addMessage(I18N::translate('The hook preferences have been updated.'), 'success');
 
-        return Registry::responseFactory()->redirect(ModulesHooksPage::class, ['hook_name' => $hook_name]);
-    }
+		return Registry::responseFactory()->redirect(ModulesHooksPage::class, ['hook_name' => $hook_name]);
+	}
 
-    /**
-     * Update the order of modules for a hook interface.
-     *
-     * @param HookCollectorInterface $hook_collector
-     * @param ServerRequestInterface $request
-     */
-    protected function updateHookOrder(HookCollectorInterface $hook_collector, ServerRequestInterface $request): void
-    {
-        $order = Validator::parsedBody($request)->array('order');
-        $order = array_flip($order);
+	/**
+	 * Update the order of modules for a hook interface.
+	 *
+	 * @param HookCollectorInterface $hook_collector
+	 * @param ServerRequestInterface $request
+	 */
+	protected function updateHookOrder(HookCollectorInterface $hook_collector, ServerRequestInterface $request): void
+	{
+		$order = Validator::parsedBody($request)->array('order');
+		$order = array_flip($order);
 
-        foreach ($hook_collector->hooks() as $hook) {
-            $this->hook_service->updateOrder($hook_collector, $hook->module(), $order[$hook->module()->name()] ?? 0);
-        }
-    }
+		foreach ($hook_collector->hooks() as $hook) {
+			$this->hook_service->updateOrder($hook_collector, $hook->module(), $order[$hook->module()->name()] ?? 0);
+		}
+	}
 }