jon48 / webtrees-lib

app/Module/GeoDispersion/Http/RequestHandlers/GeoAnalysisViewEditPage.php

Indentation +52 added lines, -52 removed lines

@@ -32,64 +32,64 @@
  */
 class GeoAnalysisViewEditPage implements RequestHandlerInterface
 {
-    use ViewResponseTrait;
+	use ViewResponseTrait;
 
-    private ?GeoDispersionModule $module;
-    private GeoAnalysisViewDataService $geoview_data_service;
-    private GeoAnalysisService $geoanalysis_service;
-    private GeoAnalysisDataService $geoanalysis_data_service;
+	private ?GeoDispersionModule $module;
+	private GeoAnalysisViewDataService $geoview_data_service;
+	private GeoAnalysisService $geoanalysis_service;
+	private GeoAnalysisDataService $geoanalysis_data_service;
 
-    /**
-     * Constructor for GeoAnalysisViewEditPage Request Handler
-     *
-     * @param ModuleService $module_service
-     * @param GeoAnalysisViewDataService $geoview_data_service
-     * @param GeoAnalysisService $geoanalysis_service
-     * @param GeoAnalysisDataService $geoanalysis_data_service
-     */
-    public function __construct(
-        ModuleService $module_service,
-        GeoAnalysisViewDataService $geoview_data_service,
-        GeoAnalysisService $geoanalysis_service,
-        GeoAnalysisDataService $geoanalysis_data_service
-    ) {
-        $this->module = $module_service->findByInterface(GeoDispersionModule::class)->first();
-        $this->geoview_data_service = $geoview_data_service;
-        $this->geoanalysis_service = $geoanalysis_service;
-        $this->geoanalysis_data_service = $geoanalysis_data_service;
-    }
+	/**
+	 * Constructor for GeoAnalysisViewEditPage Request Handler
+	 *
+	 * @param ModuleService $module_service
+	 * @param GeoAnalysisViewDataService $geoview_data_service
+	 * @param GeoAnalysisService $geoanalysis_service
+	 * @param GeoAnalysisDataService $geoanalysis_data_service
+	 */
+	public function __construct(
+		ModuleService $module_service,
+		GeoAnalysisViewDataService $geoview_data_service,
+		GeoAnalysisService $geoanalysis_service,
+		GeoAnalysisDataService $geoanalysis_data_service
+	) {
+		$this->module = $module_service->findByInterface(GeoDispersionModule::class)->first();
+		$this->geoview_data_service = $geoview_data_service;
+		$this->geoanalysis_service = $geoanalysis_service;
+		$this->geoanalysis_data_service = $geoanalysis_data_service;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        $this->layout = 'layouts/administration';
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		$this->layout = 'layouts/administration';
 
-        if ($this->module === null) {
-            throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
-        }
+		if ($this->module === null) {
+			throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
+		}
 
-        $tree = Validator::attributes($request)->tree();
+		$tree = Validator::attributes($request)->tree();
 
-        $view_id = Validator::attributes($request)->integer('view_id', -1);
-        $view = $this->geoview_data_service->find($tree, $view_id, true);
+		$view_id = Validator::attributes($request)->integer('view_id', -1);
+		$view = $this->geoview_data_service->find($tree, $view_id, true);
 
-        if ($view === null) {
-            throw new HttpNotFoundException(
-                I18N::translate('The geographical dispersion analysis view could not be found.')
-            );
-        }
+		if ($view === null) {
+			throw new HttpNotFoundException(
+				I18N::translate('The geographical dispersion analysis view could not be found.')
+			);
+		}
 
-        return $this->viewResponse($this->module->name() . '::admin/view-edit', [
-            'module'        =>  $this->module,
-            'title'         =>  I18N::translate('Edit the geographical dispersion analysis view - %s', $view->type()),
-            'tree'          =>  $tree,
-            'view'          =>  $view,
-            'geoanalysis_list'  =>  $this->geoanalysis_service->all(),
-            'place_example'     =>  $this->geoanalysis_data_service->placeHierarchyExample($tree),
-            'global_settings'   =>  $view->globalSettingsContent($this->module)
-        ]);
-    }
+		return $this->viewResponse($this->module->name() . '::admin/view-edit', [
+			'module'        =>  $this->module,
+			'title'         =>  I18N::translate('Edit the geographical dispersion analysis view - %s', $view->type()),
+			'tree'          =>  $tree,
+			'view'          =>  $view,
+			'geoanalysis_list'  =>  $this->geoanalysis_service->all(),
+			'place_example'     =>  $this->geoanalysis_data_service->placeHierarchyExample($tree),
+			'global_settings'   =>  $view->globalSettingsContent($this->module)
+		]);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -82,7 +82,7 @@
             );
         }
 
-        return $this->viewResponse($this->module->name() . '::admin/view-edit', [
+        return $this->viewResponse($this->module->name().'::admin/view-edit', [
             'module'        =>  $this->module,
             'title'         =>  I18N::translate('Edit the geographical dispersion analysis view - %s', $view->type()),
             'tree'          =>  $tree,

app/Module/GeoDispersion/PlaceMappers/TopFilteredPlaceMapperTrait.php

Indentation +44 added lines, -44 removed lines

@@ -21,51 +21,51 @@
  */
 trait TopFilteredPlaceMapperTrait
 {
-    /**
-     * @var Place[] $top_places
-     */
-    private array $top_places = [];
+	/**
+	 * @var Place[] $top_places
+	 */
+	private array $top_places = [];
 
-    /**
-     * Get the list of top level places.
-     *
-     * @return Place[]
-     */
-    public function topPlaces(): array
-    {
-        return $this->top_places;
-    }
+	/**
+	 * Get the list of top level places.
+	 *
+	 * @return Place[]
+	 */
+	public function topPlaces(): array
+	{
+		return $this->top_places;
+	}
 
-    /**
-     * Set the list of defined top level places.
-     *
-     * @param Place[] $top_places
-     */
-    public function setTopPlaces(array $top_places): void
-    {
-        $this->top_places = collect($top_places)
-            ->filter(
-                /** @psalm-suppress MissingClosureParamType */
-                fn($top_places): bool => $top_places instanceof Place
-            )->toArray();
-    }
+	/**
+	 * Set the list of defined top level places.
+	 *
+	 * @param Place[] $top_places
+	 */
+	public function setTopPlaces(array $top_places): void
+	{
+		$this->top_places = collect($top_places)
+			->filter(
+				/** @psalm-suppress MissingClosureParamType */
+				fn($top_places): bool => $top_places instanceof Place
+			)->toArray();
+	}
 
-    /**
-     * Check whether a Place belongs to one of the defined top places.
-     *
-     * @param Place $place
-     * @return bool
-     */
-    protected function belongsToTopLevels(Place $place): bool
-    {
-        foreach ($this->top_places as $top_place) {
-            if (
-                $top_place->tree()->id() === $place->tree()->id() &&
-                str_ends_with($place->gedcomName(), $top_place->gedcomName())
-            ) {
-                    return true;
-            }
-        }
-        return false;
-    }
+	/**
+	 * Check whether a Place belongs to one of the defined top places.
+	 *
+	 * @param Place $place
+	 * @return bool
+	 */
+	protected function belongsToTopLevels(Place $place): bool
+	{
+		foreach ($this->top_places as $top_place) {
+			if (
+				$top_place->tree()->id() === $place->tree()->id() &&
+				str_ends_with($place->gedcomName(), $top_place->gedcomName())
+			) {
+					return true;
+			}
+		}
+		return false;
+	}
 }

app/Module/GeoDispersion/Services/MapDefinitionsService.php

Indentation +43 added lines, -43 removed lines

@@ -25,51 +25,51 @@
  */
 class MapDefinitionsService
 {
-    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;
+	}
 
-    /**
-     * Find a map definition by ID.
-     *
-     * @param string $id
-     * @return MapDefinitionInterface|NULL
-     */
-    public function find(string $id): ?MapDefinitionInterface
-    {
-        return $this->all()->get($id);
-    }
+	/**
+	 * Find a map definition by ID.
+	 *
+	 * @param string $id
+	 * @return MapDefinitionInterface|NULL
+	 */
+	public function find(string $id): ?MapDefinitionInterface
+	{
+		return $this->all()->get($id);
+	}
 
-    /**
-     * Get all map definitions available.
-     *
-     * {@internal The list is generated based on the modules exposing ModuleMapDefinitionProviderInterface,
-     * and the result is cached}
-     *
-     * @param bool $include_disabled
-     * @return Collection<string, MapDefinitionInterface>
-     */
-    public function all(bool $include_disabled = false): Collection
-    {
-        return Registry::cache()->array()->remember(
-            'maj-geodisp-maps-all',
-            function () use ($include_disabled): Collection {
-                /** @var Collection<string, MapDefinitionInterface> $map_definitions */
-                $map_definitions = $this->module_service
-                    ->findByInterface(ModuleMapDefinitionProviderInterface::class, $include_disabled)
-                    ->flatMap(fn(ModuleMapDefinitionProviderInterface $module) => $module->listMapDefinition())
-                    ->mapWithKeys(fn(MapDefinitionInterface $map) => [ $map->id() => $map ]);
+	/**
+	 * Get all map definitions available.
+	 *
+	 * {@internal The list is generated based on the modules exposing ModuleMapDefinitionProviderInterface,
+	 * and the result is cached}
+	 *
+	 * @param bool $include_disabled
+	 * @return Collection<string, MapDefinitionInterface>
+	 */
+	public function all(bool $include_disabled = false): Collection
+	{
+		return Registry::cache()->array()->remember(
+			'maj-geodisp-maps-all',
+			function () use ($include_disabled): Collection {
+				/** @var Collection<string, MapDefinitionInterface> $map_definitions */
+				$map_definitions = $this->module_service
+					->findByInterface(ModuleMapDefinitionProviderInterface::class, $include_disabled)
+					->flatMap(fn(ModuleMapDefinitionProviderInterface $module) => $module->listMapDefinition())
+					->mapWithKeys(fn(MapDefinitionInterface $map) => [ $map->id() => $map ]);
 
-                return $map_definitions;
-            }
-        );
-    }
+				return $map_definitions;
+			}
+		);
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -61,12 +61,12 @@
     {
         return Registry::cache()->array()->remember(
             'maj-geodisp-maps-all',
-            function () use ($include_disabled): Collection {
+            function() use ($include_disabled): Collection {
                 /** @var Collection<string, MapDefinitionInterface> $map_definitions */
                 $map_definitions = $this->module_service
                     ->findByInterface(ModuleMapDefinitionProviderInterface::class, $include_disabled)
                     ->flatMap(fn(ModuleMapDefinitionProviderInterface $module) => $module->listMapDefinition())
-                    ->mapWithKeys(fn(MapDefinitionInterface $map) => [ $map->id() => $map ]);
+                    ->mapWithKeys(fn(MapDefinitionInterface $map) => [$map->id() => $map]);
 
                 return $map_definitions;
             }

app/Module/GeoDispersion/Model/GeoAnalysisMapAdapter.php

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())->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())->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());
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -156,7 +156,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()
                     );
@@ -188,7 +188,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) {
@@ -201,7 +201,7 @@ 
             }
         });
 
-        return [ $features_mapping, $result];
+        return [$features_mapping, $result];
     }
 
     /**

app/Module/GeoDispersion/Model/MapFeatureAnalysisData.php

Indentation +67 added lines, -67 removed lines

@@ -22,77 +22,77 @@
  */
 class MapFeatureAnalysisData
 {
-    private int $count;
-    private bool $in_map;
-    /**
-     * @var Collection<GeoAnalysisPlace> $places
-     */
-    private Collection $places;
+	private int $count;
+	private bool $in_map;
+	/**
+	 * @var Collection<GeoAnalysisPlace> $places
+	 */
+	private Collection $places;
 
-    /**
-     * Constructor for MapFeatureAnalysisData
-     */
-    public function __construct()
-    {
-        $this->count = 0;
-        $this->places = new Collection();
-        $this->in_map = false;
-    }
+	/**
+	 * Constructor for MapFeatureAnalysisData
+	 */
+	public function __construct()
+	{
+		$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 array<int, \Brick\Geo\IO\GeoJSON\Feature> $features
-     */
-    private array $features;
+	/**
+	 * @var array<int, \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 array<int, \Brick\Geo\IO\GeoJSON\Feature>
-     */
-    public function features(): array
-    {
-        return $this->features;
-    }
+	/**
+	 * Get the list of features to display on the map
+	 *
+	 * @return array<int, \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),
-            [...$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),
+			[...$this->features, ...$other->features]
+		);
+	}
 }

app/Module/MiscExtensions/Hooks/TitlesCardHook.php

Indentation +57 added lines, -57 removed lines

@@ -25,68 +25,68 @@
  */
 class TitlesCardHook implements NameAccordionExtenderInterface
 {
-    private ModuleInterface $module;
+	private ModuleInterface $module;
 
-    /**
-     * Constructor for TitlesCardHook
-     *
-     * @param ModuleInterface $module
-     */
-    public function __construct(ModuleInterface $module)
-    {
-        $this->module = $module;
-    }
+	/**
+	 * Constructor for TitlesCardHook
+	 *
+	 * @param ModuleInterface $module
+	 */
+	public function __construct(ModuleInterface $module)
+	{
+		$this->module = $module;
+	}
 
-    /**
-     * {@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\NameAccordionExtenderInterface::accordionCard()
-     */
-    public function accordionCard(Individual $individual): string
-    {
-        $title_separator = $this->module->getPreference('MAJ_TITLE_PREFIX');
-        if ($title_separator === '') {
-            return '';
-        }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\Hooks\NameAccordionExtenderInterface::accordionCard()
+	 */
+	public function accordionCard(Individual $individual): string
+	{
+		$title_separator = $this->module->getPreference('MAJ_TITLE_PREFIX');
+		if ($title_separator === '') {
+			return '';
+		}
 
-        $titles = $this->individualTitles($individual, '/(.*?) ((' . $title_separator .  ')(.*))/i');
+		$titles = $this->individualTitles($individual, '/(.*?) ((' . $title_separator .  ')(.*))/i');
 
-        return count($titles) === 0 ? '' :
-            view($this->module()->name() . '::components/accordion-item-titles', [ 'titles' => $titles ]);
-    }
+		return count($titles) === 0 ? '' :
+			view($this->module()->name() . '::components/accordion-item-titles', [ 'titles' => $titles ]);
+	}
 
-    /**
-     * Extract the individual titles from the TITL tags.
-     * Split the title based on a pattern to identify the title and the land it refers to.
-     *
-     * @param Individual $individual
-     * @param string $pattern
-     * @return array<string, string[]>
-     */
-    protected function individualTitles(Individual $individual, string $pattern): array
-    {
-        $titles_list = [];
-        /** @var \Illuminate\Support\Collection<string> $titles */
-        $titles = $individual->facts(['TITL'])
-            ->sortByDesc(fn(Fact $fact) => $fact->date()->julianDay())
-            ->map(fn(Fact $fact) => $fact->value());
+	/**
+	 * Extract the individual titles from the TITL tags.
+	 * Split the title based on a pattern to identify the title and the land it refers to.
+	 *
+	 * @param Individual $individual
+	 * @param string $pattern
+	 * @return array<string, string[]>
+	 */
+	protected function individualTitles(Individual $individual, string $pattern): array
+	{
+		$titles_list = [];
+		/** @var \Illuminate\Support\Collection<string> $titles */
+		$titles = $individual->facts(['TITL'])
+			->sortByDesc(fn(Fact $fact) => $fact->date()->julianDay())
+			->map(fn(Fact $fact) => $fact->value());
 
-        foreach ($titles as $title) {
-            if (preg_match($pattern, $title, $match) === 1) {
-                /** @var array<int, string> $match */
-                $titles_list[$match[1]][] = trim($match[2]);
-            } else {
-                $titles_list[$title][] = '';
-            }
-        }
-        return $titles_list;
-    }
+		foreach ($titles as $title) {
+			if (preg_match($pattern, $title, $match) === 1) {
+				/** @var array<int, string> $match */
+				$titles_list[$match[1]][] = trim($match[2]);
+			} else {
+				$titles_list[$title][] = '';
+			}
+		}
+		return $titles_list;
+	}
 }

Spacing +2 added lines, -3 removed lines

@@ -57,10 +57,9 @@
             return '';
         }
 
-        $titles = $this->individualTitles($individual, '/(.*?) ((' . $title_separator .  ')(.*))/i');
+        $titles = $this->individualTitles($individual, '/(.*?) (('.$title_separator.')(.*))/i');
 
-        return count($titles) === 0 ? '' :
-            view($this->module()->name() . '::components/accordion-item-titles', [ 'titles' => $titles ]);
+        return count($titles) === 0 ? '' : view($this->module()->name().'::components/accordion-item-titles', ['titles' => $titles]);
     }
 
     /**

app/Module/Certificates/Hooks/SourceCertificateIconHook.php

Spacing +2 added lines, -2 removed lines

@@ -61,12 +61,12 @@
     public function factSourcePrepend(Tree $tree, $fact): string
     {
         $permission_level = $tree->getPreference('MAJ_CERTIF_SHOW_CERT');
-        if (is_numeric($permission_level) && Auth::accessLevel($tree) <= (int) $permission_level) {
+        if (is_numeric($permission_level) && Auth::accessLevel($tree) <= (int)$permission_level) {
             $path = $this->extractPath($fact);
 
             if ($path !== '') {
                 $certificate = new Certificate($tree, $path);
-                return view($this->module->name() . '::components/certificate-icon', [
+                return view($this->module->name().'::components/certificate-icon', [
                     'module_name'               =>  $this->module->name(),
                     'certificate'               =>  $certificate,
                     'url_obfuscator_service'    =>  $this->url_obfuscator_service,

Indentation +77 added lines, -77 removed lines

@@ -30,87 +30,87 @@
  */
 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, $fact): string
-    {
-        $permission_level = $tree->getPreference('MAJ_CERTIF_SHOW_CERT');
-        if (is_numeric($permission_level) && Auth::accessLevel($tree) <= (int) $permission_level) {
-            $path = $this->extractPath($fact);
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\Hooks\FactSourceTextExtenderInterface::factSourcePrepend()
+	 */
+	public function factSourcePrepend(Tree $tree, $fact): string
+	{
+		$permission_level = $tree->getPreference('MAJ_CERTIF_SHOW_CERT');
+		if (is_numeric($permission_level) && Auth::accessLevel($tree) <= (int) $permission_level) {
+			$path = $this->extractPath($fact);
 
-            if ($path !== '') {
-                $certificate = new Certificate($tree, $path);
-                return view($this->module->name() . '::components/certificate-icon', [
-                    'module_name'               =>  $this->module->name(),
-                    'certificate'               =>  $certificate,
-                    'url_obfuscator_service'    =>  $this->url_obfuscator_service,
-                    'js_script_url'             =>  $this->module->assetUrl('js/certificates.min.js')
-                ]);
-            }
-        }
-        return '';
-    }
+			if ($path !== '') {
+				$certificate = new Certificate($tree, $path);
+				return view($this->module->name() . '::components/certificate-icon', [
+					'module_name'               =>  $this->module->name(),
+					'certificate'               =>  $certificate,
+					'url_obfuscator_service'    =>  $this->url_obfuscator_service,
+					'js_script_url'             =>  $this->module->assetUrl('js/certificates.min.js')
+				]);
+			}
+		}
+		return '';
+	}
 
-    /**
-     * Extract path from the provided fact objet.
-     *
-     * @param \Fisharebest\Webtrees\Fact|array<array<\Fisharebest\Webtrees\Contracts\ElementInterface|string>> $fact
-     * @return string
-     * @psalm-suppress RedundantConditionGivenDocblockType
-     */
-    private function extractPath($fact): string
-    {
-        if ($fact instanceof Fact && $fact->target() instanceof Source) {
-            return $fact->attribute('_ACT');
-        } elseif (
-            is_array($fact) && count($fact) === 2
-            && null !== ($source_elements = $fact[0]) && is_array($source_elements) // @phpstan-ignore-line
-            && null !== ($source_values = $fact[1]) && is_array($source_values) // @phpstan-ignore-line
-        ) {
-            foreach ($source_elements as $key => $element) {
-                if (
-                    $element instanceof SourceCertificate
-                    && isset($source_values[$key]) && is_string($source_values[$key])
-                ) {
-                    return $element->canonical($source_values[$key]);
-                }
-            }
-        }
-        return '';
-    }
+	/**
+	 * Extract path from the provided fact objet.
+	 *
+	 * @param \Fisharebest\Webtrees\Fact|array<array<\Fisharebest\Webtrees\Contracts\ElementInterface|string>> $fact
+	 * @return string
+	 * @psalm-suppress RedundantConditionGivenDocblockType
+	 */
+	private function extractPath($fact): string
+	{
+		if ($fact instanceof Fact && $fact->target() instanceof Source) {
+			return $fact->attribute('_ACT');
+		} elseif (
+			is_array($fact) && count($fact) === 2
+			&& null !== ($source_elements = $fact[0]) && is_array($source_elements) // @phpstan-ignore-line
+			&& null !== ($source_values = $fact[1]) && is_array($source_values) // @phpstan-ignore-line
+		) {
+			foreach ($source_elements as $key => $element) {
+				if (
+					$element instanceof SourceCertificate
+					&& isset($source_values[$key]) && is_string($source_values[$key])
+				) {
+					return $element->canonical($source_values[$key]);
+				}
+			}
+		}
+		return '';
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\Hooks\FactSourceTextExtenderInterface::factSourceAppend()
-     */
-    public function factSourceAppend(Tree $tree, $fact): string
-    {
-        return '';
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\Hooks\FactSourceTextExtenderInterface::factSourceAppend()
+	 */
+	public function factSourceAppend(Tree $tree, $fact): string
+	{
+		return '';
+	}
 }

app/Module/Certificates/Factories/CertificateImageFactory.php

Spacing +10 added lines, -10 removed lines

@@ -79,7 +79,7 @@ 
         bool $add_watermark = false,
         Watermark $watermark = null
     ): ResponseInterface {
-        $filesystem =  $this->filesystem_service->filesystem($certificate->tree());
+        $filesystem = $this->filesystem_service->filesystem($certificate->tree());
         $filename   = $certificate->path();
 
         if (!$add_watermark) {
@@ -98,34 +98,34 @@ 
             $height = $image->height();
 
             $watermark->adjustSize($width);
-            $watermark_x = (int) ceil($watermark->textLengthEstimate() * 1.5);
+            $watermark_x = (int)ceil($watermark->textLengthEstimate() * 1.5);
             $watermark_y = $watermark->size() * 12 + 1;
 
-            $font_definition = function (AbstractFont $font) use ($watermark): void {
-                $font->file(Webtrees::ROOT_DIR . 'resources/fonts/DejaVuSans.ttf');
+            $font_definition = function(AbstractFont $font) use ($watermark): void {
+                $font->file(Webtrees::ROOT_DIR.'resources/fonts/DejaVuSans.ttf');
                 $font->color($watermark->color());
                 $font->size($watermark->size());
                 $font->valign('top');
             };
 
-            for ($i = min((int) ceil($width * 0.1), $watermark_x); $i < $width; $i += $watermark_x) {
-                for ($j = min((int) ceil($height * 0.1), $watermark_y); $j < $height; $j += $watermark_y) {
+            for ($i = min((int)ceil($width * 0.1), $watermark_x); $i < $width; $i += $watermark_x) {
+                for ($j = min((int)ceil($height * 0.1), $watermark_y); $j < $height; $j += $watermark_y) {
                     $image = $image->text($watermark->text(), $i, $j, $font_definition);
                 }
             }
 
             $format  = static::SUPPORTED_FORMATS[$image->mime()] ?? 'jpg';
             $quality = $this->extractImageQuality($image, static::GD_DEFAULT_IMAGE_QUALITY);
-            $data    = (string) $image->encode($format, $quality);
+            $data    = (string)$image->encode($format, $quality);
 
             return $this->imageResponse($data, $image->mime(), '');
         } catch (NotReadableException $ex) {
             return $this->replacementImageResponse(pathinfo($filename, PATHINFO_EXTENSION))
             ->withHeader('X-Image-Exception', $ex->getMessage());
         } catch (FilesystemException | UnableToReadFile $ex) {
-            return $this->replacementImageResponse((string) StatusCodeInterface::STATUS_NOT_FOUND);
+            return $this->replacementImageResponse((string)StatusCodeInterface::STATUS_NOT_FOUND);
         } catch (Throwable $ex) {
-            return $this->replacementImageResponse((string) StatusCodeInterface::STATUS_INTERNAL_SERVER_ERROR)
+            return $this->replacementImageResponse((string)StatusCodeInterface::STATUS_INTERNAL_SERVER_ERROR)
             ->withHeader('X-Image-Exception', $ex->getMessage());
         }
     }
@@ -140,7 +140,7 @@ 
     public function certificateNeedsWatermark(Certificate $certificate, UserInterface $user): bool
     {
         $tree = $certificate->tree();
-        $watermark_level = (int) ($tree->getPreference('MAJ_CERTIF_SHOW_NO_WATERMARK', (string) Auth::PRIV_HIDE));
+        $watermark_level = (int)($tree->getPreference('MAJ_CERTIF_SHOW_NO_WATERMARK', (string)Auth::PRIV_HIDE));
 
         return Auth::accessLevel($tree, $user) > $watermark_level;
     }

Indentation +160 added lines, -160 removed lines

@@ -39,164 +39,164 @@
  */
 class CertificateImageFactory extends ImageFactory implements ImageFactoryInterface
 {
-    /**
-     * @var CertificateFilesystemService $filesystem_service
-     */
-    private $filesystem_service;
-
-    /**
-     * Constructor for the Certificate Image Factory
-     *
-     * @param CertificateFilesystemService $filesystem_service
-     */
-    public function __construct(CertificateFilesystemService $filesystem_service)
-    {
-        $this->filesystem_service = $filesystem_service;
-    }
-
-    /**
-     * Check is a file MIME type is supported by the system.
-     *
-     * @param string $mime
-     * @return bool
-     */
-    public function isMimeTypeSupported(string $mime): bool
-    {
-        return array_key_exists($mime, self::SUPPORTED_FORMATS);
-    }
-
-    /**
-     * Create a full-size version of a certificate.
-     *
-     * @param Certificate $certificate
-     * @param bool $add_watermark
-     * @param Watermark $watermark
-     * @throws InvalidArgumentException
-     * @return ResponseInterface
-     */
-    public function certificateFileResponse(
-        Certificate $certificate,
-        bool $add_watermark = false,
-        Watermark $watermark = null
-    ): ResponseInterface {
-        $filesystem =  $this->filesystem_service->filesystem($certificate->tree());
-        $filename   = $certificate->path();
-
-        if (!$add_watermark) {
-            return $this->fileResponse($filesystem, $filename, false);
-        }
-
-        try {
-            $image = $this->imageManager()->make($filesystem->readStream($filename));
-            $image = $this->autorotateImage($image);
-
-            if ($watermark === null) {
-                throw new InvalidArgumentException('Watermark data not defined');
-            }
-
-            $width = $image->width();
-            $height = $image->height();
-
-            $watermark->adjustSize($width);
-            $watermark_x = (int) ceil($watermark->textLengthEstimate() * 1.5);
-            $watermark_y = $watermark->size() * 12 + 1;
-
-            $font_definition = function (AbstractFont $font) use ($watermark): void {
-                $font->file(Webtrees::ROOT_DIR . 'resources/fonts/DejaVuSans.ttf');
-                $font->color($watermark->color());
-                $font->size($watermark->size());
-                $font->valign('top');
-            };
-
-            for ($i = min((int) ceil($width * 0.1), $watermark_x); $i < $width; $i += $watermark_x) {
-                for ($j = min((int) ceil($height * 0.1), $watermark_y); $j < $height; $j += $watermark_y) {
-                    $image = $image->text($watermark->text(), $i, $j, $font_definition);
-                }
-            }
-
-            $format  = static::SUPPORTED_FORMATS[$image->mime()] ?? 'jpg';
-            $quality = $this->extractImageQuality($image, static::GD_DEFAULT_IMAGE_QUALITY);
-            $data    = (string) $image->encode($format, $quality);
-
-            return $this->imageResponse($data, $image->mime(), '');
-        } catch (NotReadableException $ex) {
-            return $this->replacementImageResponse(pathinfo($filename, PATHINFO_EXTENSION))
-            ->withHeader('X-Image-Exception', $ex->getMessage());
-        } catch (FilesystemException | UnableToReadFile $ex) {
-            return $this->replacementImageResponse((string) StatusCodeInterface::STATUS_NOT_FOUND);
-        } catch (Throwable $ex) {
-            return $this->replacementImageResponse((string) StatusCodeInterface::STATUS_INTERNAL_SERVER_ERROR)
-            ->withHeader('X-Image-Exception', $ex->getMessage());
-        }
-    }
-
-    /**
-     * Does a full-sized certificate need a watermark?
-     *
-     * @param Certificate $certificate
-     * @param UserInterface $user
-     * @return bool
-     */
-    public function certificateNeedsWatermark(Certificate $certificate, UserInterface $user): bool
-    {
-        $tree = $certificate->tree();
-        $watermark_level = (int) ($tree->getPreference('MAJ_CERTIF_SHOW_NO_WATERMARK', (string) Auth::PRIV_HIDE));
-
-        return Auth::accessLevel($tree, $user) > $watermark_level;
-    }
-
-    /**
-     * Neutralise the methods associated with MediaFile.
-     */
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Factories\ImageFactory::mediaFileResponse()
-     */
-    public function mediaFileResponse(MediaFile $media_file, bool $add_watermark, bool $download): ResponseInterface
-    {
-        throw new BadMethodCallException("Invalid method for Certificates");
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Factories\ImageFactory::mediaFileThumbnailResponse()
-     */
-    public function mediaFileThumbnailResponse(
-        MediaFile $media_file,
-        int $width,
-        int $height,
-        string $fit,
-        bool $add_watermark
-    ): ResponseInterface {
-        throw new BadMethodCallException("Invalid method for Certificates");
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Factories\ImageFactory::createWatermark()
-     */
-    public function createWatermark(int $width, int $height, MediaFile $media_file): Image
-    {
-
-        throw new BadMethodCallException("Invalid method for Certificates");
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Factories\ImageFactory::fileNeedsWatermark()
-     */
-    public function fileNeedsWatermark(MediaFile $media_file, UserInterface $user): bool
-    {
-        throw new BadMethodCallException("Invalid method for Certificates");
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Factories\ImageFactory::thumbnailNeedsWatermark()
-     */
-    public function thumbnailNeedsWatermark(MediaFile $media_file, UserInterface $user): bool
-    {
-        throw new BadMethodCallException("Invalid method for Certificates");
-    }
+	/**
+	 * @var CertificateFilesystemService $filesystem_service
+	 */
+	private $filesystem_service;
+
+	/**
+	 * Constructor for the Certificate Image Factory
+	 *
+	 * @param CertificateFilesystemService $filesystem_service
+	 */
+	public function __construct(CertificateFilesystemService $filesystem_service)
+	{
+		$this->filesystem_service = $filesystem_service;
+	}
+
+	/**
+	 * Check is a file MIME type is supported by the system.
+	 *
+	 * @param string $mime
+	 * @return bool
+	 */
+	public function isMimeTypeSupported(string $mime): bool
+	{
+		return array_key_exists($mime, self::SUPPORTED_FORMATS);
+	}
+
+	/**
+	 * Create a full-size version of a certificate.
+	 *
+	 * @param Certificate $certificate
+	 * @param bool $add_watermark
+	 * @param Watermark $watermark
+	 * @throws InvalidArgumentException
+	 * @return ResponseInterface
+	 */
+	public function certificateFileResponse(
+		Certificate $certificate,
+		bool $add_watermark = false,
+		Watermark $watermark = null
+	): ResponseInterface {
+		$filesystem =  $this->filesystem_service->filesystem($certificate->tree());
+		$filename   = $certificate->path();
+
+		if (!$add_watermark) {
+			return $this->fileResponse($filesystem, $filename, false);
+		}
+
+		try {
+			$image = $this->imageManager()->make($filesystem->readStream($filename));
+			$image = $this->autorotateImage($image);
+
+			if ($watermark === null) {
+				throw new InvalidArgumentException('Watermark data not defined');
+			}
+
+			$width = $image->width();
+			$height = $image->height();
+
+			$watermark->adjustSize($width);
+			$watermark_x = (int) ceil($watermark->textLengthEstimate() * 1.5);
+			$watermark_y = $watermark->size() * 12 + 1;
+
+			$font_definition = function (AbstractFont $font) use ($watermark): void {
+				$font->file(Webtrees::ROOT_DIR . 'resources/fonts/DejaVuSans.ttf');
+				$font->color($watermark->color());
+				$font->size($watermark->size());
+				$font->valign('top');
+			};
+
+			for ($i = min((int) ceil($width * 0.1), $watermark_x); $i < $width; $i += $watermark_x) {
+				for ($j = min((int) ceil($height * 0.1), $watermark_y); $j < $height; $j += $watermark_y) {
+					$image = $image->text($watermark->text(), $i, $j, $font_definition);
+				}
+			}
+
+			$format  = static::SUPPORTED_FORMATS[$image->mime()] ?? 'jpg';
+			$quality = $this->extractImageQuality($image, static::GD_DEFAULT_IMAGE_QUALITY);
+			$data    = (string) $image->encode($format, $quality);
+
+			return $this->imageResponse($data, $image->mime(), '');
+		} catch (NotReadableException $ex) {
+			return $this->replacementImageResponse(pathinfo($filename, PATHINFO_EXTENSION))
+			->withHeader('X-Image-Exception', $ex->getMessage());
+		} catch (FilesystemException | UnableToReadFile $ex) {
+			return $this->replacementImageResponse((string) StatusCodeInterface::STATUS_NOT_FOUND);
+		} catch (Throwable $ex) {
+			return $this->replacementImageResponse((string) StatusCodeInterface::STATUS_INTERNAL_SERVER_ERROR)
+			->withHeader('X-Image-Exception', $ex->getMessage());
+		}
+	}
+
+	/**
+	 * Does a full-sized certificate need a watermark?
+	 *
+	 * @param Certificate $certificate
+	 * @param UserInterface $user
+	 * @return bool
+	 */
+	public function certificateNeedsWatermark(Certificate $certificate, UserInterface $user): bool
+	{
+		$tree = $certificate->tree();
+		$watermark_level = (int) ($tree->getPreference('MAJ_CERTIF_SHOW_NO_WATERMARK', (string) Auth::PRIV_HIDE));
+
+		return Auth::accessLevel($tree, $user) > $watermark_level;
+	}
+
+	/**
+	 * Neutralise the methods associated with MediaFile.
+	 */
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Factories\ImageFactory::mediaFileResponse()
+	 */
+	public function mediaFileResponse(MediaFile $media_file, bool $add_watermark, bool $download): ResponseInterface
+	{
+		throw new BadMethodCallException("Invalid method for Certificates");
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Factories\ImageFactory::mediaFileThumbnailResponse()
+	 */
+	public function mediaFileThumbnailResponse(
+		MediaFile $media_file,
+		int $width,
+		int $height,
+		string $fit,
+		bool $add_watermark
+	): ResponseInterface {
+		throw new BadMethodCallException("Invalid method for Certificates");
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Factories\ImageFactory::createWatermark()
+	 */
+	public function createWatermark(int $width, int $height, MediaFile $media_file): Image
+	{
+
+		throw new BadMethodCallException("Invalid method for Certificates");
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Factories\ImageFactory::fileNeedsWatermark()
+	 */
+	public function fileNeedsWatermark(MediaFile $media_file, UserInterface $user): bool
+	{
+		throw new BadMethodCallException("Invalid method for Certificates");
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Factories\ImageFactory::thumbnailNeedsWatermark()
+	 */
+	public function thumbnailNeedsWatermark(MediaFile $media_file, UserInterface $user): bool
+	{
+		throw new BadMethodCallException("Invalid method for Certificates");
+	}
 }