jon48 / webtrees-lib

app/Module/GeoDispersion/PlaceMappers/CoordinatesPlaceMapper.php

Spacing +2 added lines, -2 removed lines

@@ -125,7 +125,7 @@ 
         if ($cacheKey === null) {
             return null;
         }
-        return Registry::cache()->array()->remember($cacheKey, function (): ?array {
+        return Registry::cache()->array()->remember($cacheKey, function(): ?array {
             $map_def = $this->data('map');
             if (
                 !$this->setGeometryEngine()
@@ -201,7 +201,7 @@ 
             if ($map_def === null || !($map_def instanceof MapDefinitionInterface)) {
                 return null;
             }
-            return spl_object_id($this) . '-map-' . $map_def->id();
+            return spl_object_id($this).'-map-'.$map_def->id();
         }
         return $this->cache_key;
     }

Indentation +180 added lines, -180 removed lines

@@ -36,184 +36,184 @@
  */
 class CoordinatesPlaceMapper implements PlaceMapperInterface
 {
-    use PlaceMapperTrait;
-
-    private ?string $cache_key = null;
-
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperInterface::title()
-     */
-    public function title(): string
-    {
-        return I18N::translate('Mapping on place coordinates');
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * {@internal The Place is associated to a Point only.
-     * PlaceLocation can calculate a BoundingBox.
-     * Using a BoundingBox could make the mapping more complex and potentially arbitary.
-     * Furthermore, when no coordinate is found for the place or its children, then it bubbles up to the parents.
-     * This could create the unwanted side effect of a very large area to consider}
-     *
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperInterface::map()
-     */
-    public function map(Place $place, string $feature_property): ?string
-    {
-        $location = new PlaceLocation($place->gedcomName());
-        $longitude = $location->longitude();
-        $latitude = $location->latitude();
-        if ($longitude === null || $latitude === null) {
-            return null;
-        }
-
-        $features_index = $this->featuresIndex();
-        if ($features_index === null) {
-            return null;
-        }
-
-        $place_point = Point::xy($longitude, $latitude, $features_index['SRID']);
-        $grid_box = $this->getGridCell(
-            $place_point,
-            $features_index['map_NE'],
-            $features_index['map_SW'],
-            $features_index['nb_columns']
-        );
-        if ($grid_box === null || !$this->setGeometryEngine()) {
-            return null;
-        }
-        $features = $features_index['grid'][$grid_box[0]][$grid_box[1]];
-        foreach ($features as $feature) {
-            $geometry = $feature->getGeometry();
-            if ($geometry !== null && $place_point->SRID() === $geometry->SRID() && $geometry->contains($place_point)) {
-                return $feature->getProperty($feature_property);
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Return the XY coordinates in a bounded grid of the cell containing a specific point.
-     *
-     * @param Point $point Point to find
-     * @param Point $grid_NE North-East point of the bounded grid
-     * @param Point $grid_SW South-West point fo the bounded grid
-     * @param int $grid_columns Number of columns/rows in the grid
-     * @return int[]|NULL
-     */
-    protected function getGridCell(Point $point, Point $grid_NE, Point $grid_SW, int $grid_columns): ?array
-    {
-        list($x, $y) = $point->toArray();
-        list($x_max, $y_max) = $grid_NE->toArray();
-        list($x_min, $y_min) = $grid_SW->toArray();
-
-        $x_step = ($x_max - $x_min) / $grid_columns;
-        $y_step = ($y_max - $y_min) / $grid_columns;
-
-        if ($x_min <= $x && $x <= $x_max && $y_min <= $y && $y <= $y_max) {
-            return [
-                $x === $x_max ? $grid_columns - 1 : intval(($x - $x_min) / $x_step),
-                $y === $y_max ? $grid_columns - 1 : intval(($y - $y_min) / $y_step)
-            ];
-        }
-        return null;
-    }
-
-    /**
-     * Get an indexed array of the features of the map.
-     *
-     * {@internal The map is divided in a grid, eacg cell containing the features which bounding box overlaps that cell.
-     * The grid is computed once for each map, and cached.}
-     *
-     * @phpcs:ignore Generic.Files.LineLength.TooLong
-     * @return array{grid: array<int, array<int, \Brick\Geo\IO\GeoJSON\Feature[]>>, nb_columns: int, map_NE: \Brick\Geo\Point, map_SW: \Brick\Geo\Point, SRID: int}|NULL
-     */
-    protected function featuresIndex(): ?array
-    {
-        $cacheKey = $this->cacheKey();
-        if ($cacheKey === null) {
-            return null;
-        }
-        return Registry::cache()->array()->remember($cacheKey, function (): ?array {
-            $map_def = $this->data('map');
-            if (
-                !$this->setGeometryEngine()
-                || $map_def === null
-                || !($map_def instanceof MapDefinitionInterface)
-            ) {
-                return null;
-            }
-            $bounding_boxes = [];
-            $map_bounding_box = new BoundingBox();
-            $srid = 0;
-            foreach ($map_def->features() as $feature) {
-                $geometry = $feature->getGeometry();
-                if ($geometry === null) {
-                    continue;
-                }
-                $srid = $geometry->SRID();
-                $bounding_box = $geometry->getBoundingBox();
-                $bounding_boxes[] = [$feature, $bounding_box];
-                $map_bounding_box = $map_bounding_box->extendedWithBoundingBox($bounding_box);
-            }
-            $grid_columns = count($bounding_boxes);
-            $grid = array_fill(0, $grid_columns, array_fill(0, $grid_columns, []));
-            $map_NE = $map_bounding_box->getNorthEast();
-            $map_SW = $map_bounding_box->getSouthWest();
-            foreach ($bounding_boxes as $item) {
-                $grid_box_SW = $this->getGridCell($item[1]->getSouthWest(), $map_NE, $map_SW, $grid_columns) ?? [1, 1];
-                $grid_box_NE = $this->getGridCell($item[1]->getNorthEast(), $map_NE, $map_SW, $grid_columns) ?? [0, 0];
-                for ($i = $grid_box_SW[0]; $i <= $grid_box_NE[0]; $i++) {
-                    for ($j = $grid_box_SW[1]; $j <= $grid_box_NE[1]; $j++) {
-                        $grid[$i][$j][] = $item[0];
-                    }
-                }
-            }
-            return [
-                'grid'          =>  $grid,
-                'nb_columns'    =>  $grid_columns,
-                'map_NE'        =>  $map_NE,
-                'map_SW'        =>  $map_SW,
-                'SRID'          =>  $srid
-            ];
-        });
-    }
-
-    /**
-     * Set the Brick Geo Engine to use the database for geospatial computations.
-     * The engine is set only if it has not been set beforehand.
-     *
-     * @return bool
-     */
-    protected function setGeometryEngine(): bool
-    {
-        try {
-            if (!GeometryEngineRegistry::has()) {
-                GeometryEngineRegistry::set(new PDOEngine(DB::connection()->getPdo()));
-            }
-            $point = Point::xy(1, 1);
-            return $point->equals($point);
-        } catch (Throwable $ex) {
-        }
-        return false;
-    }
-
-    /**
-     * Get the key to cache the indexed grid of features.
-     *
-     * @return string|NULL
-     */
-    protected function cacheKey(): ?string
-    {
-        if ($this->cache_key === null) {
-            $map_def = $this->data('map');
-            if ($map_def === null || !($map_def instanceof MapDefinitionInterface)) {
-                return null;
-            }
-            return spl_object_id($this) . '-map-' . $map_def->id();
-        }
-        return $this->cache_key;
-    }
+	use PlaceMapperTrait;
+
+	private ?string $cache_key = null;
+
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperInterface::title()
+	 */
+	public function title(): string
+	{
+		return I18N::translate('Mapping on place coordinates');
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * {@internal The Place is associated to a Point only.
+	 * PlaceLocation can calculate a BoundingBox.
+	 * Using a BoundingBox could make the mapping more complex and potentially arbitary.
+	 * Furthermore, when no coordinate is found for the place or its children, then it bubbles up to the parents.
+	 * This could create the unwanted side effect of a very large area to consider}
+	 *
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperInterface::map()
+	 */
+	public function map(Place $place, string $feature_property): ?string
+	{
+		$location = new PlaceLocation($place->gedcomName());
+		$longitude = $location->longitude();
+		$latitude = $location->latitude();
+		if ($longitude === null || $latitude === null) {
+			return null;
+		}
+
+		$features_index = $this->featuresIndex();
+		if ($features_index === null) {
+			return null;
+		}
+
+		$place_point = Point::xy($longitude, $latitude, $features_index['SRID']);
+		$grid_box = $this->getGridCell(
+			$place_point,
+			$features_index['map_NE'],
+			$features_index['map_SW'],
+			$features_index['nb_columns']
+		);
+		if ($grid_box === null || !$this->setGeometryEngine()) {
+			return null;
+		}
+		$features = $features_index['grid'][$grid_box[0]][$grid_box[1]];
+		foreach ($features as $feature) {
+			$geometry = $feature->getGeometry();
+			if ($geometry !== null && $place_point->SRID() === $geometry->SRID() && $geometry->contains($place_point)) {
+				return $feature->getProperty($feature_property);
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Return the XY coordinates in a bounded grid of the cell containing a specific point.
+	 *
+	 * @param Point $point Point to find
+	 * @param Point $grid_NE North-East point of the bounded grid
+	 * @param Point $grid_SW South-West point fo the bounded grid
+	 * @param int $grid_columns Number of columns/rows in the grid
+	 * @return int[]|NULL
+	 */
+	protected function getGridCell(Point $point, Point $grid_NE, Point $grid_SW, int $grid_columns): ?array
+	{
+		list($x, $y) = $point->toArray();
+		list($x_max, $y_max) = $grid_NE->toArray();
+		list($x_min, $y_min) = $grid_SW->toArray();
+
+		$x_step = ($x_max - $x_min) / $grid_columns;
+		$y_step = ($y_max - $y_min) / $grid_columns;
+
+		if ($x_min <= $x && $x <= $x_max && $y_min <= $y && $y <= $y_max) {
+			return [
+				$x === $x_max ? $grid_columns - 1 : intval(($x - $x_min) / $x_step),
+				$y === $y_max ? $grid_columns - 1 : intval(($y - $y_min) / $y_step)
+			];
+		}
+		return null;
+	}
+
+	/**
+	 * Get an indexed array of the features of the map.
+	 *
+	 * {@internal The map is divided in a grid, eacg cell containing the features which bounding box overlaps that cell.
+	 * The grid is computed once for each map, and cached.}
+	 *
+	 * @phpcs:ignore Generic.Files.LineLength.TooLong
+	 * @return array{grid: array<int, array<int, \Brick\Geo\IO\GeoJSON\Feature[]>>, nb_columns: int, map_NE: \Brick\Geo\Point, map_SW: \Brick\Geo\Point, SRID: int}|NULL
+	 */
+	protected function featuresIndex(): ?array
+	{
+		$cacheKey = $this->cacheKey();
+		if ($cacheKey === null) {
+			return null;
+		}
+		return Registry::cache()->array()->remember($cacheKey, function (): ?array {
+			$map_def = $this->data('map');
+			if (
+				!$this->setGeometryEngine()
+				|| $map_def === null
+				|| !($map_def instanceof MapDefinitionInterface)
+			) {
+				return null;
+			}
+			$bounding_boxes = [];
+			$map_bounding_box = new BoundingBox();
+			$srid = 0;
+			foreach ($map_def->features() as $feature) {
+				$geometry = $feature->getGeometry();
+				if ($geometry === null) {
+					continue;
+				}
+				$srid = $geometry->SRID();
+				$bounding_box = $geometry->getBoundingBox();
+				$bounding_boxes[] = [$feature, $bounding_box];
+				$map_bounding_box = $map_bounding_box->extendedWithBoundingBox($bounding_box);
+			}
+			$grid_columns = count($bounding_boxes);
+			$grid = array_fill(0, $grid_columns, array_fill(0, $grid_columns, []));
+			$map_NE = $map_bounding_box->getNorthEast();
+			$map_SW = $map_bounding_box->getSouthWest();
+			foreach ($bounding_boxes as $item) {
+				$grid_box_SW = $this->getGridCell($item[1]->getSouthWest(), $map_NE, $map_SW, $grid_columns) ?? [1, 1];
+				$grid_box_NE = $this->getGridCell($item[1]->getNorthEast(), $map_NE, $map_SW, $grid_columns) ?? [0, 0];
+				for ($i = $grid_box_SW[0]; $i <= $grid_box_NE[0]; $i++) {
+					for ($j = $grid_box_SW[1]; $j <= $grid_box_NE[1]; $j++) {
+						$grid[$i][$j][] = $item[0];
+					}
+				}
+			}
+			return [
+				'grid'          =>  $grid,
+				'nb_columns'    =>  $grid_columns,
+				'map_NE'        =>  $map_NE,
+				'map_SW'        =>  $map_SW,
+				'SRID'          =>  $srid
+			];
+		});
+	}
+
+	/**
+	 * Set the Brick Geo Engine to use the database for geospatial computations.
+	 * The engine is set only if it has not been set beforehand.
+	 *
+	 * @return bool
+	 */
+	protected function setGeometryEngine(): bool
+	{
+		try {
+			if (!GeometryEngineRegistry::has()) {
+				GeometryEngineRegistry::set(new PDOEngine(DB::connection()->getPdo()));
+			}
+			$point = Point::xy(1, 1);
+			return $point->equals($point);
+		} catch (Throwable $ex) {
+		}
+		return false;
+	}
+
+	/**
+	 * Get the key to cache the indexed grid of features.
+	 *
+	 * @return string|NULL
+	 */
+	protected function cacheKey(): ?string
+	{
+		if ($this->cache_key === null) {
+			$map_def = $this->data('map');
+			if ($map_def === null || !($map_def instanceof MapDefinitionInterface)) {
+				return null;
+			}
+			return spl_object_id($this) . '-map-' . $map_def->id();
+		}
+		return $this->cache_key;
+	}
 }

app/Module/GeoDispersion/Model/MapFeatureAnalysisData.php

Indentation +71 added lines, -71 removed lines

@@ -22,81 +22,81 @@
  */
 class MapFeatureAnalysisData
 {
-    private string $id;
-    private int $count;
-    private bool $in_map;
-    /**
-     * @var Collection<GeoAnalysisPlace> $places
-     */
-    private Collection $places;
+	private string $id;
+	private int $count;
+	private bool $in_map;
+	/**
+	 * @var Collection<GeoAnalysisPlace> $places
+	 */
+	private Collection $places;
 
-    /**
-     * Constructor for MapFeatureAnalysisData
-     *
-     * @param string $id
-     */
-    public function __construct(string $id)
-    {
-        $this->id = $id;
-        $this->count = 0;
-        $this->places = new Collection();
-        $this->in_map = false;
-    }
+	/**
+	 * Constructor for MapFeatureAnalysisData
+	 *
+	 * @param string $id
+	 */
+	public function __construct(string $id)
+	{
+		$this->id = $id;
+		$this->count = 0;
+		$this->places = new Collection();
+		$this->in_map = false;
+	}
 
-    /**
-     * Get the list of places mapped to the feature
-     *
-     * @return Collection<GeoAnalysisPlace>
-     */
-    public function places(): Collection
-    {
-        return $this->places;
-    }
+	/**
+	 * Get the list of places mapped to the feature
+	 *
+	 * @return Collection<GeoAnalysisPlace>
+	 */
+	public function places(): Collection
+	{
+		return $this->places;
+	}
 
-    /**
-     * Get the count of analysis items occurring in the feature
-     *
-     * @return int
-     */
-    public function count(): int
-    {
-        return $this->count;
-    }
+	/**
+	 * Get the count of analysis items occurring in the feature
+	 *
+	 * @return int
+	 */
+	public function count(): int
+	{
+		return $this->count;
+	}
 
-    /**
-     * Check whether the feature exist in the target map
-     *
-     * @return bool
-     */
-    public function existsInMap(): bool
-    {
-        return $this->in_map;
-    }
+	/**
+	 * Check whether the feature exist in the target map
+	 *
+	 * @return bool
+	 */
+	public function existsInMap(): bool
+	{
+		return $this->in_map;
+	}
 
-    /**
-     * Confirm that the feature exist in the target map
-     *
-     * @return $this
-     */
-    public function tagAsExisting(): self
-    {
-        $this->in_map = true;
-        return $this;
-    }
+	/**
+	 * Confirm that the feature exist in the target map
+	 *
+	 * @return $this
+	 */
+	public function tagAsExisting(): self
+	{
+		$this->in_map = true;
+		return $this;
+	}
 
-    /**
-     * Add a GeoAnalysisPlace to the feature
-     *
-     * @param GeoAnalysisPlace $place
-     * @param int $count
-     * @return $this
-     */
-    public function add(GeoAnalysisPlace $place, int $count): self
-    {
-        if (!$place->isExcluded()) {
-            $this->places->add($place);
-            $this->count += $count;
-        }
-        return $this;
-    }
+	/**
+	 * Add a GeoAnalysisPlace to the feature
+	 *
+	 * @param GeoAnalysisPlace $place
+	 * @param int $count
+	 * @return $this
+	 */
+	public function add(GeoAnalysisPlace $place, int $count): self
+	{
+		if (!$place->isExcluded()) {
+			$this->places->add($place);
+			$this->count += $count;
+		}
+		return $this;
+	}
 }

app/Module/GeoDispersion/Model/MapAdapterResult.php

Indentation +48 added lines, -48 removed lines

@@ -24,57 +24,57 @@
  */
 class MapAdapterResult
 {
-    private GeoAnalysisResult $result;
+	private GeoAnalysisResult $result;
 
-    /**
-     * @var \Brick\Geo\IO\GeoJSON\Feature[] $features
-     */
-    private array $features;
+	/**
+	 * @var \Brick\Geo\IO\GeoJSON\Feature[] $features
+	 */
+	private array $features;
 
-    /**
-     * Constructor for MapAdapterResult
-     *
-     * @param GeoAnalysisResult $result
-     * @param \Brick\Geo\IO\GeoJSON\Feature[] $features
-     */
-    final public function __construct(GeoAnalysisResult $result, array $features)
-    {
-        $this->result = $result;
-        $this->features = $features;
-    }
+	/**
+	 * Constructor for MapAdapterResult
+	 *
+	 * @param GeoAnalysisResult $result
+	 * @param \Brick\Geo\IO\GeoJSON\Feature[] $features
+	 */
+	final public function __construct(GeoAnalysisResult $result, array $features)
+	{
+		$this->result = $result;
+		$this->features = $features;
+	}
 
-    /**
-     * Get the GeoAnalysisResult after mapping of the places
-     *
-     * @return GeoAnalysisResult
-     */
-    public function geoAnalysisResult(): GeoAnalysisResult
-    {
-        return $this->result;
-    }
+	/**
+	 * Get the GeoAnalysisResult after mapping of the places
+	 *
+	 * @return GeoAnalysisResult
+	 */
+	public function geoAnalysisResult(): GeoAnalysisResult
+	{
+		return $this->result;
+	}
 
-    /**
-     * Get the list of features to display on the map
-     *
-     * @return \Brick\Geo\IO\GeoJSON\Feature[]
-     */
-    public function features(): array
-    {
-        return $this->features;
-    }
+	/**
+	 * Get the list of features to display on the map
+	 *
+	 * @return \Brick\Geo\IO\GeoJSON\Feature[]
+	 */
+	public function features(): array
+	{
+		return $this->features;
+	}
 
-    /**
-     * Merge the current MapAdapter with another.
-     * The current object is modified, not the second one.
-     *
-     * @param MapAdapterResult $other
-     * @return static
-     */
-    public function merge(MapAdapterResult $other): self
-    {
-        return new static(
-            $this->result->merge($other->result),
-            array_merge($this->features, $other->features)
-        );
-    }
+	/**
+	 * Merge the current MapAdapter with another.
+	 * The current object is modified, not the second one.
+	 *
+	 * @param MapAdapterResult $other
+	 * @return static
+	 */
+	public function merge(MapAdapterResult $other): self
+	{
+		return new static(
+			$this->result->merge($other->result),
+			array_merge($this->features, $other->features)
+		);
+	}
 }

app/Module/GeoDispersion/Model/GeoAnalysisMapAdapter.php

Spacing +4 added lines, -4 removed lines

@@ -123,7 +123,7 @@ 
                     ->withProperty(
                         'places',
                         $feature_data->places()
-                            ->map(fn(GeoAnalysisPlace $place): string => $place->place()->firstParts(1)->first())
+                            ->map(fn(GeoAnalysisPlace $place) : string => $place->place()->firstParts(1)->first())
                             ->sort(I18N::comparator())
                             ->toArray()
                     );
@@ -135,7 +135,7 @@ 
         $features_data
             ->filter(fn(MapFeatureAnalysisData $data) => !$data->existsInMap())
             ->each(
-                fn (MapFeatureAnalysisData $data) =>
+                fn(MapFeatureAnalysisData $data) =>
                     $data->places()->each(
                         fn(GeoAnalysisPlace $place) => $result->exclude($place)
                     )
@@ -155,7 +155,7 @@ 
         $features_mapping = new Collection();
 
         $byplaces = $result->knownPlaces();
-        $byplaces->each(function (GeoAnalysisResultItem $item) use ($features_mapping, $result): void {
+        $byplaces->each(function(GeoAnalysisResultItem $item) use ($features_mapping, $result): void {
             $id = $this->place_mapper->map($item->place()->place(), $this->config->mapMappingProperty());
 
             if ($id !== null && mb_strlen($id) > 0) {
@@ -168,7 +168,7 @@ 
             }
         });
 
-        return [ $features_mapping, $result];
+        return [$features_mapping, $result];
     }
 
     /**

Indentation +185 added lines, -185 removed lines

@@ -29,189 +29,189 @@
  */
 class GeoAnalysisMapAdapter
 {
-    private int $id;
-    private int $view_id;
-    private MapDefinitionInterface $map;
-    private PlaceMapperInterface $place_mapper;
-    private MapViewConfigInterface $config;
-
-    /**
-     * Constructor for GeoAnalysisMapAdapter
-     *
-     * @param int $id
-     * @param MapDefinitionInterface $map
-     * @param PlaceMapperInterface $mapper
-     * @param MapViewConfigInterface $config
-     */
-    public function __construct(
-        int $id,
-        int $view_id,
-        MapDefinitionInterface $map,
-        PlaceMapperInterface $mapper,
-        MapViewConfigInterface $config
-    ) {
-        $this->id = $id;
-        $this->view_id = $view_id;
-        $this->map = $map;
-        $this->place_mapper = $mapper;
-        $this->config = $config;
-        $this->place_mapper->setConfig($this->config->mapperConfig());
-        $this->place_mapper->setData('map', $map);
-        $this->place_mapper->boot();
-    }
-
-    /**
-     * Create a copy of the GeoAnalysisMapAdapter with new properties.
-     *
-     * @param MapDefinitionInterface $map
-     * @param PlaceMapperInterface $mapper
-     * @param string $mapping_property
-     * @return static
-     */
-    public function with(
-        MapDefinitionInterface $map,
-        PlaceMapperInterface $mapper,
-        string $mapping_property
-    ): self {
-        $new = clone $this;
-        $new->map = $map;
-        $new->place_mapper = $mapper;
-        $new->config = $this->config->with($mapping_property, $mapper->config());
-        return $new;
-    }
-
-    /**
-     * Get the GeoAnalysisMapAdapter ID
-     *
-     * @return int
-     */
-    public function id(): int
-    {
-        return $this->id;
-    }
-
-    /**
-     * Get the ID of the associated GeoAnalysisView
-     *
-     * @return int
-     */
-    public function geoAnalysisViewId(): int
-    {
-        return $this->view_id;
-    }
-
-    /**
-     * Get the associated target map
-     *
-     * @return MapDefinitionInterface
-     */
-    public function map(): MapDefinitionInterface
-    {
-        return $this->map;
-    }
-
-    /**
-     * Get the Place Mapper used for the mapping
-     *
-     * @return PlaceMapperInterface
-     */
-    public function placeMapper(): PlaceMapperInterface
-    {
-        return $this->place_mapper;
-    }
-
-    /**
-     * Get the configuration of the Map View.
-     *
-     * @return MapViewConfigInterface
-     */
-    public function viewConfig(): MapViewConfigInterface
-    {
-        return $this->config;
-    }
-
-    /**
-     * Convert the geographical analysis result to a MapAdapter result for usage in the Map View
-     *
-     * @param GeoAnalysisResult $result
-     * @return MapAdapterResult
-     */
-    public function convert(GeoAnalysisResult $result): MapAdapterResult
-    {
-        $result = $result->copy();
-
-        $features = [];
-        list($features_data, $result) = $this->featureAnalysisData($result);
-
-        $places_found = $result->countFound();
-        foreach ($this->map->features() as $feature) {
-            $feature_id = $this->featureId($feature);
-            if ($feature_id !== null && $features_data->has($feature_id)) {
-                /** @var MapFeatureAnalysisData $feature_data */
-                $feature_data = $features_data->get($feature_id)->tagAsExisting();
-                $place_count = $feature_data->count();
-                $features[] = $feature
-                    ->withProperty('count', $place_count)
-                    ->withProperty('ratio', $places_found > 0 ? $place_count / $places_found : 0)
-                    ->withProperty(
-                        'places',
-                        $feature_data->places()
-                            ->map(fn(GeoAnalysisPlace $place): string => $place->place()->firstParts(1)->first())
-                            ->sort(I18N::comparator())
-                            ->toArray()
-                    );
-            } else {
-                $features[] = $feature;
-            }
-        }
-
-        $features_data
-            ->filter(fn(MapFeatureAnalysisData $data) => !$data->existsInMap())
-            ->each(
-                fn (MapFeatureAnalysisData $data) =>
-                    $data->places()->each(
-                        fn(GeoAnalysisPlace $place) => $result->exclude($place)
-                    )
-            );
-
-        return new MapAdapterResult($result, $features);
-    }
-
-    /**
-     * Populate the map features with the mapped Places and total count
-     *
-     * @param GeoAnalysisResult $result
-     * @return mixed[]
-     */
-    protected function featureAnalysisData(GeoAnalysisResult $result): array
-    {
-        $features_mapping = new Collection();
-
-        $byplaces = $result->knownPlaces();
-        $byplaces->each(function (GeoAnalysisResultItem $item) use ($features_mapping, $result): void {
-            $id = $this->place_mapper->map($item->place()->place(), $this->config->mapMappingProperty());
-
-            if ($id !== null && mb_strlen($id) > 0) {
-                $features_mapping->put(
-                    $id,
-                    $features_mapping->get($id, new MapFeatureAnalysisData($id))->add($item->place(), $item->count())
-                );
-            } else {
-                $result->exclude($item->place());
-            }
-        });
-
-        return [ $features_mapping, $result];
-    }
-
-    /**
-     * Get the value of the feature property used for the mapping
-     *
-     * @param Feature $feature
-     * @return string|NULL
-     */
-    protected function featureId(Feature $feature): ?string
-    {
-        return $feature->getProperty($this->config->mapMappingProperty());
-    }
+	private int $id;
+	private int $view_id;
+	private MapDefinitionInterface $map;
+	private PlaceMapperInterface $place_mapper;
+	private MapViewConfigInterface $config;
+
+	/**
+	 * Constructor for GeoAnalysisMapAdapter
+	 *
+	 * @param int $id
+	 * @param MapDefinitionInterface $map
+	 * @param PlaceMapperInterface $mapper
+	 * @param MapViewConfigInterface $config
+	 */
+	public function __construct(
+		int $id,
+		int $view_id,
+		MapDefinitionInterface $map,
+		PlaceMapperInterface $mapper,
+		MapViewConfigInterface $config
+	) {
+		$this->id = $id;
+		$this->view_id = $view_id;
+		$this->map = $map;
+		$this->place_mapper = $mapper;
+		$this->config = $config;
+		$this->place_mapper->setConfig($this->config->mapperConfig());
+		$this->place_mapper->setData('map', $map);
+		$this->place_mapper->boot();
+	}
+
+	/**
+	 * Create a copy of the GeoAnalysisMapAdapter with new properties.
+	 *
+	 * @param MapDefinitionInterface $map
+	 * @param PlaceMapperInterface $mapper
+	 * @param string $mapping_property
+	 * @return static
+	 */
+	public function with(
+		MapDefinitionInterface $map,
+		PlaceMapperInterface $mapper,
+		string $mapping_property
+	): self {
+		$new = clone $this;
+		$new->map = $map;
+		$new->place_mapper = $mapper;
+		$new->config = $this->config->with($mapping_property, $mapper->config());
+		return $new;
+	}
+
+	/**
+	 * Get the GeoAnalysisMapAdapter ID
+	 *
+	 * @return int
+	 */
+	public function id(): int
+	{
+		return $this->id;
+	}
+
+	/**
+	 * Get the ID of the associated GeoAnalysisView
+	 *
+	 * @return int
+	 */
+	public function geoAnalysisViewId(): int
+	{
+		return $this->view_id;
+	}
+
+	/**
+	 * Get the associated target map
+	 *
+	 * @return MapDefinitionInterface
+	 */
+	public function map(): MapDefinitionInterface
+	{
+		return $this->map;
+	}
+
+	/**
+	 * Get the Place Mapper used for the mapping
+	 *
+	 * @return PlaceMapperInterface
+	 */
+	public function placeMapper(): PlaceMapperInterface
+	{
+		return $this->place_mapper;
+	}
+
+	/**
+	 * Get the configuration of the Map View.
+	 *
+	 * @return MapViewConfigInterface
+	 */
+	public function viewConfig(): MapViewConfigInterface
+	{
+		return $this->config;
+	}
+
+	/**
+	 * Convert the geographical analysis result to a MapAdapter result for usage in the Map View
+	 *
+	 * @param GeoAnalysisResult $result
+	 * @return MapAdapterResult
+	 */
+	public function convert(GeoAnalysisResult $result): MapAdapterResult
+	{
+		$result = $result->copy();
+
+		$features = [];
+		list($features_data, $result) = $this->featureAnalysisData($result);
+
+		$places_found = $result->countFound();
+		foreach ($this->map->features() as $feature) {
+			$feature_id = $this->featureId($feature);
+			if ($feature_id !== null && $features_data->has($feature_id)) {
+				/** @var MapFeatureAnalysisData $feature_data */
+				$feature_data = $features_data->get($feature_id)->tagAsExisting();
+				$place_count = $feature_data->count();
+				$features[] = $feature
+					->withProperty('count', $place_count)
+					->withProperty('ratio', $places_found > 0 ? $place_count / $places_found : 0)
+					->withProperty(
+						'places',
+						$feature_data->places()
+							->map(fn(GeoAnalysisPlace $place): string => $place->place()->firstParts(1)->first())
+							->sort(I18N::comparator())
+							->toArray()
+					);
+			} else {
+				$features[] = $feature;
+			}
+		}
+
+		$features_data
+			->filter(fn(MapFeatureAnalysisData $data) => !$data->existsInMap())
+			->each(
+				fn (MapFeatureAnalysisData $data) =>
+					$data->places()->each(
+						fn(GeoAnalysisPlace $place) => $result->exclude($place)
+					)
+			);
+
+		return new MapAdapterResult($result, $features);
+	}
+
+	/**
+	 * Populate the map features with the mapped Places and total count
+	 *
+	 * @param GeoAnalysisResult $result
+	 * @return mixed[]
+	 */
+	protected function featureAnalysisData(GeoAnalysisResult $result): array
+	{
+		$features_mapping = new Collection();
+
+		$byplaces = $result->knownPlaces();
+		$byplaces->each(function (GeoAnalysisResultItem $item) use ($features_mapping, $result): void {
+			$id = $this->place_mapper->map($item->place()->place(), $this->config->mapMappingProperty());
+
+			if ($id !== null && mb_strlen($id) > 0) {
+				$features_mapping->put(
+					$id,
+					$features_mapping->get($id, new MapFeatureAnalysisData($id))->add($item->place(), $item->count())
+				);
+			} else {
+				$result->exclude($item->place());
+			}
+		});
+
+		return [ $features_mapping, $result];
+	}
+
+	/**
+	 * Get the value of the feature property used for the mapping
+	 *
+	 * @param Feature $feature
+	 * @return string|NULL
+	 */
+	protected function featureId(Feature $feature): ?string
+	{
+		return $feature->getProperty($this->config->mapMappingProperty());
+	}
 }

app/Module/Certificates/Hooks/SourceCertificateIconHook.php

Indentation +49 added lines, -49 removed lines

@@ -27,57 +27,57 @@
  */
 class SourceCertificateIconHook implements FactSourceTextExtenderInterface
 {
-    private CertificatesModule $module;
-    private UrlObfuscatorService $url_obfuscator_service;
+	private CertificatesModule $module;
+	private UrlObfuscatorService $url_obfuscator_service;
 
-    /**
-     * Constructor for SourceCertificateIconHook
-     *
-     * @param CertificatesModule $module
-     * @param UrlObfuscatorService $url_obfuscator_service
-     */
-    public function __construct(CertificatesModule $module, UrlObfuscatorService $url_obfuscator_service)
-    {
-        $this->module = $module;
-        $this->url_obfuscator_service = $url_obfuscator_service;
-    }
+	/**
+	 * Constructor for SourceCertificateIconHook
+	 *
+	 * @param CertificatesModule $module
+	 * @param UrlObfuscatorService $url_obfuscator_service
+	 */
+	public function __construct(CertificatesModule $module, UrlObfuscatorService $url_obfuscator_service)
+	{
+		$this->module = $module;
+		$this->url_obfuscator_service = $url_obfuscator_service;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\Hooks\HookInterface::module()
-     */
-    public function module(): ModuleInterface
-    {
-        return $this->module;
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\Hooks\HookInterface::module()
+	 */
+	public function module(): ModuleInterface
+	{
+		return $this->module;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\Hooks\FactSourceTextExtenderInterface::factSourcePrepend()
-     */
-    public function factSourcePrepend(Tree $tree, string $source_record, int $level): string
-    {
-        $permission_level = $tree->getPreference('MAJ_CERTIF_SHOW_CERT');
-        if (
-            is_numeric($permission_level) && Auth::accessLevel($tree) <= (int) $permission_level &&
-            preg_match('/^' . $level . ' _ACT (.*)$/m', $source_record, $match) === 1
-        ) {
-            return view($this->module->name() . '::components/certificate-icon', [
-                'module_name'               =>  $this->module->name(),
-                'certificate'               =>  new Certificate($tree, $match[1]),
-                'url_obfuscator_service'    =>  $this->url_obfuscator_service,
-                'js_script_url'             =>  $this->module->assetUrl('js/certificates.min.js')
-            ]);
-        }
-        return '';
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\Hooks\FactSourceTextExtenderInterface::factSourcePrepend()
+	 */
+	public function factSourcePrepend(Tree $tree, string $source_record, int $level): string
+	{
+		$permission_level = $tree->getPreference('MAJ_CERTIF_SHOW_CERT');
+		if (
+			is_numeric($permission_level) && Auth::accessLevel($tree) <= (int) $permission_level &&
+			preg_match('/^' . $level . ' _ACT (.*)$/m', $source_record, $match) === 1
+		) {
+			return view($this->module->name() . '::components/certificate-icon', [
+				'module_name'               =>  $this->module->name(),
+				'certificate'               =>  new Certificate($tree, $match[1]),
+				'url_obfuscator_service'    =>  $this->url_obfuscator_service,
+				'js_script_url'             =>  $this->module->assetUrl('js/certificates.min.js')
+			]);
+		}
+		return '';
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\Hooks\FactSourceTextExtenderInterface::factSourceAppend()
-     */
-    public function factSourceAppend(Tree $tree, string $source_record, int $level): string
-    {
-        return '';
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\Hooks\FactSourceTextExtenderInterface::factSourceAppend()
+	 */
+	public function factSourceAppend(Tree $tree, string $source_record, int $level): string
+	{
+		return '';
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -59,10 +59,10 @@
     {
         $permission_level = $tree->getPreference('MAJ_CERTIF_SHOW_CERT');
         if (
-            is_numeric($permission_level) && Auth::accessLevel($tree) <= (int) $permission_level &&
-            preg_match('/^' . $level . ' _ACT (.*)$/m', $source_record, $match) === 1
+            is_numeric($permission_level) && Auth::accessLevel($tree) <= (int)$permission_level &&
+            preg_match('/^'.$level.' _ACT (.*)$/m', $source_record, $match) === 1
         ) {
-            return view($this->module->name() . '::components/certificate-icon', [
+            return view($this->module->name().'::components/certificate-icon', [
                 'module_name'               =>  $this->module->name(),
                 'certificate'               =>  new Certificate($tree, $match[1]),
                 'url_obfuscator_service'    =>  $this->url_obfuscator_service,

app/Module/Certificates/CertificatesModule.php

Spacing +7 added lines, -7 removed lines

@@ -102,11 +102,11 @@ 
      */
     public function loadRoutes($router): void
     {
-        $router->attach('', '', static function (Map $router): void {
+        $router->attach('', '', static function(Map $router): void {
 
-            $router->attach('', '/module-maj/certificates', static function (Map $router): void {
+            $router->attach('', '/module-maj/certificates', static function(Map $router): void {
 
-                $router->attach('', '/admin', static function (Map $router): void {
+                $router->attach('', '/admin', static function(Map $router): void {
 
                     $router->get(AdminConfigPage::class, '/config{/tree}', AdminConfigPage::class);
                     $router->post(AdminConfigAction::class, '/config/{tree}', AdminConfigAction::class)
@@ -129,7 +129,7 @@ 
                         'permission_preference' =>  'MAJ_CERTIF_SHOW_CERT'
                     ]);
 
-                $router->attach('', '/certificate/{tree}/{cid}', static function (Map $router): void {
+                $router->attach('', '/certificate/{tree}/{cid}', static function(Map $router): void {
 
                     $router->extras([
                         'middleware'            =>  [AuthTreePreference::class],
@@ -167,7 +167,7 @@ 
      */
     public function headContent(): string
     {
-        return '<link rel="stylesheet" href="' . e($this->moduleCssUrl()) . '">';
+        return '<link rel="stylesheet" href="'.e($this->moduleCssUrl()).'">';
     }
 
     /**
@@ -176,7 +176,7 @@ 
      */
     public function listUrl(Tree $tree, array $parameters = []): string
     {
-        return route(CertificatesList::class, ['tree' => $tree->name() ] + $parameters);
+        return route(CertificatesList::class, ['tree' => $tree->name()] + $parameters);
     }
 
     /**
@@ -194,7 +194,7 @@ 
      */
     public function listIsEmpty(Tree $tree): bool
     {
-        return Auth::accessLevel($tree) > (int) $tree->getPreference('MAJ_CERTIF_SHOW_CERT', (string) Auth::PRIV_HIDE);
+        return Auth::accessLevel($tree) > (int)$tree->getPreference('MAJ_CERTIF_SHOW_CERT', (string)Auth::PRIV_HIDE);
     }
 
     /**

Indentation +192 added lines, -192 removed lines

@@ -46,197 +46,197 @@
  * Certificates Module.
  */
 class CertificatesModule extends AbstractModule implements
-    ModuleMyArtJaubInterface,
-    ModuleConfigInterface,
-    ModuleCustomTagsInterface,
-    ModuleGlobalInterface,
-    ModuleListInterface,
-    ModuleHookSubscriberInterface
+	ModuleMyArtJaubInterface,
+	ModuleConfigInterface,
+	ModuleCustomTagsInterface,
+	ModuleGlobalInterface,
+	ModuleListInterface,
+	ModuleHookSubscriberInterface
 {
-    use ModuleMyArtJaubTrait {
-        ModuleMyArtJaubTrait::boot as traitMajBoot;
-    }
-    use ModuleCustomTagsTrait {
-        ModuleCustomTagsTrait::boot as traitCustomTagsBoot;
-    }
-    use ModuleConfigTrait;
-    use ModuleGlobalTrait;
-    use ModuleListTrait;
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\AbstractModule::title()
-     */
-    public function title(): string
-    {
-        return /* I18N: Name of the “Certificates” module */ I18N::translate('Certificates');
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\AbstractModule::description()
-     */
-    public function description(): string
-    {
-        //phpcs:ignore Generic.Files.LineLength.TooLong
-        return /* I18N: Description of the “Certificates” module */ I18N::translate('Display and edition of certificates linked to sources.');
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\AbstractModule::boot()
-     */
-    public function boot(): void
-    {
-        $this->traitMajBoot();
-        $this->traitCustomTagsBoot();
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\ModuleMyArtJaubInterface::loadRoutes()
-     */
-    public function loadRoutes($router): void
-    {
-        $router->attach('', '', static function (Map $router): void {
-
-            $router->attach('', '/module-maj/certificates', static function (Map $router): void {
-
-                $router->attach('', '/admin', static function (Map $router): void {
-
-                    $router->get(AdminConfigPage::class, '/config{/tree}', AdminConfigPage::class);
-                    $router->post(AdminConfigAction::class, '/config/{tree}', AdminConfigAction::class)
-                        ->extras([
-                            'middleware' => [
-                                AuthManager::class,
-                            ],
-                        ]);
-                });
-
-                $router->get(AutoCompleteFile::class, '/autocomplete/file/{tree}/{query}', AutoCompleteFile::class)
-                    ->extras([
-                        'middleware'            =>  [AuthTreePreference::class],
-                        'permission_preference' =>  'MAJ_CERTIF_SHOW_CERT'
-                    ]);
-
-                $router->get(CertificatesList::class, '/list/{tree}{/cityobf}', CertificatesList::class)
-                    ->extras([
-                        'middleware'            =>  [AuthTreePreference::class],
-                        'permission_preference' =>  'MAJ_CERTIF_SHOW_CERT'
-                    ]);
-
-                $router->attach('', '/certificate/{tree}/{cid}', static function (Map $router): void {
-
-                    $router->extras([
-                        'middleware'            =>  [AuthTreePreference::class],
-                        'permission_preference' =>  'MAJ_CERTIF_SHOW_CERT'
-                    ]);
-
-                    $router->get(CertificatePage::class, '', CertificatePage::class);
-                    $router->get(CertificateImage::class, '/image', CertificateImage::class);
-                });
-            });
-        });
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleCustomInterface::customModuleVersion()
-     */
-    public function customModuleVersion(): string
-    {
-        return '2.1.0-v.1';
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleConfigInterface::getConfigLink()
-     */
-    public function getConfigLink(): string
-    {
-        return route(AdminConfigPage::class);
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleCustomTagsInterface::customSubTags()
-     */
-    public function customSubTags(): array
-    {
-        return [
-            'FAM:SOUR'      =>  [['_ACT', '0:1']],
-            'FAM:*:SOUR'    =>  [['_ACT', '0:1']],
-            'INDI:SOUR'     =>  [['_ACT', '0:1']],
-            'INDI:*:SOUR'   =>  [['_ACT', '0:1']],
-            'OBJE:SOUR'     =>  [['_ACT', '0:1']],
-            'OBJE:*:SOUR'   =>  [['_ACT', '0:1']],
-            'NOTE:SOUR'     =>  [['_ACT', '0:1']],
-            'NOTE:*:SOUR'   =>  [['_ACT', '0:1']]
-        ];
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleCustomTagsInterface::customTags()
-     */
-    public function customTags(): array
-    {
-        return [
-            'FAM:SOUR:_ACT'     =>  new SourceCertificate(I18N::translate('Certificate'), $this),
-            'FAM:*:SOUR:_ACT'   =>  new SourceCertificate(I18N::translate('Certificate'), $this),
-            'INDI:SOUR:_ACT'    =>  new SourceCertificate(I18N::translate('Certificate'), $this),
-            'INDI:*:SOUR:_ACT'  =>  new SourceCertificate(I18N::translate('Certificate'), $this),
-            'OBJE:SOUR:_ACT'    =>  new SourceCertificate(I18N::translate('Certificate'), $this),
-            'OBJE:*:SOUR:_ACT'  =>  new SourceCertificate(I18N::translate('Certificate'), $this),
-            'NOTE:SOUR:_ACT'    =>  new SourceCertificate(I18N::translate('Certificate'), $this),
-            'NOTE:*:SOUR:_ACT'  =>  new SourceCertificate(I18N::translate('Certificate'), $this)
-        ];
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleGlobalInterface::headContent()
-     */
-    public function headContent(): string
-    {
-        return '<link rel="stylesheet" href="' . e($this->moduleCssUrl()) . '">';
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleListInterface::listUrl()
-     */
-    public function listUrl(Tree $tree, array $parameters = []): string
-    {
-        return route(CertificatesList::class, ['tree' => $tree->name() ] + $parameters);
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleListInterface::listMenuClass()
-     */
-    public function listMenuClass(): string
-    {
-        return 'menu-maj-certificates';
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleListInterface::listIsEmpty()
-     */
-    public function listIsEmpty(Tree $tree): bool
-    {
-        return Auth::accessLevel($tree) > (int) $tree->getPreference('MAJ_CERTIF_SHOW_CERT', (string) Auth::PRIV_HIDE);
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\Hooks\ModuleHookSubscriberInterface::listSubscribedHooks()
-     */
-    public function listSubscribedHooks(): array
-    {
-        return [
-            app()->makeWith(SourceCertificateIconHook::class, ['module' => $this])
-        ];
-    }
+	use ModuleMyArtJaubTrait {
+		ModuleMyArtJaubTrait::boot as traitMajBoot;
+	}
+	use ModuleCustomTagsTrait {
+		ModuleCustomTagsTrait::boot as traitCustomTagsBoot;
+	}
+	use ModuleConfigTrait;
+	use ModuleGlobalTrait;
+	use ModuleListTrait;
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\AbstractModule::title()
+	 */
+	public function title(): string
+	{
+		return /* I18N: Name of the “Certificates” module */ I18N::translate('Certificates');
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\AbstractModule::description()
+	 */
+	public function description(): string
+	{
+		//phpcs:ignore Generic.Files.LineLength.TooLong
+		return /* I18N: Description of the “Certificates” module */ I18N::translate('Display and edition of certificates linked to sources.');
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\AbstractModule::boot()
+	 */
+	public function boot(): void
+	{
+		$this->traitMajBoot();
+		$this->traitCustomTagsBoot();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Module\ModuleMyArtJaubInterface::loadRoutes()
+	 */
+	public function loadRoutes($router): void
+	{
+		$router->attach('', '', static function (Map $router): void {
+
+			$router->attach('', '/module-maj/certificates', static function (Map $router): void {
+
+				$router->attach('', '/admin', static function (Map $router): void {
+
+					$router->get(AdminConfigPage::class, '/config{/tree}', AdminConfigPage::class);
+					$router->post(AdminConfigAction::class, '/config/{tree}', AdminConfigAction::class)
+						->extras([
+							'middleware' => [
+								AuthManager::class,
+							],
+						]);
+				});
+
+				$router->get(AutoCompleteFile::class, '/autocomplete/file/{tree}/{query}', AutoCompleteFile::class)
+					->extras([
+						'middleware'            =>  [AuthTreePreference::class],
+						'permission_preference' =>  'MAJ_CERTIF_SHOW_CERT'
+					]);
+
+				$router->get(CertificatesList::class, '/list/{tree}{/cityobf}', CertificatesList::class)
+					->extras([
+						'middleware'            =>  [AuthTreePreference::class],
+						'permission_preference' =>  'MAJ_CERTIF_SHOW_CERT'
+					]);
+
+				$router->attach('', '/certificate/{tree}/{cid}', static function (Map $router): void {
+
+					$router->extras([
+						'middleware'            =>  [AuthTreePreference::class],
+						'permission_preference' =>  'MAJ_CERTIF_SHOW_CERT'
+					]);
+
+					$router->get(CertificatePage::class, '', CertificatePage::class);
+					$router->get(CertificateImage::class, '/image', CertificateImage::class);
+				});
+			});
+		});
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleCustomInterface::customModuleVersion()
+	 */
+	public function customModuleVersion(): string
+	{
+		return '2.1.0-v.1';
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleConfigInterface::getConfigLink()
+	 */
+	public function getConfigLink(): string
+	{
+		return route(AdminConfigPage::class);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleCustomTagsInterface::customSubTags()
+	 */
+	public function customSubTags(): array
+	{
+		return [
+			'FAM:SOUR'      =>  [['_ACT', '0:1']],
+			'FAM:*:SOUR'    =>  [['_ACT', '0:1']],
+			'INDI:SOUR'     =>  [['_ACT', '0:1']],
+			'INDI:*:SOUR'   =>  [['_ACT', '0:1']],
+			'OBJE:SOUR'     =>  [['_ACT', '0:1']],
+			'OBJE:*:SOUR'   =>  [['_ACT', '0:1']],
+			'NOTE:SOUR'     =>  [['_ACT', '0:1']],
+			'NOTE:*:SOUR'   =>  [['_ACT', '0:1']]
+		];
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleCustomTagsInterface::customTags()
+	 */
+	public function customTags(): array
+	{
+		return [
+			'FAM:SOUR:_ACT'     =>  new SourceCertificate(I18N::translate('Certificate'), $this),
+			'FAM:*:SOUR:_ACT'   =>  new SourceCertificate(I18N::translate('Certificate'), $this),
+			'INDI:SOUR:_ACT'    =>  new SourceCertificate(I18N::translate('Certificate'), $this),
+			'INDI:*:SOUR:_ACT'  =>  new SourceCertificate(I18N::translate('Certificate'), $this),
+			'OBJE:SOUR:_ACT'    =>  new SourceCertificate(I18N::translate('Certificate'), $this),
+			'OBJE:*:SOUR:_ACT'  =>  new SourceCertificate(I18N::translate('Certificate'), $this),
+			'NOTE:SOUR:_ACT'    =>  new SourceCertificate(I18N::translate('Certificate'), $this),
+			'NOTE:*:SOUR:_ACT'  =>  new SourceCertificate(I18N::translate('Certificate'), $this)
+		];
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleGlobalInterface::headContent()
+	 */
+	public function headContent(): string
+	{
+		return '<link rel="stylesheet" href="' . e($this->moduleCssUrl()) . '">';
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleListInterface::listUrl()
+	 */
+	public function listUrl(Tree $tree, array $parameters = []): string
+	{
+		return route(CertificatesList::class, ['tree' => $tree->name() ] + $parameters);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleListInterface::listMenuClass()
+	 */
+	public function listMenuClass(): string
+	{
+		return 'menu-maj-certificates';
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleListInterface::listIsEmpty()
+	 */
+	public function listIsEmpty(Tree $tree): bool
+	{
+		return Auth::accessLevel($tree) > (int) $tree->getPreference('MAJ_CERTIF_SHOW_CERT', (string) Auth::PRIV_HIDE);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\Hooks\ModuleHookSubscriberInterface::listSubscribedHooks()
+	 */
+	public function listSubscribedHooks(): array
+	{
+		return [
+			app()->makeWith(SourceCertificateIconHook::class, ['module' => $this])
+		];
+	}
 }

app/Module/Certificates/Http/RequestHandlers/AdminConfigAction.php

Indentation +67 added lines, -67 removed lines

@@ -29,71 +29,71 @@
  */
 class AdminConfigAction implements RequestHandlerInterface
 {
-    /**
-     * @var CertificatesModule|null $module
-     */
-    private $module;
-
-    /**
-     * Constructor for Admin Config Action request handler
-     *
-     * @param ModuleService $module_service
-     */
-    public function __construct(ModuleService $module_service)
-    {
-        $this->module = $module_service->findByInterface(CertificatesModule::class)->first();
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        $tree = $request->getAttribute('tree');
-        assert($tree instanceof Tree);
-
-        $admin_config_route = route(AdminConfigPage::class, ['tree' => $tree->name()]);
-
-        if ($this->module === null) {
-            FlashMessages::addMessage(
-                I18N::translate('The attached module could not be found.'),
-                'danger'
-            );
-            return redirect($admin_config_route);
-        }
-
-        $params = (array) $request->getParsedBody();
-
-        $tree->setPreference('MAJ_CERTIF_SHOW_CERT', $params['MAJ_CERTIF_SHOW_CERT'] ?? (string) Auth::PRIV_HIDE);
-        $tree->setPreference(
-            'MAJ_CERTIF_SHOW_NO_WATERMARK',
-            $params['MAJ_CERTIF_SHOW_NO_WATERMARK'] ?? (string) Auth::PRIV_HIDE
-        );
-        $tree->setPreference('MAJ_CERTIF_WM_DEFAULT', $params['MAJ_CERTIF_WM_DEFAULT'] ?? '');
-
-        $watermark_font_size = $params['MAJ_CERTIF_WM_FONT_MAXSIZE'] ?? '';
-        if (is_numeric($watermark_font_size) && $watermark_font_size > 0) {
-            $tree->setPreference('MAJ_CERTIF_WM_FONT_MAXSIZE', $params['MAJ_CERTIF_WM_FONT_MAXSIZE']);
-        }
-
-        // Only accept valid color for MAJ_WM_FONT_COLOR
-        $watermark_color = $params['MAJ_CERTIF_WM_FONT_COLOR'] ?? '';
-        if (preg_match('/#([a-fA-F0-9]{3}){1,2}/', $watermark_color) === 1) {
-            $tree->setPreference('MAJ_CERTIF_WM_FONT_COLOR', $watermark_color);
-        }
-
-        // Only accept valid folders for MAJ_CERT_ROOTDIR
-        $cert_root_dir = $params['MAJ_CERTIF_ROOTDIR'] ?? '';
-        $cert_root_dir = preg_replace('/[:\/\\\\]+/', '/', $cert_root_dir);
-        $cert_root_dir = trim($cert_root_dir, '/') . '/';
-        $tree->setPreference('MAJ_CERTIF_ROOTDIR', $cert_root_dir);
-
-        FlashMessages::addMessage(
-            I18N::translate('The preferences for the module “%s” have been updated.', $this->module->title()),
-            'success'
-        );
-
-        return redirect($admin_config_route);
-    }
+	/**
+	 * @var CertificatesModule|null $module
+	 */
+	private $module;
+
+	/**
+	 * Constructor for Admin Config Action request handler
+	 *
+	 * @param ModuleService $module_service
+	 */
+	public function __construct(ModuleService $module_service)
+	{
+		$this->module = $module_service->findByInterface(CertificatesModule::class)->first();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		$tree = $request->getAttribute('tree');
+		assert($tree instanceof Tree);
+
+		$admin_config_route = route(AdminConfigPage::class, ['tree' => $tree->name()]);
+
+		if ($this->module === null) {
+			FlashMessages::addMessage(
+				I18N::translate('The attached module could not be found.'),
+				'danger'
+			);
+			return redirect($admin_config_route);
+		}
+
+		$params = (array) $request->getParsedBody();
+
+		$tree->setPreference('MAJ_CERTIF_SHOW_CERT', $params['MAJ_CERTIF_SHOW_CERT'] ?? (string) Auth::PRIV_HIDE);
+		$tree->setPreference(
+			'MAJ_CERTIF_SHOW_NO_WATERMARK',
+			$params['MAJ_CERTIF_SHOW_NO_WATERMARK'] ?? (string) Auth::PRIV_HIDE
+		);
+		$tree->setPreference('MAJ_CERTIF_WM_DEFAULT', $params['MAJ_CERTIF_WM_DEFAULT'] ?? '');
+
+		$watermark_font_size = $params['MAJ_CERTIF_WM_FONT_MAXSIZE'] ?? '';
+		if (is_numeric($watermark_font_size) && $watermark_font_size > 0) {
+			$tree->setPreference('MAJ_CERTIF_WM_FONT_MAXSIZE', $params['MAJ_CERTIF_WM_FONT_MAXSIZE']);
+		}
+
+		// Only accept valid color for MAJ_WM_FONT_COLOR
+		$watermark_color = $params['MAJ_CERTIF_WM_FONT_COLOR'] ?? '';
+		if (preg_match('/#([a-fA-F0-9]{3}){1,2}/', $watermark_color) === 1) {
+			$tree->setPreference('MAJ_CERTIF_WM_FONT_COLOR', $watermark_color);
+		}
+
+		// Only accept valid folders for MAJ_CERT_ROOTDIR
+		$cert_root_dir = $params['MAJ_CERTIF_ROOTDIR'] ?? '';
+		$cert_root_dir = preg_replace('/[:\/\\\\]+/', '/', $cert_root_dir);
+		$cert_root_dir = trim($cert_root_dir, '/') . '/';
+		$tree->setPreference('MAJ_CERTIF_ROOTDIR', $cert_root_dir);
+
+		FlashMessages::addMessage(
+			I18N::translate('The preferences for the module “%s” have been updated.', $this->module->title()),
+			'success'
+		);
+
+		return redirect($admin_config_route);
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -63,12 +63,12 @@ 
             return redirect($admin_config_route);
         }
 
-        $params = (array) $request->getParsedBody();
+        $params = (array)$request->getParsedBody();
 
-        $tree->setPreference('MAJ_CERTIF_SHOW_CERT', $params['MAJ_CERTIF_SHOW_CERT'] ?? (string) Auth::PRIV_HIDE);
+        $tree->setPreference('MAJ_CERTIF_SHOW_CERT', $params['MAJ_CERTIF_SHOW_CERT'] ?? (string)Auth::PRIV_HIDE);
         $tree->setPreference(
             'MAJ_CERTIF_SHOW_NO_WATERMARK',
-            $params['MAJ_CERTIF_SHOW_NO_WATERMARK'] ?? (string) Auth::PRIV_HIDE
+            $params['MAJ_CERTIF_SHOW_NO_WATERMARK'] ?? (string)Auth::PRIV_HIDE
         );
         $tree->setPreference('MAJ_CERTIF_WM_DEFAULT', $params['MAJ_CERTIF_WM_DEFAULT'] ?? '');
 
@@ -86,7 +86,7 @@ 
         // Only accept valid folders for MAJ_CERT_ROOTDIR
         $cert_root_dir = $params['MAJ_CERTIF_ROOTDIR'] ?? '';
         $cert_root_dir = preg_replace('/[:\/\\\\]+/', '/', $cert_root_dir);
-        $cert_root_dir = trim($cert_root_dir, '/') . '/';
+        $cert_root_dir = trim($cert_root_dir, '/').'/';
         $tree->setPreference('MAJ_CERTIF_ROOTDIR', $cert_root_dir);
 
         FlashMessages::addMessage(

app/Module/Certificates/Http/RequestHandlers/CertificateImage.php

Spacing +2 added lines, -2 removed lines

@@ -104,7 +104,7 @@ 
 
         if ($certificate === null) {
             return $this->certif_image_factory
-            ->replacementImageResponse((string) StatusCodeInterface::STATUS_NOT_FOUND)
+            ->replacementImageResponse((string)StatusCodeInterface::STATUS_NOT_FOUND)
             ->withHeader('X-Image-Exception', I18N::translate('The certificate was not found in this family tree.'))
             ;
         }
@@ -132,7 +132,7 @@ 
         $size = $certificate->tree()->getPreference('MAJ_CERTIF_WM_FONT_MAXSIZE');
         $text = $this->watermarkText($request, $certificate);
 
-        return new Watermark($text, $color, is_numeric($size) ? (int) $size : Watermark::DEFAULT_SIZE);
+        return new Watermark($text, $color, is_numeric($size) ? (int)$size : Watermark::DEFAULT_SIZE);
     }
 
     /**

Indentation +124 added lines, -124 removed lines

@@ -37,128 +37,128 @@
  */
 class CertificateImage implements RequestHandlerInterface
 {
-    /**
-     * @var CertificatesModule|null $module
-     */
-    private $module;
-
-    /**
-     * @var CertificateFilesystemService $certif_filesystem
-     */
-    private $certif_filesystem;
-
-    /**
-     * @var CertificateImageFactory $certif_image_factory
-     */
-    private $certif_image_factory;
-
-    /**
-     * @var CertificateDataService $certif_data_service
-     */
-    private $certif_data_service;
-
-    /**
-     * @var UrlObfuscatorService $url_obfuscator_service
-     */
-    private $url_obfuscator_service;
-
-    /**
-     * Constructor for Certificate Image Request Handler
-     *
-     * @param ModuleService $module_service
-     */
-    public function __construct(
-        ModuleService $module_service,
-        CertificateFilesystemService $certif_filesystem,
-        CertificateDataService $certif_data_service,
-        UrlObfuscatorService $url_obfuscator_service
-    ) {
-        $this->module = $module_service->findByInterface(CertificatesModule::class)->first();
-        $this->certif_filesystem = $certif_filesystem;
-        $this->certif_image_factory = new CertificateImageFactory($this->certif_filesystem);
-        $this->certif_data_service = $certif_data_service;
-        $this->url_obfuscator_service = $url_obfuscator_service;
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        if ($this->module === null) {
-            throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
-        }
-
-        $tree = $request->getAttribute('tree');
-        assert($tree instanceof Tree);
-
-        $user = $request->getAttribute('user');
-        assert($user instanceof UserInterface);
-
-        $certif_path = $request->getAttribute('cid');
-        $certificate = null;
-        if ($certif_path !== '' && $this->url_obfuscator_service->tryDeobfuscate($certif_path)) {
-            $certificate = $this->certif_filesystem->certificate($tree, $certif_path);
-        }
-
-        if ($certificate === null) {
-            return $this->certif_image_factory
-            ->replacementImageResponse((string) StatusCodeInterface::STATUS_NOT_FOUND)
-            ->withHeader('X-Image-Exception', I18N::translate('The certificate was not found in this family tree.'))
-            ;
-        }
-
-        $use_watermark = $this->certif_image_factory->certificateNeedsWatermark($certificate, $user);
-        $watermark = $use_watermark ? $this->watermark($request, $certificate) : null;
-
-        return $this->certif_image_factory->certificateFileResponse(
-            $certificate,
-            $use_watermark,
-            $watermark
-        );
-    }
-
-    /**
-     * Get watermark data for a certificate.
-     *
-     * @param ServerRequestInterface $request
-     * @param Certificate $certificate
-     * @return Watermark
-     */
-    private function watermark(ServerRequestInterface $request, Certificate $certificate): Watermark
-    {
-        $color = $certificate->tree()->getPreference('MAJ_CERTIF_WM_FONT_COLOR', Watermark::DEFAULT_COLOR);
-        $size = $certificate->tree()->getPreference('MAJ_CERTIF_WM_FONT_MAXSIZE');
-        $text = $this->watermarkText($request, $certificate);
-
-        return new Watermark($text, $color, is_numeric($size) ? (int) $size : Watermark::DEFAULT_SIZE);
-    }
-
-    /**
-     * Get the text to be watermarked for a certificate.
-     *
-     * @param ServerRequestInterface $request
-     * @param Certificate $certificate
-     * @return string
-     */
-    private function watermarkText(ServerRequestInterface $request, Certificate $certificate): string
-    {
-        $sid = $request->getQueryParams()['sid'] ?? '';
-        if ($sid !== '') {
-            $source = Registry::sourceFactory()->make($sid, $certificate->tree());
-        } else {
-            $source = $this->certif_data_service->oneLinkedSource($certificate);
-        }
-
-        if ($source !== null && $source->canShowName()) {
-            $repo = $source->facts(['REPO'])->first();
-            if ($repo !== null && ($repo = $repo->target()) !== null && $repo->canShowName()) {
-                return I18N::translate('© %s - %s', strip_tags($repo->fullName()), strip_tags($source->fullName()));
-            }
-            return strip_tags($source->fullName());
-        }
-        $default_text = $certificate->tree()->getPreference('MAJ_CERTIF_WM_DEFAULT');
-        return $default_text !== '' ? $default_text : I18N::translate('This image is protected under copyright law.');
-    }
+	/**
+	 * @var CertificatesModule|null $module
+	 */
+	private $module;
+
+	/**
+	 * @var CertificateFilesystemService $certif_filesystem
+	 */
+	private $certif_filesystem;
+
+	/**
+	 * @var CertificateImageFactory $certif_image_factory
+	 */
+	private $certif_image_factory;
+
+	/**
+	 * @var CertificateDataService $certif_data_service
+	 */
+	private $certif_data_service;
+
+	/**
+	 * @var UrlObfuscatorService $url_obfuscator_service
+	 */
+	private $url_obfuscator_service;
+
+	/**
+	 * Constructor for Certificate Image Request Handler
+	 *
+	 * @param ModuleService $module_service
+	 */
+	public function __construct(
+		ModuleService $module_service,
+		CertificateFilesystemService $certif_filesystem,
+		CertificateDataService $certif_data_service,
+		UrlObfuscatorService $url_obfuscator_service
+	) {
+		$this->module = $module_service->findByInterface(CertificatesModule::class)->first();
+		$this->certif_filesystem = $certif_filesystem;
+		$this->certif_image_factory = new CertificateImageFactory($this->certif_filesystem);
+		$this->certif_data_service = $certif_data_service;
+		$this->url_obfuscator_service = $url_obfuscator_service;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		if ($this->module === null) {
+			throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
+		}
+
+		$tree = $request->getAttribute('tree');
+		assert($tree instanceof Tree);
+
+		$user = $request->getAttribute('user');
+		assert($user instanceof UserInterface);
+
+		$certif_path = $request->getAttribute('cid');
+		$certificate = null;
+		if ($certif_path !== '' && $this->url_obfuscator_service->tryDeobfuscate($certif_path)) {
+			$certificate = $this->certif_filesystem->certificate($tree, $certif_path);
+		}
+
+		if ($certificate === null) {
+			return $this->certif_image_factory
+			->replacementImageResponse((string) StatusCodeInterface::STATUS_NOT_FOUND)
+			->withHeader('X-Image-Exception', I18N::translate('The certificate was not found in this family tree.'))
+			;
+		}
+
+		$use_watermark = $this->certif_image_factory->certificateNeedsWatermark($certificate, $user);
+		$watermark = $use_watermark ? $this->watermark($request, $certificate) : null;
+
+		return $this->certif_image_factory->certificateFileResponse(
+			$certificate,
+			$use_watermark,
+			$watermark
+		);
+	}
+
+	/**
+	 * Get watermark data for a certificate.
+	 *
+	 * @param ServerRequestInterface $request
+	 * @param Certificate $certificate
+	 * @return Watermark
+	 */
+	private function watermark(ServerRequestInterface $request, Certificate $certificate): Watermark
+	{
+		$color = $certificate->tree()->getPreference('MAJ_CERTIF_WM_FONT_COLOR', Watermark::DEFAULT_COLOR);
+		$size = $certificate->tree()->getPreference('MAJ_CERTIF_WM_FONT_MAXSIZE');
+		$text = $this->watermarkText($request, $certificate);
+
+		return new Watermark($text, $color, is_numeric($size) ? (int) $size : Watermark::DEFAULT_SIZE);
+	}
+
+	/**
+	 * Get the text to be watermarked for a certificate.
+	 *
+	 * @param ServerRequestInterface $request
+	 * @param Certificate $certificate
+	 * @return string
+	 */
+	private function watermarkText(ServerRequestInterface $request, Certificate $certificate): string
+	{
+		$sid = $request->getQueryParams()['sid'] ?? '';
+		if ($sid !== '') {
+			$source = Registry::sourceFactory()->make($sid, $certificate->tree());
+		} else {
+			$source = $this->certif_data_service->oneLinkedSource($certificate);
+		}
+
+		if ($source !== null && $source->canShowName()) {
+			$repo = $source->facts(['REPO'])->first();
+			if ($repo !== null && ($repo = $repo->target()) !== null && $repo->canShowName()) {
+				return I18N::translate('© %s - %s', strip_tags($repo->fullName()), strip_tags($source->fullName()));
+			}
+			return strip_tags($source->fullName());
+		}
+		$default_text = $certificate->tree()->getPreference('MAJ_CERTIF_WM_DEFAULT');
+		return $default_text !== '' ? $default_text : I18N::translate('This image is protected under copyright law.');
+	}
 }

app/Module/Certificates/Http/RequestHandlers/CertificatesList.php

Indentation +69 added lines, -69 removed lines

@@ -31,73 +31,73 @@
  */
 class CertificatesList implements RequestHandlerInterface
 {
-    use ViewResponseTrait;
-
-    /**
-     * @var CertificatesModule|null $module
-     */
-    private $module;
-
-    /**
-     * @var CertificateFilesystemService $certif_filesystem
-     */
-    private $certif_filesystem;
-
-    /**
-     * @var UrlObfuscatorService $url_obfuscator_service
-     */
-    private $url_obfuscator_service;
-
-
-    /**
-     * Constructor for CertificatesList Request Handler
-     *
-     * @param ModuleService $module_service
-     */
-    public function __construct(
-        ModuleService $module_service,
-        CertificateFilesystemService $certif_filesystem,
-        UrlObfuscatorService $url_obfuscator_service
-    ) {
-        $this->module = $module_service->findByInterface(CertificatesModule::class)->first();
-        $this->certif_filesystem = $certif_filesystem;
-        $this->url_obfuscator_service = $url_obfuscator_service;
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        if ($this->module === null) {
-            throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
-        }
-
-        $tree = $request->getAttribute('tree');
-        assert($tree instanceof Tree);
-
-        $title = I18N::translate('Certificates');
-
-        $cities = array_map(function (string $item): array {
-            return [$this->url_obfuscator_service->obfuscate($item), $item];
-        }, $this->certif_filesystem->cities($tree));
-
-        $city = $request->getQueryParams()['cityobf'] ?? $request->getAttribute('cityobf') ?? '';
-
-        if ($city !== '' && $this->url_obfuscator_service->tryDeobfuscate($city)) {
-            $title = I18N::translate('Certificates for %s', $city);
-            $certificates = $this->certif_filesystem->certificatesForCity($tree, $city);
-        }
-
-        return $this->viewResponse($this->module->name() . '::certificates-list', [
-            'title'                     =>  $title,
-            'tree'                      =>  $tree,
-            'module_name'               =>  $this->module->name(),
-            'cities'                    =>  $cities,
-            'selected_city'             =>  $city,
-            'certificates_list'         =>  $certificates ?? collect(),
-            'url_obfuscator_service'    =>  $this->url_obfuscator_service
-        ]);
-    }
+	use ViewResponseTrait;
+
+	/**
+	 * @var CertificatesModule|null $module
+	 */
+	private $module;
+
+	/**
+	 * @var CertificateFilesystemService $certif_filesystem
+	 */
+	private $certif_filesystem;
+
+	/**
+	 * @var UrlObfuscatorService $url_obfuscator_service
+	 */
+	private $url_obfuscator_service;
+
+
+	/**
+	 * Constructor for CertificatesList Request Handler
+	 *
+	 * @param ModuleService $module_service
+	 */
+	public function __construct(
+		ModuleService $module_service,
+		CertificateFilesystemService $certif_filesystem,
+		UrlObfuscatorService $url_obfuscator_service
+	) {
+		$this->module = $module_service->findByInterface(CertificatesModule::class)->first();
+		$this->certif_filesystem = $certif_filesystem;
+		$this->url_obfuscator_service = $url_obfuscator_service;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		if ($this->module === null) {
+			throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
+		}
+
+		$tree = $request->getAttribute('tree');
+		assert($tree instanceof Tree);
+
+		$title = I18N::translate('Certificates');
+
+		$cities = array_map(function (string $item): array {
+			return [$this->url_obfuscator_service->obfuscate($item), $item];
+		}, $this->certif_filesystem->cities($tree));
+
+		$city = $request->getQueryParams()['cityobf'] ?? $request->getAttribute('cityobf') ?? '';
+
+		if ($city !== '' && $this->url_obfuscator_service->tryDeobfuscate($city)) {
+			$title = I18N::translate('Certificates for %s', $city);
+			$certificates = $this->certif_filesystem->certificatesForCity($tree, $city);
+		}
+
+		return $this->viewResponse($this->module->name() . '::certificates-list', [
+			'title'                     =>  $title,
+			'tree'                      =>  $tree,
+			'module_name'               =>  $this->module->name(),
+			'cities'                    =>  $cities,
+			'selected_city'             =>  $city,
+			'certificates_list'         =>  $certificates ?? collect(),
+			'url_obfuscator_service'    =>  $this->url_obfuscator_service
+		]);
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -79,7 +79,7 @@ 
 
         $title = I18N::translate('Certificates');
 
-        $cities = array_map(function (string $item): array {
+        $cities = array_map(function(string $item): array {
             return [$this->url_obfuscator_service->obfuscate($item), $item];
         }, $this->certif_filesystem->cities($tree));
 
@@ -90,7 +90,7 @@ 
             $certificates = $this->certif_filesystem->certificatesForCity($tree, $city);
         }
 
-        return $this->viewResponse($this->module->name() . '::certificates-list', [
+        return $this->viewResponse($this->module->name().'::certificates-list', [
             'title'                     =>  $title,
             'tree'                      =>  $tree,
             'module_name'               =>  $this->module->name(),