jon48 / webtrees-lib

app/Http/Middleware/AuthTreePreference.php

Indentation +31 added lines, -31 removed lines

@@ -31,40 +31,40 @@
  */
 class AuthTreePreference implements MiddlewareInterface
 {
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\MiddlewareInterface::process()
-     */
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
-    {
-        $tree = Validator::attributes($request)->tree();
-        $route = Validator::attributes($request)->route();
-        $user = Validator::attributes($request)->user();
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\MiddlewareInterface::process()
+	 */
+	public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
+	{
+		$tree = Validator::attributes($request)->tree();
+		$route = Validator::attributes($request)->route();
+		$user = Validator::attributes($request)->user();
 
-        $permission_preference = $route->extras['permission_preference'] ?? '';
-        $permission_level = $permission_preference === '' ? '' : $tree->getPreference($permission_preference);
+		$permission_preference = $route->extras['permission_preference'] ?? '';
+		$permission_level = $permission_preference === '' ? '' : $tree->getPreference($permission_preference);
 
-        // Permissions are configured
-        if (is_numeric($permission_level)) {
-            // Logged in with the correct role?
-            if (Auth::accessLevel($tree, $user) <= (int) $permission_level) {
-                    return $handler->handle($request);
-            }
+		// Permissions are configured
+		if (is_numeric($permission_level)) {
+			// Logged in with the correct role?
+			if (Auth::accessLevel($tree, $user) <= (int) $permission_level) {
+					return $handler->handle($request);
+			}
 
-            // Logged in, but without the correct role?
-            if ($user instanceof User) {
-                throw new HttpAccessDeniedException();
-            }
-        }
+			// Logged in, but without the correct role?
+			if ($user instanceof User) {
+				throw new HttpAccessDeniedException();
+			}
+		}
 
-        // Permissions no configured, or not logged in
-        if ($request->getMethod() === RequestMethodInterface::METHOD_POST) {
-            throw new HttpAccessDeniedException();
-        }
+		// Permissions no configured, or not logged in
+		if ($request->getMethod() === RequestMethodInterface::METHOD_POST) {
+			throw new HttpAccessDeniedException();
+		}
 
-        return Registry::responseFactory()->redirect(
-            LoginPage::class,
-            ['tree' => $tree->name(), 'url' => (string) $request->getUri()]
-        );
-    }
+		return Registry::responseFactory()->redirect(
+			LoginPage::class,
+			['tree' => $tree->name(), 'url' => (string) $request->getUri()]
+		);
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -47,7 +47,7 @@ 
         // Permissions are configured
         if (is_numeric($permission_level)) {
             // Logged in with the correct role?
-            if (Auth::accessLevel($tree, $user) <= (int) $permission_level) {
+            if (Auth::accessLevel($tree, $user) <= (int)$permission_level) {
                     return $handler->handle($request);
             }
 
@@ -64,7 +64,7 @@ 
 
         return Registry::responseFactory()->redirect(
             LoginPage::class,
-            ['tree' => $tree->name(), 'url' => (string) $request->getUri()]
+            ['tree' => $tree->name(), 'url' => (string)$request->getUri()]
         );
     }
 }

app/Common/Tasks/TaskSchedule.php

Indentation +229 added lines, -229 removed lines

@@ -23,252 +23,252 @@
  */
 class TaskSchedule
 {
-    private int $id;
-    private bool $enabled;
-    private string $task_id;
-    private CarbonInterface $last_run;
-    private bool $last_result;
-    private int $frequency;
-    private int $nb_occurrences;
-    private bool $is_running;
+	private int $id;
+	private bool $enabled;
+	private string $task_id;
+	private CarbonInterface $last_run;
+	private bool $last_result;
+	private int $frequency;
+	private int $nb_occurrences;
+	private bool $is_running;
 
-    /**
-     * Constructor for TaskSchedule
-     *
-     * @param int $id Schedule ID
-     * @param string $task_id Task ID
-     * @param bool $enabled Is the schedule enabled
-     * @param CarbonInterface $last_run Last successful run date/time
-     * @param bool $last_result Result of the last run
-     * @param int $frequency Schedule frequency in minutes
-     * @param int $nb_occurrences Number of remaining occurrences to be run
-     * @param bool $is_running Is the task currently running
-     */
-    public function __construct(
-        int $id,
-        string $task_id,
-        bool $enabled,
-        CarbonInterface $last_run,
-        bool $last_result,
-        int $frequency,
-        int $nb_occurrences,
-        bool $is_running
-    ) {
-        $this->id = $id;
-        $this->task_id = $task_id;
-        $this->enabled = $enabled;
-        $this->last_run = $last_run;
-        $this->last_result = $last_result;
-        $this->frequency = $frequency;
-        $this->nb_occurrences = $nb_occurrences;
-        $this->is_running = $is_running;
-    }
+	/**
+	 * Constructor for TaskSchedule
+	 *
+	 * @param int $id Schedule ID
+	 * @param string $task_id Task ID
+	 * @param bool $enabled Is the schedule enabled
+	 * @param CarbonInterface $last_run Last successful run date/time
+	 * @param bool $last_result Result of the last run
+	 * @param int $frequency Schedule frequency in minutes
+	 * @param int $nb_occurrences Number of remaining occurrences to be run
+	 * @param bool $is_running Is the task currently running
+	 */
+	public function __construct(
+		int $id,
+		string $task_id,
+		bool $enabled,
+		CarbonInterface $last_run,
+		bool $last_result,
+		int $frequency,
+		int $nb_occurrences,
+		bool $is_running
+	) {
+		$this->id = $id;
+		$this->task_id = $task_id;
+		$this->enabled = $enabled;
+		$this->last_run = $last_run;
+		$this->last_result = $last_result;
+		$this->frequency = $frequency;
+		$this->nb_occurrences = $nb_occurrences;
+		$this->is_running = $is_running;
+	}
 
-    /**
-     * Get the schedule ID.
-     *
-     * @return int
-     */
-    public function id(): int
-    {
-        return $this->id;
-    }
+	/**
+	 * Get the schedule ID.
+	 *
+	 * @return int
+	 */
+	public function id(): int
+	{
+		return $this->id;
+	}
 
-    /**
-     * Get the task ID.
-     *
-     * @return string
-     */
-    public function taskId(): string
-    {
-        return $this->task_id;
-    }
+	/**
+	 * Get the task ID.
+	 *
+	 * @return string
+	 */
+	public function taskId(): string
+	{
+		return $this->task_id;
+	}
 
-    /**
-     * Returns whether the schedule is enabled
-     *
-     * @return bool
-     */
-    public function isEnabled(): bool
-    {
-        return $this->enabled;
-    }
+	/**
+	 * Returns whether the schedule is enabled
+	 *
+	 * @return bool
+	 */
+	public function isEnabled(): bool
+	{
+		return $this->enabled;
+	}
 
-    /**
-     * Enable the schedule
-     *
-     * @return $this
-     */
-    public function enable(): self
-    {
-        $this->enabled = true;
-        return $this;
-    }
+	/**
+	 * Enable the schedule
+	 *
+	 * @return $this
+	 */
+	public function enable(): self
+	{
+		$this->enabled = true;
+		return $this;
+	}
 
-    /**
-     * Disable the schedule
-     *
-     * @return $this
-     */
-    public function disable(): self
-    {
-        $this->enabled = false;
-        return $this;
-    }
+	/**
+	 * Disable the schedule
+	 *
+	 * @return $this
+	 */
+	public function disable(): self
+	{
+		$this->enabled = false;
+		return $this;
+	}
 
-    /**
-     * Get the frequency of the schedule
-     *
-     * @return int
-     */
-    public function frequency(): int
-    {
-        return $this->frequency;
-    }
+	/**
+	 * Get the frequency of the schedule
+	 *
+	 * @return int
+	 */
+	public function frequency(): int
+	{
+		return $this->frequency;
+	}
 
-    /**
-     * Set the frequency of the schedule
-     *
-     * @param int $frequency
-     * @return $this
-     */
-    public function setFrequency(int $frequency): self
-    {
-        $this->frequency = $frequency;
-        return $this;
-    }
+	/**
+	 * Set the frequency of the schedule
+	 *
+	 * @param int $frequency
+	 * @return $this
+	 */
+	public function setFrequency(int $frequency): self
+	{
+		$this->frequency = $frequency;
+		return $this;
+	}
 
-    /**
-     * Get the date/time of the last successful run.
-     *
-     * @return CarbonInterface
-     */
-    public function lastRunTime(): CarbonInterface
-    {
-        return $this->last_run;
-    }
+	/**
+	 * Get the date/time of the last successful run.
+	 *
+	 * @return CarbonInterface
+	 */
+	public function lastRunTime(): CarbonInterface
+	{
+		return $this->last_run;
+	}
 
-    /**
-     * Set the last successful run date/time
-     *
-     * @param CarbonInterface $last_run
-     * @return $this
-     */
-    public function setLastRunTime(CarbonInterface $last_run): self
-    {
-        $this->last_run = $last_run;
-        return $this;
-    }
+	/**
+	 * Set the last successful run date/time
+	 *
+	 * @param CarbonInterface $last_run
+	 * @return $this
+	 */
+	public function setLastRunTime(CarbonInterface $last_run): self
+	{
+		$this->last_run = $last_run;
+		return $this;
+	}
 
-    /**
-     * Returns whether the last run was successful
-     *
-     * @return bool
-     */
-    public function wasLastRunSuccess(): bool
-    {
-        return $this->last_result;
-    }
+	/**
+	 * Returns whether the last run was successful
+	 *
+	 * @return bool
+	 */
+	public function wasLastRunSuccess(): bool
+	{
+		return $this->last_result;
+	}
 
-    /**
-     * Set the last run result
-     *
-     * @param bool $last_result
-     * @return $this
-     */
-    public function setLastResult(bool $last_result): self
-    {
-        $this->last_result = $last_result;
-        return $this;
-    }
+	/**
+	 * Set the last run result
+	 *
+	 * @param bool $last_result
+	 * @return $this
+	 */
+	public function setLastResult(bool $last_result): self
+	{
+		$this->last_result = $last_result;
+		return $this;
+	}
 
-    /**
-     * Get the number of remaining of occurrences of task runs.
-     * Returns 0 if the tasks must be run indefinitely.
-     *
-     * @return int
-     */
-    public function remainingOccurrences(): int
-    {
-        return $this->nb_occurrences;
-    }
+	/**
+	 * Get the number of remaining of occurrences of task runs.
+	 * Returns 0 if the tasks must be run indefinitely.
+	 *
+	 * @return int
+	 */
+	public function remainingOccurrences(): int
+	{
+		return $this->nb_occurrences;
+	}
 
-    /**
-     * Decrements the number of remaining occurrences by 1.
-     * The task will be disabled when the number reaches 0.
-     *
-     * @return $this
-     */
-    public function decrementRemainingOccurrences(): self
-    {
-        if ($this->nb_occurrences > 0) {
-            $this->nb_occurrences--;
-            if ($this->nb_occurrences === 0) {
-                $this->disable();
-            }
-        }
-        return $this;
-    }
+	/**
+	 * Decrements the number of remaining occurrences by 1.
+	 * The task will be disabled when the number reaches 0.
+	 *
+	 * @return $this
+	 */
+	public function decrementRemainingOccurrences(): self
+	{
+		if ($this->nb_occurrences > 0) {
+			$this->nb_occurrences--;
+			if ($this->nb_occurrences === 0) {
+				$this->disable();
+			}
+		}
+		return $this;
+	}
 
-    /**
-     * Set the number of remaining occurrences of task runs.
-     *
-     * @param int $nb_occurrences
-     * @return $this
-     */
-    public function setRemainingOccurrences(int $nb_occurrences): self
-    {
-        $this->nb_occurrences = $nb_occurrences;
-        return $this;
-    }
+	/**
+	 * Set the number of remaining occurrences of task runs.
+	 *
+	 * @param int $nb_occurrences
+	 * @return $this
+	 */
+	public function setRemainingOccurrences(int $nb_occurrences): self
+	{
+		$this->nb_occurrences = $nb_occurrences;
+		return $this;
+	}
 
-    /**
-     * Returns whether the task is running
-     * @return bool
-     */
-    public function isRunning(): bool
-    {
-        return $this->is_running;
-    }
+	/**
+	 * Returns whether the task is running
+	 * @return bool
+	 */
+	public function isRunning(): bool
+	{
+		return $this->is_running;
+	}
 
-    /**
-     * Informs the schedule that the task is going to run
-     *
-     * @return $this
-     */
-    public function startRunning(): self
-    {
-        $this->is_running = true;
-        return $this;
-    }
+	/**
+	 * Informs the schedule that the task is going to run
+	 *
+	 * @return $this
+	 */
+	public function startRunning(): self
+	{
+		$this->is_running = true;
+		return $this;
+	}
 
-    /**
-     * Informs the schedule that the task has stopped running.
-     * @return $this
-     */
-    public function stopRunning(): self
-    {
-        $this->is_running = false;
-        return $this;
-    }
+	/**
+	 * Informs the schedule that the task has stopped running.
+	 * @return $this
+	 */
+	public function stopRunning(): self
+	{
+		$this->is_running = false;
+		return $this;
+	}
 
-    /**
-     * Returns the schedule details as an associate array
-     *
-     * @phpcs:ignore Generic.Files.LineLength.TooLong
-     * @return array{id: int, task_id: string, enabled: bool, last_run: CarbonInterface, last_result: bool, frequency: int, nb_occurrences: int, is_running: bool}
-     */
-    public function toArray(): array
-    {
-        return [
-            'id'            =>  $this->id,
-            'task_id'       =>  $this->task_id,
-            'enabled'       =>  $this->enabled,
-            'last_run'      =>  $this->last_run,
-            'last_result'   =>  $this->last_result,
-            'frequency'     =>  $this->frequency,
-            'nb_occurrences' =>  $this->nb_occurrences,
-            'is_running'    =>  $this->is_running
-        ];
-    }
+	/**
+	 * Returns the schedule details as an associate array
+	 *
+	 * @phpcs:ignore Generic.Files.LineLength.TooLong
+	 * @return array{id: int, task_id: string, enabled: bool, last_run: CarbonInterface, last_result: bool, frequency: int, nb_occurrences: int, is_running: bool}
+	 */
+	public function toArray(): array
+	{
+		return [
+			'id'            =>  $this->id,
+			'task_id'       =>  $this->task_id,
+			'enabled'       =>  $this->enabled,
+			'last_run'      =>  $this->last_run,
+			'last_result'   =>  $this->last_result,
+			'frequency'     =>  $this->frequency,
+			'nb_occurrences' =>  $this->nb_occurrences,
+			'is_running'    =>  $this->is_running
+		];
+	}
 }

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

Indentation +46 added lines, -46 removed lines

@@ -31,58 +31,58 @@
  */
 class SosaComputeAction implements RequestHandlerInterface
 {
-    private UserService $user_service;
+	private UserService $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 = Validator::attributes($request)->tree();
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		$tree = Validator::attributes($request)->tree();
 
-        // Cannot use Validator with negative integers issue webtrees #4408
-        // $user_id = Validator::parsedBody($request)->integer('user_id', Auth::id() ?? 0);
-        $parsed_body = (array) $request->getParsedBody();
-        $user_id = (int) filter_var($parsed_body['user_id'] ?? Auth::id(), FILTER_VALIDATE_INT);
+		// Cannot use Validator with negative integers issue webtrees #4408
+		// $user_id = Validator::parsedBody($request)->integer('user_id', Auth::id() ?? 0);
+		$parsed_body = (array) $request->getParsedBody();
+		$user_id = (int) filter_var($parsed_body['user_id'] ?? Auth::id(), FILTER_VALIDATE_INT);
 
-        $partial_from = Validator::parsedBody($request)->isXref()->string('partial_from', '');
+		$partial_from = Validator::parsedBody($request)->isXref()->string('partial_from', '');
 
-        if (($user_id === -1 && Auth::isManager($tree)) || Auth::id() === $user_id) {
-            $user = $user_id === -1 ? new DefaultUser() : $this->user_service->find($user_id);
+		if (($user_id === -1 && Auth::isManager($tree)) || Auth::id() === $user_id) {
+			$user = $user_id === -1 ? new DefaultUser() : $this->user_service->find($user_id);
 
-            /** @var SosaCalculatorService $sosa_calc_service */
-            $sosa_calc_service = app()->makeWith(SosaCalculatorService::class, [ 'tree' => $tree, 'user' => $user]);
+			/** @var SosaCalculatorService $sosa_calc_service */
+			$sosa_calc_service = app()->makeWith(SosaCalculatorService::class, [ 'tree' => $tree, 'user' => $user]);
 
-            if (
-                $partial_from !== '' &&
-                ($sosa_from = Registry::individualFactory()->make($partial_from, $tree)) !== null
-            ) {
-                $res = $sosa_calc_service->computeFromIndividual($sosa_from);
-            } else {
-                $res = $sosa_calc_service->computeAll();
-            }
+			if (
+				$partial_from !== '' &&
+				($sosa_from = Registry::individualFactory()->make($partial_from, $tree)) !== null
+			) {
+				$res = $sosa_calc_service->computeFromIndividual($sosa_from);
+			} else {
+				$res = $sosa_calc_service->computeAll();
+			}
 
-            return $res ?
-                Registry::responseFactory()->response() :
-                Registry::responseFactory()->response(
-                    I18N::translate('An error occurred while computing Sosa ancestors.'),
-                    StatusCodeInterface::STATUS_INTERNAL_SERVER_ERROR
-                );
-        }
-        return Registry::responseFactory()->response(
-            I18N::translate('You do not have permission to modify the user.'),
-            StatusCodeInterface::STATUS_FORBIDDEN
-        );
-    }
+			return $res ?
+				Registry::responseFactory()->response() :
+				Registry::responseFactory()->response(
+					I18N::translate('An error occurred while computing Sosa ancestors.'),
+					StatusCodeInterface::STATUS_INTERNAL_SERVER_ERROR
+				);
+		}
+		return Registry::responseFactory()->response(
+			I18N::translate('You do not have permission to modify the user.'),
+			StatusCodeInterface::STATUS_FORBIDDEN
+		);
+	}
 }

Spacing +4 added lines, -5 removed lines

@@ -53,8 +53,8 @@ 
 
         // Cannot use Validator with negative integers issue webtrees #4408
         // $user_id = Validator::parsedBody($request)->integer('user_id', Auth::id() ?? 0);
-        $parsed_body = (array) $request->getParsedBody();
-        $user_id = (int) filter_var($parsed_body['user_id'] ?? Auth::id(), FILTER_VALIDATE_INT);
+        $parsed_body = (array)$request->getParsedBody();
+        $user_id = (int)filter_var($parsed_body['user_id'] ?? Auth::id(), FILTER_VALIDATE_INT);
 
         $partial_from = Validator::parsedBody($request)->isXref()->string('partial_from', '');
 
@@ -62,7 +62,7 @@ 
             $user = $user_id === -1 ? new DefaultUser() : $this->user_service->find($user_id);
 
             /** @var SosaCalculatorService $sosa_calc_service */
-            $sosa_calc_service = app()->makeWith(SosaCalculatorService::class, [ 'tree' => $tree, 'user' => $user]);
+            $sosa_calc_service = app()->makeWith(SosaCalculatorService::class, ['tree' => $tree, 'user' => $user]);
 
             if (
                 $partial_from !== '' &&
@@ -74,8 +74,7 @@ 
             }
 
             return $res ?
-                Registry::responseFactory()->response() :
-                Registry::responseFactory()->response(
+                Registry::responseFactory()->response() : Registry::responseFactory()->response(
                     I18N::translate('An error occurred while computing Sosa ancestors.'),
                     StatusCodeInterface::STATUS_INTERNAL_SERVER_ERROR
                 );

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

Indentation +31 added lines, -31 removed lines

@@ -28,39 +28,39 @@
  */
 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 Registry::responseFactory()->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 Registry::responseFactory()->response(view('modals/error', [
+				'title' => I18N::translate('Error'),
+				'error' => I18N::translate('The attached module could not be found.')
+			]));
+		}
 
-        $tree = Validator::attributes($request)->tree();
+		$tree = Validator::attributes($request)->tree();
 
-        return Registry::responseFactory()->response(view($this->module->name() . '::modals/sosa-compute', [
-            'tree'          => $tree,
-            'xref'          => Validator::attributes($request)->isXref()->string('xref', '')
-        ]));
-    }
+		return Registry::responseFactory()->response(view($this->module->name() . '::modals/sosa-compute', [
+			'tree'          => $tree,
+			'xref'          => Validator::attributes($request)->isXref()->string('xref', '')
+		]));
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
 
         $tree = Validator::attributes($request)->tree();
 
-        return Registry::responseFactory()->response(view($this->module->name() . '::modals/sosa-compute', [
+        return Registry::responseFactory()->response(view($this->module->name().'::modals/sosa-compute', [
             'tree'          => $tree,
             'xref'          => Validator::attributes($request)->isXref()->string('xref', '')
         ]));

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

Indentation +62 added lines, -62 removed lines

@@ -33,75 +33,75 @@
  */
 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 = Validator::attributes($request)->tree();
+		$tree = Validator::attributes($request)->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;
+		};
 
-        // Cannot use Validator with negative integers issue webtrees #4408
-        $selected_user_id = (int) filter_var($request->getQueryParams()['user_id'] ?? 0, FILTER_VALIDATE_INT);
+		// Cannot use Validator with negative integers issue webtrees #4408
+		$selected_user_id = (int) filter_var($request->getQueryParams()['user_id'] ?? 0, FILTER_VALIDATE_INT);
 
-        return $this->viewResponse($this->module->name() . '::config-page', [
-            'module_name'       =>  $this->module->name(),
-            'title'             =>  I18N::translate('Sosa Configuration'),
-            'tree'              =>  $tree,
-            'user_id'           =>  Validator::attributes($request)->user(),
-            //'selected_user_id'  =>  Validator::queryParams($request)->integer('user_id', 0), // See webtree #4408
-            'selected_user_id'  =>  $selected_user_id,
-            'immediate_compute' =>  Validator::queryParams($request)->string('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'           =>  Validator::attributes($request)->user(),
+			//'selected_user_id'  =>  Validator::queryParams($request)->integer('user_id', 0), // See webtree #4408
+			'selected_user_id'  =>  $selected_user_id,
+			'immediate_compute' =>  Validator::queryParams($request)->string('compute', '') === 'yes',
+			'users_root'        =>  $users_root
+		]);
+	}
 }

Spacing +3 added lines, -4 removed lines

@@ -86,14 +86,13 @@
         $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;
         };
 
         // Cannot use Validator with negative integers issue webtrees #4408
-        $selected_user_id = (int) filter_var($request->getQueryParams()['user_id'] ?? 0, FILTER_VALIDATE_INT);
+        $selected_user_id = (int)filter_var($request->getQueryParams()['user_id'] ?? 0, FILTER_VALIDATE_INT);
 
-        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,

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

Indentation +75 added lines, -75 removed lines

@@ -35,79 +35,79 @@
  */
 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 = Validator::attributes($request)->tree();
-        $user = Auth::check() ? Validator::attributes($request)->user() : new DefaultUser();
-        $current_gen = Validator::attributes($request)->integer('gen', 0);
-
-        if ($current_gen <= 0) {
-            return Registry::responseFactory()->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
-            ->filter(function (stdClass $value) use ($tree): bool {
-                $indi = Registry::individualFactory()->make($value->majs_i_id, $tree);
-                return $indi !== null && $indi->canShowName();
-            })
-            ->mapWithKeys(function (stdClass $value) use ($tree): array {
-                $indi = Registry::individualFactory()->make($value->majs_i_id, $tree);
-                return [(int) $value->majs_sosa => $indi];
-            });
-
-        $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 = Validator::attributes($request)->tree();
+		$user = Auth::check() ? Validator::attributes($request)->user() : new DefaultUser();
+		$current_gen = Validator::attributes($request)->integer('gen', 0);
+
+		if ($current_gen <= 0) {
+			return Registry::responseFactory()->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
+			->filter(function (stdClass $value) use ($tree): bool {
+				$indi = Registry::individualFactory()->make($value->majs_i_id, $tree);
+				return $indi !== null && $indi->canShowName();
+			})
+			->mapWithKeys(function (stdClass $value) use ($tree): array {
+				$indi = Registry::individualFactory()->make($value->majs_i_id, $tree);
+				return [(int) $value->majs_sosa => $indi];
+			});
+
+		$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

@@ -89,18 +89,18 @@
 
         /** @var \Illuminate\Support\Collection<int, \Fisharebest\Webtrees\Individual> $list_ancestors */
         $list_ancestors = $list_ancestors
-            ->filter(function (stdClass $value) use ($tree): bool {
+            ->filter(function(stdClass $value) use ($tree): bool {
                 $indi = Registry::individualFactory()->make($value->majs_i_id, $tree);
                 return $indi !== null && $indi->canShowName();
             })
-            ->mapWithKeys(function (stdClass $value) use ($tree): array {
+            ->mapWithKeys(function(stdClass $value) use ($tree): array {
                 $indi = Registry::individualFactory()->make($value->majs_i_id, $tree);
-                return [(int) $value->majs_sosa => $indi];
+                return [(int)$value->majs_sosa => $indi];
             });
 
         $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/AncestorsListFamily.php

Indentation +74 added lines, -74 removed lines

@@ -35,78 +35,78 @@
  */
 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 = Validator::attributes($request)->tree();
-        $user = Auth::check() ? Validator::attributes($request)->user() : new DefaultUser();
-        $current_gen = Validator::attributes($request)->integer('gen', 0);
-
-        if ($current_gen <= 0) {
-            return Registry::responseFactory()->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
-            ->filter(function (stdClass $value) use ($tree): bool {
-                $fam = Registry::familyFactory()->make($value->f_id, $tree);
-                return $fam !== null && $fam->canShow();
-            })
-            ->mapWithKeys(function (stdClass $value) use ($tree): array {
-                $fam = Registry::familyFactory()->make($value->f_id, $tree);
-                return [(int) $value->majs_sosa => $fam];
-            });
-
-        $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 = Validator::attributes($request)->tree();
+		$user = Auth::check() ? Validator::attributes($request)->user() : new DefaultUser();
+		$current_gen = Validator::attributes($request)->integer('gen', 0);
+
+		if ($current_gen <= 0) {
+			return Registry::responseFactory()->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
+			->filter(function (stdClass $value) use ($tree): bool {
+				$fam = Registry::familyFactory()->make($value->f_id, $tree);
+				return $fam !== null && $fam->canShow();
+			})
+			->mapWithKeys(function (stdClass $value) use ($tree): array {
+				$fam = Registry::familyFactory()->make($value->f_id, $tree);
+				return [(int) $value->majs_sosa => $fam];
+			});
+
+		$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

@@ -89,18 +89,18 @@
 
         /** @var \Illuminate\Support\Collection<int, \Fisharebest\Webtrees\Family> $list_families */
         $list_families = $list_families
-            ->filter(function (stdClass $value) use ($tree): bool {
+            ->filter(function(stdClass $value) use ($tree): bool {
                 $fam = Registry::familyFactory()->make($value->f_id, $tree);
                 return $fam !== null && $fam->canShow();
             })
-            ->mapWithKeys(function (stdClass $value) use ($tree): array {
+            ->mapWithKeys(function(stdClass $value) use ($tree): array {
                 $fam = Registry::familyFactory()->make($value->f_id, $tree);
-                return [(int) $value->majs_sosa => $fam];
+                return [(int)$value->majs_sosa => $fam];
             });
 
         $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/SosaConfigAction.php

Indentation +45 added lines, -45 removed lines

@@ -31,54 +31,54 @@
  */
 class SosaConfigAction implements RequestHandlerInterface
 {
-    private UserService $user_service;
-    private SosaRecordsService $sosa_record_service;
+	private UserService $user_service;
+	private SosaRecordsService $sosa_record_service;
 
-    /**
-     * Constructor for SosaConfigAction Request Handler
-     *
-     * @param UserService $user_service
-     * @param SosaRecordsService $sosa_records_service
-     */
-    public function __construct(UserService $user_service, SosaRecordsService $sosa_records_service)
-    {
-        $this->user_service = $user_service;
-        $this->sosa_record_service = $sosa_records_service;
-    }
+	/**
+	 * Constructor for SosaConfigAction Request Handler
+	 *
+	 * @param UserService $user_service
+	 * @param SosaRecordsService $sosa_records_service
+	 */
+	public function __construct(UserService $user_service, SosaRecordsService $sosa_records_service)
+	{
+		$this->user_service = $user_service;
+		$this->sosa_record_service = $sosa_records_service;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        $tree = Validator::attributes($request)->tree();
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		$tree = Validator::attributes($request)->tree();
 
-        // Cannot use Validator with negative integers issue webtrees #4408
-        //$user_id = Validator::parsedBody($request)->integer('sosa-userid', -1);
-        $parsed_body = (array) $request->getParsedBody();
-        $user_id = (int) filter_var($parsed_body['sosa-userid'] ?? 0, FILTER_VALIDATE_INT);
-        $root_id = Validator::parsedBody($request)->isXref()->string('sosa-rootid', '');
-        $max_gen = Validator::parsedBody($request)->integer(
-            'sosa-maxgen',
-            $this->sosa_record_service->maxSystemGenerations()
-        );
+		// Cannot use Validator with negative integers issue webtrees #4408
+		//$user_id = Validator::parsedBody($request)->integer('sosa-userid', -1);
+		$parsed_body = (array) $request->getParsedBody();
+		$user_id = (int) filter_var($parsed_body['sosa-userid'] ?? 0, FILTER_VALIDATE_INT);
+		$root_id = Validator::parsedBody($request)->isXref()->string('sosa-rootid', '');
+		$max_gen = Validator::parsedBody($request)->integer(
+			'sosa-maxgen',
+			$this->sosa_record_service->maxSystemGenerations()
+		);
 
-        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', (string) $max_gen);
-                FlashMessages::addMessage(I18N::translate('The root individual has been updated.'));
-                return Registry::responseFactory()->redirect(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', (string) $max_gen);
+				FlashMessages::addMessage(I18N::translate('The root individual has been updated.'));
+				return Registry::responseFactory()->redirect(SosaConfig::class, [
+					'tree' => $tree->name(),
+					'compute' => 'yes',
+					'user_id' => $user_id
+				]);
+			}
+		}
 
-        FlashMessages::addMessage(I18N::translate('The root individual could not be updated.'), 'danger');
-        return Registry::responseFactory()->redirect(SosaConfig::class, ['tree' => $tree->name()]);
-    }
+		FlashMessages::addMessage(I18N::translate('The root individual could not be updated.'), 'danger');
+		return Registry::responseFactory()->redirect(SosaConfig::class, ['tree' => $tree->name()]);
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -56,8 +56,8 @@ 
 
         // Cannot use Validator with negative integers issue webtrees #4408
         //$user_id = Validator::parsedBody($request)->integer('sosa-userid', -1);
-        $parsed_body = (array) $request->getParsedBody();
-        $user_id = (int) filter_var($parsed_body['sosa-userid'] ?? 0, FILTER_VALIDATE_INT);
+        $parsed_body = (array)$request->getParsedBody();
+        $user_id = (int)filter_var($parsed_body['sosa-userid'] ?? 0, FILTER_VALIDATE_INT);
         $root_id = Validator::parsedBody($request)->isXref()->string('sosa-rootid', '');
         $max_gen = Validator::parsedBody($request)->integer(
             'sosa-maxgen',
@@ -68,7 +68,7 @@ 
             $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', (string) $max_gen);
+                $tree->setUserPreference($user, 'MAJ_SOSA_MAX_GEN', (string)$max_gen);
                 FlashMessages::addMessage(I18N::translate('The root individual has been updated.'));
                 return Registry::responseFactory()->redirect(SosaConfig::class, [
                     'tree' => $tree->name(),

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

Indentation +39 added lines, -39 removed lines

@@ -33,49 +33,49 @@
  */
 class PedigreeCollapseData implements RequestHandlerInterface
 {
-    /**
-     * @var SosaModule|null $module
-     */
-    private $module;
+	/**
+	 * @var SosaModule|null $module
+	 */
+	private $module;
 
-    /**
-     * Constructor for PedigreeCollapseData Request Handler
-     *
-     * @param ModuleService $module_service
-     */
-    public function __construct(ModuleService $module_service)
-    {
-        $this->module = $module_service->findByInterface(SosaModule::class)->first();
-    }
+	/**
+	 * Constructor for PedigreeCollapseData Request Handler
+	 *
+	 * @param ModuleService $module_service
+	 */
+	public function __construct(ModuleService $module_service)
+	{
+		$this->module = $module_service->findByInterface(SosaModule::class)->first();
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        if ($this->module === null) {
-            throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
-        }
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		if ($this->module === null) {
+			throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
+		}
 
-        $tree = Validator::attributes($request)->tree();
-        $user = Auth::check() ? Validator::attributes($request)->user() : new DefaultUser();
+		$tree = Validator::attributes($request)->tree();
+		$user = Auth::check() ? Validator::attributes($request)->user() : new DefaultUser();
 
-        /** @var SosaStatisticsService $sosa_stats_service */
-        $sosa_stats_service = app()->makeWith(SosaStatisticsService::class, ['tree' => $tree, 'user' => $user]);
-        $pedi_collapse_data = $sosa_stats_service->pedigreeCollapseByGenerationData();
+		/** @var SosaStatisticsService $sosa_stats_service */
+		$sosa_stats_service = app()->makeWith(SosaStatisticsService::class, ['tree' => $tree, 'user' => $user]);
+		$pedi_collapse_data = $sosa_stats_service->pedigreeCollapseByGenerationData();
 
-        $response = [ 'cells' => [] ];
-        $last_pedi_collapse = 0;
-        foreach ($pedi_collapse_data as $gen => $rec) {
-            $response['cells'][$gen] = view($this->module->name() . '::components/pedigree-collapse-cell', [
-                'pedi_collapse_roots'   =>  $rec['pedi_collapse_roots'],
-                'pedi_collapse_xgen'    =>  $rec['pedi_collapse_xgen']
-            ]);
-            $last_pedi_collapse = $rec['pedi_collapse_roots'];
-        }
-        $response['pedi_collapse'] = I18N::percentage($last_pedi_collapse, 2);
+		$response = [ 'cells' => [] ];
+		$last_pedi_collapse = 0;
+		foreach ($pedi_collapse_data as $gen => $rec) {
+			$response['cells'][$gen] = view($this->module->name() . '::components/pedigree-collapse-cell', [
+				'pedi_collapse_roots'   =>  $rec['pedi_collapse_roots'],
+				'pedi_collapse_xgen'    =>  $rec['pedi_collapse_xgen']
+			]);
+			$last_pedi_collapse = $rec['pedi_collapse_roots'];
+		}
+		$response['pedi_collapse'] = I18N::percentage($last_pedi_collapse, 2);
 
-        return Registry::responseFactory()->response($response);
-    }
+		return Registry::responseFactory()->response($response);
+	}
 }