jon48 / webtrees-lib

app/Module/Sosa/Schema/Migration1.php

Indentation +8 added lines, -8 removed lines

@@ -22,12 +22,12 @@
 class Migration1 implements MigrationInterface
 {
     
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Schema\MigrationInterface::upgrade()
-     */
-    public function upgrade(): void
-    {
-        // These migrations have been merged into migration 2.
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Schema\MigrationInterface::upgrade()
+	 */
+	public function upgrade(): void
+	{
+		// These migrations have been merged into migration 2.
+	}
 }

app/Module/Sosa/Schema/Migration2.php

Indentation +32 added lines, -32 removed lines

@@ -24,36 +24,36 @@
 class Migration2 implements MigrationInterface
 {
 
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Schema\MigrationInterface::upgrade()
-     */
-    public function upgrade(): void
-    {
-
-        // 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');
-        });
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Schema\MigrationInterface::upgrade()
+	 */
+	public function upgrade(): void
+	{
+
+		// 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');
+		});
+	}
 }

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);

app/Module/Sosa/Schema/Migration0.php

Indentation +8 added lines, -8 removed lines

@@ -22,12 +22,12 @@
 class Migration0 implements MigrationInterface
 {
 
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Schema\MigrationInterface::upgrade()
-     */
-    public function upgrade(): void
-    {
-        // These migrations have been merged into migration 2.
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Schema\MigrationInterface::upgrade()
+	 */
+	public function upgrade(): void
+	{
+		// These migrations have been merged into migration 2.
+	}
 }

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/Sosa/Services/SosaRecordsService.php

Spacing +32 added lines, -32 removed lines

@@ -88,8 +88,8 @@ 
     public function sosaNumbers(Tree $tree, UserInterface $user, Individual $indi): Collection
     {
         return Registry::cache()->array()->remember(
-            'sosanumbers-' . $indi->xref() . '@' . $tree->id() . '-' . $user->id(),
-            function () use ($tree, $user, $indi): Collection {
+            'sosanumbers-'.$indi->xref().'@'.$tree->id().'-'.$user->id(),
+            function() use ($tree, $user, $indi): Collection {
                 return DB::table('maj_sosa')
                     ->select(['majs_sosa', 'majs_gen'])
                     ->where('majs_gedcom_id', '=', $tree->id())
@@ -149,14 +149,14 @@ 
     {
         $table_prefix = DB::connection()->getTablePrefix();
         return DB::table('families')
-            ->join('maj_sosa AS sosa_husb', function (JoinClause $join) use ($tree, $user): void {
+            ->join('maj_sosa AS sosa_husb', function(JoinClause $join) use ($tree, $user): void {
                 // Link to family husband
                 $join->on('families.f_file', '=', 'sosa_husb.majs_gedcom_id')
                     ->on('families.f_husb', '=', 'sosa_husb.majs_i_id')
                     ->where('sosa_husb.majs_gedcom_id', '=', $tree->id())
                     ->where('sosa_husb.majs_user_id', '=', $user->id());
             })
-            ->join('maj_sosa AS sosa_wife', function (JoinClause $join) use ($tree, $user): void {
+            ->join('maj_sosa AS sosa_wife', function(JoinClause $join) use ($tree, $user): void {
                 // Link to family husband
                 $join->on('families.f_file', '=', 'sosa_wife.majs_gedcom_id')
                 ->on('families.f_wife', '=', 'sosa_wife.majs_i_id')
@@ -165,7 +165,7 @@ 
             })
             ->select(['sosa_husb.majs_sosa', 'families.f_id'])
             ->where('sosa_husb.majs_gen', '=', $gen)
-            ->whereRaw($table_prefix . 'sosa_husb.majs_sosa + 1 = ' . $table_prefix . 'sosa_wife.majs_sosa')
+            ->whereRaw($table_prefix.'sosa_husb.majs_sosa + 1 = '.$table_prefix.'sosa_wife.majs_sosa')
             ->orderBy('sosa_husb.majs_sosa')
             ->get();
     }
@@ -188,28 +188,28 @@ 
         $table_prefix = DB::connection()->getTablePrefix();
         return DB::table('maj_sosa AS sosa')
             ->select(['sosa.majs_i_id', 'sosa_fat.majs_i_id AS majs_fat_id', 'sosa_mot.majs_i_id AS majs_mot_id'])
-            ->selectRaw('MIN(' . $table_prefix . 'sosa.majs_sosa) AS majs_sosa')
-            ->leftJoin('maj_sosa AS sosa_fat', function (JoinClause $join) use ($tree, $user, $table_prefix): void {
+            ->selectRaw('MIN('.$table_prefix.'sosa.majs_sosa) AS majs_sosa')
+            ->leftJoin('maj_sosa AS sosa_fat', function(JoinClause $join) use ($tree, $user, $table_prefix): void {
                 // Link to sosa's father
-                $join->whereRaw($table_prefix . 'sosa_fat.majs_sosa = 2 * ' . $table_prefix . 'sosa.majs_sosa')
+                $join->whereRaw($table_prefix.'sosa_fat.majs_sosa = 2 * '.$table_prefix.'sosa.majs_sosa')
                     ->where('sosa_fat.majs_gedcom_id', '=', $tree->id())
                     ->where('sosa_fat.majs_user_id', '=', $user->id());
             })
-            ->leftJoin('maj_sosa AS sosa_mot', function (JoinClause $join) use ($tree, $user, $table_prefix): void {
+            ->leftJoin('maj_sosa AS sosa_mot', function(JoinClause $join) use ($tree, $user, $table_prefix): void {
                 // Link to sosa's mother
-                $join->whereRaw($table_prefix . 'sosa_mot.majs_sosa = 2 * ' . $table_prefix . 'sosa.majs_sosa + 1')
+                $join->whereRaw($table_prefix.'sosa_mot.majs_sosa = 2 * '.$table_prefix.'sosa.majs_sosa + 1')
                     ->where('sosa_mot.majs_gedcom_id', '=', $tree->id())
                     ->where('sosa_mot.majs_user_id', '=', $user->id());
             })
             ->where('sosa.majs_gedcom_id', '=', $tree->id())
             ->where('sosa.majs_user_id', '=', $user->id())
             ->where('sosa.majs_gen', '=', $gen - 1)
-            ->where(function (Builder $query): void {
+            ->where(function(Builder $query): void {
                 $query->whereNull('sosa_fat.majs_i_id')
                     ->orWhereNull('sosa_mot.majs_i_id');
             })
             ->groupBy('sosa.majs_i_id', 'sosa_fat.majs_i_id', 'sosa_mot.majs_i_id')
-            ->orderByRaw('MIN(' . $table_prefix . 'sosa.majs_sosa)')
+            ->orderByRaw('MIN('.$table_prefix.'sosa.majs_sosa)')
             ->get();
     }
 
@@ -261,29 +261,29 @@ 
         $has_records = false;
         foreach ($sosa_records as $i => $row) {
             $gen = $this->generation($row['sosa']);
-            if ($gen <=  $this->maxSystemGenerations()) {
+            if ($gen <= $this->maxSystemGenerations()) {
                 $has_records = true;
                 if ($mass_update) {
-                    $bindings_placeholders[] = '(:tree_id' . $i . ', :user_id' . $i . ', :sosa' . $i . ',' .
-                        ' :indi_id' . $i . ', :gen' . $i . ',' .
-                        ' :byear' . $i . ', :byearest' . $i . ', :dyear' . $i . ', :dyearest' . $i . ')';
+                    $bindings_placeholders[] = '(:tree_id'.$i.', :user_id'.$i.', :sosa'.$i.','.
+                        ' :indi_id'.$i.', :gen'.$i.','.
+                        ' :byear'.$i.', :byearest'.$i.', :dyear'.$i.', :dyearest'.$i.')';
                     $bindings_values = array_merge(
                         $bindings_values,
                         [
-                            'tree_id' . $i => $tree->id(),
-                            'user_id' . $i => $user->id(),
-                            'sosa' . $i => $row['sosa'],
-                            'indi_id' . $i => $row['indi'],
-                            'gen' . $i => $gen,
-                            'byear' . $i => $row['birth_year'],
-                            'byearest' . $i => $row['birth_year_est'],
-                            'dyear' . $i => $row['death_year'],
-                            'dyearest' . $i => $row['death_year_est']
+                            'tree_id'.$i => $tree->id(),
+                            'user_id'.$i => $user->id(),
+                            'sosa'.$i => $row['sosa'],
+                            'indi_id'.$i => $row['indi'],
+                            'gen'.$i => $gen,
+                            'byear'.$i => $row['birth_year'],
+                            'byearest'.$i => $row['birth_year_est'],
+                            'dyear'.$i => $row['death_year'],
+                            'dyearest'.$i => $row['death_year_est']
                         ]
                     );
                 } else {
                     DB::table('maj_sosa')->updateOrInsert(
-                        [ 'majs_gedcom_id' => $tree->id(), 'majs_user_id' => $user->id(), 'majs_sosa' => $row['sosa']],
+                        ['majs_gedcom_id' => $tree->id(), 'majs_user_id' => $user->id(), 'majs_sosa' => $row['sosa']],
                         [
                             'majs_i_id' => $row['indi'],
                             'majs_gen' => $gen,
@@ -299,12 +299,12 @@ 
 
         if ($has_records && $mass_update) {
             DB::connection()->statement(
-                'INSERT INTO `' . DB::connection()->getTablePrefix() . 'maj_sosa`' .
-                ' (majs_gedcom_id, majs_user_id, majs_sosa,' .
-                '   majs_i_id, majs_gen, majs_birth_year, majs_birth_year_est, majs_death_year, majs_death_year_est)' .
-                ' VALUES ' . implode(',', $bindings_placeholders) .
-                ' ON DUPLICATE KEY UPDATE majs_i_id = VALUES(majs_i_id), majs_gen = VALUES(majs_gen),' .
-                '   majs_birth_year = VALUES(majs_birth_year), majs_birth_year_est = VALUES(majs_birth_year_est),' .
+                'INSERT INTO `'.DB::connection()->getTablePrefix().'maj_sosa`'.
+                ' (majs_gedcom_id, majs_user_id, majs_sosa,'.
+                '   majs_i_id, majs_gen, majs_birth_year, majs_birth_year_est, majs_death_year, majs_death_year_est)'.
+                ' VALUES '.implode(',', $bindings_placeholders).
+                ' ON DUPLICATE KEY UPDATE majs_i_id = VALUES(majs_i_id), majs_gen = VALUES(majs_gen),'.
+                '   majs_birth_year = VALUES(majs_birth_year), majs_birth_year_est = VALUES(majs_birth_year_est),'.
                 '   majs_death_year = VALUES(majs_death_year), majs_death_year_est = VALUES(majs_death_year_est)',
                 $bindings_values
             );

Indentation +275 added lines, -275 removed lines

@@ -30,294 +30,294 @@
  */
 class SosaRecordsService
 {
-    private ?int $max_system_generations = null;
+	private ?int $max_system_generations = null;
 
-    /**
-     * Maximum number of generation the system is able to hold.
-     * This is based on the size of the bigint SQL type (2^63) and the maximum PHP integer type
-     *
-     * @return int
-     */
-    public function maxSystemGenerations(): int
-    {
-        if ($this->max_system_generations === null) {
-            $this->max_system_generations = min(63, $this->generation(PHP_INT_MAX));
-        }
-        return $this->max_system_generations;
-    }
+	/**
+	 * Maximum number of generation the system is able to hold.
+	 * This is based on the size of the bigint SQL type (2^63) and the maximum PHP integer type
+	 *
+	 * @return int
+	 */
+	public function maxSystemGenerations(): int
+	{
+		if ($this->max_system_generations === null) {
+			$this->max_system_generations = min(63, $this->generation(PHP_INT_MAX));
+		}
+		return $this->max_system_generations;
+	}
 
-    /**
-     * Calculate the generation of a sosa
-     * Sosa 1 is of generation 1.
-     *
-     * @param int $sosa
-     * @return int
-     */
-    public function generation(int $sosa): int
-    {
-        return BigInteger::of($sosa)->getBitLength();
-    }
+	/**
+	 * Calculate the generation of a sosa
+	 * Sosa 1 is of generation 1.
+	 *
+	 * @param int $sosa
+	 * @return int
+	 */
+	public function generation(int $sosa): int
+	{
+		return BigInteger::of($sosa)->getBitLength();
+	}
 
-    /**
-     * Calculate the descendant sosa of the given sosa, at the given generation.
-     * For instance, the descendant of the Sosa 14 at generation 2 is Sosa 3 (mother).
-     *
-     * @param int $sosa
-     * @param int $gen
-     * @return int
-     */
-    public function sosaDescendantOf(int $sosa, int $gen): int
-    {
-        $gen_sosa = $this->generation($sosa);
-        return $gen_sosa <= $gen ? $sosa : BigInteger::of($sosa)
-            ->dividedBy(BigInteger::of(2)->power($this->generation($sosa) - $gen), RoundingMode::DOWN)
-            ->toInt();
-    }
+	/**
+	 * Calculate the descendant sosa of the given sosa, at the given generation.
+	 * For instance, the descendant of the Sosa 14 at generation 2 is Sosa 3 (mother).
+	 *
+	 * @param int $sosa
+	 * @param int $gen
+	 * @return int
+	 */
+	public function sosaDescendantOf(int $sosa, int $gen): int
+	{
+		$gen_sosa = $this->generation($sosa);
+		return $gen_sosa <= $gen ? $sosa : BigInteger::of($sosa)
+			->dividedBy(BigInteger::of(2)->power($this->generation($sosa) - $gen), RoundingMode::DOWN)
+			->toInt();
+	}
 
-    /**
-     * Check whether an individual is a Sosa ancestor.
-     *
-     * @param Tree $tree
-     * @param UserInterface $user
-     * @param Individual $indi
-     * @return bool
-     */
-    public function isSosa(Tree $tree, UserInterface $user, Individual $indi): bool
-    {
-        return $this->sosaNumbers($tree, $user, $indi)->count() > 0;
-    }
+	/**
+	 * Check whether an individual is a Sosa ancestor.
+	 *
+	 * @param Tree $tree
+	 * @param UserInterface $user
+	 * @param Individual $indi
+	 * @return bool
+	 */
+	public function isSosa(Tree $tree, UserInterface $user, Individual $indi): bool
+	{
+		return $this->sosaNumbers($tree, $user, $indi)->count() > 0;
+	}
 
-    /**
-     * Returns all Sosa numbers associated to an Individual
-     *
-     * @param Tree $tree
-     * @param UserInterface $user
-     * @param Individual $indi
-     * @return Collection<int, int>
-     */
-    public function sosaNumbers(Tree $tree, UserInterface $user, Individual $indi): Collection
-    {
-        return Registry::cache()->array()->remember(
-            'sosanumbers-' . $indi->xref() . '@' . $tree->id() . '-' . $user->id(),
-            function () use ($tree, $user, $indi): Collection {
-                return DB::table('maj_sosa')
-                    ->select(['majs_sosa', 'majs_gen'])
-                    ->where('majs_gedcom_id', '=', $tree->id())
-                    ->where('majs_user_id', '=', $user->id())
-                    ->where('majs_i_id', '=', $indi->xref())
-                    ->orderBy('majs_sosa')
-                    ->get()->pluck('majs_gen', 'majs_sosa');
-            }
-        );
-    }
+	/**
+	 * Returns all Sosa numbers associated to an Individual
+	 *
+	 * @param Tree $tree
+	 * @param UserInterface $user
+	 * @param Individual $indi
+	 * @return Collection<int, int>
+	 */
+	public function sosaNumbers(Tree $tree, UserInterface $user, Individual $indi): Collection
+	{
+		return Registry::cache()->array()->remember(
+			'sosanumbers-' . $indi->xref() . '@' . $tree->id() . '-' . $user->id(),
+			function () use ($tree, $user, $indi): Collection {
+				return DB::table('maj_sosa')
+					->select(['majs_sosa', 'majs_gen'])
+					->where('majs_gedcom_id', '=', $tree->id())
+					->where('majs_user_id', '=', $user->id())
+					->where('majs_i_id', '=', $indi->xref())
+					->orderBy('majs_sosa')
+					->get()->pluck('majs_gen', 'majs_sosa');
+			}
+		);
+	}
 
-    /**
-     * Return a list of the Sosa ancestors across all generation
-     *
-     * @param Tree $tree
-     * @param UserInterface $user
-     * @return Collection<\stdClass>
-     */
-    public function listAncestors(Tree $tree, UserInterface $user): Collection
-    {
-        return DB::table('maj_sosa')
-            ->select(['majs_sosa', 'majs_i_id'])
-            ->where('majs_gedcom_id', '=', $tree->id())
-            ->where('majs_user_id', '=', $user->id())
-            ->orderBy('majs_sosa')
-            ->get();
-    }
+	/**
+	 * Return a list of the Sosa ancestors across all generation
+	 *
+	 * @param Tree $tree
+	 * @param UserInterface $user
+	 * @return Collection<\stdClass>
+	 */
+	public function listAncestors(Tree $tree, UserInterface $user): Collection
+	{
+		return DB::table('maj_sosa')
+			->select(['majs_sosa', 'majs_i_id'])
+			->where('majs_gedcom_id', '=', $tree->id())
+			->where('majs_user_id', '=', $user->id())
+			->orderBy('majs_sosa')
+			->get();
+	}
 
-    /**
-     * Return a list of the Sosa ancestors at a given generation
-     *
-     * @param Tree $tree
-     * @param UserInterface $user
-     * @param int $gen
-     * @return Collection<\stdClass>
-     */
-    public function listAncestorsAtGeneration(Tree $tree, UserInterface $user, int $gen): Collection
-    {
-        return DB::table('maj_sosa')
-            ->select(['majs_sosa', 'majs_i_id'])
-            ->where('majs_gedcom_id', '=', $tree->id())
-            ->where('majs_user_id', '=', $user->id())
-            ->where('majs_gen', '=', $gen)
-            ->orderBy('majs_sosa')
-            ->get();
-    }
+	/**
+	 * Return a list of the Sosa ancestors at a given generation
+	 *
+	 * @param Tree $tree
+	 * @param UserInterface $user
+	 * @param int $gen
+	 * @return Collection<\stdClass>
+	 */
+	public function listAncestorsAtGeneration(Tree $tree, UserInterface $user, int $gen): Collection
+	{
+		return DB::table('maj_sosa')
+			->select(['majs_sosa', 'majs_i_id'])
+			->where('majs_gedcom_id', '=', $tree->id())
+			->where('majs_user_id', '=', $user->id())
+			->where('majs_gen', '=', $gen)
+			->orderBy('majs_sosa')
+			->get();
+	}
 
-    /**
-     * Return a list of the Sosa families at a given generation
-     *
-     * @param Tree $tree
-     * @param UserInterface $user
-     * @param int $gen
-     * @return Collection<\stdClass>
-     */
-    public function listAncestorFamiliesAtGeneration(Tree $tree, UserInterface $user, int $gen): Collection
-    {
-        $table_prefix = DB::connection()->getTablePrefix();
-        return DB::table('families')
-            ->join('maj_sosa AS sosa_husb', function (JoinClause $join) use ($tree, $user): void {
-                // Link to family husband
-                $join->on('families.f_file', '=', 'sosa_husb.majs_gedcom_id')
-                    ->on('families.f_husb', '=', 'sosa_husb.majs_i_id')
-                    ->where('sosa_husb.majs_gedcom_id', '=', $tree->id())
-                    ->where('sosa_husb.majs_user_id', '=', $user->id());
-            })
-            ->join('maj_sosa AS sosa_wife', function (JoinClause $join) use ($tree, $user): void {
-                // Link to family husband
-                $join->on('families.f_file', '=', 'sosa_wife.majs_gedcom_id')
-                ->on('families.f_wife', '=', 'sosa_wife.majs_i_id')
-                ->where('sosa_wife.majs_gedcom_id', '=', $tree->id())
-                ->where('sosa_wife.majs_user_id', '=', $user->id());
-            })
-            ->select(['sosa_husb.majs_sosa', 'families.f_id'])
-            ->where('sosa_husb.majs_gen', '=', $gen)
-            ->whereRaw($table_prefix . 'sosa_husb.majs_sosa + 1 = ' . $table_prefix . 'sosa_wife.majs_sosa')
-            ->orderBy('sosa_husb.majs_sosa')
-            ->get();
-    }
+	/**
+	 * Return a list of the Sosa families at a given generation
+	 *
+	 * @param Tree $tree
+	 * @param UserInterface $user
+	 * @param int $gen
+	 * @return Collection<\stdClass>
+	 */
+	public function listAncestorFamiliesAtGeneration(Tree $tree, UserInterface $user, int $gen): Collection
+	{
+		$table_prefix = DB::connection()->getTablePrefix();
+		return DB::table('families')
+			->join('maj_sosa AS sosa_husb', function (JoinClause $join) use ($tree, $user): void {
+				// Link to family husband
+				$join->on('families.f_file', '=', 'sosa_husb.majs_gedcom_id')
+					->on('families.f_husb', '=', 'sosa_husb.majs_i_id')
+					->where('sosa_husb.majs_gedcom_id', '=', $tree->id())
+					->where('sosa_husb.majs_user_id', '=', $user->id());
+			})
+			->join('maj_sosa AS sosa_wife', function (JoinClause $join) use ($tree, $user): void {
+				// Link to family husband
+				$join->on('families.f_file', '=', 'sosa_wife.majs_gedcom_id')
+				->on('families.f_wife', '=', 'sosa_wife.majs_i_id')
+				->where('sosa_wife.majs_gedcom_id', '=', $tree->id())
+				->where('sosa_wife.majs_user_id', '=', $user->id());
+			})
+			->select(['sosa_husb.majs_sosa', 'families.f_id'])
+			->where('sosa_husb.majs_gen', '=', $gen)
+			->whereRaw($table_prefix . 'sosa_husb.majs_sosa + 1 = ' . $table_prefix . 'sosa_wife.majs_sosa')
+			->orderBy('sosa_husb.majs_sosa')
+			->get();
+	}
 
-    /**
-     * Return a list of Sosa ancestors missing at a given generation.
-     * It includes the reference of either parent if it is known.
-     *
-     * @param Tree $tree
-     * @param UserInterface $user
-     * @param int $gen
-     * @return Collection<\stdClass>
-     */
-    public function listMissingAncestorsAtGeneration(Tree $tree, UserInterface $user, int $gen): Collection
-    {
-        if ($gen == 1) {
-            return collect();
-        }
+	/**
+	 * Return a list of Sosa ancestors missing at a given generation.
+	 * It includes the reference of either parent if it is known.
+	 *
+	 * @param Tree $tree
+	 * @param UserInterface $user
+	 * @param int $gen
+	 * @return Collection<\stdClass>
+	 */
+	public function listMissingAncestorsAtGeneration(Tree $tree, UserInterface $user, int $gen): Collection
+	{
+		if ($gen == 1) {
+			return collect();
+		}
 
-        $table_prefix = DB::connection()->getTablePrefix();
-        return DB::table('maj_sosa AS sosa')
-            ->select(['sosa.majs_i_id', 'sosa_fat.majs_i_id AS majs_fat_id', 'sosa_mot.majs_i_id AS majs_mot_id'])
-            ->selectRaw('MIN(' . $table_prefix . 'sosa.majs_sosa) AS majs_sosa')
-            ->leftJoin('maj_sosa AS sosa_fat', function (JoinClause $join) use ($tree, $user, $table_prefix): void {
-                // Link to sosa's father
-                $join->whereRaw($table_prefix . 'sosa_fat.majs_sosa = 2 * ' . $table_prefix . 'sosa.majs_sosa')
-                    ->where('sosa_fat.majs_gedcom_id', '=', $tree->id())
-                    ->where('sosa_fat.majs_user_id', '=', $user->id());
-            })
-            ->leftJoin('maj_sosa AS sosa_mot', function (JoinClause $join) use ($tree, $user, $table_prefix): void {
-                // Link to sosa's mother
-                $join->whereRaw($table_prefix . 'sosa_mot.majs_sosa = 2 * ' . $table_prefix . 'sosa.majs_sosa + 1')
-                    ->where('sosa_mot.majs_gedcom_id', '=', $tree->id())
-                    ->where('sosa_mot.majs_user_id', '=', $user->id());
-            })
-            ->where('sosa.majs_gedcom_id', '=', $tree->id())
-            ->where('sosa.majs_user_id', '=', $user->id())
-            ->where('sosa.majs_gen', '=', $gen - 1)
-            ->where(function (Builder $query): void {
-                $query->whereNull('sosa_fat.majs_i_id')
-                    ->orWhereNull('sosa_mot.majs_i_id');
-            })
-            ->groupBy('sosa.majs_i_id', 'sosa_fat.majs_i_id', 'sosa_mot.majs_i_id')
-            ->orderByRaw('MIN(' . $table_prefix . 'sosa.majs_sosa)')
-            ->get();
-    }
+		$table_prefix = DB::connection()->getTablePrefix();
+		return DB::table('maj_sosa AS sosa')
+			->select(['sosa.majs_i_id', 'sosa_fat.majs_i_id AS majs_fat_id', 'sosa_mot.majs_i_id AS majs_mot_id'])
+			->selectRaw('MIN(' . $table_prefix . 'sosa.majs_sosa) AS majs_sosa')
+			->leftJoin('maj_sosa AS sosa_fat', function (JoinClause $join) use ($tree, $user, $table_prefix): void {
+				// Link to sosa's father
+				$join->whereRaw($table_prefix . 'sosa_fat.majs_sosa = 2 * ' . $table_prefix . 'sosa.majs_sosa')
+					->where('sosa_fat.majs_gedcom_id', '=', $tree->id())
+					->where('sosa_fat.majs_user_id', '=', $user->id());
+			})
+			->leftJoin('maj_sosa AS sosa_mot', function (JoinClause $join) use ($tree, $user, $table_prefix): void {
+				// Link to sosa's mother
+				$join->whereRaw($table_prefix . 'sosa_mot.majs_sosa = 2 * ' . $table_prefix . 'sosa.majs_sosa + 1')
+					->where('sosa_mot.majs_gedcom_id', '=', $tree->id())
+					->where('sosa_mot.majs_user_id', '=', $user->id());
+			})
+			->where('sosa.majs_gedcom_id', '=', $tree->id())
+			->where('sosa.majs_user_id', '=', $user->id())
+			->where('sosa.majs_gen', '=', $gen - 1)
+			->where(function (Builder $query): void {
+				$query->whereNull('sosa_fat.majs_i_id')
+					->orWhereNull('sosa_mot.majs_i_id');
+			})
+			->groupBy('sosa.majs_i_id', 'sosa_fat.majs_i_id', 'sosa_mot.majs_i_id')
+			->orderByRaw('MIN(' . $table_prefix . 'sosa.majs_sosa)')
+			->get();
+	}
 
-    /**
-     * Remove all Sosa entries related to the gedcom file and user
-     *
-     * @param Tree $tree
-     * @param UserInterface $user
-     */
-    public function deleteAll(Tree $tree, UserInterface $user): void
-    {
-        DB::table('maj_sosa')
-            ->where('majs_gedcom_id', '=', $tree->id())
-            ->where('majs_user_id', '=', $user->id())
-            ->delete();
-    }
+	/**
+	 * Remove all Sosa entries related to the gedcom file and user
+	 *
+	 * @param Tree $tree
+	 * @param UserInterface $user
+	 */
+	public function deleteAll(Tree $tree, UserInterface $user): void
+	{
+		DB::table('maj_sosa')
+			->where('majs_gedcom_id', '=', $tree->id())
+			->where('majs_user_id', '=', $user->id())
+			->delete();
+	}
 
-    /**
-     *
-     * @param Tree $tree
-     * @param UserInterface $user
-     * @param int $sosa
-     */
-    public function deleteAncestorsFrom(Tree $tree, UserInterface $user, int $sosa): void
-    {
-        DB::table('maj_sosa')
-            ->where('majs_gedcom_id', '=', $tree->id())
-            ->where('majs_user_id', '=', $user->id())
-            ->where('majs_sosa', '>=', $sosa)
-            ->whereRaw(
-                'FLOOR(majs_sosa / (POW(2, (majs_gen - ?)))) = ?',
-                [$this->generation($sosa), $sosa]
-            )
-            ->delete();
-    }
+	/**
+	 *
+	 * @param Tree $tree
+	 * @param UserInterface $user
+	 * @param int $sosa
+	 */
+	public function deleteAncestorsFrom(Tree $tree, UserInterface $user, int $sosa): void
+	{
+		DB::table('maj_sosa')
+			->where('majs_gedcom_id', '=', $tree->id())
+			->where('majs_user_id', '=', $user->id())
+			->where('majs_sosa', '>=', $sosa)
+			->whereRaw(
+				'FLOOR(majs_sosa / (POW(2, (majs_gen - ?)))) = ?',
+				[$this->generation($sosa), $sosa]
+			)
+			->delete();
+	}
 
-    /**
-     * Insert (or update if already existing) a list of Sosa individuals
-     *
-     * @param Tree $tree
-     * @param UserInterface $user
-     * @param array<array<string,mixed>> $sosa_records
-     */
-    public function insertOrUpdate(Tree $tree, UserInterface $user, array $sosa_records): void
-    {
-        $mass_update = DB::connection()->getDriverName() === 'mysql';
+	/**
+	 * Insert (or update if already existing) a list of Sosa individuals
+	 *
+	 * @param Tree $tree
+	 * @param UserInterface $user
+	 * @param array<array<string,mixed>> $sosa_records
+	 */
+	public function insertOrUpdate(Tree $tree, UserInterface $user, array $sosa_records): void
+	{
+		$mass_update = DB::connection()->getDriverName() === 'mysql';
 
-        $bindings_placeholders = $bindings_values = [];
-        $has_records = false;
-        foreach ($sosa_records as $i => $row) {
-            $gen = $this->generation($row['sosa']);
-            if ($gen <=  $this->maxSystemGenerations()) {
-                $has_records = true;
-                if ($mass_update) {
-                    $bindings_placeholders[] = '(:tree_id' . $i . ', :user_id' . $i . ', :sosa' . $i . ',' .
-                        ' :indi_id' . $i . ', :gen' . $i . ',' .
-                        ' :byear' . $i . ', :byearest' . $i . ', :dyear' . $i . ', :dyearest' . $i . ')';
-                    $bindings_values = array_merge(
-                        $bindings_values,
-                        [
-                            'tree_id' . $i => $tree->id(),
-                            'user_id' . $i => $user->id(),
-                            'sosa' . $i => $row['sosa'],
-                            'indi_id' . $i => $row['indi'],
-                            'gen' . $i => $gen,
-                            'byear' . $i => $row['birth_year'],
-                            'byearest' . $i => $row['birth_year_est'],
-                            'dyear' . $i => $row['death_year'],
-                            'dyearest' . $i => $row['death_year_est']
-                        ]
-                    );
-                } else {
-                    DB::table('maj_sosa')->updateOrInsert(
-                        [ 'majs_gedcom_id' => $tree->id(), 'majs_user_id' => $user->id(), 'majs_sosa' => $row['sosa']],
-                        [
-                            'majs_i_id' => $row['indi'],
-                            'majs_gen' => $gen,
-                            'majs_birth_year' => $row['birth_year'],
-                            'majs_birth_year_est' => $row['birth_year_est'],
-                            'majs_death_year' => $row['death_year'],
-                            'majs_death_year_est' => $row['death_year_est']
-                        ]
-                    );
-                }
-            }
-        }
+		$bindings_placeholders = $bindings_values = [];
+		$has_records = false;
+		foreach ($sosa_records as $i => $row) {
+			$gen = $this->generation($row['sosa']);
+			if ($gen <=  $this->maxSystemGenerations()) {
+				$has_records = true;
+				if ($mass_update) {
+					$bindings_placeholders[] = '(:tree_id' . $i . ', :user_id' . $i . ', :sosa' . $i . ',' .
+						' :indi_id' . $i . ', :gen' . $i . ',' .
+						' :byear' . $i . ', :byearest' . $i . ', :dyear' . $i . ', :dyearest' . $i . ')';
+					$bindings_values = array_merge(
+						$bindings_values,
+						[
+							'tree_id' . $i => $tree->id(),
+							'user_id' . $i => $user->id(),
+							'sosa' . $i => $row['sosa'],
+							'indi_id' . $i => $row['indi'],
+							'gen' . $i => $gen,
+							'byear' . $i => $row['birth_year'],
+							'byearest' . $i => $row['birth_year_est'],
+							'dyear' . $i => $row['death_year'],
+							'dyearest' . $i => $row['death_year_est']
+						]
+					);
+				} else {
+					DB::table('maj_sosa')->updateOrInsert(
+						[ 'majs_gedcom_id' => $tree->id(), 'majs_user_id' => $user->id(), 'majs_sosa' => $row['sosa']],
+						[
+							'majs_i_id' => $row['indi'],
+							'majs_gen' => $gen,
+							'majs_birth_year' => $row['birth_year'],
+							'majs_birth_year_est' => $row['birth_year_est'],
+							'majs_death_year' => $row['death_year'],
+							'majs_death_year_est' => $row['death_year_est']
+						]
+					);
+				}
+			}
+		}
 
-        if ($has_records && $mass_update) {
-            DB::connection()->statement(
-                'INSERT INTO `' . DB::connection()->getTablePrefix() . 'maj_sosa`' .
-                ' (majs_gedcom_id, majs_user_id, majs_sosa,' .
-                '   majs_i_id, majs_gen, majs_birth_year, majs_birth_year_est, majs_death_year, majs_death_year_est)' .
-                ' VALUES ' . implode(',', $bindings_placeholders) .
-                ' ON DUPLICATE KEY UPDATE majs_i_id = VALUES(majs_i_id), majs_gen = VALUES(majs_gen),' .
-                '   majs_birth_year = VALUES(majs_birth_year), majs_birth_year_est = VALUES(majs_birth_year_est),' .
-                '   majs_death_year = VALUES(majs_death_year), majs_death_year_est = VALUES(majs_death_year_est)',
-                $bindings_values
-            );
-        }
-    }
+		if ($has_records && $mass_update) {
+			DB::connection()->statement(
+				'INSERT INTO `' . DB::connection()->getTablePrefix() . 'maj_sosa`' .
+				' (majs_gedcom_id, majs_user_id, majs_sosa,' .
+				'   majs_i_id, majs_gen, majs_birth_year, majs_birth_year_est, majs_death_year, majs_death_year_est)' .
+				' VALUES ' . implode(',', $bindings_placeholders) .
+				' ON DUPLICATE KEY UPDATE majs_i_id = VALUES(majs_i_id), majs_gen = VALUES(majs_gen),' .
+				'   majs_birth_year = VALUES(majs_birth_year), majs_birth_year_est = VALUES(majs_birth_year_est),' .
+				'   majs_death_year = VALUES(majs_death_year), majs_death_year_est = VALUES(majs_death_year_est)',
+				$bindings_values
+			);
+		}
+	}
 }

app/Module/Sosa/GeoAnalyses/SosaByGenerationGeoAnalysis.php

Indentation +97 added lines, -97 removed lines

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

Spacing +1 added lines, -1 removed lines

@@ -78,7 +78,7 @@
             if ($ancestor === null || !$ancestor->canShow()) {
                 continue;
             }
-            $generation = $this->records_service->generation((int) $item->majs_sosa);
+            $generation = $this->records_service->generation((int)$item->majs_sosa);
             $significantplace = new GeoAnalysisPlace($tree, null, $depth);
             foreach ($this->significantPlaces($ancestor) as $place) {
                 $significantplace = new GeoAnalysisPlace($tree, $place, $depth, true);

app/Module/GeoDispersion/GeoDispersionModule.php

Indentation +181 added lines, -181 removed lines

@@ -59,186 +59,186 @@
  * 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.0-v.1';
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\ModuleMyArtJaubInterface::loadRoutes()
-     */
-    public function loadRoutes(Map $router): void
-    {
-        $router->attach('', '', static function (Map $router): void {
-
-            $router->attach('', '/module-maj/geodispersion', static function (Map $router): void {
-                $router->attach('', '/admin', static function (Map $router): void {
-                    $router->get(AdminConfigPage::class, '/config{/tree}', AdminConfigPage::class);
-
-                    $router->attach('', '/analysis-views/{tree}', static function (Map $router): void {
-                        $router->tokens(['view_id' => '\d+', 'enable' => '[01]']);
-                        $router->extras([
-                            'middleware' => [
-                                AuthManager::class,
-                            ],
-                        ]);
-                        $router->get(GeoAnalysisViewListData::class, '', GeoAnalysisViewListData::class);
-
-                        $router->get(GeoAnalysisViewAddPage::class, '/add', GeoAnalysisViewAddPage::class);
-                        $router->post(GeoAnalysisViewAddAction::class, '/add', GeoAnalysisViewAddAction::class);
-                        $router->get(GeoAnalysisViewEditPage::class, '/{view_id}', GeoAnalysisViewEditPage::class);
-                        $router->post(GeoAnalysisViewEditAction::class, '/{view_id}', GeoAnalysisViewEditAction::class);
-                        //phpcs:disable Generic.Files.LineLength.TooLong
-                        $router->get(GeoAnalysisViewStatusAction::class, '/{view_id}/status/{enable}', GeoAnalysisViewStatusAction::class);
-                        $router->get(GeoAnalysisViewDeleteAction::class, '/{view_id}/delete', GeoAnalysisViewDeleteAction::class);
-                        //phpcs:enable
-                    });
-
-                    $router->attach('', '/map-adapters/{tree}', static function (Map $router): void {
-                        $router->tokens(['adapter_id' => '\d+', 'view_id' => '\d+']);
-                        $router->extras([
-                            'middleware' => [
-                                AuthManager::class,
-                            ],
-                        ]);
-
-                        $router->get(MapAdapterAddPage::class, '/add/{view_id}', MapAdapterAddPage::class);
-                        $router->post(MapAdapterAddAction::class, '/add/{view_id}', MapAdapterAddAction::class);
-                        $router->get(MapAdapterEditPage::class, '/{adapter_id}', MapAdapterEditPage::class);
-                        $router->post(MapAdapterEditAction::class, '/{adapter_id}', MapAdapterEditAction::class);
-                        //phpcs:disable Generic.Files.LineLength.TooLong
-                        $router->get(MapAdapterDeleteAction::class, '/{adapter_id}/delete', MapAdapterDeleteAction::class);
-                        $router->get(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()
-     */
-    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.0-v.1';
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Module\ModuleMyArtJaubInterface::loadRoutes()
+	 */
+	public function loadRoutes(Map $router): void
+	{
+		$router->attach('', '', static function (Map $router): void {
+
+			$router->attach('', '/module-maj/geodispersion', static function (Map $router): void {
+				$router->attach('', '/admin', static function (Map $router): void {
+					$router->get(AdminConfigPage::class, '/config{/tree}', AdminConfigPage::class);
+
+					$router->attach('', '/analysis-views/{tree}', static function (Map $router): void {
+						$router->tokens(['view_id' => '\d+', 'enable' => '[01]']);
+						$router->extras([
+							'middleware' => [
+								AuthManager::class,
+							],
+						]);
+						$router->get(GeoAnalysisViewListData::class, '', GeoAnalysisViewListData::class);
+
+						$router->get(GeoAnalysisViewAddPage::class, '/add', GeoAnalysisViewAddPage::class);
+						$router->post(GeoAnalysisViewAddAction::class, '/add', GeoAnalysisViewAddAction::class);
+						$router->get(GeoAnalysisViewEditPage::class, '/{view_id}', GeoAnalysisViewEditPage::class);
+						$router->post(GeoAnalysisViewEditAction::class, '/{view_id}', GeoAnalysisViewEditAction::class);
+						//phpcs:disable Generic.Files.LineLength.TooLong
+						$router->get(GeoAnalysisViewStatusAction::class, '/{view_id}/status/{enable}', GeoAnalysisViewStatusAction::class);
+						$router->get(GeoAnalysisViewDeleteAction::class, '/{view_id}/delete', GeoAnalysisViewDeleteAction::class);
+						//phpcs:enable
+					});
+
+					$router->attach('', '/map-adapters/{tree}', static function (Map $router): void {
+						$router->tokens(['adapter_id' => '\d+', 'view_id' => '\d+']);
+						$router->extras([
+							'middleware' => [
+								AuthManager::class,
+							],
+						]);
+
+						$router->get(MapAdapterAddPage::class, '/add/{view_id}', MapAdapterAddPage::class);
+						$router->post(MapAdapterAddAction::class, '/add/{view_id}', MapAdapterAddAction::class);
+						$router->get(MapAdapterEditPage::class, '/{adapter_id}', MapAdapterEditPage::class);
+						$router->post(MapAdapterEditAction::class, '/{adapter_id}', MapAdapterEditAction::class);
+						//phpcs:disable Generic.Files.LineLength.TooLong
+						$router->get(MapAdapterDeleteAction::class, '/{adapter_id}/delete', MapAdapterDeleteAction::class);
+						$router->get(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()
+	 */
+	public function chartUrl(Individual $individual, array $parameters = []): string
+	{
+		return route(GeoAnalysisViewsList::class, ['tree' => $individual->tree()->name()] + $parameters);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleChartInterface::chartMenuClass()
+	 */
+	public function chartMenuClass(): string
+	{
+		return 'menu-maj-geodispersion';
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleGlobalInterface::headContent()
+	 */
+	public function headContent(): string
+	{
+		return '<link rel="stylesheet" href="' . e($this->moduleCssUrl()) . '">';
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\ModulePlaceMapperProviderInterface::listPlaceMappers()
+	 */
+	public function listPlaceMappers(): array
+	{
+		return [
+			CoordinatesPlaceMapper::class,
+			SimplePlaceMapper::class,
+			SimpleTopFilteredPlaceMapper::class
+		];
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\ModuleGeoAnalysisProviderInterface::listGeoAnalyses()
+	 */
+	public function listGeoAnalyses(): array
+	{
+		return [
+			AllEventsByCenturyGeoAnalysis::class,
+			AllEventsByTypeGeoAnalysis::class
+		];
+	}
 }

Spacing +8 added lines, -8 removed lines

@@ -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()).'">';
     }
 
     /**

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

Indentation +53 added lines, -53 removed lines

@@ -38,64 +38,64 @@
  */
 class GeoAnalysisViewEditPage implements RequestHandlerInterface
 {
-    use ViewResponseTrait;
+	use ViewResponseTrait;
 
-    private ?GeoDispersionModule $module;
-    private GeoAnalysisViewDataService $geoview_data_service;
-    private GeoAnalysisService $geoanalysis_service;
-    private GeoAnalysisDataService $geoanalysis_data_service;
+	private ?GeoDispersionModule $module;
+	private GeoAnalysisViewDataService $geoview_data_service;
+	private GeoAnalysisService $geoanalysis_service;
+	private GeoAnalysisDataService $geoanalysis_data_service;
 
-    /**
-     * Constructor for GeoAnalysisViewEditPage Request Handler
-     *
-     * @param ModuleService $module_service
-     * @param GeoAnalysisViewDataService $geoview_data_service
-     * @param GeoAnalysisService $geoanalysis_service
-     * @param GeoAnalysisDataService $geoanalysis_data_service
-     */
-    public function __construct(
-        ModuleService $module_service,
-        GeoAnalysisViewDataService $geoview_data_service,
-        GeoAnalysisService $geoanalysis_service,
-        GeoAnalysisDataService $geoanalysis_data_service
-    ) {
-        $this->module = $module_service->findByInterface(GeoDispersionModule::class)->first();
-        $this->geoview_data_service = $geoview_data_service;
-        $this->geoanalysis_service = $geoanalysis_service;
-        $this->geoanalysis_data_service = $geoanalysis_data_service;
-    }
+	/**
+	 * Constructor for GeoAnalysisViewEditPage Request Handler
+	 *
+	 * @param ModuleService $module_service
+	 * @param GeoAnalysisViewDataService $geoview_data_service
+	 * @param GeoAnalysisService $geoanalysis_service
+	 * @param GeoAnalysisDataService $geoanalysis_data_service
+	 */
+	public function __construct(
+		ModuleService $module_service,
+		GeoAnalysisViewDataService $geoview_data_service,
+		GeoAnalysisService $geoanalysis_service,
+		GeoAnalysisDataService $geoanalysis_data_service
+	) {
+		$this->module = $module_service->findByInterface(GeoDispersionModule::class)->first();
+		$this->geoview_data_service = $geoview_data_service;
+		$this->geoanalysis_service = $geoanalysis_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';
+	/**
+	 * {@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.'));
-        }
-        $tree = $request->getAttribute('tree');
-        assert($tree instanceof Tree);
+		if ($this->module === null) {
+			throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
+		}
+		$tree = $request->getAttribute('tree');
+		assert($tree instanceof Tree);
 
-        $view_id = (int) $request->getAttribute('view_id');
-        $view = $this->geoview_data_service->find($tree, $view_id, true);
+		$view_id = (int) $request->getAttribute('view_id');
+		$view = $this->geoview_data_service->find($tree, $view_id, true);
 
-        if ($view === null) {
-            throw new HttpNotFoundException(
-                I18N::translate('The geographical dispersion analysis view could not be found.')
-            );
-        }
+		if ($view === null) {
+			throw new HttpNotFoundException(
+				I18N::translate('The geographical dispersion analysis view could not be found.')
+			);
+		}
 
-        return $this->viewResponse($this->module->name() . '::admin/view-edit', [
-            'module'        =>  $this->module,
-            'title'         =>  I18N::translate('Edit the geographical dispersion analysis view - %s', $view->type()),
-            'tree'          =>  $tree,
-            'view'          =>  $view,
-            'geoanalysis_list'  =>  $this->geoanalysis_service->all(),
-            'place_example'     =>  $this->geoanalysis_data_service->placeHierarchyExample($tree),
-            'global_settings'   =>  $view->globalSettingsContent($this->module)
-        ]);
-    }
+		return $this->viewResponse($this->module->name() . '::admin/view-edit', [
+			'module'        =>  $this->module,
+			'title'         =>  I18N::translate('Edit the geographical dispersion analysis view - %s', $view->type()),
+			'tree'          =>  $tree,
+			'view'          =>  $view,
+			'geoanalysis_list'  =>  $this->geoanalysis_service->all(),
+			'place_example'     =>  $this->geoanalysis_data_service->placeHierarchyExample($tree),
+			'global_settings'   =>  $view->globalSettingsContent($this->module)
+		]);
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -79,7 +79,7 @@ 
         $tree = $request->getAttribute('tree');
         assert($tree instanceof Tree);
 
-        $view_id = (int) $request->getAttribute('view_id');
+        $view_id = (int)$request->getAttribute('view_id');
         $view = $this->geoview_data_service->find($tree, $view_id, true);
 
         if ($view === null) {
@@ -88,7 +88,7 @@ 
             );
         }
 
-        return $this->viewResponse($this->module->name() . '::admin/view-edit', [
+        return $this->viewResponse($this->module->name().'::admin/view-edit', [
             'module'        =>  $this->module,
             'title'         =>  I18N::translate('Edit the geographical dispersion analysis view - %s', $view->type()),
             'tree'          =>  $tree,

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

Indentation +85 added lines, -85 removed lines

@@ -34,89 +34,89 @@
  */
 class GeoAnalysisViewEditAction implements RequestHandlerInterface
 {
-    private ?GeoDispersionModule $module;
-    private GeoAnalysisViewDataService $geoview_data_service;
-
-    /**
-     * Constructor for GeoAnalysisViewEditAction Request Handler
-     *
-     * @param ModuleService $module_service
-     * @param GeoAnalysisViewDataService $geoview_data_service
-     */
-    public function __construct(ModuleService $module_service, GeoAnalysisViewDataService $geoview_data_service)
-    {
-        $this->module = $module_service->findByInterface(GeoDispersionModule::class)->first();
-        $this->geoview_data_service = $geoview_data_service;
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        $tree = $request->getAttribute('tree');
-        assert($tree instanceof Tree);
-
-        $admin_config_route = route(AdminConfigPage::class, ['tree' => $tree->name()]);
-
-        if ($this->module === null) {
-            FlashMessages::addMessage(
-                I18N::translate('The attached module could not be found.'),
-                'danger'
-            );
-            return redirect($admin_config_route);
-        }
-
-
-        $view_id = (int) $request->getAttribute('view_id');
-        $view = $this->geoview_data_service->find($tree, $view_id, true);
-
-        $params = (array) $request->getParsedBody();
-
-        $description    = $params['view_description'] ?? '';
-        $place_depth    = (int) ($params['view_depth'] ?? 1);
-        $top_places     = (int) ($params['view_top_places'] ?? 0);
-
-        $analysis = null;
-        try {
-            $analysis = app($params['view_analysis'] ?? '');
-        } catch (BindingResolutionException $ex) {
-        }
-
-        if (
-            $view === null
-            || $analysis === null || !($analysis instanceof GeoAnalysisInterface)
-            || $place_depth <= 0 && $top_places < 0
-        ) {
-            FlashMessages::addMessage(
-                I18N::translate('The parameters for view with ID “%s” are not valid.', I18N::number($view_id)),
-                'danger'
-            );
-            return redirect($admin_config_route);
-        }
-
-        $new_view = $view
-            ->with($view->isEnabled(), $description, $analysis, $place_depth, $top_places)
-            ->withGlobalSettingsUpdate($request);
-
-        try {
-            $this->geoview_data_service->update($new_view);
-            FlashMessages::addMessage(
-                I18N::translate('The geographical dispersion analysis view has been successfully updated.'),
-                'success'
-            );
-            //phpcs:ignore Generic.Files.LineLength.TooLong
-            Log::addConfigurationLog('Module ' . $this->module->title() . ' : View “' . $view->id() . '” has been updated.');
-        } catch (Throwable $ex) {
-            FlashMessages::addMessage(
-                I18N::translate('An error occured while updating the geographical dispersion analysis view.'),
-                'danger'
-            );
-            //phpcs:ignore Generic.Files.LineLength.TooLong
-            Log::addErrorLog('Module ' . $this->module->title() . ' : Error when updating view “' . $view->id() . '”: ' . $ex->getMessage());
-        }
-
-        return redirect($admin_config_route);
-    }
+	private ?GeoDispersionModule $module;
+	private GeoAnalysisViewDataService $geoview_data_service;
+
+	/**
+	 * Constructor for GeoAnalysisViewEditAction Request Handler
+	 *
+	 * @param ModuleService $module_service
+	 * @param GeoAnalysisViewDataService $geoview_data_service
+	 */
+	public function __construct(ModuleService $module_service, GeoAnalysisViewDataService $geoview_data_service)
+	{
+		$this->module = $module_service->findByInterface(GeoDispersionModule::class)->first();
+		$this->geoview_data_service = $geoview_data_service;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		$tree = $request->getAttribute('tree');
+		assert($tree instanceof Tree);
+
+		$admin_config_route = route(AdminConfigPage::class, ['tree' => $tree->name()]);
+
+		if ($this->module === null) {
+			FlashMessages::addMessage(
+				I18N::translate('The attached module could not be found.'),
+				'danger'
+			);
+			return redirect($admin_config_route);
+		}
+
+
+		$view_id = (int) $request->getAttribute('view_id');
+		$view = $this->geoview_data_service->find($tree, $view_id, true);
+
+		$params = (array) $request->getParsedBody();
+
+		$description    = $params['view_description'] ?? '';
+		$place_depth    = (int) ($params['view_depth'] ?? 1);
+		$top_places     = (int) ($params['view_top_places'] ?? 0);
+
+		$analysis = null;
+		try {
+			$analysis = app($params['view_analysis'] ?? '');
+		} catch (BindingResolutionException $ex) {
+		}
+
+		if (
+			$view === null
+			|| $analysis === null || !($analysis instanceof GeoAnalysisInterface)
+			|| $place_depth <= 0 && $top_places < 0
+		) {
+			FlashMessages::addMessage(
+				I18N::translate('The parameters for view with ID “%s” are not valid.', I18N::number($view_id)),
+				'danger'
+			);
+			return redirect($admin_config_route);
+		}
+
+		$new_view = $view
+			->with($view->isEnabled(), $description, $analysis, $place_depth, $top_places)
+			->withGlobalSettingsUpdate($request);
+
+		try {
+			$this->geoview_data_service->update($new_view);
+			FlashMessages::addMessage(
+				I18N::translate('The geographical dispersion analysis view has been successfully updated.'),
+				'success'
+			);
+			//phpcs:ignore Generic.Files.LineLength.TooLong
+			Log::addConfigurationLog('Module ' . $this->module->title() . ' : View “' . $view->id() . '” has been updated.');
+		} catch (Throwable $ex) {
+			FlashMessages::addMessage(
+				I18N::translate('An error occured while updating the geographical dispersion analysis view.'),
+				'danger'
+			);
+			//phpcs:ignore Generic.Files.LineLength.TooLong
+			Log::addErrorLog('Module ' . $this->module->title() . ' : Error when updating view “' . $view->id() . '”: ' . $ex->getMessage());
+		}
+
+		return redirect($admin_config_route);
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -69,14 +69,14 @@ 
         }
 
 
-        $view_id = (int) $request->getAttribute('view_id');
+        $view_id = (int)$request->getAttribute('view_id');
         $view = $this->geoview_data_service->find($tree, $view_id, true);
 
-        $params = (array) $request->getParsedBody();
+        $params = (array)$request->getParsedBody();
 
         $description    = $params['view_description'] ?? '';
-        $place_depth    = (int) ($params['view_depth'] ?? 1);
-        $top_places     = (int) ($params['view_top_places'] ?? 0);
+        $place_depth    = (int)($params['view_depth'] ?? 1);
+        $top_places     = (int)($params['view_top_places'] ?? 0);
 
         $analysis = null;
         try {
@@ -107,14 +107,14 @@ 
                 'success'
             );
             //phpcs:ignore Generic.Files.LineLength.TooLong
-            Log::addConfigurationLog('Module ' . $this->module->title() . ' : View “' . $view->id() . '” has been updated.');
+            Log::addConfigurationLog('Module '.$this->module->title().' : View “'.$view->id().'” has been updated.');
         } catch (Throwable $ex) {
             FlashMessages::addMessage(
                 I18N::translate('An error occured while updating the geographical dispersion analysis view.'),
                 'danger'
             );
             //phpcs:ignore Generic.Files.LineLength.TooLong
-            Log::addErrorLog('Module ' . $this->module->title() . ' : Error when updating view “' . $view->id() . '”: ' . $ex->getMessage());
+            Log::addErrorLog('Module '.$this->module->title().' : Error when updating view “'.$view->id().'”: '.$ex->getMessage());
         }
 
         return redirect($admin_config_route);