jon48 / webtrees-lib

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

Indentation +31 added lines, -31 removed lines

@@ -28,35 +28,35 @@
  */
 class AdminConfigPage implements RequestHandlerInterface
 {
-    use ViewResponseTrait;
-
-    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();
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        $this->layout = 'layouts/administration';
-
-        if ($this->module === null) {
-            throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
-        }
-
-        return $this->viewResponse($this->module->name() . '::admin/config', [
-            'module'    =>  $this->module,
-            'title'     =>  $this->module->title()
-        ]);
-    }
+	use ViewResponseTrait;
+
+	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();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		$this->layout = 'layouts/administration';
+
+		if ($this->module === null) {
+			throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
+		}
+
+		return $this->viewResponse($this->module->name() . '::admin/config', [
+			'module'    =>  $this->module,
+			'title'     =>  $this->module->title()
+		]);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
             throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
         }
 
-        return $this->viewResponse($this->module->name() . '::admin/config', [
+        return $this->viewResponse($this->module->name().'::admin/config', [
             'module'    =>  $this->module,
             'title'     =>  $this->module->title()
         ]);

app/Module/Sosa/Data/MissingAncestor.php

Indentation +67 added lines, -67 removed lines

@@ -21,79 +21,79 @@
  */
 class MissingAncestor
 {
-    /**
-     * @var Individual $individual
-     */
-    private $individual;
+	/**
+	 * @var Individual $individual
+	 */
+	private $individual;
 
-    /**
-     * @var int $sosa
-     */
-    private $sosa;
+	/**
+	 * @var int $sosa
+	 */
+	private $sosa;
 
-    /**
-     * @var bool $missing_father
-     */
-    private $missing_father;
+	/**
+	 * @var bool $missing_father
+	 */
+	private $missing_father;
 
-    /**
-     * @var bool $missing_mother
-     */
-    private $missing_mother;
+	/**
+	 * @var bool $missing_mother
+	 */
+	private $missing_mother;
 
-    /**
-     * Constructor for MissingAncestor data class
-     *
-     * @param Individual $ancestor
-     * @param int $sosa
-     * @param bool $missing_father
-     * @param bool $missing_mother
-     */
-    public function __construct(Individual $ancestor, int $sosa, bool $missing_father, bool $missing_mother)
-    {
-        $this->individual = $ancestor;
-        $this->sosa = $sosa;
-        $this->missing_father = $missing_father;
-        $this->missing_mother = $missing_mother;
-    }
+	/**
+	 * Constructor for MissingAncestor data class
+	 *
+	 * @param Individual $ancestor
+	 * @param int $sosa
+	 * @param bool $missing_father
+	 * @param bool $missing_mother
+	 */
+	public function __construct(Individual $ancestor, int $sosa, bool $missing_father, bool $missing_mother)
+	{
+		$this->individual = $ancestor;
+		$this->sosa = $sosa;
+		$this->missing_father = $missing_father;
+		$this->missing_mother = $missing_mother;
+	}
 
-    /**
-     * Reference individual of the row
-     *
-     * @return Individual
-     */
-    public function individual(): Individual
-    {
-        return $this->individual;
-    }
+	/**
+	 * Reference individual of the row
+	 *
+	 * @return Individual
+	 */
+	public function individual(): Individual
+	{
+		return $this->individual;
+	}
 
-    /**
-     * Minimum sosa of the reference individual
-     *
-     * @return int
-     */
-    public function sosa(): int
-    {
-        return $this->sosa;
-    }
+	/**
+	 * Minimum sosa of the reference individual
+	 *
+	 * @return int
+	 */
+	public function sosa(): int
+	{
+		return $this->sosa;
+	}
 
-    /**
-     * Indicate whether the reference individual does not have a father
-     *
-     * @return bool
-     */
-    public function isFatherMissing(): bool
-    {
-        return $this->missing_father;
-    }
+	/**
+	 * Indicate whether the reference individual does not have a father
+	 *
+	 * @return bool
+	 */
+	public function isFatherMissing(): bool
+	{
+		return $this->missing_father;
+	}
 
-    /**
-     * Indicate whether the reference individual does not have a mother
-     *
-     * @return bool
-     */
-    public function isMotherMissing(): bool
-    {
-        return $this->missing_mother;
-    }
+	/**
+	 * Indicate whether the reference individual does not have a mother
+	 *
+	 * @return bool
+	 */
+	public function isMotherMissing(): bool
+	{
+		return $this->missing_mother;
+	}
 }

app/Module/Sosa/Http/RequestHandlers/SosaStatistics.php

Spacing +14 added lines, -17 removed lines

@@ -71,7 +71,7 @@ 
         /** @var SosaStatisticsService $sosa_stats_service */
         $sosa_stats_service = app()->makeWith(SosaStatisticsService::class, ['tree' => $tree, 'user' => $user]);
 
-        return $this->viewResponse($this->module->name() . '::statistics-page', [
+        return $this->viewResponse($this->module->name().'::statistics-page', [
             'module_name'       =>  $this->module->name(),
             'title'             =>  I18N::translate('Sosa Statistics'),
             'tree'              =>  $tree,
@@ -126,37 +126,34 @@ 
 
         foreach ($stats_by_gen as $gen => $stats_gen) {
             $gen_diff = $gen > 1 ?
-                (int) $stats_gen['diffSosaTotalCount'] - (int) $stats_by_gen[$gen - 1]['diffSosaTotalCount'] :
-                1;
+                (int)$stats_gen['diffSosaTotalCount'] - (int)$stats_by_gen[$gen - 1]['diffSosaTotalCount'] : 1;
             $generation_stats[$gen] = array(
-                'gen_min_birth' => $stats_gen['firstBirth'] ?? (int) $stats_gen['firstEstimatedBirth'],
-                'gen_max_birth' => $stats_gen['lastBirth'] ?? (int) $stats_gen['lastEstimatedBirth'],
+                'gen_min_birth' => $stats_gen['firstBirth'] ?? (int)$stats_gen['firstEstimatedBirth'],
+                'gen_max_birth' => $stats_gen['lastBirth'] ?? (int)$stats_gen['lastEstimatedBirth'],
                 'theoretical' => BigInteger::of(2)->power($gen - 1)->toInt(),
-                'known' => (int) $stats_gen['sosaCount'],
+                'known' => (int)$stats_gen['sosaCount'],
                 'perc_known' => $this->safeDivision(
-                    BigInteger::of((int) $stats_gen['sosaCount']),
+                    BigInteger::of((int)$stats_gen['sosaCount']),
                     BigInteger::of(2)->power($gen - 1)
                 ),
                 'missing' => $gen > 1 ?
-                    2 * (int) $stats_by_gen[$gen - 1]['sosaCount'] - (int) $stats_gen['sosaCount'] :
-                    0,
+                    2 * (int)$stats_by_gen[$gen - 1]['sosaCount'] - (int)$stats_gen['sosaCount'] : 0,
                 'perc_missing' => $gen > 1 ?
                     1 - $this->safeDivision(
-                        BigInteger::of((int) $stats_gen['sosaCount']),
-                        BigInteger::of(2 * (int) $stats_by_gen[$gen - 1]['sosaCount'])
-                    ) :
-                    0,
-                'total_known' => (int) $stats_gen['sosaTotalCount'],
+                        BigInteger::of((int)$stats_gen['sosaCount']),
+                        BigInteger::of(2 * (int)$stats_by_gen[$gen - 1]['sosaCount'])
+                    ) : 0,
+                'total_known' => (int)$stats_gen['sosaTotalCount'],
                 'perc_total_known' => $this->safeDivision(
-                    BigInteger::of((int) $stats_gen['sosaTotalCount']),
+                    BigInteger::of((int)$stats_gen['sosaTotalCount']),
                     BigInteger::of(2)->power($gen)->minus(1)
                 ),
                 'different' => $gen_diff,
                 'perc_different' => $this->safeDivision(
                     BigInteger::of($gen_diff),
-                    BigInteger::of((int) $stats_gen['sosaCount'])
+                    BigInteger::of((int)$stats_gen['sosaCount'])
                 ),
-                'total_different' => (int) $stats_gen['diffSosaTotalCount']
+                'total_different' => (int)$stats_gen['diffSosaTotalCount']
             );
         }
 

Indentation +138 added lines, -138 removed lines

@@ -38,142 +38,142 @@
  */
 class SosaStatistics implements RequestHandlerInterface
 {
-    use ViewResponseTrait;
-
-    private ?SosaModule $module;
-    private RelationshipService $relationship_service;
-
-    /**
-     * Constructor for AncestorsList Request Handler
-     *
-     * @param ModuleService $module_service
-     */
-    public function __construct(ModuleService $module_service, RelationshipService $relationship_service)
-    {
-        $this->module = $module_service->findByInterface(SosaModule::class)->first();
-        $this->relationship_service = $relationship_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();
-        $user = Auth::check() ? Validator::attributes($request)->user() : new DefaultUser();
-
-        /** @var SosaStatisticsService $sosa_stats_service */
-        $sosa_stats_service = app()->makeWith(SosaStatisticsService::class, ['tree' => $tree, 'user' => $user]);
-
-        return $this->viewResponse($this->module->name() . '::statistics-page', [
-            'module_name'       =>  $this->module->name(),
-            'title'             =>  I18N::translate('Sosa Statistics'),
-            'tree'              =>  $tree,
-            'theme'             =>  app(ModuleThemeInterface::class),
-            'root_indi'         =>  $sosa_stats_service->rootIndividual(),
-            'general_stats'     =>  $this->statisticsGeneral($sosa_stats_service),
-            'generation_stats'  =>  $this->statisticsByGenerations($sosa_stats_service),
-            'generation_depth'  =>  $sosa_stats_service->generationDepthStatsAtGeneration(1)->first(),
-            'multiple_sosas'    =>  $sosa_stats_service->topMultipleAncestorsWithNoTies(10)->groupBy('sosa_count'),
-            'sosa_dispersion_g2' =>  $sosa_stats_service->ancestorsDispersionForGeneration(2),
-            'sosa_dispersion_g3' =>  $sosa_stats_service->ancestorsDispersionForGeneration(3),
-            'gen_depth_g3'      =>  $sosa_stats_service->generationDepthStatsAtGeneration(3),
-            'relationship_service'  =>  $this->relationship_service,
-        ]);
-    }
-
-    /**
-     * Retrieve and compute the global statistics of ancestors for the tree.
-     * Statistics include the number of ancestors, the number of different ancestors, pedigree collapse...
-     *
-     * @param SosaStatisticsService $sosa_stats_service
-     * @return array<string, int|float>
-     */
-    private function statisticsGeneral(SosaStatisticsService $sosa_stats_service): array
-    {
-        $ancestors_count = $sosa_stats_service->totalAncestors();
-        $ancestors_distinct_count = $sosa_stats_service->totalDistinctAncestors();
-        $individual_count = $sosa_stats_service->totalIndividuals();
-
-        return [
-            'sosa_count'    =>  $ancestors_count,
-            'distinct_count'    =>  $ancestors_distinct_count,
-            'sosa_rate' =>  $this->safeDivision(
-                BigInteger::of($ancestors_distinct_count),
-                BigInteger::of($individual_count)
-            ),
-            'mean_gen_time'         =>  $sosa_stats_service->meanGenerationTime()
-        ];
-    }
-
-    /**
-     * Retrieve and compute the statistics of ancestors by generations.
-     * Statistics include the number of ancestors, the number of different ancestors, cumulative statistics...
-     *
-     * @param SosaStatisticsService $sosa_stats_service
-     * @return array<int, array<string, int|float>>
-     */
-    private function statisticsByGenerations(SosaStatisticsService $sosa_stats_service): array
-    {
-        $stats_by_gen = $sosa_stats_service->statisticsByGenerations();
-
-        $generation_stats = array();
-
-        foreach ($stats_by_gen as $gen => $stats_gen) {
-            $gen_diff = $gen > 1 ?
-                (int) $stats_gen['diffSosaTotalCount'] - (int) $stats_by_gen[$gen - 1]['diffSosaTotalCount'] :
-                1;
-            $generation_stats[$gen] = array(
-                'gen_min_birth' => $stats_gen['firstBirth'] ?? (int) $stats_gen['firstEstimatedBirth'],
-                'gen_max_birth' => $stats_gen['lastBirth'] ?? (int) $stats_gen['lastEstimatedBirth'],
-                'theoretical' => BigInteger::of(2)->power($gen - 1)->toInt(),
-                'known' => (int) $stats_gen['sosaCount'],
-                'perc_known' => $this->safeDivision(
-                    BigInteger::of((int) $stats_gen['sosaCount']),
-                    BigInteger::of(2)->power($gen - 1)
-                ),
-                'missing' => $gen > 1 ?
-                    2 * (int) $stats_by_gen[$gen - 1]['sosaCount'] - (int) $stats_gen['sosaCount'] :
-                    0,
-                'perc_missing' => $gen > 1 ?
-                    1 - $this->safeDivision(
-                        BigInteger::of((int) $stats_gen['sosaCount']),
-                        BigInteger::of(2 * (int) $stats_by_gen[$gen - 1]['sosaCount'])
-                    ) :
-                    0,
-                'total_known' => (int) $stats_gen['sosaTotalCount'],
-                'perc_total_known' => $this->safeDivision(
-                    BigInteger::of((int) $stats_gen['sosaTotalCount']),
-                    BigInteger::of(2)->power($gen)->minus(1)
-                ),
-                'different' => $gen_diff,
-                'perc_different' => $this->safeDivision(
-                    BigInteger::of($gen_diff),
-                    BigInteger::of((int) $stats_gen['sosaCount'])
-                ),
-                'total_different' => (int) $stats_gen['diffSosaTotalCount']
-            );
-        }
-
-        return $generation_stats;
-    }
-
-    /**
-     * Return the result of a division, and a default value if denominator is 0
-     *
-     * @param BigInteger $p Numerator
-     * @param BigInteger $q Denominator
-     * @param int $scale Rounding scale
-     * @param float $default Value if denominator is 0
-     * @return float
-     */
-    private function safeDivision(BigInteger $p, BigInteger $q, int $scale = 10, float $default = 0): float
-    {
-        return $q->isZero() ? $default : $p->toBigDecimal()->dividedBy($q, $scale, RoundingMode::HALF_DOWN)->toFloat();
-    }
+	use ViewResponseTrait;
+
+	private ?SosaModule $module;
+	private RelationshipService $relationship_service;
+
+	/**
+	 * Constructor for AncestorsList Request Handler
+	 *
+	 * @param ModuleService $module_service
+	 */
+	public function __construct(ModuleService $module_service, RelationshipService $relationship_service)
+	{
+		$this->module = $module_service->findByInterface(SosaModule::class)->first();
+		$this->relationship_service = $relationship_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();
+		$user = Auth::check() ? Validator::attributes($request)->user() : new DefaultUser();
+
+		/** @var SosaStatisticsService $sosa_stats_service */
+		$sosa_stats_service = app()->makeWith(SosaStatisticsService::class, ['tree' => $tree, 'user' => $user]);
+
+		return $this->viewResponse($this->module->name() . '::statistics-page', [
+			'module_name'       =>  $this->module->name(),
+			'title'             =>  I18N::translate('Sosa Statistics'),
+			'tree'              =>  $tree,
+			'theme'             =>  app(ModuleThemeInterface::class),
+			'root_indi'         =>  $sosa_stats_service->rootIndividual(),
+			'general_stats'     =>  $this->statisticsGeneral($sosa_stats_service),
+			'generation_stats'  =>  $this->statisticsByGenerations($sosa_stats_service),
+			'generation_depth'  =>  $sosa_stats_service->generationDepthStatsAtGeneration(1)->first(),
+			'multiple_sosas'    =>  $sosa_stats_service->topMultipleAncestorsWithNoTies(10)->groupBy('sosa_count'),
+			'sosa_dispersion_g2' =>  $sosa_stats_service->ancestorsDispersionForGeneration(2),
+			'sosa_dispersion_g3' =>  $sosa_stats_service->ancestorsDispersionForGeneration(3),
+			'gen_depth_g3'      =>  $sosa_stats_service->generationDepthStatsAtGeneration(3),
+			'relationship_service'  =>  $this->relationship_service,
+		]);
+	}
+
+	/**
+	 * Retrieve and compute the global statistics of ancestors for the tree.
+	 * Statistics include the number of ancestors, the number of different ancestors, pedigree collapse...
+	 *
+	 * @param SosaStatisticsService $sosa_stats_service
+	 * @return array<string, int|float>
+	 */
+	private function statisticsGeneral(SosaStatisticsService $sosa_stats_service): array
+	{
+		$ancestors_count = $sosa_stats_service->totalAncestors();
+		$ancestors_distinct_count = $sosa_stats_service->totalDistinctAncestors();
+		$individual_count = $sosa_stats_service->totalIndividuals();
+
+		return [
+			'sosa_count'    =>  $ancestors_count,
+			'distinct_count'    =>  $ancestors_distinct_count,
+			'sosa_rate' =>  $this->safeDivision(
+				BigInteger::of($ancestors_distinct_count),
+				BigInteger::of($individual_count)
+			),
+			'mean_gen_time'         =>  $sosa_stats_service->meanGenerationTime()
+		];
+	}
+
+	/**
+	 * Retrieve and compute the statistics of ancestors by generations.
+	 * Statistics include the number of ancestors, the number of different ancestors, cumulative statistics...
+	 *
+	 * @param SosaStatisticsService $sosa_stats_service
+	 * @return array<int, array<string, int|float>>
+	 */
+	private function statisticsByGenerations(SosaStatisticsService $sosa_stats_service): array
+	{
+		$stats_by_gen = $sosa_stats_service->statisticsByGenerations();
+
+		$generation_stats = array();
+
+		foreach ($stats_by_gen as $gen => $stats_gen) {
+			$gen_diff = $gen > 1 ?
+				(int) $stats_gen['diffSosaTotalCount'] - (int) $stats_by_gen[$gen - 1]['diffSosaTotalCount'] :
+				1;
+			$generation_stats[$gen] = array(
+				'gen_min_birth' => $stats_gen['firstBirth'] ?? (int) $stats_gen['firstEstimatedBirth'],
+				'gen_max_birth' => $stats_gen['lastBirth'] ?? (int) $stats_gen['lastEstimatedBirth'],
+				'theoretical' => BigInteger::of(2)->power($gen - 1)->toInt(),
+				'known' => (int) $stats_gen['sosaCount'],
+				'perc_known' => $this->safeDivision(
+					BigInteger::of((int) $stats_gen['sosaCount']),
+					BigInteger::of(2)->power($gen - 1)
+				),
+				'missing' => $gen > 1 ?
+					2 * (int) $stats_by_gen[$gen - 1]['sosaCount'] - (int) $stats_gen['sosaCount'] :
+					0,
+				'perc_missing' => $gen > 1 ?
+					1 - $this->safeDivision(
+						BigInteger::of((int) $stats_gen['sosaCount']),
+						BigInteger::of(2 * (int) $stats_by_gen[$gen - 1]['sosaCount'])
+					) :
+					0,
+				'total_known' => (int) $stats_gen['sosaTotalCount'],
+				'perc_total_known' => $this->safeDivision(
+					BigInteger::of((int) $stats_gen['sosaTotalCount']),
+					BigInteger::of(2)->power($gen)->minus(1)
+				),
+				'different' => $gen_diff,
+				'perc_different' => $this->safeDivision(
+					BigInteger::of($gen_diff),
+					BigInteger::of((int) $stats_gen['sosaCount'])
+				),
+				'total_different' => (int) $stats_gen['diffSosaTotalCount']
+			);
+		}
+
+		return $generation_stats;
+	}
+
+	/**
+	 * Return the result of a division, and a default value if denominator is 0
+	 *
+	 * @param BigInteger $p Numerator
+	 * @param BigInteger $q Denominator
+	 * @param int $scale Rounding scale
+	 * @param float $default Value if denominator is 0
+	 * @return float
+	 */
+	private function safeDivision(BigInteger $p, BigInteger $q, int $scale = 10, float $default = 0): float
+	{
+		return $q->isZero() ? $default : $p->toBigDecimal()->dividedBy($q, $scale, RoundingMode::HALF_DOWN)->toFloat();
+	}
 }

app/Module/Sosa/Http/RequestHandlers/PedigreeCollapseData.php

Spacing +2 added lines, -2 removed lines

@@ -67,10 +67,10 @@
         $sosa_stats_service = app()->makeWith(SosaStatisticsService::class, ['tree' => $tree, 'user' => $user]);
         $pedi_collapse_data = $sosa_stats_service->pedigreeCollapseByGenerationData();
 
-        $response = [ 'cells' => [] ];
+        $response = ['cells' => []];
         $last_pedi_collapse = 0;
         foreach ($pedi_collapse_data as $gen => $rec) {
-            $response['cells'][$gen] = view($this->module->name() . '::components/pedigree-collapse-cell', [
+            $response['cells'][$gen] = view($this->module->name().'::components/pedigree-collapse-cell', [
                 'pedi_collapse_roots'   =>  $rec['pedi_collapse_roots'],
                 'pedi_collapse_xgen'    =>  $rec['pedi_collapse_xgen']
             ]);

Indentation +39 added lines, -39 removed lines

@@ -33,49 +33,49 @@
  */
 class PedigreeCollapseData implements RequestHandlerInterface
 {
-    /**
-     * @var SosaModule|null $module
-     */
-    private $module;
+	/**
+	 * @var SosaModule|null $module
+	 */
+	private $module;
 
-    /**
-     * Constructor for PedigreeCollapseData Request Handler
-     *
-     * @param ModuleService $module_service
-     */
-    public function __construct(ModuleService $module_service)
-    {
-        $this->module = $module_service->findByInterface(SosaModule::class)->first();
-    }
+	/**
+	 * Constructor for PedigreeCollapseData Request Handler
+	 *
+	 * @param ModuleService $module_service
+	 */
+	public function __construct(ModuleService $module_service)
+	{
+		$this->module = $module_service->findByInterface(SosaModule::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();
-        $user = Auth::check() ? Validator::attributes($request)->user() : new DefaultUser();
+		$tree = Validator::attributes($request)->tree();
+		$user = Auth::check() ? Validator::attributes($request)->user() : new DefaultUser();
 
-        /** @var SosaStatisticsService $sosa_stats_service */
-        $sosa_stats_service = app()->makeWith(SosaStatisticsService::class, ['tree' => $tree, 'user' => $user]);
-        $pedi_collapse_data = $sosa_stats_service->pedigreeCollapseByGenerationData();
+		/** @var SosaStatisticsService $sosa_stats_service */
+		$sosa_stats_service = app()->makeWith(SosaStatisticsService::class, ['tree' => $tree, 'user' => $user]);
+		$pedi_collapse_data = $sosa_stats_service->pedigreeCollapseByGenerationData();
 
-        $response = [ 'cells' => [] ];
-        $last_pedi_collapse = 0;
-        foreach ($pedi_collapse_data as $gen => $rec) {
-            $response['cells'][$gen] = view($this->module->name() . '::components/pedigree-collapse-cell', [
-                'pedi_collapse_roots'   =>  $rec['pedi_collapse_roots'],
-                'pedi_collapse_xgen'    =>  $rec['pedi_collapse_xgen']
-            ]);
-            $last_pedi_collapse = $rec['pedi_collapse_roots'];
-        }
-        $response['pedi_collapse'] = I18N::percentage($last_pedi_collapse, 2);
+		$response = [ 'cells' => [] ];
+		$last_pedi_collapse = 0;
+		foreach ($pedi_collapse_data as $gen => $rec) {
+			$response['cells'][$gen] = view($this->module->name() . '::components/pedigree-collapse-cell', [
+				'pedi_collapse_roots'   =>  $rec['pedi_collapse_roots'],
+				'pedi_collapse_xgen'    =>  $rec['pedi_collapse_xgen']
+			]);
+			$last_pedi_collapse = $rec['pedi_collapse_roots'];
+		}
+		$response['pedi_collapse'] = I18N::percentage($last_pedi_collapse, 2);
 
-        return Registry::responseFactory()->response($response);
-    }
+		return Registry::responseFactory()->response($response);
+	}
 }

app/Module/Sosa/Schema/Migration2.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
         // Clean up previous sosa table if it exists
         DB::schema()->dropIfExists('maj_sosa');
 
-        DB::schema()->create('maj_sosa', static function (Blueprint $table): void {
+        DB::schema()->create('maj_sosa', static function(Blueprint $table): void {
 
             $table->integer('majs_gedcom_id');
             $table->integer('majs_user_id')->default(-1);

Indentation +37 added lines, -37 removed lines

@@ -23,41 +23,41 @@
  */
 class Migration2 implements MigrationInterface
 {
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Schema\MigrationInterface::upgrade()
-     */
-    public function upgrade(): void
-    {
-        $in_transaction = DB::connection()->getPdo()->inTransaction();
-
-        // Clean up previous sosa table if it exists
-        DB::schema()->dropIfExists('maj_sosa');
-
-        DB::schema()->create('maj_sosa', static function (Blueprint $table): void {
-
-            $table->integer('majs_gedcom_id');
-            $table->integer('majs_user_id')->default(-1);
-            $table->bigInteger('majs_sosa')->unsigned(); // Allow to calculate sosa on 64 generations
-            $table->string('majs_i_id', 20);
-            $table->tinyInteger('majs_gen')->nullable();
-            $table->smallInteger('majs_birth_year')->nullable();
-            $table->smallInteger('majs_birth_year_est')->nullable();
-            $table->smallInteger('majs_death_year')->nullable();
-            $table->smallInteger('majs_death_year_est')->nullable();
-
-            $table->primary(['majs_gedcom_id', 'majs_user_id', 'majs_sosa']);
-
-            $table->index(['majs_gedcom_id', 'majs_user_id']);
-            $table->index(['majs_gedcom_id', 'majs_user_id', 'majs_i_id']);
-            $table->index(['majs_gedcom_id', 'majs_user_id', 'majs_gen']);
-
-            $table->foreign('majs_gedcom_id')->references('gedcom_id')->on('gedcom')->onDelete('cascade');
-            $table->foreign('majs_user_id')->references('user_id')->on('user')->onDelete('cascade');
-        });
-
-        if ($in_transaction && !DB::connection()->getPdo()->inTransaction()) {
-            DB::connection()->beginTransaction();
-        }
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Schema\MigrationInterface::upgrade()
+	 */
+	public function upgrade(): void
+	{
+		$in_transaction = DB::connection()->getPdo()->inTransaction();
+
+		// Clean up previous sosa table if it exists
+		DB::schema()->dropIfExists('maj_sosa');
+
+		DB::schema()->create('maj_sosa', static function (Blueprint $table): void {
+
+			$table->integer('majs_gedcom_id');
+			$table->integer('majs_user_id')->default(-1);
+			$table->bigInteger('majs_sosa')->unsigned(); // Allow to calculate sosa on 64 generations
+			$table->string('majs_i_id', 20);
+			$table->tinyInteger('majs_gen')->nullable();
+			$table->smallInteger('majs_birth_year')->nullable();
+			$table->smallInteger('majs_birth_year_est')->nullable();
+			$table->smallInteger('majs_death_year')->nullable();
+			$table->smallInteger('majs_death_year_est')->nullable();
+
+			$table->primary(['majs_gedcom_id', 'majs_user_id', 'majs_sosa']);
+
+			$table->index(['majs_gedcom_id', 'majs_user_id']);
+			$table->index(['majs_gedcom_id', 'majs_user_id', 'majs_i_id']);
+			$table->index(['majs_gedcom_id', 'majs_user_id', 'majs_gen']);
+
+			$table->foreign('majs_gedcom_id')->references('gedcom_id')->on('gedcom')->onDelete('cascade');
+			$table->foreign('majs_user_id')->references('user_id')->on('user')->onDelete('cascade');
+		});
+
+		if ($in_transaction && !DB::connection()->getPdo()->inTransaction()) {
+			DB::connection()->beginTransaction();
+		}
+	}
 }

app/Module/Sosa/Services/SosaCalculatorService.php

Indentation +139 added lines, -139 removed lines

@@ -24,143 +24,143 @@
  */
 class SosaCalculatorService
 {
-    /**
-     * Maximium size for the temporary Sosa table
-     * @var int TMP_SOSA_TABLE_LIMIT
-     */
-    private const TMP_SOSA_TABLE_LIMIT = 1000;
-
-    /**
-     * @var SosaRecordsService $sosa_records_service
-     */
-    private $sosa_records_service;
-
-    /**
-     * Reference user
-     * @var UserInterface $user
-     */
-    private $user;
-
-    /**
-     * Reference tree
-     * @var Tree $tree
-     */
-    private $tree;
-
-    /**
-     * Temporary Sosa table, used during construction
-     * @var array<array<string,mixed>> $tmp_sosa_table
-     */
-    private $tmp_sosa_table;
-
-    /**
-     * Maximum number of generations to calculate
-     * @var int $max_generations
-     */
-    private $max_generations;
-
-    /**
-     * Constructor for the Sosa Calculator
-     *
-     * @param SosaRecordsService $sosa_records_service
-     * @param Tree $tree
-     * @param UserInterface $user
-     */
-    public function __construct(SosaRecordsService $sosa_records_service, Tree $tree, UserInterface $user)
-    {
-        $this->sosa_records_service = $sosa_records_service;
-        $this->tree = $tree;
-        $this->user = $user;
-        $this->tmp_sosa_table = array();
-        $max_gen_setting = $tree->getUserPreference($user, 'MAJ_SOSA_MAX_GEN');
-        $this->max_generations = is_numeric($max_gen_setting) ?
-            (int) $max_gen_setting :
-            $this->sosa_records_service->maxSystemGenerations();
-    }
-
-    /**
-     * Compute all Sosa ancestors from the user's root individual.
-     *
-     * @return bool Result of the computation
-     */
-    public function computeAll(): bool
-    {
-        $root_id = $this->tree->getUserPreference($this->user, 'MAJ_SOSA_ROOT_ID');
-        if (($indi = Registry::individualFactory()->make($root_id, $this->tree)) !== null) {
-            $this->sosa_records_service->deleteAll($this->tree, $this->user);
-            $this->addNode($indi, 1);
-            $this->flushTmpSosaTable(true);
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Compute all Sosa Ancestors from a specified Individual
-     *
-     * @param Individual $indi
-     * @return bool
-     */
-    public function computeFromIndividual(Individual $indi): bool
-    {
-        $current_sosas = $this->sosa_records_service->sosaNumbers($this->tree, $this->user, $indi);
-        foreach ($current_sosas->keys() as $sosa) {
-            $this->sosa_records_service->deleteAncestorsFrom($this->tree, $this->user, $sosa);
-            $this->addNode($indi, $sosa);
-        }
-        $this->flushTmpSosaTable(true);
-        return true;
-    }
-
-    /**
-     * Recursive method to add individual to the Sosa table, and flush it regularly
-     *
-     * @param Individual $indi Individual to add
-     * @param int $sosa Individual's sosa
-     */
-    private function addNode(Individual $indi, int $sosa): void
-    {
-        $birth_year = $indi->getBirthDate()->gregorianYear();
-        $birth_year_est = $birth_year === 0 ? $indi->getEstimatedBirthDate()->gregorianYear() : $birth_year;
-
-        $death_year = $indi->getDeathDate()->gregorianYear();
-        $death_year_est = $death_year === 0 ? $indi->getEstimatedDeathDate()->gregorianYear() : $death_year;
-
-        $this->tmp_sosa_table[] = [
-            'indi' => $indi->xref(),
-            'sosa' => $sosa,
-            'birth_year' => $birth_year === 0 ? null : $birth_year,
-            'birth_year_est' => $birth_year_est === 0 ? null : $birth_year_est,
-            'death_year' => $death_year === 0 ? null : $death_year,
-            'death_year_est' => $death_year_est === 0 ? null : $death_year_est
-        ];
-
-        $this->flushTmpSosaTable();
-
-        if (
-            ($fam = $indi->childFamilies()->first()) !== null
-            && $this->sosa_records_service->generation($sosa) < $this->max_generations
-        ) {
-            /** @var \Fisharebest\Webtrees\Family $fam */
-            if (($husb = $fam->husband()) !== null) {
-                $this->addNode($husb, 2 * $sosa);
-            }
-            if (($wife = $fam->wife()) !== null) {
-                $this->addNode($wife, 2 * $sosa + 1);
-            }
-        }
-    }
-
-    /**
-     * Write sosas in the table, if the number of items is superior to the limit, or if forced.
-     *
-     * @param bool $force Should the flush be forced
-     */
-    private function flushTmpSosaTable($force = false): void
-    {
-        if ($force || count($this->tmp_sosa_table) >= self::TMP_SOSA_TABLE_LIMIT) {
-            $this->sosa_records_service->insertOrUpdate($this->tree, $this->user, $this->tmp_sosa_table);
-            $this->tmp_sosa_table = array();
-        }
-    }
+	/**
+	 * Maximium size for the temporary Sosa table
+	 * @var int TMP_SOSA_TABLE_LIMIT
+	 */
+	private const TMP_SOSA_TABLE_LIMIT = 1000;
+
+	/**
+	 * @var SosaRecordsService $sosa_records_service
+	 */
+	private $sosa_records_service;
+
+	/**
+	 * Reference user
+	 * @var UserInterface $user
+	 */
+	private $user;
+
+	/**
+	 * Reference tree
+	 * @var Tree $tree
+	 */
+	private $tree;
+
+	/**
+	 * Temporary Sosa table, used during construction
+	 * @var array<array<string,mixed>> $tmp_sosa_table
+	 */
+	private $tmp_sosa_table;
+
+	/**
+	 * Maximum number of generations to calculate
+	 * @var int $max_generations
+	 */
+	private $max_generations;
+
+	/**
+	 * Constructor for the Sosa Calculator
+	 *
+	 * @param SosaRecordsService $sosa_records_service
+	 * @param Tree $tree
+	 * @param UserInterface $user
+	 */
+	public function __construct(SosaRecordsService $sosa_records_service, Tree $tree, UserInterface $user)
+	{
+		$this->sosa_records_service = $sosa_records_service;
+		$this->tree = $tree;
+		$this->user = $user;
+		$this->tmp_sosa_table = array();
+		$max_gen_setting = $tree->getUserPreference($user, 'MAJ_SOSA_MAX_GEN');
+		$this->max_generations = is_numeric($max_gen_setting) ?
+			(int) $max_gen_setting :
+			$this->sosa_records_service->maxSystemGenerations();
+	}
+
+	/**
+	 * Compute all Sosa ancestors from the user's root individual.
+	 *
+	 * @return bool Result of the computation
+	 */
+	public function computeAll(): bool
+	{
+		$root_id = $this->tree->getUserPreference($this->user, 'MAJ_SOSA_ROOT_ID');
+		if (($indi = Registry::individualFactory()->make($root_id, $this->tree)) !== null) {
+			$this->sosa_records_service->deleteAll($this->tree, $this->user);
+			$this->addNode($indi, 1);
+			$this->flushTmpSosaTable(true);
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Compute all Sosa Ancestors from a specified Individual
+	 *
+	 * @param Individual $indi
+	 * @return bool
+	 */
+	public function computeFromIndividual(Individual $indi): bool
+	{
+		$current_sosas = $this->sosa_records_service->sosaNumbers($this->tree, $this->user, $indi);
+		foreach ($current_sosas->keys() as $sosa) {
+			$this->sosa_records_service->deleteAncestorsFrom($this->tree, $this->user, $sosa);
+			$this->addNode($indi, $sosa);
+		}
+		$this->flushTmpSosaTable(true);
+		return true;
+	}
+
+	/**
+	 * Recursive method to add individual to the Sosa table, and flush it regularly
+	 *
+	 * @param Individual $indi Individual to add
+	 * @param int $sosa Individual's sosa
+	 */
+	private function addNode(Individual $indi, int $sosa): void
+	{
+		$birth_year = $indi->getBirthDate()->gregorianYear();
+		$birth_year_est = $birth_year === 0 ? $indi->getEstimatedBirthDate()->gregorianYear() : $birth_year;
+
+		$death_year = $indi->getDeathDate()->gregorianYear();
+		$death_year_est = $death_year === 0 ? $indi->getEstimatedDeathDate()->gregorianYear() : $death_year;
+
+		$this->tmp_sosa_table[] = [
+			'indi' => $indi->xref(),
+			'sosa' => $sosa,
+			'birth_year' => $birth_year === 0 ? null : $birth_year,
+			'birth_year_est' => $birth_year_est === 0 ? null : $birth_year_est,
+			'death_year' => $death_year === 0 ? null : $death_year,
+			'death_year_est' => $death_year_est === 0 ? null : $death_year_est
+		];
+
+		$this->flushTmpSosaTable();
+
+		if (
+			($fam = $indi->childFamilies()->first()) !== null
+			&& $this->sosa_records_service->generation($sosa) < $this->max_generations
+		) {
+			/** @var \Fisharebest\Webtrees\Family $fam */
+			if (($husb = $fam->husband()) !== null) {
+				$this->addNode($husb, 2 * $sosa);
+			}
+			if (($wife = $fam->wife()) !== null) {
+				$this->addNode($wife, 2 * $sosa + 1);
+			}
+		}
+	}
+
+	/**
+	 * Write sosas in the table, if the number of items is superior to the limit, or if forced.
+	 *
+	 * @param bool $force Should the flush be forced
+	 */
+	private function flushTmpSosaTable($force = false): void
+	{
+		if ($force || count($this->tmp_sosa_table) >= self::TMP_SOSA_TABLE_LIMIT) {
+			$this->sosa_records_service->insertOrUpdate($this->tree, $this->user, $this->tmp_sosa_table);
+			$this->tmp_sosa_table = array();
+		}
+	}
 }

Spacing +1 added lines, -2 removed lines

@@ -74,8 +74,7 @@
         $this->tmp_sosa_table = array();
         $max_gen_setting = $tree->getUserPreference($user, 'MAJ_SOSA_MAX_GEN');
         $this->max_generations = is_numeric($max_gen_setting) ?
-            (int) $max_gen_setting :
-            $this->sosa_records_service->maxSystemGenerations();
+            (int)$max_gen_setting : $this->sosa_records_service->maxSystemGenerations();
     }
 
     /**

app/Module/GeoDispersion/GeoDispersionModule.php

Spacing +8 added lines, -8 removed lines

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

Indentation +183 added lines, -183 removed lines

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

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

Spacing +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
             ->all($tree)
             ->sortBy(fn(AbstractGeoAnalysisView $view) => $view->description());
 
-        return $this->viewResponse($this->module->name() . '::geoanalysisviews-list', [
+        return $this->viewResponse($this->module->name().'::geoanalysisviews-list', [
             'module'        =>  $this->module,
             'title'         =>  I18N::translate('Geographical dispersion'),
             'tree'          =>  $tree,

Indentation +36 added lines, -36 removed lines

@@ -33,46 +33,46 @@
  */
 class GeoAnalysisViewsList implements RequestHandlerInterface
 {
-    use ViewResponseTrait;
+	use ViewResponseTrait;
 
-    private ?GeoDispersionModule $module;
-    private GeoAnalysisViewDataService $geoviewdata_service;
+	private ?GeoDispersionModule $module;
+	private GeoAnalysisViewDataService $geoviewdata_service;
 
-    /**
-     * Constructor for GeoAnalysisViewsList Request Handler
-     *
-     * @param ModuleService $module_service
-     */
-    public function __construct(
-        ModuleService $module_service,
-        GeoAnalysisViewDataService $geoviewdata_service
-    ) {
-        $this->module = $module_service->findByInterface(GeoDispersionModule::class)->first();
-        $this->geoviewdata_service = $geoviewdata_service;
-    }
+	/**
+	 * Constructor for GeoAnalysisViewsList Request Handler
+	 *
+	 * @param ModuleService $module_service
+	 */
+	public function __construct(
+		ModuleService $module_service,
+		GeoAnalysisViewDataService $geoviewdata_service
+	) {
+		$this->module = $module_service->findByInterface(GeoDispersionModule::class)->first();
+		$this->geoviewdata_service = $geoviewdata_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.'));
-        }
+	/**
+	 * {@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();
+		$tree = Validator::attributes($request)->tree();
 
-        $views_list = $this->geoviewdata_service
-            ->all($tree)
-            ->sortBy(fn(AbstractGeoAnalysisView $view) => $view->description());
+		$views_list = $this->geoviewdata_service
+			->all($tree)
+			->sortBy(fn(AbstractGeoAnalysisView $view) => $view->description());
 
-        return $this->viewResponse($this->module->name() . '::geoanalysisviews-list', [
-            'module'        =>  $this->module,
-            'title'         =>  I18N::translate('Geographical dispersion'),
-            'tree'          =>  $tree,
-            'views_list'    =>  $views_list,
-            'js_script_url' =>  $this->module->assetUrl('js/geodispersion.min.js')
-        ]);
-    }
+		return $this->viewResponse($this->module->name() . '::geoanalysisviews-list', [
+			'module'        =>  $this->module,
+			'title'         =>  I18N::translate('Geographical dispersion'),
+			'tree'          =>  $tree,
+			'views_list'    =>  $views_list,
+			'js_script_url' =>  $this->module->assetUrl('js/geodispersion.min.js')
+		]);
+	}
 }

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

Spacing +1 added lines, -1 removed lines

@@ -87,7 +87,7 @@
             throw new HttpAccessDeniedException();
         }
 
-        return $this->viewResponse($this->module->name() . '::admin/config', [
+        return $this->viewResponse($this->module->name().'::admin/config', [
             'module_name'       =>  $this->module->name(),
             'title'             =>  $this->module->title(),
             'tree'              =>  $tree,

Indentation +60 added lines, -60 removed lines

@@ -35,64 +35,64 @@
  */
 class AdminConfigPage implements RequestHandlerInterface
 {
-    use ViewResponseTrait;
-
-    private ?GeoDispersionModule $module;
-
-    private TreeService $tree_service;
-
-    private GeoAnalysisDataService $geoanalysis_data_service;
-
-    /**
-     * Constructor for the AdminConfigPage Request Handler
-     *
-     * @param ModuleService $module_service
-     * @param TreeService $tree_service
-     * @param GeoAnalysisDataService $geoanalysis_data_service
-     */
-    public function __construct(
-        ModuleService $module_service,
-        TreeService $tree_service,
-        GeoAnalysisDataService $geoanalysis_data_service
-    ) {
-        $this->module = $module_service->findByInterface(GeoDispersionModule::class)->first();
-        $this->tree_service = $tree_service;
-        $this->geoanalysis_data_service = $geoanalysis_data_service;
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        $this->layout = 'layouts/administration';
-
-        if ($this->module === null) {
-            throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
-        }
-
-        $user = Validator::attributes($request)->user();
-
-        $all_trees = $this->tree_service->all()->filter(fn(Tree $tree) => Auth::isManager($tree, $user));
-        if ($all_trees->count() === 0) {
-            throw new HttpAccessDeniedException();
-        }
-
-        $tree = Validator::attributes($request)->treeOptional() ?? $all_trees->first();
-
-        $same_tree = fn(Tree $tree_collection): bool => $tree->id() === $tree_collection->id();
-        if (!$all_trees->contains($same_tree)) {
-            throw new HttpAccessDeniedException();
-        }
-
-        return $this->viewResponse($this->module->name() . '::admin/config', [
-            'module_name'       =>  $this->module->name(),
-            'title'             =>  $this->module->title(),
-            'tree'              =>  $tree,
-            'other_trees'       =>  $all_trees->reject($same_tree),
-            'place_example'     =>  $this->geoanalysis_data_service->placeHierarchyExample($tree),
-            'js_script_url'     =>  $this->module->assetUrl('js/geodispersion.min.js')
-        ]);
-    }
+	use ViewResponseTrait;
+
+	private ?GeoDispersionModule $module;
+
+	private TreeService $tree_service;
+
+	private GeoAnalysisDataService $geoanalysis_data_service;
+
+	/**
+	 * Constructor for the AdminConfigPage Request Handler
+	 *
+	 * @param ModuleService $module_service
+	 * @param TreeService $tree_service
+	 * @param GeoAnalysisDataService $geoanalysis_data_service
+	 */
+	public function __construct(
+		ModuleService $module_service,
+		TreeService $tree_service,
+		GeoAnalysisDataService $geoanalysis_data_service
+	) {
+		$this->module = $module_service->findByInterface(GeoDispersionModule::class)->first();
+		$this->tree_service = $tree_service;
+		$this->geoanalysis_data_service = $geoanalysis_data_service;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		$this->layout = 'layouts/administration';
+
+		if ($this->module === null) {
+			throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
+		}
+
+		$user = Validator::attributes($request)->user();
+
+		$all_trees = $this->tree_service->all()->filter(fn(Tree $tree) => Auth::isManager($tree, $user));
+		if ($all_trees->count() === 0) {
+			throw new HttpAccessDeniedException();
+		}
+
+		$tree = Validator::attributes($request)->treeOptional() ?? $all_trees->first();
+
+		$same_tree = fn(Tree $tree_collection): bool => $tree->id() === $tree_collection->id();
+		if (!$all_trees->contains($same_tree)) {
+			throw new HttpAccessDeniedException();
+		}
+
+		return $this->viewResponse($this->module->name() . '::admin/config', [
+			'module_name'       =>  $this->module->name(),
+			'title'             =>  $this->module->title(),
+			'tree'              =>  $tree,
+			'other_trees'       =>  $all_trees->reject($same_tree),
+			'place_example'     =>  $this->geoanalysis_data_service->placeHierarchyExample($tree),
+			'js_script_url'     =>  $this->module->assetUrl('js/geodispersion.min.js')
+		]);
+	}
 }