jon48 / webtrees-lib

app/Contracts/GeoDispersion/ModulePlaceMapperProviderInterface.php

Indentation +6 added lines, -6 removed lines

@@ -19,10 +19,10 @@
  */
 interface ModulePlaceMapperProviderInterface
 {
-    /**
-     * List place mappers provided by the module as an array.
-     *
-     * @return string[] List of place mappers
-     */
-    public function listPlaceMappers(): array;
+	/**
+	 * List place mappers provided by the module as an array.
+	 *
+	 * @return string[] List of place mappers
+	 */
+	public function listPlaceMappers(): array;
 }

app/Contracts/GeoDispersion/GeoAnalysisInterface.php

Indentation +20 added lines, -20 removed lines

@@ -22,26 +22,26 @@
  */
 interface GeoAnalysisInterface
 {
-    /**
-     * Get the geographical dispersion analysis title
-     *
-     * @return string
-     */
-    public function title(): string;
+	/**
+	 * Get the geographical dispersion analysis title
+	 *
+	 * @return string
+	 */
+	public function title(): string;
 
-    /**
-     * Gets the function to translate
-     *
-     * @return callable(int $count): string
-     */
-    public function itemsDescription(): callable;
+	/**
+	 * Gets the function to translate
+	 *
+	 * @return callable(int $count): string
+	 */
+	public function itemsDescription(): callable;
 
-    /**
-     * Get the results of the geographical dispersion analysis
-     *
-     * @param Tree $tree
-     * @param int $depth
-     * @return GeoAnalysisResults
-     */
-    public function results(Tree $tree, int $depth): GeoAnalysisResults;
+	/**
+	 * Get the results of the geographical dispersion analysis
+	 *
+	 * @param Tree $tree
+	 * @param int $depth
+	 * @return GeoAnalysisResults
+	 */
+	public function results(Tree $tree, int $depth): GeoAnalysisResults;
 }

app/Contracts/GeoDispersion/MapDefinitionInterface.php

Indentation +18 added lines, -18 removed lines

@@ -19,24 +19,24 @@
  */
 interface MapDefinitionInterface
 {
-    /**
-     * Get the map ID
-     *
-     * @return string
-     */
-    public function id(): string;
+	/**
+	 * Get the map ID
+	 *
+	 * @return string
+	 */
+	public function id(): string;
 
-    /**
-     * Get the map title
-     *
-     * @return string
-     */
-    public function title(): string;
+	/**
+	 * Get the map title
+	 *
+	 * @return string
+	 */
+	public function title(): string;
 
-    /**
-     * Get the features in the map
-     *
-     * @return \Brick\Geo\IO\GeoJSON\Feature[]
-     */
-    public function features(): array;
+	/**
+	 * Get the features in the map
+	 *
+	 * @return \Brick\Geo\IO\GeoJSON\Feature[]
+	 */
+	public function features(): array;
 }

app/Contracts/GeoDispersion/MapViewConfigInterface.php

Indentation +20 added lines, -20 removed lines

@@ -19,26 +19,26 @@
  */
 interface MapViewConfigInterface
 {
-    /**
-     * Get the feature property to be used for mapping the map feature with the analysis results
-     *
-     * @return string
-     */
-    public function mapMappingProperty(): string;
+	/**
+	 * Get the feature property to be used for mapping the map feature with the analysis results
+	 *
+	 * @return string
+	 */
+	public function mapMappingProperty(): string;
 
-    /**
-     * Get the config of the mapper associated with the map view
-     *
-     * @return PlaceMapperConfigInterface
-     */
-    public function mapperConfig(): PlaceMapperConfigInterface;
+	/**
+	 * Get the config of the mapper associated with the map view
+	 *
+	 * @return PlaceMapperConfigInterface
+	 */
+	public function mapperConfig(): PlaceMapperConfigInterface;
 
-    /**
-     * Get a MapViewConfigInterface object with the new properties
-     *
-     * @param string $mapping_property
-     * @param PlaceMapperConfigInterface $mapper_config
-     * @return static
-     */
-    public function with(string $mapping_property, PlaceMapperConfigInterface $mapper_config): self;
+	/**
+	 * Get a MapViewConfigInterface object with the new properties
+	 *
+	 * @param string $mapping_property
+	 * @param PlaceMapperConfigInterface $mapper_config
+	 * @return static
+	 */
+	public function with(string $mapping_property, PlaceMapperConfigInterface $mapper_config): self;
 }

app/Contracts/GeoDispersion/PlaceMapperInterface.php

Indentation +44 added lines, -44 removed lines

@@ -22,54 +22,54 @@
  */
 interface PlaceMapperInterface
 {
-    /**
-     * Get the Place mapper title
-     *
-     * @return string
-     */
-    public function title(): string;
+	/**
+	 * Get the Place mapper title
+	 *
+	 * @return string
+	 */
+	public function title(): string;
 
-    /**
-     * Boot the Place mapper
-     */
-    public function boot(): void;
+	/**
+	 * Boot the Place mapper
+	 */
+	public function boot(): void;
 
-    /**
-     * Get the configuration associated to the mapper
-     *
-     * @return PlaceMapperConfigInterface
-     */
-    public function config(): PlaceMapperConfigInterface;
+	/**
+	 * Get the configuration associated to the mapper
+	 *
+	 * @return PlaceMapperConfigInterface
+	 */
+	public function config(): PlaceMapperConfigInterface;
 
-    /**
-     * Set the configured associated to the mapper
-     *
-     * @param PlaceMapperConfigInterface $config
-     */
-    public function setConfig(PlaceMapperConfigInterface $config): void;
+	/**
+	 * Set the configured associated to the mapper
+	 *
+	 * @param PlaceMapperConfigInterface $config
+	 */
+	public function setConfig(PlaceMapperConfigInterface $config): void;
 
-    /**
-     * Get the data associated to the mapper, for a specific key
-     *
-     * @param string $key
-     * @return null|mixed
-     */
-    public function data(string $key);
+	/**
+	 * Get the data associated to the mapper, for a specific key
+	 *
+	 * @param string $key
+	 * @return null|mixed
+	 */
+	public function data(string $key);
 
-    /**
-     * Set the data associated to the mapper, for a specific key
-     *
-     * @param string $key
-     * @param mixed $data
-     */
-    public function setData(string $key, $data): void;
+	/**
+	 * Set the data associated to the mapper, for a specific key
+	 *
+	 * @param string $key
+	 * @param mixed $data
+	 */
+	public function setData(string $key, $data): void;
 
-    /**
-     * Return the property value of the feature identifying a place in a GeoJson map.
-     *
-     * @param Place $place
-     * @param string $feature_property
-     * @return string|NULL
-     */
-    public function map(Place $place, string $feature_property): ?string;
+	/**
+	 * Return the property value of the feature identifying a place in a GeoJson map.
+	 *
+	 * @param Place $place
+	 * @param string $feature_property
+	 * @return string|NULL
+	 */
+	public function map(Place $place, string $feature_property): ?string;
 }

app/Contracts/GeoDispersion/PlaceMapperConfigInterface.php

Indentation +37 added lines, -37 removed lines

@@ -24,45 +24,45 @@
  */
 interface PlaceMapperConfigInterface extends JsonSerializable
 {
-    /**
-     * Deserialise the mapper configuration from a string or an array
-     *
-     * @param mixed $config
-     * @return $this
-     */
-    public function jsonDeserialize($config): self;
+	/**
+	 * Deserialise the mapper configuration from a string or an array
+	 *
+	 * @param mixed $config
+	 * @return $this
+	 */
+	public function jsonDeserialize($config): self;
 
-    /**
-     * Check if the configuration contains a specific key
-     *
-     * @param string $key
-     * @return bool
-     */
-    public function has(string $key): bool;
+	/**
+	 * Check if the configuration contains a specific key
+	 *
+	 * @param string $key
+	 * @return bool
+	 */
+	public function has(string $key): bool;
 
-    /**
-     * Return the configuration associated with a key, or a default value if none found.
-     *
-     * @param string $key
-     * @param mixed|null $default
-     * @return mixed|null
-     */
-    public function get(string $key, $default = null);
+	/**
+	 * Return the configuration associated with a key, or a default value if none found.
+	 *
+	 * @param string $key
+	 * @param mixed|null $default
+	 * @return mixed|null
+	 */
+	public function get(string $key, $default = null);
 
-    /**
-     * Return the content of the mapper configuration section of the config page
-     *
-     * @param ModuleInterface $module
-     * @param Tree $tree
-     * @return string
-     */
-    public function configContent(ModuleInterface $module, Tree $tree): string;
+	/**
+	 * Return the content of the mapper configuration section of the config page
+	 *
+	 * @param ModuleInterface $module
+	 * @param Tree $tree
+	 * @return string
+	 */
+	public function configContent(ModuleInterface $module, Tree $tree): string;
 
-    /**
-     * Return a PlaceMapperConfigInterface object updated according to its mapper configuration rules
-     *
-     * @param ServerRequestInterface $request
-     * @return static
-     */
-    public function withConfigUpdate(ServerRequestInterface $request): self;
+	/**
+	 * Return a PlaceMapperConfigInterface object updated according to its mapper configuration rules
+	 *
+	 * @param ServerRequestInterface $request
+	 * @return static
+	 */
+	public function withConfigUpdate(ServerRequestInterface $request): self;
 }

app/Contracts/Tasks/TaskInterface.php

Indentation +19 added lines, -19 removed lines

@@ -19,25 +19,25 @@
  */
 interface TaskInterface
 {
-    /**
-     * Display name of the task
-     *
-     * @return string
-     */
-    public function name(): string;
+	/**
+	 * Display name of the task
+	 *
+	 * @return string
+	 */
+	public function name(): string;
     
-    /**
-     * Return the default frequency for the execution of the task, in minutes.
-     *
-     * @return int Frequency for the execution of the task
-     */
-    public function defaultFrequency(): int;
+	/**
+	 * Return the default frequency for the execution of the task, in minutes.
+	 *
+	 * @return int Frequency for the execution of the task
+	 */
+	public function defaultFrequency(): int;
     
-    /**
-     * Run the task's actions, and return whether the execution has been successful.
-     *
-     * @param TaskSchedule $task_schedule
-     * @return bool Has the execution been a success
-     */
-    public function run(TaskSchedule $task_schedule): bool;
+	/**
+	 * Run the task's actions, and return whether the execution has been successful.
+	 *
+	 * @param TaskSchedule $task_schedule
+	 * @return bool Has the execution been a success
+	 */
+	public function run(TaskSchedule $task_schedule): bool;
 }

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

Spacing +3 added lines, -3 removed lines

@@ -75,16 +75,16 @@
 
         $initial = mb_substr($surname, 0, 1);
         $initials_list = collect($this->indilist_module->surnameAlpha($tree, false, false, I18N::locale()))
-            ->reject(function (int $count, string $initial): bool {
+            ->reject(function(int $count, string $initial): bool {
 
                 return $initial === '@' || $initial === ',';
             });
 
-        $title = I18N::translate('Patronymic Lineages') . ' — ' . $surname;
+        $title = I18N::translate('Patronymic Lineages').' — '.$surname;
 
         $lineages = app()->make(LineageBuilder::class, ['surname' => $surname])->buildLineages();
 
-        return $this->viewResponse($this->module->name() . '::lineages-page', [
+        return $this->viewResponse($this->module->name().'::lineages-page', [
             'title'         =>  $title,
             'module'        =>  $this->module,
             'tree'          =>  $tree,

Indentation +52 added lines, -52 removed lines

@@ -32,66 +32,66 @@
  */
 class LineagesPage implements RequestHandlerInterface
 {
-    use ViewResponseTrait;
+	use ViewResponseTrait;
 
-    /**
-     * @var PatronymicLineageModule|null $module
-     */
-    private $module;
+	/**
+	 * @var PatronymicLineageModule|null $module
+	 */
+	private $module;
 
-    /**
-     * @var IndividualListModule|null $indilist_module
-     */
-    private $indilist_module;
+	/**
+	 * @var IndividualListModule|null $indilist_module
+	 */
+	private $indilist_module;
 
-    /**
-     * Constructor for LineagesPage Request handler
-     *
-     * @param ModuleService $module_service
-     */
-    public function __construct(ModuleService $module_service)
-    {
-        $this->module = $module_service->findByInterface(PatronymicLineageModule::class)->first();
-        $this->indilist_module = $module_service->findByInterface(IndividualListModule::class)->first();
-    }
+	/**
+	 * Constructor for LineagesPage Request handler
+	 *
+	 * @param ModuleService $module_service
+	 */
+	public function __construct(ModuleService $module_service)
+	{
+		$this->module = $module_service->findByInterface(PatronymicLineageModule::class)->first();
+		$this->indilist_module = $module_service->findByInterface(IndividualListModule::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.'));
+		}
 
-        if ($this->indilist_module === null) {
-            throw new HttpNotFoundException(I18N::translate('There is no module to handle individual lists.'));
-        }
+		if ($this->indilist_module === null) {
+			throw new HttpNotFoundException(I18N::translate('There is no module to handle individual lists.'));
+		}
 
-        $tree = Validator::attributes($request)->tree();
-        $surname = Validator::attributes($request)->string('surname', '');
+		$tree = Validator::attributes($request)->tree();
+		$surname = Validator::attributes($request)->string('surname', '');
 
-        $initial = mb_substr($surname, 0, 1);
-        $initials_list = collect($this->indilist_module->surnameAlpha($tree, false, false, I18N::locale()))
-            ->reject(function (int $count, string $initial): bool {
-                return $initial === '@' || $initial === ',';
-            });
+		$initial = mb_substr($surname, 0, 1);
+		$initials_list = collect($this->indilist_module->surnameAlpha($tree, false, false, I18N::locale()))
+			->reject(function (int $count, string $initial): bool {
+				return $initial === '@' || $initial === ',';
+			});
 
-        $title = I18N::translate('Patronymic Lineages') . ' — ' . $surname;
+		$title = I18N::translate('Patronymic Lineages') . ' — ' . $surname;
 
-        $lineages = app()->make(LineageBuilder::class, ['surname' => $surname])->buildLineages();
+		$lineages = app()->make(LineageBuilder::class, ['surname' => $surname])->buildLineages();
 
-        return $this->viewResponse($this->module->name() . '::lineages-page', [
-            'title'         =>  $title,
-            'module'        =>  $this->module,
-            'tree'          =>  $tree,
-            'initials_list' =>  $initials_list,
-            'initial'       =>  $initial,
-            'show_all'      =>  'no',
-            'surname'       =>  $surname,
-            'lineages'      =>  $lineages,
-            'nb_lineages'   =>  $lineages !== null ? $lineages->count() : 0
-        ]);
-    }
+		return $this->viewResponse($this->module->name() . '::lineages-page', [
+			'title'         =>  $title,
+			'module'        =>  $this->module,
+			'tree'          =>  $tree,
+			'initials_list' =>  $initials_list,
+			'initial'       =>  $initial,
+			'show_all'      =>  'no',
+			'surname'       =>  $surname,
+			'lineages'      =>  $lineages,
+			'nb_lineages'   =>  $lineages !== null ? $lineages->count() : 0
+		]);
+	}
 }

app/Module/PatronymicLineage/Model/LineageNode.php

Spacing +2 added lines, -2 removed lines

@@ -68,7 +68,7 @@ 
     public function addFamily(Family $fams): object
     {
         if (!$this->linked_fams->has($fams->xref())) {
-            $this->linked_fams->put($fams->xref(), (object) [
+            $this->linked_fams->put($fams->xref(), (object)[
                 'family'   =>  $fams,
                 'children' =>  new Collection()
             ]);
@@ -135,6 +135,6 @@ 
      */
     public function hasFollowUpSurname(): bool
     {
-        return mb_strlen($this->followUpSurname()) > 0 ;
+        return mb_strlen($this->followUpSurname()) > 0;
     }
 }

Indentation +93 added lines, -93 removed lines

@@ -24,106 +24,106 @@
  */
 class LineageNode
 {
-    /**
-     * @var Collection<string, stdClass>  $linked_fams Spouse families linked to the node
-     */
-    private Collection $linked_fams;
+	/**
+	 * @var Collection<string, stdClass>  $linked_fams Spouse families linked to the node
+	 */
+	private Collection $linked_fams;
 
-    private ?Individual $node_indi;
-    private LineageRootNode $root_node;
-    private ?string $alt_surname;
+	private ?Individual $node_indi;
+	private LineageRootNode $root_node;
+	private ?string $alt_surname;
 
-    /**
-     * Constructor for Lineage node
-     *
-     * @param Individual $node_indi Main individual
-     * @param LineageRootNode $root_node Node of the lineage root
-     * @param null|string $alt_surname Follow-up surname
-     */
-    public function __construct(?Individual $node_indi = null, LineageRootNode $root_node, $alt_surname = null)
-    {
-        $this->node_indi = $node_indi;
-        $this->root_node = $root_node;
-        $this->alt_surname = $alt_surname;
-        $this->linked_fams = new Collection();
-    }
+	/**
+	 * Constructor for Lineage node
+	 *
+	 * @param Individual $node_indi Main individual
+	 * @param LineageRootNode $root_node Node of the lineage root
+	 * @param null|string $alt_surname Follow-up surname
+	 */
+	public function __construct(?Individual $node_indi = null, LineageRootNode $root_node, $alt_surname = null)
+	{
+		$this->node_indi = $node_indi;
+		$this->root_node = $root_node;
+		$this->alt_surname = $alt_surname;
+		$this->linked_fams = new Collection();
+	}
 
-    /**
-     * Add a spouse family to the node
-     *
-     * @param Family $fams
-     * @return stdClass
-     */
-    public function addFamily(Family $fams): object
-    {
-        if (!$this->linked_fams->has($fams->xref())) {
-            $this->linked_fams->put($fams->xref(), (object) [
-                'family'   =>  $fams,
-                'children' =>  new Collection()
-            ]);
-        }
-        return $this->linked_fams->get($fams->xref());
-    }
+	/**
+	 * Add a spouse family to the node
+	 *
+	 * @param Family $fams
+	 * @return stdClass
+	 */
+	public function addFamily(Family $fams): object
+	{
+		if (!$this->linked_fams->has($fams->xref())) {
+			$this->linked_fams->put($fams->xref(), (object) [
+				'family'   =>  $fams,
+				'children' =>  new Collection()
+			]);
+		}
+		return $this->linked_fams->get($fams->xref());
+	}
 
-    /**
-     * Add a child LineageNode to the node
-     *
-     * @param Family $fams
-     * @param LineageNode $child
-     */
-    public function addChild(Family $fams, LineageNode $child = null): void
-    {
-        $this->addFamily($fams)->children->push($child);
-        $this->root_node->incrementChildNodes();
-    }
+	/**
+	 * Add a child LineageNode to the node
+	 *
+	 * @param Family $fams
+	 * @param LineageNode $child
+	 */
+	public function addChild(Family $fams, LineageNode $child = null): void
+	{
+		$this->addFamily($fams)->children->push($child);
+		$this->root_node->incrementChildNodes();
+	}
 
-    /**
-     * Returns the node individual
-     *
-     * @return Individual|NULL
-     */
-    public function individual(): ?Individual
-    {
-        return $this->node_indi;
-    }
+	/**
+	 * Returns the node individual
+	 *
+	 * @return Individual|NULL
+	 */
+	public function individual(): ?Individual
+	{
+		return $this->node_indi;
+	}
 
-    /**
-     * Returns the lineage root node individual
-     *
-     * @return LineageRootNode
-     */
-    public function rootNode(): LineageRootNode
-    {
-        return $this->root_node;
-    }
+	/**
+	 * Returns the lineage root node individual
+	 *
+	 * @return LineageRootNode
+	 */
+	public function rootNode(): LineageRootNode
+	{
+		return $this->root_node;
+	}
 
-    /**
-     * Returns the spouse families linked to the node
-     *
-     * @return Collection<string, \stdClass>
-     */
-    public function families(): Collection
-    {
-        return $this->linked_fams;
-    }
+	/**
+	 * Returns the spouse families linked to the node
+	 *
+	 * @return Collection<string, \stdClass>
+	 */
+	public function families(): Collection
+	{
+		return $this->linked_fams;
+	}
 
-    /**
-     * Returns the follow-up surname
-     *
-     * @return string
-     */
-    public function followUpSurname(): string
-    {
-        return $this->alt_surname ?? '';
-    }
+	/**
+	 * Returns the follow-up surname
+	 *
+	 * @return string
+	 */
+	public function followUpSurname(): string
+	{
+		return $this->alt_surname ?? '';
+	}
 
-    /**
-     * Indicates whether the node has a follow up surname
-     *
-     * @return boolean
-     */
-    public function hasFollowUpSurname(): bool
-    {
-        return mb_strlen($this->followUpSurname()) > 0 ;
-    }
+	/**
+	 * Indicates whether the node has a follow up surname
+	 *
+	 * @return boolean
+	 */
+	public function hasFollowUpSurname(): bool
+	{
+		return mb_strlen($this->followUpSurname()) > 0 ;
+	}
 }