jon48 / webtrees-lib

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

Indentation +39 added lines, -39 removed lines

@@ -32,48 +32,48 @@
  */
 class GeoAnalysisViewAddPage implements RequestHandlerInterface
 {
-    use ViewResponseTrait;
+	use ViewResponseTrait;
 
-    private ?GeoDispersionModule $module;
-    private GeoAnalysisService $geoanalysis_service;
-    private GeoAnalysisDataService $geoanalysis_data_service;
+	private ?GeoDispersionModule $module;
+	private GeoAnalysisService $geoanalysis_service;
+	private GeoAnalysisDataService $geoanalysis_data_service;
 
-    /**
-     * Constructor for GeoAnalysisViewAddPage Request Handler
-     *
-     * @param ModuleService $module_service
-     * @param GeoAnalysisService $geoanalysis_service
-     * @param GeoAnalysisDataService $geoanalysis_data_service
-     */
-    public function __construct(
-        ModuleService $module_service,
-        GeoAnalysisService $geoanalysis_service,
-        GeoAnalysisDataService $geoanalysis_data_service
-    ) {
-        $this->module = $module_service->findByInterface(GeoDispersionModule::class)->first();
-        $this->geoanalysis_service = $geoanalysis_service;
-        $this->geoanalysis_data_service = $geoanalysis_data_service;
-    }
+	/**
+	 * Constructor for GeoAnalysisViewAddPage Request Handler
+	 *
+	 * @param ModuleService $module_service
+	 * @param GeoAnalysisService $geoanalysis_service
+	 * @param GeoAnalysisDataService $geoanalysis_data_service
+	 */
+	public function __construct(
+		ModuleService $module_service,
+		GeoAnalysisService $geoanalysis_service,
+		GeoAnalysisDataService $geoanalysis_data_service
+	) {
+		$this->module = $module_service->findByInterface(GeoDispersionModule::class)->first();
+		$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.'));
-        }
-        $tree = Validator::attributes($request)->tree();
+		if ($this->module === null) {
+			throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
+		}
+		$tree = Validator::attributes($request)->tree();
 
-        return $this->viewResponse($this->module->name() . '::admin/view-add', [
-            'module'        =>  $this->module,
-            'title'         =>  I18N::translate('Add a geographical dispersion analysis view'),
-            'tree'          =>  $tree,
-            'geoanalysis_list'  =>  $this->geoanalysis_service->all(),
-            'place_example'     =>  $this->geoanalysis_data_service->placeHierarchyExample($tree)
-        ]);
-    }
+		return $this->viewResponse($this->module->name() . '::admin/view-add', [
+			'module'        =>  $this->module,
+			'title'         =>  I18N::translate('Add a geographical dispersion analysis view'),
+			'tree'          =>  $tree,
+			'geoanalysis_list'  =>  $this->geoanalysis_service->all(),
+			'place_example'     =>  $this->geoanalysis_data_service->placeHierarchyExample($tree)
+		]);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
         }
         $tree = Validator::attributes($request)->tree();
 
-        return $this->viewResponse($this->module->name() . '::admin/view-add', [
+        return $this->viewResponse($this->module->name().'::admin/view-add', [
             'module'        =>  $this->module,
             'title'         =>  I18N::translate('Add a geographical dispersion analysis view'),
             'tree'          =>  $tree,

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

Indentation +56 added lines, -56 removed lines

@@ -33,68 +33,68 @@
  */
 class MapAdapterEditPage implements RequestHandlerInterface
 {
-    use ViewResponseTrait;
+	use ViewResponseTrait;
 
-    private ?GeoDispersionModule $module;
-    private MapAdapterDataService $mapadapter_data_service;
-    private MapDefinitionsService $map_definition_service;
-    private PlaceMapperService $place_mapper_service;
+	private ?GeoDispersionModule $module;
+	private MapAdapterDataService $mapadapter_data_service;
+	private MapDefinitionsService $map_definition_service;
+	private PlaceMapperService $place_mapper_service;
 
-    /**
-     * Constructor for MapAdapterEditPage Request Handler
-     *
-     * @param ModuleService $module_service
-     * @param MapAdapterDataService $mapadapter_data_service
-     * @param MapDefinitionsService $map_definition_service
-     * @param PlaceMapperService $place_mapper_service
-     */
-    public function __construct(
-        ModuleService $module_service,
-        MapAdapterDataService $mapadapter_data_service,
-        MapDefinitionsService $map_definition_service,
-        PlaceMapperService $place_mapper_service
-    ) {
-        $this->module = $module_service->findByInterface(GeoDispersionModule::class)->first();
-        $this->mapadapter_data_service = $mapadapter_data_service;
-        $this->map_definition_service = $map_definition_service;
-        $this->place_mapper_service = $place_mapper_service;
-    }
+	/**
+	 * Constructor for MapAdapterEditPage Request Handler
+	 *
+	 * @param ModuleService $module_service
+	 * @param MapAdapterDataService $mapadapter_data_service
+	 * @param MapDefinitionsService $map_definition_service
+	 * @param PlaceMapperService $place_mapper_service
+	 */
+	public function __construct(
+		ModuleService $module_service,
+		MapAdapterDataService $mapadapter_data_service,
+		MapDefinitionsService $map_definition_service,
+		PlaceMapperService $place_mapper_service
+	) {
+		$this->module = $module_service->findByInterface(GeoDispersionModule::class)->first();
+		$this->mapadapter_data_service = $mapadapter_data_service;
+		$this->map_definition_service = $map_definition_service;
+		$this->place_mapper_service = $place_mapper_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();
 
-        $adapter_id = Validator::attributes($request)->integer('adapter_id', -1);
-        $map_adapter = $this->mapadapter_data_service->find($adapter_id);
+		$adapter_id = Validator::attributes($request)->integer('adapter_id', -1);
+		$map_adapter = $this->mapadapter_data_service->find($adapter_id);
 
-        if ($map_adapter === null) {
-            throw new HttpNotFoundException(
-                I18N::translate('The map configuration could not be found.')
-            );
-        }
+		if ($map_adapter === null) {
+			throw new HttpNotFoundException(
+				I18N::translate('The map configuration could not be found.')
+			);
+		}
 
-        return $this->viewResponse($this->module->name() . '::admin/map-adapter-edit', [
-            'module'            =>  $this->module,
-            'title'             =>  I18N::translate('Edit the map configuration'),
-            'tree'              =>  $tree,
-            'view_id'           =>  $map_adapter->geoAnalysisViewId(),
-            'map_adapter'       =>  $map_adapter,
-            'maps_list'         =>  $this->map_definition_service->all(),
-            'mappers_list'      =>  $this->place_mapper_service->all(),
-            'route_edit'        =>  route(MapAdapterEditAction::class, [
-                                        'tree' => $tree->name(),
-                                        'adapter_id' => $map_adapter->id()
-                                    ])
-        ]);
-    }
+		return $this->viewResponse($this->module->name() . '::admin/map-adapter-edit', [
+			'module'            =>  $this->module,
+			'title'             =>  I18N::translate('Edit the map configuration'),
+			'tree'              =>  $tree,
+			'view_id'           =>  $map_adapter->geoAnalysisViewId(),
+			'map_adapter'       =>  $map_adapter,
+			'maps_list'         =>  $this->map_definition_service->all(),
+			'mappers_list'      =>  $this->place_mapper_service->all(),
+			'route_edit'        =>  route(MapAdapterEditAction::class, [
+										'tree' => $tree->name(),
+										'adapter_id' => $map_adapter->id()
+									])
+		]);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -83,7 +83,7 @@
             );
         }
 
-        return $this->viewResponse($this->module->name() . '::admin/map-adapter-edit', [
+        return $this->viewResponse($this->module->name().'::admin/map-adapter-edit', [
             'module'            =>  $this->module,
             'title'             =>  I18N::translate('Edit the map configuration'),
             'tree'              =>  $tree,

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

Indentation +54 added lines, -54 removed lines

@@ -33,67 +33,67 @@
  */
 class MapAdapterMapperConfig implements RequestHandlerInterface
 {
-    use ViewResponseTrait;
+	use ViewResponseTrait;
 
-    private ?GeoDispersionModule $module;
-    private MapAdapterDataService $mapadapter_data_service;
+	private ?GeoDispersionModule $module;
+	private MapAdapterDataService $mapadapter_data_service;
 
-    /**
-     * Constructor for MapAdapterMapperConfig Request Handler
-     *
-     * @param ModuleService $module_service
-     * @param MapAdapterDataService $mapadapter_data_service
-     */
-    public function __construct(
-        ModuleService $module_service,
-        MapAdapterDataService $mapadapter_data_service
-    ) {
-        $this->module = $module_service->findByInterface(GeoDispersionModule::class)->first();
-        $this->mapadapter_data_service = $mapadapter_data_service;
-    }
+	/**
+	 * Constructor for MapAdapterMapperConfig Request Handler
+	 *
+	 * @param ModuleService $module_service
+	 * @param MapAdapterDataService $mapadapter_data_service
+	 */
+	public function __construct(
+		ModuleService $module_service,
+		MapAdapterDataService $mapadapter_data_service
+	) {
+		$this->module = $module_service->findByInterface(GeoDispersionModule::class)->first();
+		$this->mapadapter_data_service = $mapadapter_data_service;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        $this->layout = 'layouts/ajax';
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		$this->layout = 'layouts/ajax';
 
-        if ($this->module === null) {
-            throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
-        }
-        $tree = Validator::attributes($request)->tree();
+		if ($this->module === null) {
+			throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
+		}
+		$tree = Validator::attributes($request)->tree();
 
-        $adapter_id = Validator::attributes($request)->integer('adapter_id', -1);
-        $map_adapter = $this->mapadapter_data_service->find($adapter_id);
+		$adapter_id = Validator::attributes($request)->integer('adapter_id', -1);
+		$map_adapter = $this->mapadapter_data_service->find($adapter_id);
 
-        $mapper_class = Validator::queryParams($request)->string('mapper', '');
-        $mapper = null;
-        if ($mapper_class === '' && $map_adapter !== null) {
-            $mapper = $map_adapter->placeMapper();
-        } else {
-            try {
-                $mapper = app($mapper_class);
-            } catch (BindingResolutionException $ex) {
-            }
+		$mapper_class = Validator::queryParams($request)->string('mapper', '');
+		$mapper = null;
+		if ($mapper_class === '' && $map_adapter !== null) {
+			$mapper = $map_adapter->placeMapper();
+		} else {
+			try {
+				$mapper = app($mapper_class);
+			} catch (BindingResolutionException $ex) {
+			}
 
-            if (
-                $mapper !== null && $map_adapter !== null &&
-                get_class($map_adapter->placeMapper()) === get_class($mapper)
-            ) {
-                $mapper = $map_adapter->placeMapper();
-            }
-        }
+			if (
+				$mapper !== null && $map_adapter !== null &&
+				get_class($map_adapter->placeMapper()) === get_class($mapper)
+			) {
+				$mapper = $map_adapter->placeMapper();
+			}
+		}
 
-        if ($mapper === null || !($mapper instanceof PlaceMapperInterface)) {
-            throw new HttpNotFoundException(
-                I18N::translate('The configuration for the place mapper could not be found.')
-            );
-        }
+		if ($mapper === null || !($mapper instanceof PlaceMapperInterface)) {
+			throw new HttpNotFoundException(
+				I18N::translate('The configuration for the place mapper could not be found.')
+			);
+		}
 
-        return $this->viewResponse('layouts/ajax', [
-            'content' => $mapper->config()->configContent($this->module, $tree)
-        ]);
-    }
+		return $this->viewResponse('layouts/ajax', [
+			'content' => $mapper->config()->configContent($this->module, $tree)
+		]);
+	}
 }

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

Indentation +56 added lines, -56 removed lines

@@ -33,68 +33,68 @@
  */
 class MapAdapterAddPage implements RequestHandlerInterface
 {
-    use ViewResponseTrait;
+	use ViewResponseTrait;
 
-    private ?GeoDispersionModule $module;
-    private GeoAnalysisViewDataService $geoview_data_service;
-    private MapDefinitionsService $map_definition_service;
-    private PlaceMapperService $place_mapper_service;
+	private ?GeoDispersionModule $module;
+	private GeoAnalysisViewDataService $geoview_data_service;
+	private MapDefinitionsService $map_definition_service;
+	private PlaceMapperService $place_mapper_service;
 
-    /**
-     * Constructor for MapAdapterAddPage Request Handler
-     *
-     * @param ModuleService $module_service
-     * @param GeoAnalysisViewDataService $geoview_data_service
-     * @param MapDefinitionsService $map_definition_service
-     * @param PlaceMapperService $place_mapper_service
-     */
-    public function __construct(
-        ModuleService $module_service,
-        GeoAnalysisViewDataService $geoview_data_service,
-        MapDefinitionsService $map_definition_service,
-        PlaceMapperService $place_mapper_service
-    ) {
-        $this->module = $module_service->findByInterface(GeoDispersionModule::class)->first();
-        $this->geoview_data_service = $geoview_data_service;
-        $this->map_definition_service = $map_definition_service;
-        $this->place_mapper_service = $place_mapper_service;
-    }
+	/**
+	 * Constructor for MapAdapterAddPage Request Handler
+	 *
+	 * @param ModuleService $module_service
+	 * @param GeoAnalysisViewDataService $geoview_data_service
+	 * @param MapDefinitionsService $map_definition_service
+	 * @param PlaceMapperService $place_mapper_service
+	 */
+	public function __construct(
+		ModuleService $module_service,
+		GeoAnalysisViewDataService $geoview_data_service,
+		MapDefinitionsService $map_definition_service,
+		PlaceMapperService $place_mapper_service
+	) {
+		$this->module = $module_service->findByInterface(GeoDispersionModule::class)->first();
+		$this->geoview_data_service = $geoview_data_service;
+		$this->map_definition_service = $map_definition_service;
+		$this->place_mapper_service = $place_mapper_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/map-adapter-edit', [
-            'module'            =>  $this->module,
-            'title'             =>  I18N::translate('Add a map configuration'),
-            'tree'              =>  $tree,
-            'view_id'           =>  $view_id,
-            'map_adapter'       =>  null,
-            'maps_list'         =>  $this->map_definition_service->all(),
-            'mappers_list'      =>  $this->place_mapper_service->all(),
-            'route_edit'        =>  route(MapAdapterAddAction::class, [
-                                        'tree'      => $tree->name(),
-                                        'view_id'   => $view_id
-                                    ])
-        ]);
-    }
+		return $this->viewResponse($this->module->name() . '::admin/map-adapter-edit', [
+			'module'            =>  $this->module,
+			'title'             =>  I18N::translate('Add a map configuration'),
+			'tree'              =>  $tree,
+			'view_id'           =>  $view_id,
+			'map_adapter'       =>  null,
+			'maps_list'         =>  $this->map_definition_service->all(),
+			'mappers_list'      =>  $this->place_mapper_service->all(),
+			'route_edit'        =>  route(MapAdapterAddAction::class, [
+										'tree'      => $tree->name(),
+										'view_id'   => $view_id
+									])
+		]);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -83,7 +83,7 @@
             );
         }
 
-        return $this->viewResponse($this->module->name() . '::admin/map-adapter-edit', [
+        return $this->viewResponse($this->module->name().'::admin/map-adapter-edit', [
             'module'            =>  $this->module,
             'title'             =>  I18N::translate('Add a map configuration'),
             'tree'              =>  $tree,

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

Indentation +33 added lines, -33 removed lines

@@ -32,42 +32,42 @@
  */
 class GeoAnalysisViewPage implements RequestHandlerInterface
 {
-    use ViewResponseTrait;
+	use ViewResponseTrait;
 
-    private ?GeoDispersionModule $module;
-    private GeoAnalysisViewDataService $geoviewdata_service;
+	private ?GeoDispersionModule $module;
+	private GeoAnalysisViewDataService $geoviewdata_service;
 
-    /**
-     * Constructor for GeoAnalysisViewPage Request Handler
-     *
-     * @param ModuleService $module_service
-     */
-    public function __construct(
-        ModuleService $module_service,
-        GeoAnalysisViewDataService $geoviewdata_service
-    ) {
-        $this->module = $module_service->findByInterface(GeoDispersionModule::class)->first();
-        $this->geoviewdata_service = $geoviewdata_service;
-    }
+	/**
+	 * Constructor for GeoAnalysisViewPage Request Handler
+	 *
+	 * @param ModuleService $module_service
+	 */
+	public function __construct(
+		ModuleService $module_service,
+		GeoAnalysisViewDataService $geoviewdata_service
+	) {
+		$this->module = $module_service->findByInterface(GeoDispersionModule::class)->first();
+		$this->geoviewdata_service = $geoviewdata_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.'));
-        }
+	/**
+	 * {@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 = Validator::attributes($request)->tree();
-        $view_id = Validator::attributes($request)->integer('view_id', 0);
+		$tree = Validator::attributes($request)->tree();
+		$view_id = Validator::attributes($request)->integer('view_id', 0);
 
-        return $this->viewResponse($this->module->name() . '::geoanalysisview-page', [
-            'module_name'           =>  $this->module->name(),
-            'title'                 =>  I18N::translate('Geographical dispersion'),
-            'tree'                  =>  $tree,
-            'view'                  =>  $this->geoviewdata_service->find($tree, $view_id)
-        ]);
-    }
+		return $this->viewResponse($this->module->name() . '::geoanalysisview-page', [
+			'module_name'           =>  $this->module->name(),
+			'title'                 =>  I18N::translate('Geographical dispersion'),
+			'tree'                  =>  $tree,
+			'view'                  =>  $this->geoviewdata_service->find($tree, $view_id)
+		]);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
         $tree = Validator::attributes($request)->tree();
         $view_id = Validator::attributes($request)->integer('view_id', 0);
 
-        return $this->viewResponse($this->module->name() . '::geoanalysisview-page', [
+        return $this->viewResponse($this->module->name().'::geoanalysisview-page', [
             'module_name'           =>  $this->module->name(),
             'title'                 =>  I18N::translate('Geographical dispersion'),
             'tree'                  =>  $tree,

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];
     }
 
     /**