jon48 / webtrees-lib

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/MapViewConfig.php

Indentation +43 added lines, -43 removed lines

@@ -23,51 +23,51 @@
  */
 class MapViewConfig implements MapViewConfigInterface
 {
-    private string $map_mapping_property;
-    private PlaceMapperConfigInterface $mapper_config;
+	private string $map_mapping_property;
+	private PlaceMapperConfigInterface $mapper_config;
 
-    /**
-     * Constructor for MapViewConfig
-     *
-     * @param string $map_mapping_property
-     * @param PlaceMapperConfigInterface $mapper_config
-     */
-    public function __construct(
-        string $map_mapping_property,
-        PlaceMapperConfigInterface $mapper_config = null
-    ) {
-        $this->map_mapping_property = $map_mapping_property;
-        $this->mapper_config = $mapper_config ?? new NullPlaceMapperConfig();
-    }
+	/**
+	 * Constructor for MapViewConfig
+	 *
+	 * @param string $map_mapping_property
+	 * @param PlaceMapperConfigInterface $mapper_config
+	 */
+	public function __construct(
+		string $map_mapping_property,
+		PlaceMapperConfigInterface $mapper_config = null
+	) {
+		$this->map_mapping_property = $map_mapping_property;
+		$this->mapper_config = $mapper_config ?? new NullPlaceMapperConfig();
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\MapViewConfigInterface::mapMappingProperty()
-     */
-    public function mapMappingProperty(): string
-    {
-        return $this->map_mapping_property;
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\MapViewConfigInterface::mapMappingProperty()
+	 */
+	public function mapMappingProperty(): string
+	{
+		return $this->map_mapping_property;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\MapViewConfigInterface::mapperConfig()
-     */
-    public function mapperConfig(): PlaceMapperConfigInterface
-    {
-        return $this->mapper_config;
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\MapViewConfigInterface::mapperConfig()
+	 */
+	public function mapperConfig(): PlaceMapperConfigInterface
+	{
+		return $this->mapper_config;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\MapViewConfigInterface::with()
-     * @return static
-     */
-    public function with(string $mapping_property, PlaceMapperConfigInterface $mapper_config): self
-    {
-        $new = clone $this;
-        $new->map_mapping_property = $mapping_property;
-        $new->mapper_config = $mapper_config;
-        return $new;
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\MapViewConfigInterface::with()
+	 * @return static
+	 */
+	public function with(string $mapping_property, PlaceMapperConfigInterface $mapper_config): self
+	{
+		$new = clone $this;
+		$new->map_mapping_property = $mapping_property;
+		$new->mapper_config = $mapper_config;
+		return $new;
+	}
 }

app/Module/Certificates/Services/CertificateFilesystemService.php

Indentation +117 added lines, -117 removed lines

@@ -32,129 +32,129 @@
  */
 class CertificateFilesystemService
 {
-    /**
-     * @var array<int,FilesystemOperator> $filesystem
-     */
-    private array $filesystem = [];
+	/**
+	 * @var array<int,FilesystemOperator> $filesystem
+	 */
+	private array $filesystem = [];
 
-    /**
-     * Get the filesystem containing certificates for a tree.
-     *
-     * @param Tree $tree
-     * @return FilesystemOperator
-     */
-    public function filesystem(Tree $tree): FilesystemOperator
-    {
-        if (!isset($this->filesystem[$tree->id()])) {
-            $cert_dir = $tree->getPreference('MAJ_CERTIF_ROOTDIR', 'certificates/');
-            $adapter   = new ChrootAdapter(Registry::filesystem()->data(), $cert_dir);
+	/**
+	 * Get the filesystem containing certificates for a tree.
+	 *
+	 * @param Tree $tree
+	 * @return FilesystemOperator
+	 */
+	public function filesystem(Tree $tree): FilesystemOperator
+	{
+		if (!isset($this->filesystem[$tree->id()])) {
+			$cert_dir = $tree->getPreference('MAJ_CERTIF_ROOTDIR', 'certificates/');
+			$adapter   = new ChrootAdapter(Registry::filesystem()->data(), $cert_dir);
 
-            $this->filesystem[$tree->id()] = new FileSystem($adapter);
-        }
-        return $this->filesystem[$tree->id()];
-    }
+			$this->filesystem[$tree->id()] = new FileSystem($adapter);
+		}
+		return $this->filesystem[$tree->id()];
+	}
 
-    /**
-     * Set the filesystem containing certificates for a tree.
-     *
-     * @param Tree $tree
-     * @param FilesystemOperator $filesystem
-     */
-    public function setFilesystem(Tree $tree, FilesystemOperator $filesystem): void
-    {
-        $this->filesystem[$tree->id()] = $filesystem;
-    }
+	/**
+	 * Set the filesystem containing certificates for a tree.
+	 *
+	 * @param Tree $tree
+	 * @param FilesystemOperator $filesystem
+	 */
+	public function setFilesystem(Tree $tree, FilesystemOperator $filesystem): void
+	{
+		$this->filesystem[$tree->id()] = $filesystem;
+	}
 
-    /**
-     * Create the Certificate object defined by a path on the filesystem.
-     *
-     * @param Tree $tree
-     * @param string $path
-     * @return Certificate|NULL
-     */
-    public function certificate(Tree $tree, string $path): ?Certificate
-    {
-        $filesystem = $this->filesystem($tree);
-        if ($filesystem->fileExists($path) && $this->isFileSupported($filesystem, $path)) {
-            return new Certificate($tree, $path);
-        }
-        return null;
-    }
+	/**
+	 * Create the Certificate object defined by a path on the filesystem.
+	 *
+	 * @param Tree $tree
+	 * @param string $path
+	 * @return Certificate|NULL
+	 */
+	public function certificate(Tree $tree, string $path): ?Certificate
+	{
+		$filesystem = $this->filesystem($tree);
+		if ($filesystem->fileExists($path) && $this->isFileSupported($filesystem, $path)) {
+			return new Certificate($tree, $path);
+		}
+		return null;
+	}
 
-    /**
-     * Get the cities (first-level folder) available in a the filesystem.
-     *
-     * @param Tree $tree
-     * @return string[]
-     */
-    public function cities(Tree $tree): array
-    {
-        $cities =  $this->filesystem($tree)
-            ->listContents('')
-            ->filter(fn (StorageAttributes $attributes): bool => $attributes->isDir())
-            ->map(fn (StorageAttributes $attributes): string => $attributes->path())
-            ->toArray();
-        usort($cities, I18N::comparator());
-        return $cities;
-    }
+	/**
+	 * Get the cities (first-level folder) available in a the filesystem.
+	 *
+	 * @param Tree $tree
+	 * @return string[]
+	 */
+	public function cities(Tree $tree): array
+	{
+		$cities =  $this->filesystem($tree)
+			->listContents('')
+			->filter(fn (StorageAttributes $attributes): bool => $attributes->isDir())
+			->map(fn (StorageAttributes $attributes): string => $attributes->path())
+			->toArray();
+		usort($cities, I18N::comparator());
+		return $cities;
+	}
 
-    /**
-     * Get the certificates available for a city (first-level folder).
-     *
-     * @param Tree $tree
-     * @param string $city
-     * @return Collection<Certificate>
-     */
-    public function certificatesForCity(Tree $tree, string $city): Collection
-    {
-        $filesystem = $this->filesystem($tree);
-        $certificates_paths = $filesystem->listContents($city)
-            ->filter(fn (StorageAttributes $attributes): bool  =>
-                $attributes->isFile() && $this->isFileSupported($filesystem, $attributes->path()))
-            ->map(fn (StorageAttributes $attributes): string => $attributes->path())
-            ->toArray();
-        usort($certificates_paths, I18N::comparator());
-        return collect($certificates_paths)->map(fn (string $path): Certificate => new Certificate($tree, $path));
-    }
+	/**
+	 * Get the certificates available for a city (first-level folder).
+	 *
+	 * @param Tree $tree
+	 * @param string $city
+	 * @return Collection<Certificate>
+	 */
+	public function certificatesForCity(Tree $tree, string $city): Collection
+	{
+		$filesystem = $this->filesystem($tree);
+		$certificates_paths = $filesystem->listContents($city)
+			->filter(fn (StorageAttributes $attributes): bool  =>
+				$attributes->isFile() && $this->isFileSupported($filesystem, $attributes->path()))
+			->map(fn (StorageAttributes $attributes): string => $attributes->path())
+			->toArray();
+		usort($certificates_paths, I18N::comparator());
+		return collect($certificates_paths)->map(fn (string $path): Certificate => new Certificate($tree, $path));
+	}
 
-    /**
-     * Get the certificates available for a city (first-level folder), containing a specified text.
-     *
-     * @param Tree $tree
-     * @param string $city
-     * @param string $contains
-     * @return Collection<Certificate>
-     */
-    public function certificatesForCityContaining(Tree $tree, string $city, string $contains): Collection
-    {
-        $filesystem = $this->filesystem($tree);
-        $certificates_paths = $filesystem->listContents($city)
-            ->filter(fn (StorageAttributes $attributes): bool  =>
-                $attributes->isFile() && $this->isFileSupported($filesystem, $attributes->path())
-                && mb_stripos($attributes->path(), $contains) !== false)
-            ->map(fn (StorageAttributes $attributes): string => $attributes->path())
-            ->toArray();
-        usort($certificates_paths, I18N::comparator());
-        return collect($certificates_paths)->map(fn (string $path): Certificate => new Certificate($tree, $path));
-    }
+	/**
+	 * Get the certificates available for a city (first-level folder), containing a specified text.
+	 *
+	 * @param Tree $tree
+	 * @param string $city
+	 * @param string $contains
+	 * @return Collection<Certificate>
+	 */
+	public function certificatesForCityContaining(Tree $tree, string $city, string $contains): Collection
+	{
+		$filesystem = $this->filesystem($tree);
+		$certificates_paths = $filesystem->listContents($city)
+			->filter(fn (StorageAttributes $attributes): bool  =>
+				$attributes->isFile() && $this->isFileSupported($filesystem, $attributes->path())
+				&& mb_stripos($attributes->path(), $contains) !== false)
+			->map(fn (StorageAttributes $attributes): string => $attributes->path())
+			->toArray();
+		usort($certificates_paths, I18N::comparator());
+		return collect($certificates_paths)->map(fn (string $path): Certificate => new Certificate($tree, $path));
+	}
 
-    /**
-     * Check if a file on the filesystem is supported by the certificate module.
-     *
-     * @param FilesystemOperator $filesystem
-     * @param string $path
-     * @return bool
-     */
-    protected function isFileSupported(FilesystemOperator $filesystem, string $path): bool
-    {
-        try {
-            $mime = $filesystem->mimeType($path);
-            return Registry::cache()->array()->remember(
-                'maj-certif-supportedfiles-' . $mime,
-                fn (): bool => app(CertificateImageFactory::class)->isMimeTypeSupported($mime)
-            );
-        } catch (UnableToRetrieveMetadata | FilesystemException $ex) {
-        }
-        return false;
-    }
+	/**
+	 * Check if a file on the filesystem is supported by the certificate module.
+	 *
+	 * @param FilesystemOperator $filesystem
+	 * @param string $path
+	 * @return bool
+	 */
+	protected function isFileSupported(FilesystemOperator $filesystem, string $path): bool
+	{
+		try {
+			$mime = $filesystem->mimeType($path);
+			return Registry::cache()->array()->remember(
+				'maj-certif-supportedfiles-' . $mime,
+				fn (): bool => app(CertificateImageFactory::class)->isMimeTypeSupported($mime)
+			);
+		} catch (UnableToRetrieveMetadata | FilesystemException $ex) {
+		}
+		return false;
+	}
 }

app/Module/ModuleMyArtJaubInterface.php

Indentation +14 added lines, -14 removed lines

@@ -21,19 +21,19 @@
  */
 interface ModuleMyArtJaubInterface extends ModuleCustomInterface
 {
-    /**
-     * Add module routes to webtrees route loader
-     *
-     * @param Map<\Aura\Router\Route> $router
-     */
-    public function loadRoutes(Map $router): void;
+	/**
+	 * Add module routes to webtrees route loader
+	 *
+	 * @param Map<\Aura\Router\Route> $router
+	 */
+	public function loadRoutes(Map $router): void;
 
-    /**
-     * Returns the URL of the module specific stylesheets.
-     * It will look for a CSS file matching the theme name (e.g. xenea.min.css),
-     * and fallback to default.min.css if none are found
-     *
-     * @return string
-     */
-    public function moduleCssUrl(): string;
+	/**
+	 * Returns the URL of the module specific stylesheets.
+	 * It will look for a CSS file matching the theme name (e.g. xenea.min.css),
+	 * and fallback to default.min.css if none are found
+	 *
+	 * @return string
+	 */
+	public function moduleCssUrl(): string;
 }

app/Module/GeoDispersion/Services/MapAdapterDataService.php

Indentation +157 added lines, -157 removed lines

@@ -31,171 +31,171 @@
  */
 class MapAdapterDataService
 {
-    private MapDefinitionsService $mapdefinition_service;
+	private MapDefinitionsService $mapdefinition_service;
 
-    /**
-     * Constructor for MapAdapterDataService
-     *
-     * @param MapDefinitionsService $mapdefinition_service
-     */
-    public function __construct(MapDefinitionsService $mapdefinition_service)
-    {
-        $this->mapdefinition_service = $mapdefinition_service;
-    }
+	/**
+	 * Constructor for MapAdapterDataService
+	 *
+	 * @param MapDefinitionsService $mapdefinition_service
+	 */
+	public function __construct(MapDefinitionsService $mapdefinition_service)
+	{
+		$this->mapdefinition_service = $mapdefinition_service;
+	}
 
-    /**
-     * Find a GeoAnalysisMapAdapter by ID
-     *
-     * @param int $id
-     * @return GeoAnalysisMapAdapter|NULL
-     */
-    public function find(int $id): ?GeoAnalysisMapAdapter
-    {
-        return DB::table('maj_geodisp_mapviews')
-            ->select('maj_geodisp_mapviews.*')
-            ->where('majgm_id', '=', $id)
-            ->get()
-            ->map($this->mapAdapterMapper())
-            ->first();
-    }
+	/**
+	 * Find a GeoAnalysisMapAdapter by ID
+	 *
+	 * @param int $id
+	 * @return GeoAnalysisMapAdapter|NULL
+	 */
+	public function find(int $id): ?GeoAnalysisMapAdapter
+	{
+		return DB::table('maj_geodisp_mapviews')
+			->select('maj_geodisp_mapviews.*')
+			->where('majgm_id', '=', $id)
+			->get()
+			->map($this->mapAdapterMapper())
+			->first();
+	}
 
-    /**
-     * Get all GeoAnalysisMapAdapters linked to a Map View.
-     *
-     * @param GeoAnalysisMap $map_view
-     * @param bool $show_invalid
-     * @return Collection<GeoAnalysisMapAdapter|null>
-     */
-    public function allForView(GeoAnalysisMap $map_view, bool $show_invalid = false): Collection
-    {
-        $map_adapters = DB::table('maj_geodisp_mapviews')
-            ->select('maj_geodisp_mapviews.*')
-            ->where('majgm_majgv_id', '=', $map_view->id())
-            ->get()
-            ->map($this->mapAdapterMapper());
-        return $show_invalid ? $map_adapters : $map_adapters->filter();
-    }
+	/**
+	 * Get all GeoAnalysisMapAdapters linked to a Map View.
+	 *
+	 * @param GeoAnalysisMap $map_view
+	 * @param bool $show_invalid
+	 * @return Collection<GeoAnalysisMapAdapter|null>
+	 */
+	public function allForView(GeoAnalysisMap $map_view, bool $show_invalid = false): Collection
+	{
+		$map_adapters = DB::table('maj_geodisp_mapviews')
+			->select('maj_geodisp_mapviews.*')
+			->where('majgm_majgv_id', '=', $map_view->id())
+			->get()
+			->map($this->mapAdapterMapper());
+		return $show_invalid ? $map_adapters : $map_adapters->filter();
+	}
 
-    /**
-     * Insert a GeoAnalysisMapAdapter in the database.
-     *
-     * @param GeoAnalysisMapAdapter $map_adapter
-     * @return int
-     */
-    public function insertGetId(GeoAnalysisMapAdapter $map_adapter): int
-    {
-        return DB::table('maj_geodisp_mapviews')
-            ->insertGetId([
-                'majgm_majgv_id' => $map_adapter->geoAnalysisViewId(),
-                'majgm_map_id' => $map_adapter->map()->id(),
-                'majgm_mapper' => get_class($map_adapter->placeMapper()),
-                'majgm_feature_prop' => $map_adapter->viewConfig()->mapMappingProperty(),
-                'majgm_config' => json_encode($map_adapter->viewConfig()->mapperConfig())
-            ]);
-    }
+	/**
+	 * Insert a GeoAnalysisMapAdapter in the database.
+	 *
+	 * @param GeoAnalysisMapAdapter $map_adapter
+	 * @return int
+	 */
+	public function insertGetId(GeoAnalysisMapAdapter $map_adapter): int
+	{
+		return DB::table('maj_geodisp_mapviews')
+			->insertGetId([
+				'majgm_majgv_id' => $map_adapter->geoAnalysisViewId(),
+				'majgm_map_id' => $map_adapter->map()->id(),
+				'majgm_mapper' => get_class($map_adapter->placeMapper()),
+				'majgm_feature_prop' => $map_adapter->viewConfig()->mapMappingProperty(),
+				'majgm_config' => json_encode($map_adapter->viewConfig()->mapperConfig())
+			]);
+	}
 
-    /**
-     * Update a GeoAnalysisMapAdapter in the database.
-     *
-     * @param GeoAnalysisMapAdapter $map_adapter
-     * @return int
-     */
-    public function update(GeoAnalysisMapAdapter $map_adapter): int
-    {
-        return DB::table('maj_geodisp_mapviews')
-            ->where('majgm_id', '=', $map_adapter->id())
-            ->update([
-                'majgm_map_id' => $map_adapter->map()->id(),
-                'majgm_mapper' => get_class($map_adapter->placeMapper()),
-                'majgm_feature_prop' => $map_adapter->viewConfig()->mapMappingProperty(),
-                'majgm_config' => json_encode($map_adapter->placeMapper()->config())
-            ]);
-    }
+	/**
+	 * Update a GeoAnalysisMapAdapter in the database.
+	 *
+	 * @param GeoAnalysisMapAdapter $map_adapter
+	 * @return int
+	 */
+	public function update(GeoAnalysisMapAdapter $map_adapter): int
+	{
+		return DB::table('maj_geodisp_mapviews')
+			->where('majgm_id', '=', $map_adapter->id())
+			->update([
+				'majgm_map_id' => $map_adapter->map()->id(),
+				'majgm_mapper' => get_class($map_adapter->placeMapper()),
+				'majgm_feature_prop' => $map_adapter->viewConfig()->mapMappingProperty(),
+				'majgm_config' => json_encode($map_adapter->placeMapper()->config())
+			]);
+	}
 
-    /**
-     * Delete a GeoAnalysisMapAdapter from the database.
-     *
-     * @param GeoAnalysisMapAdapter $map_adapter
-     * @return int
-     */
-    public function delete(GeoAnalysisMapAdapter $map_adapter): int
-    {
-        return DB::table('maj_geodisp_mapviews')
-            ->where('majgm_id', '=', $map_adapter->id())
-            ->delete();
-    }
+	/**
+	 * Delete a GeoAnalysisMapAdapter from the database.
+	 *
+	 * @param GeoAnalysisMapAdapter $map_adapter
+	 * @return int
+	 */
+	public function delete(GeoAnalysisMapAdapter $map_adapter): int
+	{
+		return DB::table('maj_geodisp_mapviews')
+			->where('majgm_id', '=', $map_adapter->id())
+			->delete();
+	}
 
-    /**
-     * Delete invalid GeoAnalysisMapAdapters from the database.
-     *
-     * @param AbstractGeoAnalysisView $view
-     * @param Collection<int> $valid_map_adapters
-     * @return int
-     */
-    public function deleteInvalid(AbstractGeoAnalysisView $view, Collection $valid_map_adapters): int
-    {
-        return DB::table('maj_geodisp_mapviews')
-            ->where('majgm_majgv_id', '=', $view->id())
-            ->whereNotIn('majgm_id', $valid_map_adapters)
-            ->delete();
-    }
+	/**
+	 * Delete invalid GeoAnalysisMapAdapters from the database.
+	 *
+	 * @param AbstractGeoAnalysisView $view
+	 * @param Collection<int> $valid_map_adapters
+	 * @return int
+	 */
+	public function deleteInvalid(AbstractGeoAnalysisView $view, Collection $valid_map_adapters): int
+	{
+		return DB::table('maj_geodisp_mapviews')
+			->where('majgm_majgv_id', '=', $view->id())
+			->whereNotIn('majgm_id', $valid_map_adapters)
+			->delete();
+	}
 
-    /**
-     * Get the closure to create a GeoAnalysisMapAdapter object from a row in the database.
-     * It returns null if the classes stored in the DB cannot be loaded through the Laravel container,
-     * or if the types do not match with the ones expected.
-     *
-     * @return Closure(\stdClass $row):?GeoAnalysisMapAdapter
-     */
-    private function mapAdapterMapper(): Closure
-    {
-        return function (stdClass $row): ?GeoAnalysisMapAdapter {
-            if (null === $map = $this->mapdefinition_service->find($row->majgm_map_id)) {
-                return null;
-            }
-            try {
-                $mapper = app($row->majgm_mapper);
-                if (!($mapper instanceof PlaceMapperInterface)) {
-                    return null;
-                }
+	/**
+	 * Get the closure to create a GeoAnalysisMapAdapter object from a row in the database.
+	 * It returns null if the classes stored in the DB cannot be loaded through the Laravel container,
+	 * or if the types do not match with the ones expected.
+	 *
+	 * @return Closure(\stdClass $row):?GeoAnalysisMapAdapter
+	 */
+	private function mapAdapterMapper(): Closure
+	{
+		return function (stdClass $row): ?GeoAnalysisMapAdapter {
+			if (null === $map = $this->mapdefinition_service->find($row->majgm_map_id)) {
+				return null;
+			}
+			try {
+				$mapper = app($row->majgm_mapper);
+				if (!($mapper instanceof PlaceMapperInterface)) {
+					return null;
+				}
 
-                return new GeoAnalysisMapAdapter(
-                    (int) $row->majgm_id,
-                    (int) $row->majgm_majgv_id,
-                    $map,
-                    app($row->majgm_mapper),
-                    new MapViewConfig($row->majgm_feature_prop, $this->mapperConfigDecoder($row->majgm_config))
-                );
-            } catch (BindingResolutionException $ex) {
-                return null;
-            }
-        };
-    }
+				return new GeoAnalysisMapAdapter(
+					(int) $row->majgm_id,
+					(int) $row->majgm_majgv_id,
+					$map,
+					app($row->majgm_mapper),
+					new MapViewConfig($row->majgm_feature_prop, $this->mapperConfigDecoder($row->majgm_config))
+				);
+			} catch (BindingResolutionException $ex) {
+				return null;
+			}
+		};
+	}
 
-    /**
-     * Create a PlaceMapperConfigInterface object from a JSON column value.
-     * Returns null if the JSON string is invalid/empty or if the extracted mapper class cannot be loaded
-     * through the Laravel container or if the type do not match with the one expected.
-     *
-     * @param string $json_config
-     * @return PlaceMapperConfigInterface|NULL
-     */
-    private function mapperConfigDecoder(?string $json_config): ?PlaceMapperConfigInterface
-    {
-        $config = $json_config === null ? [] : json_decode($json_config, true);
-        $class = $config['class'] ?? null;
-        $json_mapper_config = $config['config'] ?? null;
-        if ($class === null || $json_mapper_config === null) {
-            return null;
-        }
-        try {
-            $mapper_config = app($class);
-            if (!$mapper_config instanceof PlaceMapperConfigInterface) {
-                return null;
-            }
-            return $mapper_config->jsonDeserialize($json_mapper_config);
-        } catch (BindingResolutionException $ex) {
-            return null;
-        }
-    }
+	/**
+	 * Create a PlaceMapperConfigInterface object from a JSON column value.
+	 * Returns null if the JSON string is invalid/empty or if the extracted mapper class cannot be loaded
+	 * through the Laravel container or if the type do not match with the one expected.
+	 *
+	 * @param string $json_config
+	 * @return PlaceMapperConfigInterface|NULL
+	 */
+	private function mapperConfigDecoder(?string $json_config): ?PlaceMapperConfigInterface
+	{
+		$config = $json_config === null ? [] : json_decode($json_config, true);
+		$class = $config['class'] ?? null;
+		$json_mapper_config = $config['config'] ?? null;
+		if ($class === null || $json_mapper_config === null) {
+			return null;
+		}
+		try {
+			$mapper_config = app($class);
+			if (!$mapper_config instanceof PlaceMapperConfigInterface) {
+				return null;
+			}
+			return $mapper_config->jsonDeserialize($json_mapper_config);
+		} catch (BindingResolutionException $ex) {
+			return null;
+		}
+	}
 }

app/Module/GeoDispersion/Services/GeoAnalysisService.php

Indentation +34 added lines, -34 removed lines

@@ -25,41 +25,41 @@
  */
 class GeoAnalysisService
 {
-    private ModuleService $module_service;
+	private ModuleService $module_service;
 
-    /**
-     * Constructor for MapDefinitionsService
-     *
-     * @param ModuleService $module_service
-     */
-    public function __construct(ModuleService $module_service)
-    {
-        $this->module_service = $module_service;
-    }
+	/**
+	 * Constructor for MapDefinitionsService
+	 *
+	 * @param ModuleService $module_service
+	 */
+	public function __construct(ModuleService $module_service)
+	{
+		$this->module_service = $module_service;
+	}
 
-    /**
-     * Get all available geographical dispersion analyses.
-     *
-     * {@internal The list is generated based on the modules exposing ModuleGeoAnalysisProviderInterface
-     *
-     * @param bool $include_disabled
-     * @return Collection<GeoAnalysisInterface>
-     */
-    public function all(bool $include_disabled = false): Collection
-    {
-        /** @var Collection<GeoAnalysisInterface> $geoanalyses */
-        $geoanalyses = $this->module_service
-            ->findByInterface(ModuleGeoAnalysisProviderInterface::class, $include_disabled)
-            ->flatMap(fn(ModuleGeoAnalysisProviderInterface $module) => $module->listGeoAnalyses())
-            ->map(static function (string $analysis_class): ?GeoAnalysisInterface {
-                try {
-                    $analysis = app($analysis_class);
-                    return $analysis instanceof GeoAnalysisInterface ? $analysis : null;
-                } catch (BindingResolutionException $ex) {
-                    return null;
-                }
-            })->filter();
+	/**
+	 * Get all available geographical dispersion analyses.
+	 *
+	 * {@internal The list is generated based on the modules exposing ModuleGeoAnalysisProviderInterface
+	 *
+	 * @param bool $include_disabled
+	 * @return Collection<GeoAnalysisInterface>
+	 */
+	public function all(bool $include_disabled = false): Collection
+	{
+		/** @var Collection<GeoAnalysisInterface> $geoanalyses */
+		$geoanalyses = $this->module_service
+			->findByInterface(ModuleGeoAnalysisProviderInterface::class, $include_disabled)
+			->flatMap(fn(ModuleGeoAnalysisProviderInterface $module) => $module->listGeoAnalyses())
+			->map(static function (string $analysis_class): ?GeoAnalysisInterface {
+				try {
+					$analysis = app($analysis_class);
+					return $analysis instanceof GeoAnalysisInterface ? $analysis : null;
+				} catch (BindingResolutionException $ex) {
+					return null;
+				}
+			})->filter();
 
-        return $geoanalyses;
-    }
+		return $geoanalyses;
+	}
 }

app/Module/GeoDispersion/Services/PlaceMapperService.php

Indentation +34 added lines, -34 removed lines

@@ -25,41 +25,41 @@
  */
 class PlaceMapperService
 {
-    private ModuleService $module_service;
+	private ModuleService $module_service;
 
-    /**
-     * Constructor for PlaceMapperService
-     *
-     * @param ModuleService $module_service
-     */
-    public function __construct(ModuleService $module_service)
-    {
-        $this->module_service = $module_service;
-    }
+	/**
+	 * Constructor for PlaceMapperService
+	 *
+	 * @param ModuleService $module_service
+	 */
+	public function __construct(ModuleService $module_service)
+	{
+		$this->module_service = $module_service;
+	}
 
-    /**
-     * Get all place mappers available.
-     *
-     * {@internal The list is generated based on the modules exposing ModulePlaceMapperProviderInterface}
-     *
-     * @param bool $include_disabled
-     * @return Collection<PlaceMapperInterface>
-     */
-    public function all(bool $include_disabled = false): Collection
-    {
-        /** @var Collection<PlaceMapperInterface> $place_mappers */
-        $place_mappers =  $this->module_service
-            ->findByInterface(ModulePlaceMapperProviderInterface::class, $include_disabled)
-            ->flatMap(fn(ModulePlaceMapperProviderInterface $module) => $module->listPlaceMappers())
-            ->map(static function (string $mapper_class): ?PlaceMapperInterface {
-                try {
-                    $mapper = app($mapper_class);
-                    return $mapper instanceof PlaceMapperInterface ? $mapper : null;
-                } catch (BindingResolutionException $ex) {
-                    return null;
-                }
-            })->filter();
+	/**
+	 * Get all place mappers available.
+	 *
+	 * {@internal The list is generated based on the modules exposing ModulePlaceMapperProviderInterface}
+	 *
+	 * @param bool $include_disabled
+	 * @return Collection<PlaceMapperInterface>
+	 */
+	public function all(bool $include_disabled = false): Collection
+	{
+		/** @var Collection<PlaceMapperInterface> $place_mappers */
+		$place_mappers =  $this->module_service
+			->findByInterface(ModulePlaceMapperProviderInterface::class, $include_disabled)
+			->flatMap(fn(ModulePlaceMapperProviderInterface $module) => $module->listPlaceMappers())
+			->map(static function (string $mapper_class): ?PlaceMapperInterface {
+				try {
+					$mapper = app($mapper_class);
+					return $mapper instanceof PlaceMapperInterface ? $mapper : null;
+				} catch (BindingResolutionException $ex) {
+					return null;
+				}
+			})->filter();
 
-        return $place_mappers;
-    }
+		return $place_mappers;
+	}
 }