jon48 / webtrees-lib

app/Module/GeoDispersion/GeoAnalyses/AllEventsByCenturyGeoAnalysis.php

Indentation +56 added lines, -56 removed lines

@@ -28,66 +28,66 @@
  */
 class AllEventsByCenturyGeoAnalysis implements GeoAnalysisInterface
 {
-    private GeoAnalysisDataService $geoanalysis_data_service;
-    private CenturyService $century_service;
+	private GeoAnalysisDataService $geoanalysis_data_service;
+	private CenturyService $century_service;
 
-    /**
-     * Constructor for AllEventsByCenturyGeoAnalysis
-     *
-     * @param GeoAnalysisDataService $geoanalysis_data_service
-     * @param CenturyService $century_service
-     */
-    public function __construct(GeoAnalysisDataService $geoanalysis_data_service, CenturyService $century_service)
-    {
-        $this->geoanalysis_data_service = $geoanalysis_data_service;
-        $this->century_service = $century_service;
-    }
+	/**
+	 * Constructor for AllEventsByCenturyGeoAnalysis
+	 *
+	 * @param GeoAnalysisDataService $geoanalysis_data_service
+	 * @param CenturyService $century_service
+	 */
+	public function __construct(GeoAnalysisDataService $geoanalysis_data_service, CenturyService $century_service)
+	{
+		$this->geoanalysis_data_service = $geoanalysis_data_service;
+		$this->century_service = $century_service;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\GeoAnalysisInterface::title()
-     */
-    public function title(): string
-    {
-        return I18N::translate('All events places by century');
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\GeoAnalysisInterface::title()
+	 */
+	public function title(): string
+	{
+		return I18N::translate('All events places by century');
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\GeoAnalysisInterface::itemsDescription()
-     */
-    public function itemsDescription(): callable
-    {
-        return fn(int $count): string => I18N::plural('event', 'events', $count);
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\GeoAnalysisInterface::itemsDescription()
+	 */
+	public function itemsDescription(): callable
+	{
+		return fn(int $count): string => I18N::plural('event', 'events', $count);
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\GeoAnalysisInterface::results()
-     */
-    public function results(Tree $tree, int $depth): GeoAnalysisResults
-    {
-        $results = new GeoAnalysisResults();
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\GeoAnalysisInterface::results()
+	 */
+	public function results(Tree $tree, int $depth): GeoAnalysisResults
+	{
+		$results = new GeoAnalysisResults();
 
-        foreach ($this->geoanalysis_data_service->individualsAndFamilies($tree) as $record) {
-            foreach ($record->facts([]) as $fact) {
-                $place = new GeoAnalysisPlace($tree, $fact->place(), $depth);
-                if ($place->isUnknown()) {
-                    continue;
-                }
-                $results->addPlace($place);
-                $date = $fact->date();
-                if ($date->isOK()) {
-                    $century = intdiv($date->gregorianYear(), 100);
-                    $results->addPlaceInCategory(
-                        I18N::translate('%s century', $this->century_service->centuryName($century)),
-                        $century,
-                        $place
-                    );
-                }
-            }
-        }
+		foreach ($this->geoanalysis_data_service->individualsAndFamilies($tree) as $record) {
+			foreach ($record->facts([]) as $fact) {
+				$place = new GeoAnalysisPlace($tree, $fact->place(), $depth);
+				if ($place->isUnknown()) {
+					continue;
+				}
+				$results->addPlace($place);
+				$date = $fact->date();
+				if ($date->isOK()) {
+					$century = intdiv($date->gregorianYear(), 100);
+					$results->addPlaceInCategory(
+						I18N::translate('%s century', $this->century_service->centuryName($century)),
+						$century,
+						$place
+					);
+				}
+			}
+		}
 
-        return $results;
-    }
+		return $results;
+	}
 }

app/Module/GeoDispersion/PlaceMappers/SimplePlaceMapper.php

Indentation +17 added lines, -17 removed lines

@@ -24,23 +24,23 @@
  */
 class SimplePlaceMapper implements PlaceMapperInterface
 {
-    use PlaceMapperTrait;
+	use PlaceMapperTrait;
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperInterface::title()
-     */
-    public function title(): string
-    {
-        return I18N::translate('Mapping on place name');
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperInterface::title()
+	 */
+	public function title(): string
+	{
+		return I18N::translate('Mapping on place name');
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperInterface::map()
-     */
-    public function map(Place $place, string $feature_property): ?string
-    {
-        return $place->firstParts(1)->first();
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperInterface::map()
+	 */
+	public function map(Place $place, string $feature_property): ?string
+	{
+		return $place->firstParts(1)->first();
+	}
 }

app/Module/GeoDispersion/PlaceMappers/SimpleTopFilteredPlaceMapper.php

Indentation +43 added lines, -43 removed lines

@@ -28,51 +28,51 @@
  */
 class SimpleTopFilteredPlaceMapper extends SimplePlaceMapper implements PlaceMapperInterface
 {
-    use TopFilteredPlaceMapperTrait;
+	use TopFilteredPlaceMapperTrait;
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\GeoDispersion\PlaceMappers\SimplePlaceMapper::title()
-     */
-    public function title(): string
-    {
-        return I18N::translate('Mapping on place name with filter');
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Module\GeoDispersion\PlaceMappers\SimplePlaceMapper::title()
+	 */
+	public function title(): string
+	{
+		return I18N::translate('Mapping on place name with filter');
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperInterface::boot()
-     */
-    public function boot(): void
-    {
-        parent::boot();
-        $top_places = $this->config()->get('topPlaces');
-        if (is_array($top_places)) {
-            $this->setTopPlaces($top_places);
-        }
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperInterface::boot()
+	 */
+	public function boot(): void
+	{
+		parent::boot();
+		$top_places = $this->config()->get('topPlaces');
+		if (is_array($top_places)) {
+			$this->setTopPlaces($top_places);
+		}
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperInterface::config()
-     */
-    public function config(): PlaceMapperConfigInterface
-    {
-        if (!(parent::config() instanceof FilteredTopPlaceMapperConfig)) {
-            $this->setConfig(app(FilteredTopPlaceMapperConfig::class));
-        }
-        return parent::config();
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperInterface::config()
+	 */
+	public function config(): PlaceMapperConfigInterface
+	{
+		if (!(parent::config() instanceof FilteredTopPlaceMapperConfig)) {
+			$this->setConfig(app(FilteredTopPlaceMapperConfig::class));
+		}
+		return parent::config();
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\GeoDispersion\PlaceMappers\SimplePlaceMapper::map()
-     */
-    public function map(Place $place, string $feature_property): ?string
-    {
-        if (!$this->belongsToTopLevels($place)) {
-            return null;
-        }
-        return parent::map($place, $feature_property);
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Module\GeoDispersion\PlaceMappers\SimplePlaceMapper::map()
+	 */
+	public function map(Place $place, string $feature_property): ?string
+	{
+		if (!$this->belongsToTopLevels($place)) {
+			return null;
+		}
+		return parent::map($place, $feature_property);
+	}
 }

app/Module/AdminTasks/Services/TokenService.php

Indentation +28 added lines, -28 removed lines

@@ -20,32 +20,32 @@
  */
 class TokenService
 {
-    /**
-     * Returns a random-ish generated token of a given size
-     *
-     * @param int $length Length of the token, default to 32
-     * @return string Random token
-     */
-    public function generateRandomToken(int $length = 32): string
-    {
-        $chars = str_split('abcdefghijkmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789');
-        $len_chars = count($chars);
-        $token = '';
-
-        for ($i = 0; $i < $length; $i++) {
-            $token .= $chars[mt_rand(0, $len_chars - 1)];
-        }
-
-        # Number of 32 char chunks
-        $chunks = ceil(strlen($token) / 32);
-        $md5token = '';
-
-        # Run each chunk through md5
-        for ($i = 1; $i <= $chunks; $i++) {
-            $md5token .= md5(substr($token, $i * 32 - 32, 32));
-        }
-
-        # Trim the token to the required length
-        return substr($md5token, 0, $length);
-    }
+	/**
+	 * Returns a random-ish generated token of a given size
+	 *
+	 * @param int $length Length of the token, default to 32
+	 * @return string Random token
+	 */
+	public function generateRandomToken(int $length = 32): string
+	{
+		$chars = str_split('abcdefghijkmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789');
+		$len_chars = count($chars);
+		$token = '';
+
+		for ($i = 0; $i < $length; $i++) {
+			$token .= $chars[mt_rand(0, $len_chars - 1)];
+		}
+
+		# Number of 32 char chunks
+		$chunks = ceil(strlen($token) / 32);
+		$md5token = '';
+
+		# Run each chunk through md5
+		for ($i = 1; $i <= $chunks; $i++) {
+			$md5token .= md5(substr($token, $i * 32 - 32, 32));
+		}
+
+		# Trim the token to the required length
+		return substr($md5token, 0, $length);
+	}
 }

app/Helpers/functions.php

Indentation +9 added lines, -9 removed lines

@@ -28,15 +28,15 @@ 
  */
 function hook(string $hook_interface, callable $apply, $default = null)
 {
-    try {
-        $hook_collector = app(HookServiceInterface::class)->use($hook_interface);
-        if ($hook_collector !== null) {
-            return $apply($hook_collector);
-        }
-    } catch (BindingResolutionException $ex) {
-    }
+	try {
+		$hook_collector = app(HookServiceInterface::class)->use($hook_interface);
+		if ($hook_collector !== null) {
+			return $apply($hook_collector);
+		}
+	} catch (BindingResolutionException $ex) {
+	}
 
-    return $default;
+	return $default;
 }
 
 /**
@@ -48,5 +48,5 @@ 
  */
 function columnIndex(int $initial_index, Collection $new_column_indexes): int
 {
-    return $initial_index + $new_column_indexes->filter(fn(int $i) => $i <= $initial_index)->count();
+	return $initial_index + $new_column_indexes->filter(fn(int $i) => $i <= $initial_index)->count();
 }

app/Common/GeoDispersion/GeoAnalysis/GeoAnalysisResult.php

Indentation +221 added lines, -221 removed lines

@@ -24,225 +24,225 @@
  */
 class GeoAnalysisResult
 {
-    private string $description;
-    private int $order;
-    private int $unknown_count;
-    /**
-     * @var Collection<GeoAnalysisResultItem>
-     */
-    private Collection $places;
-
-    /**
-     * Constructor for GeoAnalysisResult
-     *
-     * @param string $description
-     * @param int $order
-     * @param Collection<GeoAnalysisResultItem> $places
-     * @param int $unknown
-     */
-    final public function __construct(
-        string $description,
-        int $order = 0,
-        Collection $places = null,
-        int $unknown = 0
-    ) {
-        $this->description = $description;
-        $this->order = $order;
-        $this->places = $places ?? new Collection();
-        $this->unknown_count = $unknown;
-    }
-
-    /**
-     * Get the category description
-     *
-     * @return string
-     */
-    public function description(): string
-    {
-        return $this->description;
-    }
-
-    /**
-     * Get the category order
-     *
-     * @return int
-     */
-    public function order(): int
-    {
-        return $this->order;
-    }
-
-    /**
-     * Add a place to the analysis result
-     *
-     * @param GeoAnalysisPlace $place
-     */
-    public function addPlace(GeoAnalysisPlace $place): void
-    {
-        if ($place->isKnown()) {
-            /** @var GeoAnalysisResultItem $item */
-            $item = $this->places->get($place->key(), new GeoAnalysisResultItem($place));
-            $this->places->put($item->key(), $item->increment());
-        } else {
-            $this->addUnknown();
-        }
-    }
-
-    /**
-     * Exclude a place from the analysis result
-     *
-     * @param GeoAnalysisPlace $place
-     */
-    public function exclude(GeoAnalysisPlace $place): void
-    {
-        /** @var GeoAnalysisResultItem|null $item */
-        $item = $this->places->get($place->key());
-        if ($item !== null) {
-            $item->place()->exclude();
-        }
-    }
-
-    /**
-     * Add an unknown place to the analysis result
-     */
-    public function addUnknown(): void
-    {
-        $this->unknown_count++;
-    }
-
-    /**
-     * Take a copy of the current analysis result
-     *
-     * @return static
-     */
-    public function copy(): self
-    {
-        return new static(
-            $this->description(),
-            $this->order(),
-            $this->places->map(fn(GeoAnalysisResultItem $item): GeoAnalysisResultItem => clone $item),
-            $this->countUnknown()
-        );
-    }
-
-    /**
-     * Merge the current analysis result with another.
-     * The current object is modified, not the second one.
-     *
-     * @param GeoAnalysisResult $other
-     * @return $this
-     */
-    public function merge(GeoAnalysisResult $other): self
-    {
-        $this->places->each(function (GeoAnalysisResultItem $item) use ($other): void {
-            if ($other->places->has($item->key())) {
-                $item->place()->exclude(
-                    $item->place()->isExcluded()
-                    && $other->places->get($item->key())->place()->isExcluded()
-                );
-            }
-        });
-
-        $other->places->each(function (GeoAnalysisResultItem $item): void {
-            if (!$this->places->has($item->key())) {
-                $this->addPlace($item->place());
-            }
-        });
-
-        return $this;
-    }
-
-    /**
-     * Get the count of Known places
-     *
-     * @return int
-     */
-    public function countKnown(): int
-    {
-        return $this->places->sum(fn(GeoAnalysisResultItem $item): int => $item->count()) ?? 0;
-    }
-
-    /**
-     * Get the count of Found places
-     *
-     * @return int
-     */
-    public function countFound(): int
-    {
-        return $this->places
-            ->reject(fn(GeoAnalysisResultItem $item): bool => $item->place()->isExcluded())
-            ->sum(fn(GeoAnalysisResultItem $item): int => $item->count()) ?? 0;
-    }
-
-    /**
-     * Get the count of Excluded places
-     *
-     * @return int
-     */
-    public function countExcluded(): int
-    {
-        return $this->places
-            ->filter(fn(GeoAnalysisResultItem $item): bool => $item->place()->isExcluded())
-            ->sum(fn(GeoAnalysisResultItem $item): int => $item->count()) ?? 0;
-    }
-
-    /**
-     * Get the count of Unknown places
-     *
-     * @return int
-     */
-    public function countUnknown(): int
-    {
-        return $this->unknown_count;
-    }
-
-    /**
-     * Get the count of the most represented Place in the analysis result
-     *
-     * @return int
-     */
-    public function maxCount(): int
-    {
-        return $this->places->max(fn(GeoAnalysisResultItem $item): int => $item->count()) ?? 0;
-    }
-
-    /**
-     * Get the list of Known places with their associated count
-     *
-     * @param bool $exclude_other
-     * @return Collection<GeoAnalysisResultItem>
-     */
-    public function knownPlaces(bool $exclude_other = false): Collection
-    {
-        if ($exclude_other) {
-            return $this->places->reject(fn(GeoAnalysisResultItem $item): bool => $item->place()->isExcluded());
-        }
-        return $this->places;
-    }
-
-    /**
-     * Get the list of Known places with their associated count.
-     * The list is sorted first by descending count, then by ascending Place name
-     *
-     * @param bool $exclude_other
-     * @return Collection<GeoAnalysisResultItem>
-     */
-    public function sortedKnownPlaces(bool $exclude_other = false): Collection
-    {
-        return $this->knownPlaces($exclude_other)->sortBy([
-            fn (GeoAnalysisResultItem $a, GeoAnalysisResultItem $b): int => $b->count() <=> $a->count(),
-            fn (GeoAnalysisResultItem $a, GeoAnalysisResultItem $b): int =>
-                I18N::comparator()($a->place()->place()->gedcomName(), $b->place()->place()->gedcomName())
-        ]);
-    }
-
-    /**
-     * Get the list of Excluded places
-     *
-     * @return Collection<GeoAnalysisResultItem>
-     */
-    public function excludedPlaces(): Collection
-    {
-        return $this->places->filter(fn(GeoAnalysisResultItem $item): bool => $item->place()->isExcluded());
-    }
+	private string $description;
+	private int $order;
+	private int $unknown_count;
+	/**
+	 * @var Collection<GeoAnalysisResultItem>
+	 */
+	private Collection $places;
+
+	/**
+	 * Constructor for GeoAnalysisResult
+	 *
+	 * @param string $description
+	 * @param int $order
+	 * @param Collection<GeoAnalysisResultItem> $places
+	 * @param int $unknown
+	 */
+	final public function __construct(
+		string $description,
+		int $order = 0,
+		Collection $places = null,
+		int $unknown = 0
+	) {
+		$this->description = $description;
+		$this->order = $order;
+		$this->places = $places ?? new Collection();
+		$this->unknown_count = $unknown;
+	}
+
+	/**
+	 * Get the category description
+	 *
+	 * @return string
+	 */
+	public function description(): string
+	{
+		return $this->description;
+	}
+
+	/**
+	 * Get the category order
+	 *
+	 * @return int
+	 */
+	public function order(): int
+	{
+		return $this->order;
+	}
+
+	/**
+	 * Add a place to the analysis result
+	 *
+	 * @param GeoAnalysisPlace $place
+	 */
+	public function addPlace(GeoAnalysisPlace $place): void
+	{
+		if ($place->isKnown()) {
+			/** @var GeoAnalysisResultItem $item */
+			$item = $this->places->get($place->key(), new GeoAnalysisResultItem($place));
+			$this->places->put($item->key(), $item->increment());
+		} else {
+			$this->addUnknown();
+		}
+	}
+
+	/**
+	 * Exclude a place from the analysis result
+	 *
+	 * @param GeoAnalysisPlace $place
+	 */
+	public function exclude(GeoAnalysisPlace $place): void
+	{
+		/** @var GeoAnalysisResultItem|null $item */
+		$item = $this->places->get($place->key());
+		if ($item !== null) {
+			$item->place()->exclude();
+		}
+	}
+
+	/**
+	 * Add an unknown place to the analysis result
+	 */
+	public function addUnknown(): void
+	{
+		$this->unknown_count++;
+	}
+
+	/**
+	 * Take a copy of the current analysis result
+	 *
+	 * @return static
+	 */
+	public function copy(): self
+	{
+		return new static(
+			$this->description(),
+			$this->order(),
+			$this->places->map(fn(GeoAnalysisResultItem $item): GeoAnalysisResultItem => clone $item),
+			$this->countUnknown()
+		);
+	}
+
+	/**
+	 * Merge the current analysis result with another.
+	 * The current object is modified, not the second one.
+	 *
+	 * @param GeoAnalysisResult $other
+	 * @return $this
+	 */
+	public function merge(GeoAnalysisResult $other): self
+	{
+		$this->places->each(function (GeoAnalysisResultItem $item) use ($other): void {
+			if ($other->places->has($item->key())) {
+				$item->place()->exclude(
+					$item->place()->isExcluded()
+					&& $other->places->get($item->key())->place()->isExcluded()
+				);
+			}
+		});
+
+		$other->places->each(function (GeoAnalysisResultItem $item): void {
+			if (!$this->places->has($item->key())) {
+				$this->addPlace($item->place());
+			}
+		});
+
+		return $this;
+	}
+
+	/**
+	 * Get the count of Known places
+	 *
+	 * @return int
+	 */
+	public function countKnown(): int
+	{
+		return $this->places->sum(fn(GeoAnalysisResultItem $item): int => $item->count()) ?? 0;
+	}
+
+	/**
+	 * Get the count of Found places
+	 *
+	 * @return int
+	 */
+	public function countFound(): int
+	{
+		return $this->places
+			->reject(fn(GeoAnalysisResultItem $item): bool => $item->place()->isExcluded())
+			->sum(fn(GeoAnalysisResultItem $item): int => $item->count()) ?? 0;
+	}
+
+	/**
+	 * Get the count of Excluded places
+	 *
+	 * @return int
+	 */
+	public function countExcluded(): int
+	{
+		return $this->places
+			->filter(fn(GeoAnalysisResultItem $item): bool => $item->place()->isExcluded())
+			->sum(fn(GeoAnalysisResultItem $item): int => $item->count()) ?? 0;
+	}
+
+	/**
+	 * Get the count of Unknown places
+	 *
+	 * @return int
+	 */
+	public function countUnknown(): int
+	{
+		return $this->unknown_count;
+	}
+
+	/**
+	 * Get the count of the most represented Place in the analysis result
+	 *
+	 * @return int
+	 */
+	public function maxCount(): int
+	{
+		return $this->places->max(fn(GeoAnalysisResultItem $item): int => $item->count()) ?? 0;
+	}
+
+	/**
+	 * Get the list of Known places with their associated count
+	 *
+	 * @param bool $exclude_other
+	 * @return Collection<GeoAnalysisResultItem>
+	 */
+	public function knownPlaces(bool $exclude_other = false): Collection
+	{
+		if ($exclude_other) {
+			return $this->places->reject(fn(GeoAnalysisResultItem $item): bool => $item->place()->isExcluded());
+		}
+		return $this->places;
+	}
+
+	/**
+	 * Get the list of Known places with their associated count.
+	 * The list is sorted first by descending count, then by ascending Place name
+	 *
+	 * @param bool $exclude_other
+	 * @return Collection<GeoAnalysisResultItem>
+	 */
+	public function sortedKnownPlaces(bool $exclude_other = false): Collection
+	{
+		return $this->knownPlaces($exclude_other)->sortBy([
+			fn (GeoAnalysisResultItem $a, GeoAnalysisResultItem $b): int => $b->count() <=> $a->count(),
+			fn (GeoAnalysisResultItem $a, GeoAnalysisResultItem $b): int =>
+				I18N::comparator()($a->place()->place()->gedcomName(), $b->place()->place()->gedcomName())
+		]);
+	}
+
+	/**
+	 * Get the list of Excluded places
+	 *
+	 * @return Collection<GeoAnalysisResultItem>
+	 */
+	public function excludedPlaces(): Collection
+	{
+		return $this->places->filter(fn(GeoAnalysisResultItem $item): bool => $item->place()->isExcluded());
+	}
 }

app/Common/GeoDispersion/Maps/SimpleFilesystemMap.php

Indentation +51 added lines, -51 removed lines

@@ -27,59 +27,59 @@
  */
 class SimpleFilesystemMap implements MapDefinitionInterface
 {
-    private string $id;
-    private string $title;
-    private string $path;
-    private FilesystemReader $filesystem;
+	private string $id;
+	private string $title;
+	private string $path;
+	private FilesystemReader $filesystem;
 
-    /**
-     * Constructor for SimpleFilesystemMap
-     *
-     * @param string $id
-     * @param string $title
-     * @param FilesystemReader $filesystem
-     * @param string $path
-     */
-    public function __construct(string $id, string $title, FilesystemReader $filesystem, string $path)
-    {
-        $this->id = $id;
-        $this->title = $title;
-        $this->filesystem = $filesystem;
-        $this->path = $path;
-    }
+	/**
+	 * Constructor for SimpleFilesystemMap
+	 *
+	 * @param string $id
+	 * @param string $title
+	 * @param FilesystemReader $filesystem
+	 * @param string $path
+	 */
+	public function __construct(string $id, string $title, FilesystemReader $filesystem, string $path)
+	{
+		$this->id = $id;
+		$this->title = $title;
+		$this->filesystem = $filesystem;
+		$this->path = $path;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\MapDefinitionInterface::id()
-     */
-    public function id(): string
-    {
-        return $this->id;
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\MapDefinitionInterface::id()
+	 */
+	public function id(): string
+	{
+		return $this->id;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\MapDefinitionInterface::title()
-     */
-    public function title(): string
-    {
-        return $this->title;
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\MapDefinitionInterface::title()
+	 */
+	public function title(): string
+	{
+		return $this->title;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\MapDefinitionInterface::features()
-     */
-    public function features(): array
-    {
-        $reader = new GeoJSONReader();
-        try {
-            $feature_collection = $reader->read($this->filesystem->read($this->path));
-            if ($feature_collection instanceof FeatureCollection) {
-                return $feature_collection->getFeatures();
-            }
-        } catch (Throwable $ex) {
-        }
-        return [];
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\MapDefinitionInterface::features()
+	 */
+	public function features(): array
+	{
+		$reader = new GeoJSONReader();
+		try {
+			$feature_collection = $reader->read($this->filesystem->read($this->path));
+			if ($feature_collection instanceof FeatureCollection) {
+				return $feature_collection->getFeatures();
+			}
+		} catch (Throwable $ex) {
+		}
+		return [];
+	}
 }

app/Common/GeoDispersion/Config/MapColorsConfig.php

Indentation +81 added lines, -81 removed lines

@@ -23,92 +23,92 @@
  */
 class MapColorsConfig implements JsonSerializable
 {
-    private Color $default;
-    private Color $stroke;
-    private Color $max_value;
-    private Color $hover;
+	private Color $default;
+	private Color $stroke;
+	private Color $max_value;
+	private Color $hover;
 
-    /**
-     * Constructor for MapColorsConfig
-     *
-     * @param Color $default
-     * @param Color $stroke
-     * @param Color $max_value
-     * @param Color $hover
-     */
-    public function __construct(
-        Color $default,
-        Color $stroke,
-        Color $max_value,
-        Color $hover
-    ) {
-        $this->default = $default;
-        $this->stroke = $stroke;
-        $this->max_value = $max_value;
-        $this->hover = $hover;
-    }
+	/**
+	 * Constructor for MapColorsConfig
+	 *
+	 * @param Color $default
+	 * @param Color $stroke
+	 * @param Color $max_value
+	 * @param Color $hover
+	 */
+	public function __construct(
+		Color $default,
+		Color $stroke,
+		Color $max_value,
+		Color $hover
+	) {
+		$this->default = $default;
+		$this->stroke = $stroke;
+		$this->max_value = $max_value;
+		$this->hover = $hover;
+	}
 
-    /**
-     * Get the default color for the features
-     *
-     * @return Color
-     */
-    public function defaultColor(): Color
-    {
-        return $this->default;
-    }
+	/**
+	 * Get the default color for the features
+	 *
+	 * @return Color
+	 */
+	public function defaultColor(): Color
+	{
+		return $this->default;
+	}
 
-    /**
-     * Get the color for the features' strokes
-     *
-     * @return Color
-     */
-    public function strokeColor(): Color
-    {
-        return $this->stroke;
-    }
+	/**
+	 * Get the color for the features' strokes
+	 *
+	 * @return Color
+	 */
+	public function strokeColor(): Color
+	{
+		return $this->stroke;
+	}
 
-    /**
-     * Get the color for the features with the lowest count
-     *
-     * @return Color
-     */
-    public function minValueColor(): Color
-    {
-        return new Rgb(255, 255, 255);
-    }
+	/**
+	 * Get the color for the features with the lowest count
+	 *
+	 * @return Color
+	 */
+	public function minValueColor(): Color
+	{
+		return new Rgb(255, 255, 255);
+	}
 
-    /**
-     * Get the color for the features with the highest count
-     *
-     * @return Color
-     */
-    public function maxValueColor(): Color
-    {
-        return $this->max_value;
-    }
+	/**
+	 * Get the color for the features with the highest count
+	 *
+	 * @return Color
+	 */
+	public function maxValueColor(): Color
+	{
+		return $this->max_value;
+	}
 
-    /**
-     * Get the color for feature hovering
-     *
-     * @return Color
-     */
-    public function hoverColor(): Color
-    {
-        return $this->hover;
-    }
+	/**
+	 * Get the color for feature hovering
+	 *
+	 * @return Color
+	 */
+	public function hoverColor(): Color
+	{
+		return $this->hover;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see JsonSerializable::jsonSerialize()
-     */
-    public function jsonSerialize()
-    {
-        return [
-            'default'   => (string) $this->defaultColor()->toHex(),
-            'stroke'    => (string) $this->strokeColor()->toHex(),
-            'maxvalue'  => (string) $this->maxValueColor()->toHex(),
-            'hover'     => (string) $this->hoverColor()->toHex(),
-        ];
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see JsonSerializable::jsonSerialize()
+	 */
+	public function jsonSerialize()
+	{
+		return [
+			'default'   => (string) $this->defaultColor()->toHex(),
+			'stroke'    => (string) $this->strokeColor()->toHex(),
+			'maxvalue'  => (string) $this->maxValueColor()->toHex(),
+			'hover'     => (string) $this->hoverColor()->toHex(),
+		];
+	}
 }

app/Common/GeoDispersion/Config/NullPlaceMapperConfig.php

Indentation +52 added lines, -52 removed lines

@@ -26,61 +26,61 @@
  */
 class NullPlaceMapperConfig implements PlaceMapperConfigInterface
 {
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperConfigInterface::get()
-     */
-    public function get(string $key, $default = null)
-    {
-        return $default;
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperConfigInterface::get()
+	 */
+	public function get(string $key, $default = null)
+	{
+		return $default;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperConfigInterface::has()
-     */
-    public function has(string $key): bool
-    {
-        return false;
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperConfigInterface::has()
+	 */
+	public function has(string $key): bool
+	{
+		return false;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperConfigInterface::jsonDeserialize()
-     *
-     * @param mixed $config
-     * @return $this
-     */
-    public function jsonDeserialize($config): self
-    {
-        return $this;
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperConfigInterface::jsonDeserialize()
+	 *
+	 * @param mixed $config
+	 * @return $this
+	 */
+	public function jsonDeserialize($config): self
+	{
+		return $this;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see JsonSerializable::jsonSerialize()
-     */
-    public function jsonSerialize()
-    {
-        return [];
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see JsonSerializable::jsonSerialize()
+	 */
+	public function jsonSerialize()
+	{
+		return [];
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperConfigInterface::configContent()
-     */
-    public function configContent(ModuleInterface $module, Tree $tree): string
-    {
-        return '';
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperConfigInterface::configContent()
+	 */
+	public function configContent(ModuleInterface $module, Tree $tree): string
+	{
+		return '';
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperConfigInterface::withConfigUpdate()
-     * @return $this
-     */
-    public function withConfigUpdate(ServerRequestInterface $request): self
-    {
-        return $this;
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperConfigInterface::withConfigUpdate()
+	 * @return $this
+	 */
+	public function withConfigUpdate(ServerRequestInterface $request): self
+	{
+		return $this;
+	}
 }