jon48 / webtrees-lib

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

Indentation +70 added lines, -70 removed lines

@@ -35,74 +35,74 @@
  */
 class AncestorsListIndividual implements RequestHandlerInterface
 {
-    use ViewResponseTrait;
-
-    /**
-     * @var SosaModule|null $module
-     */
-    private $module;
-
-    /**
-     * @var SosaRecordsService $sosa_record_service
-     */
-    private $sosa_record_service;
-
-    /**
-     * Constructor for AncestorsListIndividual Request Handler
-     *
-     * @param ModuleService $module_service
-     * @param SosaRecordsService $sosa_record_service
-     */
-    public function __construct(
-        ModuleService $module_service,
-        SosaRecordsService $sosa_record_service
-    ) {
-        $this->module = $module_service->findByInterface(SosaModule::class)->first();
-        $this->sosa_record_service = $sosa_record_service;
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        $this->layout = 'layouts/ajax';
-
-        if ($this->module === null) {
-            throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
-        }
-
-        $tree = $request->getAttribute('tree');
-        assert($tree instanceof Tree);
-
-        $user = Auth::check() ? $request->getAttribute('user') : new DefaultUser();
-
-        $current_gen = (int) ($request->getAttribute('gen') ?? 0);
-
-        if ($current_gen <= 0) {
-            return response('Invalid generation', StatusCodeInterface::STATUS_UNPROCESSABLE_ENTITY);
-        }
-
-        $list_ancestors = $this->sosa_record_service->listAncestorsAtGeneration($tree, $user, $current_gen);
-        $nb_ancestors_all = $list_ancestors->count();
-
-        /** @var \Illuminate\Support\Collection<int, \Fisharebest\Webtrees\Individual> $list_ancestors */
-        $list_ancestors = $list_ancestors->mapWithKeys(function (stdClass $value) use ($tree): ?array {
-                $indi = Registry::individualFactory()->make($value->majs_i_id, $tree);
-                return ($indi !== null && $indi->canShowName()) ? [(int) $value->majs_sosa => $indi] : null;
-        })->filter();
-
-        $nb_ancestors_shown = $list_ancestors->count();
-
-        return $this->viewResponse($this->module->name() . '::list-ancestors-indi-tab', [
-            'module_name'       =>  $this->module->name(),
-            'title'             =>  I18N::translate('Sosa Ancestors'),
-            'tree'              =>  $tree,
-            'list_ancestors'    =>  $list_ancestors,
-            'nb_ancestors_all'  =>  $nb_ancestors_all,
-            'nb_ancestors_theor' =>  pow(2, $current_gen - 1),
-            'nb_ancestors_shown' =>  $nb_ancestors_shown
-        ]);
-    }
+	use ViewResponseTrait;
+
+	/**
+	 * @var SosaModule|null $module
+	 */
+	private $module;
+
+	/**
+	 * @var SosaRecordsService $sosa_record_service
+	 */
+	private $sosa_record_service;
+
+	/**
+	 * Constructor for AncestorsListIndividual Request Handler
+	 *
+	 * @param ModuleService $module_service
+	 * @param SosaRecordsService $sosa_record_service
+	 */
+	public function __construct(
+		ModuleService $module_service,
+		SosaRecordsService $sosa_record_service
+	) {
+		$this->module = $module_service->findByInterface(SosaModule::class)->first();
+		$this->sosa_record_service = $sosa_record_service;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		$this->layout = 'layouts/ajax';
+
+		if ($this->module === null) {
+			throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
+		}
+
+		$tree = $request->getAttribute('tree');
+		assert($tree instanceof Tree);
+
+		$user = Auth::check() ? $request->getAttribute('user') : new DefaultUser();
+
+		$current_gen = (int) ($request->getAttribute('gen') ?? 0);
+
+		if ($current_gen <= 0) {
+			return response('Invalid generation', StatusCodeInterface::STATUS_UNPROCESSABLE_ENTITY);
+		}
+
+		$list_ancestors = $this->sosa_record_service->listAncestorsAtGeneration($tree, $user, $current_gen);
+		$nb_ancestors_all = $list_ancestors->count();
+
+		/** @var \Illuminate\Support\Collection<int, \Fisharebest\Webtrees\Individual> $list_ancestors */
+		$list_ancestors = $list_ancestors->mapWithKeys(function (stdClass $value) use ($tree): ?array {
+				$indi = Registry::individualFactory()->make($value->majs_i_id, $tree);
+				return ($indi !== null && $indi->canShowName()) ? [(int) $value->majs_sosa => $indi] : null;
+		})->filter();
+
+		$nb_ancestors_shown = $list_ancestors->count();
+
+		return $this->viewResponse($this->module->name() . '::list-ancestors-indi-tab', [
+			'module_name'       =>  $this->module->name(),
+			'title'             =>  I18N::translate('Sosa Ancestors'),
+			'tree'              =>  $tree,
+			'list_ancestors'    =>  $list_ancestors,
+			'nb_ancestors_all'  =>  $nb_ancestors_all,
+			'nb_ancestors_theor' =>  pow(2, $current_gen - 1),
+			'nb_ancestors_shown' =>  $nb_ancestors_shown
+		]);
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -78,7 +78,7 @@ 
 
         $user = Auth::check() ? $request->getAttribute('user') : new DefaultUser();
 
-        $current_gen = (int) ($request->getAttribute('gen') ?? 0);
+        $current_gen = (int)($request->getAttribute('gen') ?? 0);
 
         if ($current_gen <= 0) {
             return response('Invalid generation', StatusCodeInterface::STATUS_UNPROCESSABLE_ENTITY);
@@ -88,14 +88,14 @@ 
         $nb_ancestors_all = $list_ancestors->count();
 
         /** @var \Illuminate\Support\Collection<int, \Fisharebest\Webtrees\Individual> $list_ancestors */
-        $list_ancestors = $list_ancestors->mapWithKeys(function (stdClass $value) use ($tree): ?array {
+        $list_ancestors = $list_ancestors->mapWithKeys(function(stdClass $value) use ($tree): ?array {
                 $indi = Registry::individualFactory()->make($value->majs_i_id, $tree);
-                return ($indi !== null && $indi->canShowName()) ? [(int) $value->majs_sosa => $indi] : null;
+                return ($indi !== null && $indi->canShowName()) ? [(int)$value->majs_sosa => $indi] : null;
         })->filter();
 
         $nb_ancestors_shown = $list_ancestors->count();
 
-        return $this->viewResponse($this->module->name() . '::list-ancestors-indi-tab', [
+        return $this->viewResponse($this->module->name().'::list-ancestors-indi-tab', [
             'module_name'       =>  $this->module->name(),
             'title'             =>  I18N::translate('Sosa Ancestors'),
             'tree'              =>  $tree,

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

Indentation +84 added lines, -84 removed lines

@@ -36,88 +36,88 @@
  */
 class MissingAncestorsList implements RequestHandlerInterface
 {
-    use ViewResponseTrait;
-
-    /**
-     * @var SosaModule|null $module
-     */
-    private $module;
-
-    /**
-     * @var SosaRecordsService $sosa_record_service
-     */
-    private $sosa_record_service;
-
-    /**
-     * Constructor for MissingAncestorsList Request Handler
-     *
-     * @param ModuleService $module_service
-     * @param SosaRecordsService $sosa_record_service
-     */
-    public function __construct(
-        ModuleService $module_service,
-        SosaRecordsService $sosa_record_service
-    ) {
-        $this->module = $module_service->findByInterface(SosaModule::class)->first();
-        $this->sosa_record_service = $sosa_record_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 = $request->getAttribute('tree');
-        assert($tree instanceof Tree);
-
-        $user = Auth::check() ? $request->getAttribute('user') : new DefaultUser();
-
-        /** @var SosaStatisticsService $sosa_stats_service */
-        $sosa_stats_service = app()->makeWith(SosaStatisticsService::class, ['tree' => $tree, 'user' => $user]);
-
-        $current_gen = (int) ($request->getQueryParams()['gen'] ?? $request->getAttribute('gen') ?? 0);
-
-        $list_missing = $this->sosa_record_service->listMissingAncestorsAtGeneration($tree, $user, $current_gen);
-        $nb_missing_diff = $list_missing->sum(function (stdClass $value): int {
-            return ($value->majs_fat_id === null ? 1 : 0) + ($value->majs_mot_id === null ? 1 : 0);
-        });
-
-        $list_missing = $list_missing->map(function (stdClass $value) use ($tree): ?MissingAncestor {
-            $indi = Registry::individualFactory()->make($value->majs_i_id, $tree);
-            if ($indi !== null && $indi->canShowName()) {
-                return new MissingAncestor(
-                    $indi,
-                    (int) $value->majs_sosa,
-                    $value->majs_fat_id === null,
-                    $value->majs_mot_id === null
-                );
-            }
-            return null;
-        })->filter();
-
-        $nb_missing_shown = $list_missing->sum(function (MissingAncestor $value): int {
-            return ($value->isFatherMissing() ? 1 : 0) + ($value->isMotherMissing() ? 1 : 0);
-        });
-
-        return $this->viewResponse($this->module->name() . '::list-missing-page', [
-            'module_name'       =>  $this->module->name(),
-            'title'             =>  I18N::translate('Missing Ancestors'),
-            'tree'              =>  $tree,
-            'root_indi'         =>  $sosa_stats_service->rootIndividual(),
-            'max_gen'           =>  $sosa_stats_service->maxGeneration(),
-            'current_gen'       =>  $current_gen,
-            'list_missing'      =>  $list_missing,
-            'nb_missing_diff'   =>  $nb_missing_diff,
-            'nb_missing_shown'  =>  $nb_missing_shown,
-            'gen_completeness'  =>
-                $sosa_stats_service->totalAncestorsAtGeneration($current_gen) / pow(2, $current_gen - 1),
-            'gen_potential'     =>
-                $sosa_stats_service->totalAncestorsAtGeneration($current_gen - 1) / pow(2, $current_gen - 2)
-        ]);
-    }
+	use ViewResponseTrait;
+
+	/**
+	 * @var SosaModule|null $module
+	 */
+	private $module;
+
+	/**
+	 * @var SosaRecordsService $sosa_record_service
+	 */
+	private $sosa_record_service;
+
+	/**
+	 * Constructor for MissingAncestorsList Request Handler
+	 *
+	 * @param ModuleService $module_service
+	 * @param SosaRecordsService $sosa_record_service
+	 */
+	public function __construct(
+		ModuleService $module_service,
+		SosaRecordsService $sosa_record_service
+	) {
+		$this->module = $module_service->findByInterface(SosaModule::class)->first();
+		$this->sosa_record_service = $sosa_record_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 = $request->getAttribute('tree');
+		assert($tree instanceof Tree);
+
+		$user = Auth::check() ? $request->getAttribute('user') : new DefaultUser();
+
+		/** @var SosaStatisticsService $sosa_stats_service */
+		$sosa_stats_service = app()->makeWith(SosaStatisticsService::class, ['tree' => $tree, 'user' => $user]);
+
+		$current_gen = (int) ($request->getQueryParams()['gen'] ?? $request->getAttribute('gen') ?? 0);
+
+		$list_missing = $this->sosa_record_service->listMissingAncestorsAtGeneration($tree, $user, $current_gen);
+		$nb_missing_diff = $list_missing->sum(function (stdClass $value): int {
+			return ($value->majs_fat_id === null ? 1 : 0) + ($value->majs_mot_id === null ? 1 : 0);
+		});
+
+		$list_missing = $list_missing->map(function (stdClass $value) use ($tree): ?MissingAncestor {
+			$indi = Registry::individualFactory()->make($value->majs_i_id, $tree);
+			if ($indi !== null && $indi->canShowName()) {
+				return new MissingAncestor(
+					$indi,
+					(int) $value->majs_sosa,
+					$value->majs_fat_id === null,
+					$value->majs_mot_id === null
+				);
+			}
+			return null;
+		})->filter();
+
+		$nb_missing_shown = $list_missing->sum(function (MissingAncestor $value): int {
+			return ($value->isFatherMissing() ? 1 : 0) + ($value->isMotherMissing() ? 1 : 0);
+		});
+
+		return $this->viewResponse($this->module->name() . '::list-missing-page', [
+			'module_name'       =>  $this->module->name(),
+			'title'             =>  I18N::translate('Missing Ancestors'),
+			'tree'              =>  $tree,
+			'root_indi'         =>  $sosa_stats_service->rootIndividual(),
+			'max_gen'           =>  $sosa_stats_service->maxGeneration(),
+			'current_gen'       =>  $current_gen,
+			'list_missing'      =>  $list_missing,
+			'nb_missing_diff'   =>  $nb_missing_diff,
+			'nb_missing_shown'  =>  $nb_missing_shown,
+			'gen_completeness'  =>
+				$sosa_stats_service->totalAncestorsAtGeneration($current_gen) / pow(2, $current_gen - 1),
+			'gen_potential'     =>
+				$sosa_stats_service->totalAncestorsAtGeneration($current_gen - 1) / pow(2, $current_gen - 2)
+		]);
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -80,19 +80,19 @@ 
         /** @var SosaStatisticsService $sosa_stats_service */
         $sosa_stats_service = app()->makeWith(SosaStatisticsService::class, ['tree' => $tree, 'user' => $user]);
 
-        $current_gen = (int) ($request->getQueryParams()['gen'] ?? $request->getAttribute('gen') ?? 0);
+        $current_gen = (int)($request->getQueryParams()['gen'] ?? $request->getAttribute('gen') ?? 0);
 
         $list_missing = $this->sosa_record_service->listMissingAncestorsAtGeneration($tree, $user, $current_gen);
-        $nb_missing_diff = $list_missing->sum(function (stdClass $value): int {
+        $nb_missing_diff = $list_missing->sum(function(stdClass $value): int {
             return ($value->majs_fat_id === null ? 1 : 0) + ($value->majs_mot_id === null ? 1 : 0);
         });
 
-        $list_missing = $list_missing->map(function (stdClass $value) use ($tree): ?MissingAncestor {
+        $list_missing = $list_missing->map(function(stdClass $value) use ($tree): ?MissingAncestor {
             $indi = Registry::individualFactory()->make($value->majs_i_id, $tree);
             if ($indi !== null && $indi->canShowName()) {
                 return new MissingAncestor(
                     $indi,
-                    (int) $value->majs_sosa,
+                    (int)$value->majs_sosa,
                     $value->majs_fat_id === null,
                     $value->majs_mot_id === null
                 );
@@ -100,11 +100,11 @@ 
             return null;
         })->filter();
 
-        $nb_missing_shown = $list_missing->sum(function (MissingAncestor $value): int {
+        $nb_missing_shown = $list_missing->sum(function(MissingAncestor $value): int {
             return ($value->isFatherMissing() ? 1 : 0) + ($value->isMotherMissing() ? 1 : 0);
         });
 
-        return $this->viewResponse($this->module->name() . '::list-missing-page', [
+        return $this->viewResponse($this->module->name().'::list-missing-page', [
             'module_name'       =>  $this->module->name(),
             'title'             =>  I18N::translate('Missing Ancestors'),
             'tree'              =>  $tree,

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

Indentation +69 added lines, -69 removed lines

@@ -35,73 +35,73 @@
  */
 class AncestorsListFamily implements RequestHandlerInterface
 {
-    use ViewResponseTrait;
-
-    /**
-     * @var SosaModule|null $module
-     */
-    private $module;
-
-    /**
-     * @var SosaRecordsService $sosa_record_service
-     */
-    private $sosa_record_service;
-
-    /**
-     * Constructor for AncestorsListFamily Request Handler
-     *
-     * @param ModuleService $module_service
-     * @param SosaRecordsService $sosa_record_service
-     */
-    public function __construct(
-        ModuleService $module_service,
-        SosaRecordsService $sosa_record_service
-    ) {
-        $this->module = $module_service->findByInterface(SosaModule::class)->first();
-        $this->sosa_record_service = $sosa_record_service;
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        $this->layout = 'layouts/ajax';
-
-        if ($this->module === null) {
-            throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
-        }
-
-        $tree = $request->getAttribute('tree');
-        assert($tree instanceof Tree);
-
-        $user = Auth::check() ? $request->getAttribute('user') : new DefaultUser();
-
-        $current_gen = (int) ($request->getAttribute('gen') ?? 0);
-
-        if ($current_gen <= 0) {
-            return response('Invalid generation', StatusCodeInterface::STATUS_UNPROCESSABLE_ENTITY);
-        }
-
-        $list_families = $this->sosa_record_service->listAncestorFamiliesAtGeneration($tree, $user, $current_gen);
-        $nb_families_all = $list_families->count();
-
-        /** @var \Illuminate\Support\Collection<int, \Fisharebest\Webtrees\Family> $list_families */
-        $list_families = $list_families->mapWithKeys(function (stdClass $value) use ($tree): ?array {
-                $fam = Registry::familyFactory()->make($value->f_id, $tree);
-                return ($fam !== null && $fam->canShow()) ? [(int) $value->majs_sosa => $fam] : null;
-        })->filter();
-
-        $nb_families_shown = $list_families->count();
-
-        return $this->viewResponse($this->module->name() . '::list-ancestors-fam-tab', [
-            'module_name'       =>  $this->module->name(),
-            'title'             =>  I18N::translate('Sosa Ancestors'),
-            'tree'              =>  $tree,
-            'list_families'     =>  $list_families,
-            'nb_families_all'   =>  $nb_families_all,
-            'nb_families_shown' =>  $nb_families_shown
-        ]);
-    }
+	use ViewResponseTrait;
+
+	/**
+	 * @var SosaModule|null $module
+	 */
+	private $module;
+
+	/**
+	 * @var SosaRecordsService $sosa_record_service
+	 */
+	private $sosa_record_service;
+
+	/**
+	 * Constructor for AncestorsListFamily Request Handler
+	 *
+	 * @param ModuleService $module_service
+	 * @param SosaRecordsService $sosa_record_service
+	 */
+	public function __construct(
+		ModuleService $module_service,
+		SosaRecordsService $sosa_record_service
+	) {
+		$this->module = $module_service->findByInterface(SosaModule::class)->first();
+		$this->sosa_record_service = $sosa_record_service;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		$this->layout = 'layouts/ajax';
+
+		if ($this->module === null) {
+			throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
+		}
+
+		$tree = $request->getAttribute('tree');
+		assert($tree instanceof Tree);
+
+		$user = Auth::check() ? $request->getAttribute('user') : new DefaultUser();
+
+		$current_gen = (int) ($request->getAttribute('gen') ?? 0);
+
+		if ($current_gen <= 0) {
+			return response('Invalid generation', StatusCodeInterface::STATUS_UNPROCESSABLE_ENTITY);
+		}
+
+		$list_families = $this->sosa_record_service->listAncestorFamiliesAtGeneration($tree, $user, $current_gen);
+		$nb_families_all = $list_families->count();
+
+		/** @var \Illuminate\Support\Collection<int, \Fisharebest\Webtrees\Family> $list_families */
+		$list_families = $list_families->mapWithKeys(function (stdClass $value) use ($tree): ?array {
+				$fam = Registry::familyFactory()->make($value->f_id, $tree);
+				return ($fam !== null && $fam->canShow()) ? [(int) $value->majs_sosa => $fam] : null;
+		})->filter();
+
+		$nb_families_shown = $list_families->count();
+
+		return $this->viewResponse($this->module->name() . '::list-ancestors-fam-tab', [
+			'module_name'       =>  $this->module->name(),
+			'title'             =>  I18N::translate('Sosa Ancestors'),
+			'tree'              =>  $tree,
+			'list_families'     =>  $list_families,
+			'nb_families_all'   =>  $nb_families_all,
+			'nb_families_shown' =>  $nb_families_shown
+		]);
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -78,7 +78,7 @@ 
 
         $user = Auth::check() ? $request->getAttribute('user') : new DefaultUser();
 
-        $current_gen = (int) ($request->getAttribute('gen') ?? 0);
+        $current_gen = (int)($request->getAttribute('gen') ?? 0);
 
         if ($current_gen <= 0) {
             return response('Invalid generation', StatusCodeInterface::STATUS_UNPROCESSABLE_ENTITY);
@@ -88,14 +88,14 @@ 
         $nb_families_all = $list_families->count();
 
         /** @var \Illuminate\Support\Collection<int, \Fisharebest\Webtrees\Family> $list_families */
-        $list_families = $list_families->mapWithKeys(function (stdClass $value) use ($tree): ?array {
+        $list_families = $list_families->mapWithKeys(function(stdClass $value) use ($tree): ?array {
                 $fam = Registry::familyFactory()->make($value->f_id, $tree);
-                return ($fam !== null && $fam->canShow()) ? [(int) $value->majs_sosa => $fam] : null;
+                return ($fam !== null && $fam->canShow()) ? [(int)$value->majs_sosa => $fam] : null;
         })->filter();
 
         $nb_families_shown = $list_families->count();
 
-        return $this->viewResponse($this->module->name() . '::list-ancestors-fam-tab', [
+        return $this->viewResponse($this->module->name().'::list-ancestors-fam-tab', [
             'module_name'       =>  $this->module->name(),
             'title'             =>  I18N::translate('Sosa Ancestors'),
             'tree'              =>  $tree,

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

Indentation +46 added lines, -46 removed lines

@@ -33,59 +33,59 @@
  */
 class AncestorsList implements RequestHandlerInterface
 {
-    use ViewResponseTrait;
+	use ViewResponseTrait;
 
-    /**
-     * @var SosaModule|null $module
-     */
-    private $module;
+	/**
+	 * @var SosaModule|null $module
+	 */
+	private $module;
 
-    /**
-     * @var SosaRecordsService $sosa_record_service
-     */
-    private $sosa_record_service;
+	/**
+	 * @var SosaRecordsService $sosa_record_service
+	 */
+	private $sosa_record_service;
 
-    /**
-     * Constructor for AncestorsList Request Handler
-     *
-     * @param ModuleService $module_service
-     * @param SosaRecordsService $sosa_record_service
-     */
-    public function __construct(
-        ModuleService $module_service,
-        SosaRecordsService $sosa_record_service
-    ) {
-        $this->module = $module_service->findByInterface(SosaModule::class)->first();
-        $this->sosa_record_service = $sosa_record_service;
-    }
+	/**
+	 * Constructor for AncestorsList Request Handler
+	 *
+	 * @param ModuleService $module_service
+	 * @param SosaRecordsService $sosa_record_service
+	 */
+	public function __construct(
+		ModuleService $module_service,
+		SosaRecordsService $sosa_record_service
+	) {
+		$this->module = $module_service->findByInterface(SosaModule::class)->first();
+		$this->sosa_record_service = $sosa_record_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 = $request->getAttribute('tree');
-        assert($tree instanceof Tree);
+		$tree = $request->getAttribute('tree');
+		assert($tree instanceof Tree);
 
-        $user = Auth::check() ? $request->getAttribute('user') : new DefaultUser();
+		$user = Auth::check() ? $request->getAttribute('user') : new DefaultUser();
 
-        /** @var SosaStatisticsService $sosa_stats_service */
-        $sosa_stats_service = app()->makeWith(SosaStatisticsService::class, ['tree' => $tree, 'user' => $user]);
+		/** @var SosaStatisticsService $sosa_stats_service */
+		$sosa_stats_service = app()->makeWith(SosaStatisticsService::class, ['tree' => $tree, 'user' => $user]);
 
-        $current_gen = (int) ($request->getQueryParams()['gen'] ?? $request->getAttribute('gen') ?? 0);
+		$current_gen = (int) ($request->getQueryParams()['gen'] ?? $request->getAttribute('gen') ?? 0);
 
-        return $this->viewResponse($this->module->name() . '::list-ancestors-page', [
-            'module_name'       =>  $this->module->name(),
-            'title'             =>  I18N::translate('Sosa Ancestors'),
-            'tree'              =>  $tree,
-            'root_indi'         =>  $sosa_stats_service->rootIndividual(),
-            'max_gen'           =>  $sosa_stats_service->maxGeneration(),
-            'current_gen'       =>  $current_gen
-        ]);
-    }
+		return $this->viewResponse($this->module->name() . '::list-ancestors-page', [
+			'module_name'       =>  $this->module->name(),
+			'title'             =>  I18N::translate('Sosa Ancestors'),
+			'tree'              =>  $tree,
+			'root_indi'         =>  $sosa_stats_service->rootIndividual(),
+			'max_gen'           =>  $sosa_stats_service->maxGeneration(),
+			'current_gen'       =>  $current_gen
+		]);
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -77,9 +77,9 @@
         /** @var SosaStatisticsService $sosa_stats_service */
         $sosa_stats_service = app()->makeWith(SosaStatisticsService::class, ['tree' => $tree, 'user' => $user]);
 
-        $current_gen = (int) ($request->getQueryParams()['gen'] ?? $request->getAttribute('gen') ?? 0);
+        $current_gen = (int)($request->getQueryParams()['gen'] ?? $request->getAttribute('gen') ?? 0);
 
-        return $this->viewResponse($this->module->name() . '::list-ancestors-page', [
+        return $this->viewResponse($this->module->name().'::list-ancestors-page', [
             'module_name'       =>  $this->module->name(),
             'title'             =>  I18N::translate('Sosa Ancestors'),
             'tree'              =>  $tree,

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 +140 added lines, -140 removed lines

@@ -37,144 +37,144 @@
  */
 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 = $request->getAttribute('tree');
-        assert($tree instanceof Tree);
-
-        $user = Auth::check() ? $request->getAttribute('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 = $request->getAttribute('tree');
+		assert($tree instanceof Tree);
+
+		$user = Auth::check() ? $request->getAttribute('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

Indentation +40 added lines, -40 removed lines

@@ -33,51 +33,51 @@
  */
 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 = $request->getAttribute('tree');
-        assert($tree instanceof Tree);
+		$tree = $request->getAttribute('tree');
+		assert($tree instanceof Tree);
 
-        $user = Auth::check() ? $request->getAttribute('user') : new DefaultUser();
+		$user = Auth::check() ? $request->getAttribute('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 response($response, StatusCodeInterface::STATUS_OK);
-    }
+		return response($response, StatusCodeInterface::STATUS_OK);
+	}
 }

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

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

Indentation +42 added lines, -42 removed lines

@@ -30,52 +30,52 @@
  */
 class SosaConfigAction implements RequestHandlerInterface
 {
-    /**
-     * @var UserService $user_service
-     */
-    private $user_service;
+	/**
+	 * @var UserService $user_service
+	 */
+	private $user_service;
 
-    /**
-     * Constructor for SosaConfigAction Request Handler
-     *
-     * @param UserService $user_service
-     */
-    public function __construct(UserService $user_service)
-    {
-        $this->user_service = $user_service;
-    }
+	/**
+	 * Constructor for SosaConfigAction Request Handler
+	 *
+	 * @param UserService $user_service
+	 */
+	public function __construct(UserService $user_service)
+	{
+		$this->user_service = $user_service;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        $tree = $request->getAttribute('tree');
-        assert($tree instanceof Tree);
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		$tree = $request->getAttribute('tree');
+		assert($tree instanceof Tree);
 
-        $params = $request->getParsedBody();
-        assert(is_array($params));
+		$params = $request->getParsedBody();
+		assert(is_array($params));
 
-        $user_id = (int) $params['sosa-userid'];
-        $root_id = $params['sosa-rootid'] ?? '';
-        $max_gen = $params['sosa-maxgen'] ?? '';
+		$user_id = (int) $params['sosa-userid'];
+		$root_id = $params['sosa-rootid'] ?? '';
+		$max_gen = $params['sosa-maxgen'] ?? '';
 
-        if (Auth::id() == $user_id || ($user_id == -1 && Auth::isManager($tree))) {
-            $user = $user_id == -1 ? new DefaultUser() : $this->user_service->find($user_id);
-            if ($user !== null && ($root_indi = Registry::individualFactory()->make($root_id, $tree)) !== null) {
-                $tree->setUserPreference($user, 'MAJ_SOSA_ROOT_ID', $root_indi->xref());
-                $tree->setUserPreference($user, 'MAJ_SOSA_MAX_GEN', $max_gen);
-                FlashMessages::addMessage(I18N::translate('The root individual has been updated.'));
-                return redirect(route(SosaConfig::class, [
-                    'tree' => $tree->name(),
-                    'compute' => 'yes',
-                    'user_id' => $user_id
-                ]));
-            }
-        }
+		if (Auth::id() == $user_id || ($user_id == -1 && Auth::isManager($tree))) {
+			$user = $user_id == -1 ? new DefaultUser() : $this->user_service->find($user_id);
+			if ($user !== null && ($root_indi = Registry::individualFactory()->make($root_id, $tree)) !== null) {
+				$tree->setUserPreference($user, 'MAJ_SOSA_ROOT_ID', $root_indi->xref());
+				$tree->setUserPreference($user, 'MAJ_SOSA_MAX_GEN', $max_gen);
+				FlashMessages::addMessage(I18N::translate('The root individual has been updated.'));
+				return redirect(route(SosaConfig::class, [
+					'tree' => $tree->name(),
+					'compute' => 'yes',
+					'user_id' => $user_id
+				]));
+			}
+		}
 
-        FlashMessages::addMessage(I18N::translate('The root individual could not be updated.'), 'danger');
-        return redirect(route(SosaConfig::class, ['tree' => $tree->name()]));
-    }
+		FlashMessages::addMessage(I18N::translate('The root individual could not be updated.'), 'danger');
+		return redirect(route(SosaConfig::class, ['tree' => $tree->name()]));
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
         $params = $request->getParsedBody();
         assert(is_array($params));
 
-        $user_id = (int) $params['sosa-userid'];
+        $user_id = (int)$params['sosa-userid'];
         $root_id = $params['sosa-rootid'] ?? '';
         $max_gen = $params['sosa-maxgen'] ?? '';
 

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

Indentation +60 added lines, -60 removed lines

@@ -32,72 +32,72 @@
  */
 class SosaConfig implements RequestHandlerInterface
 {
-    use ViewResponseTrait;
+	use ViewResponseTrait;
 
-    /**
-     * @var SosaModule|null $module
-     */
-    private $module;
+	/**
+	 * @var SosaModule|null $module
+	 */
+	private $module;
 
-    /**
-     * Constructor for SosaConfig Request Handler
-     *
-     * @param ModuleService $module_service
-     */
-    public function __construct(ModuleService $module_service)
-    {
-        $this->module = $module_service->findByInterface(SosaModule::class)->first();
-    }
+	/**
+	 * Constructor for SosaConfig 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 = $request->getAttribute('tree');
-        assert($tree instanceof Tree);
+		$tree = $request->getAttribute('tree');
+		assert($tree instanceof Tree);
 
-        $users_root = array();
-        if (Auth::check()) {
-            /** @var \Fisharebest\Webtrees\User $user */
-            $user = Auth::user();
-            $users_root[] = [
-                'user'      => $user,
-                'root_id'   => $tree->getUserPreference($user, 'MAJ_SOSA_ROOT_ID'),
-                'max_gen'   => $tree->getUserPreference($user, 'MAJ_SOSA_MAX_GEN')
-            ];
+		$users_root = array();
+		if (Auth::check()) {
+			/** @var \Fisharebest\Webtrees\User $user */
+			$user = Auth::user();
+			$users_root[] = [
+				'user'      => $user,
+				'root_id'   => $tree->getUserPreference($user, 'MAJ_SOSA_ROOT_ID'),
+				'max_gen'   => $tree->getUserPreference($user, 'MAJ_SOSA_MAX_GEN')
+			];
 
-            if (Auth::isManager($tree)) {
-                $default_user = new DefaultUser();
-                $users_root[] = [
-                    'user' => $default_user,
-                    'root_id' => $tree->getUserPreference($default_user, 'MAJ_SOSA_ROOT_ID'),
-                    'max_gen'   => $tree->getUserPreference($default_user, 'MAJ_SOSA_MAX_GEN')
-                ];
-            }
-        }
+			if (Auth::isManager($tree)) {
+				$default_user = new DefaultUser();
+				$users_root[] = [
+					'user' => $default_user,
+					'root_id' => $tree->getUserPreference($default_user, 'MAJ_SOSA_ROOT_ID'),
+					'max_gen'   => $tree->getUserPreference($default_user, 'MAJ_SOSA_MAX_GEN')
+				];
+			}
+		}
 
-        // Use the system max generations if not set
-        $max_gen_system = app(SosaRecordsService::class)->maxSystemGenerations();
-        foreach ($users_root as $key => $user_root) {
-            $users_root[$key]['max_gen'] = is_numeric($user_root['max_gen']) ?
-                (int) $user_root['max_gen'] :
-                $max_gen_system;
-        };
+		// Use the system max generations if not set
+		$max_gen_system = app(SosaRecordsService::class)->maxSystemGenerations();
+		foreach ($users_root as $key => $user_root) {
+			$users_root[$key]['max_gen'] = is_numeric($user_root['max_gen']) ?
+				(int) $user_root['max_gen'] :
+				$max_gen_system;
+		};
 
-        return $this->viewResponse($this->module->name() . '::config-page', [
-            'module_name'       =>  $this->module->name(),
-            'title'             =>  I18N::translate('Sosa Configuration'),
-            'tree'              =>  $tree,
-            'user_id'           =>  $request->getAttribute('user'),
-            'selected_user_id'  =>  (int) ($request->getQueryParams()['user_id'] ?? 0),
-            'immediate_compute' =>  ($request->getQueryParams()['compute'] ?? '') == 'yes',
-            'users_root'        =>  $users_root
-        ]);
-    }
+		return $this->viewResponse($this->module->name() . '::config-page', [
+			'module_name'       =>  $this->module->name(),
+			'title'             =>  I18N::translate('Sosa Configuration'),
+			'tree'              =>  $tree,
+			'user_id'           =>  $request->getAttribute('user'),
+			'selected_user_id'  =>  (int) ($request->getQueryParams()['user_id'] ?? 0),
+			'immediate_compute' =>  ($request->getQueryParams()['compute'] ?? '') == 'yes',
+			'users_root'        =>  $users_root
+		]);
+	}
 }

Spacing +3 added lines, -4 removed lines

@@ -86,16 +86,15 @@
         $max_gen_system = app(SosaRecordsService::class)->maxSystemGenerations();
         foreach ($users_root as $key => $user_root) {
             $users_root[$key]['max_gen'] = is_numeric($user_root['max_gen']) ?
-                (int) $user_root['max_gen'] :
-                $max_gen_system;
+                (int)$user_root['max_gen'] : $max_gen_system;
         };
 
-        return $this->viewResponse($this->module->name() . '::config-page', [
+        return $this->viewResponse($this->module->name().'::config-page', [
             'module_name'       =>  $this->module->name(),
             'title'             =>  I18N::translate('Sosa Configuration'),
             'tree'              =>  $tree,
             'user_id'           =>  $request->getAttribute('user'),
-            'selected_user_id'  =>  (int) ($request->getQueryParams()['user_id'] ?? 0),
+            'selected_user_id'  =>  (int)($request->getQueryParams()['user_id'] ?? 0),
             'immediate_compute' =>  ($request->getQueryParams()['compute'] ?? '') == 'yes',
             'users_root'        =>  $users_root
         ]);

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

Indentation +32 added lines, -32 removed lines

@@ -28,40 +28,40 @@
  */
 class SosaComputeModal implements RequestHandlerInterface
 {
-    /**
-     * @var SosaModule|null $module
-     */
-    private $module;
+	/**
+	 * @var SosaModule|null $module
+	 */
+	private $module;
 
-    /**
-     * Constructor for SosaComputeModal Request Handler
-     *
-     * @param ModuleService $module_service
-     */
-    public function __construct(ModuleService $module_service)
-    {
-        $this->module = $module_service->findByInterface(SosaModule::class)->first();
-    }
+	/**
+	 * Constructor for SosaComputeModal 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) {
-            return response(view('modals/error', [
-                'title' => I18N::translate('Error'),
-                'error' => 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) {
+			return response(view('modals/error', [
+				'title' => I18N::translate('Error'),
+				'error' => I18N::translate('The attached module could not be found.')
+			]));
+		}
 
-        $tree = $request->getAttribute('tree');
-        assert($tree instanceof Tree);
+		$tree = $request->getAttribute('tree');
+		assert($tree instanceof Tree);
 
-        return response(view($this->module->name() . '::modals/sosa-compute', [
-            'tree'          => $tree,
-            'xref'          =>  $request->getAttribute('xref')
-        ]));
-    }
+		return response(view($this->module->name() . '::modals/sosa-compute', [
+			'tree'          => $tree,
+			'xref'          =>  $request->getAttribute('xref')
+		]));
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
         $tree = $request->getAttribute('tree');
         assert($tree instanceof Tree);
 
-        return response(view($this->module->name() . '::modals/sosa-compute', [
+        return response(view($this->module->name().'::modals/sosa-compute', [
             'tree'          => $tree,
             'xref'          =>  $request->getAttribute('xref')
         ]));