jon48 / webtrees-lib

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

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

Indentation +54 added lines, -54 removed lines

@@ -31,66 +31,66 @@
  */
 class GeoAnalysisViewDeleteAction implements RequestHandlerInterface
 {
-    private ?GeoDispersionModule $module;
-    private GeoAnalysisViewDataService $geoview_data_service;
+	private ?GeoDispersionModule $module;
+	private GeoAnalysisViewDataService $geoview_data_service;
 
-    /**
-     * Constructor for GeoAnalysisViewDeleteAction Request Handler
-     *
-     * @param ModuleService $module_service
-     * @param GeoAnalysisViewDataService $geoview_data_service
-     */
-    public function __construct(ModuleService $module_service, GeoAnalysisViewDataService $geoview_data_service)
-    {
-        $this->module = $module_service->findByInterface(GeoDispersionModule::class)->first();
-        $this->geoview_data_service = $geoview_data_service;
-    }
+	/**
+	 * Constructor for GeoAnalysisViewDeleteAction Request Handler
+	 *
+	 * @param ModuleService $module_service
+	 * @param GeoAnalysisViewDataService $geoview_data_service
+	 */
+	public function __construct(ModuleService $module_service, GeoAnalysisViewDataService $geoview_data_service)
+	{
+		$this->module = $module_service->findByInterface(GeoDispersionModule::class)->first();
+		$this->geoview_data_service = $geoview_data_service;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        $tree = Validator::attributes($request)->tree();
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		$tree = Validator::attributes($request)->tree();
 
-        $admin_config_route = route(AdminConfigPage::class, ['tree' => $tree->name()]);
+		$admin_config_route = route(AdminConfigPage::class, ['tree' => $tree->name()]);
 
-        if ($this->module === null) {
-            FlashMessages::addMessage(
-                I18N::translate('The attached module could not be found.'),
-                'danger'
-            );
-            return redirect($admin_config_route);
-        }
+		if ($this->module === null) {
+			FlashMessages::addMessage(
+				I18N::translate('The attached module could not be found.'),
+				'danger'
+			);
+			return redirect($admin_config_route);
+		}
 
-        $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) {
-            FlashMessages::addMessage(
-                I18N::translate('The view with ID “%s” does not exist.', I18N::number($view_id)),
-                'danger'
-            );
-            return redirect($admin_config_route);
-        }
+		if ($view === null) {
+			FlashMessages::addMessage(
+				I18N::translate('The view with ID “%s” does not exist.', I18N::number($view_id)),
+				'danger'
+			);
+			return redirect($admin_config_route);
+		}
 
-        if ($this->geoview_data_service->delete($view) > 0) {
-            FlashMessages::addMessage(
-                I18N::translate('The geographical dispersion analysis view has been successfully deleted.'),
-                'success'
-            );
-            //phpcs:ignore Generic.Files.LineLength.TooLong
-            Log::addConfigurationLog('Module ' . $this->module->title() . ' : View “' . $view->id() . '” has been deleted.');
-        } else {
-            FlashMessages::addMessage(
-                I18N::translate('An error occured while deleting the geographical dispersion analysis view.'),
-                'danger'
-            );
-            //phpcs:ignore Generic.Files.LineLength.TooLong
-            Log::addConfigurationLog('Module ' . $this->module->title() . ' : View “' . $view->id() . '” could not be deleted. See error log.');
-        }
+		if ($this->geoview_data_service->delete($view) > 0) {
+			FlashMessages::addMessage(
+				I18N::translate('The geographical dispersion analysis view has been successfully deleted.'),
+				'success'
+			);
+			//phpcs:ignore Generic.Files.LineLength.TooLong
+			Log::addConfigurationLog('Module ' . $this->module->title() . ' : View “' . $view->id() . '” has been deleted.');
+		} else {
+			FlashMessages::addMessage(
+				I18N::translate('An error occured while deleting the geographical dispersion analysis view.'),
+				'danger'
+			);
+			//phpcs:ignore Generic.Files.LineLength.TooLong
+			Log::addConfigurationLog('Module ' . $this->module->title() . ' : View “' . $view->id() . '” could not be deleted. See error log.');
+		}
 
-        return redirect($admin_config_route);
-    }
+		return redirect($admin_config_route);
+	}
 }

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

Indentation +60 added lines, -60 removed lines

@@ -35,64 +35,64 @@
  */
 class AdminConfigPage implements RequestHandlerInterface
 {
-    use ViewResponseTrait;
-
-    private ?GeoDispersionModule $module;
-
-    private TreeService $tree_service;
-
-    private GeoAnalysisDataService $geoanalysis_data_service;
-
-    /**
-     * Constructor for the AdminConfigPage Request Handler
-     *
-     * @param ModuleService $module_service
-     * @param TreeService $tree_service
-     * @param GeoAnalysisDataService $geoanalysis_data_service
-     */
-    public function __construct(
-        ModuleService $module_service,
-        TreeService $tree_service,
-        GeoAnalysisDataService $geoanalysis_data_service
-    ) {
-        $this->module = $module_service->findByInterface(GeoDispersionModule::class)->first();
-        $this->tree_service = $tree_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';
-
-        if ($this->module === null) {
-            throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
-        }
-
-        $user = Validator::attributes($request)->user();
-
-        $all_trees = $this->tree_service->all()->filter(fn(Tree $tree) => Auth::isManager($tree, $user));
-        if ($all_trees->count() === 0) {
-            throw new HttpAccessDeniedException();
-        }
-
-        $tree = Validator::attributes($request)->treeOptional() ?? $all_trees->first();
-
-        $same_tree = fn(Tree $tree_collection): bool => $tree->id() === $tree_collection->id();
-        if (!$all_trees->contains($same_tree)) {
-            throw new HttpAccessDeniedException();
-        }
-
-        return $this->viewResponse($this->module->name() . '::admin/config', [
-            'module_name'       =>  $this->module->name(),
-            'title'             =>  $this->module->title(),
-            'tree'              =>  $tree,
-            'other_trees'       =>  $all_trees->reject($same_tree),
-            'place_example'     =>  $this->geoanalysis_data_service->placeHierarchyExample($tree),
-            'js_script_url'     =>  $this->module->assetUrl('js/geodispersion.min.js')
-        ]);
-    }
+	use ViewResponseTrait;
+
+	private ?GeoDispersionModule $module;
+
+	private TreeService $tree_service;
+
+	private GeoAnalysisDataService $geoanalysis_data_service;
+
+	/**
+	 * Constructor for the AdminConfigPage Request Handler
+	 *
+	 * @param ModuleService $module_service
+	 * @param TreeService $tree_service
+	 * @param GeoAnalysisDataService $geoanalysis_data_service
+	 */
+	public function __construct(
+		ModuleService $module_service,
+		TreeService $tree_service,
+		GeoAnalysisDataService $geoanalysis_data_service
+	) {
+		$this->module = $module_service->findByInterface(GeoDispersionModule::class)->first();
+		$this->tree_service = $tree_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';
+
+		if ($this->module === null) {
+			throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
+		}
+
+		$user = Validator::attributes($request)->user();
+
+		$all_trees = $this->tree_service->all()->filter(fn(Tree $tree) => Auth::isManager($tree, $user));
+		if ($all_trees->count() === 0) {
+			throw new HttpAccessDeniedException();
+		}
+
+		$tree = Validator::attributes($request)->treeOptional() ?? $all_trees->first();
+
+		$same_tree = fn(Tree $tree_collection): bool => $tree->id() === $tree_collection->id();
+		if (!$all_trees->contains($same_tree)) {
+			throw new HttpAccessDeniedException();
+		}
+
+		return $this->viewResponse($this->module->name() . '::admin/config', [
+			'module_name'       =>  $this->module->name(),
+			'title'             =>  $this->module->title(),
+			'tree'              =>  $tree,
+			'other_trees'       =>  $all_trees->reject($same_tree),
+			'place_example'     =>  $this->geoanalysis_data_service->placeHierarchyExample($tree),
+			'js_script_url'     =>  $this->module->assetUrl('js/geodispersion.min.js')
+		]);
+	}
 }

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

Indentation +65 added lines, -65 removed lines

@@ -35,77 +35,77 @@
  */
 class MapAdapterDeleteInvalidAction implements RequestHandlerInterface
 {
-    private ?GeoDispersionModule $module;
-    private GeoAnalysisViewDataService $geoview_data_service;
-    private MapAdapterDataService $mapadapter_data_service;
+	private ?GeoDispersionModule $module;
+	private GeoAnalysisViewDataService $geoview_data_service;
+	private MapAdapterDataService $mapadapter_data_service;
 
-    /**
-     * Constructor for MapAdapterDeleteInvalidAction Request Handler
-     *
-     * @param ModuleService $module_service
-     * @param GeoAnalysisViewDataService $geoview_data_service
-     * @param MapAdapterDataService $mapadapter_data_service
-     */
-    public function __construct(
-        ModuleService $module_service,
-        GeoAnalysisViewDataService $geoview_data_service,
-        MapAdapterDataService $mapadapter_data_service
-    ) {
-        $this->module = $module_service->findByInterface(GeoDispersionModule::class)->first();
-        $this->geoview_data_service = $geoview_data_service;
-        $this->mapadapter_data_service = $mapadapter_data_service;
-    }
+	/**
+	 * Constructor for MapAdapterDeleteInvalidAction Request Handler
+	 *
+	 * @param ModuleService $module_service
+	 * @param GeoAnalysisViewDataService $geoview_data_service
+	 * @param MapAdapterDataService $mapadapter_data_service
+	 */
+	public function __construct(
+		ModuleService $module_service,
+		GeoAnalysisViewDataService $geoview_data_service,
+		MapAdapterDataService $mapadapter_data_service
+	) {
+		$this->module = $module_service->findByInterface(GeoDispersionModule::class)->first();
+		$this->geoview_data_service = $geoview_data_service;
+		$this->mapadapter_data_service = $mapadapter_data_service;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        $tree = Validator::attributes($request)->tree();
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		$tree = Validator::attributes($request)->tree();
 
-        if ($this->module === null) {
-            FlashMessages::addMessage(
-                I18N::translate('The attached module could not be found.'),
-                'danger'
-            );
-            return redirect(route(AdminConfigPage::class, ['tree' => $tree->name()]));
-        }
+		if ($this->module === null) {
+			FlashMessages::addMessage(
+				I18N::translate('The attached module could not be found.'),
+				'danger'
+			);
+			return redirect(route(AdminConfigPage::class, ['tree' => $tree->name()]));
+		}
 
-        $view_id = Validator::attributes($request)->integer('view_id', -1);
-        $view = $this->geoview_data_service->find($tree, $view_id);
+		$view_id = Validator::attributes($request)->integer('view_id', -1);
+		$view = $this->geoview_data_service->find($tree, $view_id);
 
-        if ($view === null || !($view instanceof GeoAnalysisMap)) {
-            FlashMessages::addMessage(
-                I18N::translate('The view with ID “%s” does not exist.', I18N::number($view_id)),
-                'danger'
-            );
-            return redirect(route(AdminConfigPage::class, ['tree' => $tree->name()]));
-        }
+		if ($view === null || !($view instanceof GeoAnalysisMap)) {
+			FlashMessages::addMessage(
+				I18N::translate('The view with ID “%s” does not exist.', I18N::number($view_id)),
+				'danger'
+			);
+			return redirect(route(AdminConfigPage::class, ['tree' => $tree->name()]));
+		}
 
-        /** @var \Illuminate\Support\Collection<int> $valid_map_adapters */
-        $valid_map_adapters = $this->mapadapter_data_service
-            ->allForView($view)
-            ->map(fn(GeoAnalysisMapAdapter $map_adapter): int => $map_adapter->id());
+		/** @var \Illuminate\Support\Collection<int> $valid_map_adapters */
+		$valid_map_adapters = $this->mapadapter_data_service
+			->allForView($view)
+			->map(fn(GeoAnalysisMapAdapter $map_adapter): int => $map_adapter->id());
 
-        try {
-            $this->mapadapter_data_service->deleteInvalid($view, $valid_map_adapters);
-            FlashMessages::addMessage(
-                I18N::translate('The invalid map configurations have been successfully deleted.'),
-                'success'
-            );
-        } catch (Throwable $ex) {
-            FlashMessages::addMessage(
-                I18N::translate('An error occured while deleting the invalid map configurations.'),
-                'danger'
-            );
-            //phpcs:ignore Generic.Files.LineLength.TooLong
-            Log::addConfigurationLog('Module ' . $this->module->title() . ' : Error when deleting invalid map configurations: ' . $ex->getMessage());
-        }
+		try {
+			$this->mapadapter_data_service->deleteInvalid($view, $valid_map_adapters);
+			FlashMessages::addMessage(
+				I18N::translate('The invalid map configurations have been successfully deleted.'),
+				'success'
+			);
+		} catch (Throwable $ex) {
+			FlashMessages::addMessage(
+				I18N::translate('An error occured while deleting the invalid map configurations.'),
+				'danger'
+			);
+			//phpcs:ignore Generic.Files.LineLength.TooLong
+			Log::addConfigurationLog('Module ' . $this->module->title() . ' : Error when deleting invalid map configurations: ' . $ex->getMessage());
+		}
 
-        return redirect(route(GeoAnalysisViewEditPage::class, [
-            'tree'      => $tree->name(),
-            'view_id'   => $view_id
-        ]));
-    }
+		return redirect(route(GeoAnalysisViewEditPage::class, [
+			'tree'      => $tree->name(),
+			'view_id'   => $view_id
+		]));
+	}
 }

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

Indentation +42 added lines, -42 removed lines

@@ -30,51 +30,51 @@
  */
 class MapFeaturePropertyData implements RequestHandlerInterface
 {
-    private MapDefinitionsService $map_definition_service;
+	private MapDefinitionsService $map_definition_service;
 
-    /**
-     * Constructor for MapFeaturePropertyData Request Handler
-     *
-     * @param MapDefinitionsService $map_definition_service
-     */
-    public function __construct(
-        MapDefinitionsService $map_definition_service
-    ) {
-        $this->map_definition_service = $map_definition_service;
-    }
+	/**
+	 * Constructor for MapFeaturePropertyData Request Handler
+	 *
+	 * @param MapDefinitionsService $map_definition_service
+	 */
+	public function __construct(
+		MapDefinitionsService $map_definition_service
+	) {
+		$this->map_definition_service = $map_definition_service;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        $map_id = Validator::queryParams($request)->string(
-            'map_id',
-            Validator::attributes($request)->string('map_id', '')
-        );
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		$map_id = Validator::queryParams($request)->string(
+			'map_id',
+			Validator::attributes($request)->string('map_id', '')
+		);
 
-        return response(Registry::cache()->file()->remember(
-            'map-properties-' . $map_id,
-            function () use ($map_id): array {
-                $map = $this->map_definition_service->find($map_id);
-                if ($map === null) {
-                    throw new HttpNotFoundException(I18N::translate('The map could not be found.'));
-                }
+		return response(Registry::cache()->file()->remember(
+			'map-properties-' . $map_id,
+			function () use ($map_id): array {
+				$map = $this->map_definition_service->find($map_id);
+				if ($map === null) {
+					throw new HttpNotFoundException(I18N::translate('The map could not be found.'));
+				}
 
-                $features = [];
-                collect($map->features())
-                    ->map(fn(Feature $feature): ?stdClass => $feature->getProperties())
-                    ->filter()
-                    ->map(fn(stdClass $properties): array => array_keys(get_object_vars($properties)))
-                    ->each(function (array $properties) use (&$features): void {
-                        $features = count($features) === 0 ? $properties : array_intersect($features, $properties);
-                    });
+				$features = [];
+				collect($map->features())
+					->map(fn(Feature $feature): ?stdClass => $feature->getProperties())
+					->filter()
+					->map(fn(stdClass $properties): array => array_keys(get_object_vars($properties)))
+					->each(function (array $properties) use (&$features): void {
+						$features = count($features) === 0 ? $properties : array_intersect($features, $properties);
+					});
 
-                usort($features, I18N::comparator());
-                return  $features;
-            },
-            86400000
-        ));
-    }
+				usort($features, I18N::comparator());
+				return  $features;
+			},
+			86400000
+		));
+	}
 }

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

Indentation +69 added lines, -69 removed lines

@@ -35,82 +35,82 @@
  */
 class GeoAnalysisViewAddAction implements RequestHandlerInterface
 {
-    private ?GeoDispersionModule $module;
-    private GeoAnalysisViewDataService $geoview_data_service;
+	private ?GeoDispersionModule $module;
+	private GeoAnalysisViewDataService $geoview_data_service;
 
-    /**
-     * Constructor for GeoAnalysisViewAddAction Request Handler
-     *
-     * @param ModuleService $module_service
-     * @param GeoAnalysisViewDataService $geoview_data_service
-     */
-    public function __construct(ModuleService $module_service, GeoAnalysisViewDataService $geoview_data_service)
-    {
-        $this->module = $module_service->findByInterface(GeoDispersionModule::class)->first();
-        $this->geoview_data_service = $geoview_data_service;
-    }
+	/**
+	 * Constructor for GeoAnalysisViewAddAction Request Handler
+	 *
+	 * @param ModuleService $module_service
+	 * @param GeoAnalysisViewDataService $geoview_data_service
+	 */
+	public function __construct(ModuleService $module_service, GeoAnalysisViewDataService $geoview_data_service)
+	{
+		$this->module = $module_service->findByInterface(GeoDispersionModule::class)->first();
+		$this->geoview_data_service = $geoview_data_service;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        $tree = Validator::attributes($request)->tree();
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		$tree = Validator::attributes($request)->tree();
 
-        $admin_config_route = route(AdminConfigPage::class, ['tree' => $tree->name()]);
+		$admin_config_route = route(AdminConfigPage::class, ['tree' => $tree->name()]);
 
-        if ($this->module === null) {
-            FlashMessages::addMessage(
-                I18N::translate('The attached module could not be found.'),
-                'danger'
-            );
-            return redirect($admin_config_route);
-        }
+		if ($this->module === null) {
+			FlashMessages::addMessage(
+				I18N::translate('The attached module could not be found.'),
+				'danger'
+			);
+			return redirect($admin_config_route);
+		}
 
-        $type           = Validator::parsedBody($request)->isInArray(['table', 'map'])->string('view_type', '');
-        $description    = Validator::parsedBody($request)->string('view_description', '');
-        $place_depth    = Validator::parsedBody($request)->integer('view_depth', 1);
+		$type           = Validator::parsedBody($request)->isInArray(['table', 'map'])->string('view_type', '');
+		$description    = Validator::parsedBody($request)->string('view_description', '');
+		$place_depth    = Validator::parsedBody($request)->integer('view_depth', 1);
 
-        $analysis = null;
-        try {
-            $analysis = app(Validator::parsedBody($request)->string('view_analysis', ''));
-        } catch (BindingResolutionException $ex) {
-        }
+		$analysis = null;
+		try {
+			$analysis = app(Validator::parsedBody($request)->string('view_analysis', ''));
+		} catch (BindingResolutionException $ex) {
+		}
 
-        if ($type === '' || $place_depth <= 0 || $analysis === null || !($analysis instanceof GeoAnalysisInterface)) {
-            FlashMessages::addMessage(
-                I18N::translate('The parameters for the new view are not valid.'),
-                'danger'
-            );
-            return redirect($admin_config_route);
-        }
+		if ($type === '' || $place_depth <= 0 || $analysis === null || !($analysis instanceof GeoAnalysisInterface)) {
+			FlashMessages::addMessage(
+				I18N::translate('The parameters for the new view are not valid.'),
+				'danger'
+			);
+			return redirect($admin_config_route);
+		}
 
-        if ($type === 'map') {
-            $new_view = new GeoAnalysisMap(0, $tree, true, $description, $analysis, $place_depth);
-        } else {
-            $new_view = new GeoAnalysisTable(0, $tree, true, $description, $analysis, $place_depth);
-        }
+		if ($type === 'map') {
+			$new_view = new GeoAnalysisMap(0, $tree, true, $description, $analysis, $place_depth);
+		} else {
+			$new_view = new GeoAnalysisTable(0, $tree, true, $description, $analysis, $place_depth);
+		}
 
-        $new_view_id = $this->geoview_data_service->insertGetId($new_view);
-        if ($new_view_id > 0) {
-            FlashMessages::addMessage(
-                I18N::translate('The geographical dispersion analysis view has been successfully added.'),
-                'success'
-            );
-            //phpcs:ignore Generic.Files.LineLength.TooLong
-            Log::addConfigurationLog('Module ' . $this->module->title() . ' : View “' . $new_view_id . '” has been added.');
-            return redirect(
-                route(GeoAnalysisViewEditPage::class, ['tree' => $tree->name(), 'view_id' => $new_view_id ])
-            );
-        } else {
-            FlashMessages::addMessage(
-                I18N::translate('An error occured while adding the geographical dispersion analysis view.'),
-                'danger'
-            );
-            //phpcs:ignore Generic.Files.LineLength.TooLong
-            Log::addConfigurationLog('Module ' . $this->module->title() . ' : A new View could not be added. See error log.');
-            return redirect($admin_config_route);
-        }
-    }
+		$new_view_id = $this->geoview_data_service->insertGetId($new_view);
+		if ($new_view_id > 0) {
+			FlashMessages::addMessage(
+				I18N::translate('The geographical dispersion analysis view has been successfully added.'),
+				'success'
+			);
+			//phpcs:ignore Generic.Files.LineLength.TooLong
+			Log::addConfigurationLog('Module ' . $this->module->title() . ' : View “' . $new_view_id . '” has been added.');
+			return redirect(
+				route(GeoAnalysisViewEditPage::class, ['tree' => $tree->name(), 'view_id' => $new_view_id ])
+			);
+		} else {
+			FlashMessages::addMessage(
+				I18N::translate('An error occured while adding the geographical dispersion analysis view.'),
+				'danger'
+			);
+			//phpcs:ignore Generic.Files.LineLength.TooLong
+			Log::addConfigurationLog('Module ' . $this->module->title() . ' : A new View could not be added. See error log.');
+			return redirect($admin_config_route);
+		}
+	}
 }

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

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

Indentation +57 added lines, -57 removed lines

@@ -31,69 +31,69 @@
  */
 class MapAdapterDeleteAction implements RequestHandlerInterface
 {
-    private ?GeoDispersionModule $module;
-    private MapAdapterDataService $mapadapter_data_service;
+	private ?GeoDispersionModule $module;
+	private MapAdapterDataService $mapadapter_data_service;
 
-    /**
-     * Constructor for MapAdapterDeleteAction 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 MapAdapterDeleteAction 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
-    {
-        $tree = Validator::attributes($request)->tree();
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		$tree = Validator::attributes($request)->tree();
 
-        $admin_config_route = route(AdminConfigPage::class, ['tree' => $tree->name()]);
+		$admin_config_route = route(AdminConfigPage::class, ['tree' => $tree->name()]);
 
-        if ($this->module === null) {
-            FlashMessages::addMessage(
-                I18N::translate('The attached module could not be found.'),
-                'danger'
-            );
-            return redirect($admin_config_route);
-        }
+		if ($this->module === null) {
+			FlashMessages::addMessage(
+				I18N::translate('The attached module could not be found.'),
+				'danger'
+			);
+			return redirect($admin_config_route);
+		}
 
-        $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) {
-            FlashMessages::addMessage(
-                I18N::translate('The map configuration with ID “%d” does not exist.', I18N::number($adapter_id)),
-                'danger'
-            );
-            return redirect($admin_config_route);
-        }
+		if ($map_adapter === null) {
+			FlashMessages::addMessage(
+				I18N::translate('The map configuration with ID “%d” does not exist.', I18N::number($adapter_id)),
+				'danger'
+			);
+			return redirect($admin_config_route);
+		}
 
-        if ($this->mapadapter_data_service->delete($map_adapter) > 0) {
-            FlashMessages::addMessage(
-                I18N::translate('The map configuration has been successfully deleted.'),
-                'success'
-            );
-            //phpcs:ignore Generic.Files.LineLength.TooLong
-            Log::addConfigurationLog('Module ' . $this->module->title() . ' : Map Adapter “' . $map_adapter->id() . '” has been deleted.');
-        } else {
-            FlashMessages::addMessage(
-                I18N::translate('An error occured while deleting the map configuration.'),
-                'danger'
-            );
-            //phpcs:ignore Generic.Files.LineLength.TooLong
-            Log::addConfigurationLog('Module ' . $this->module->title() . ' : Map Adapter “' . $map_adapter->id() . '” could not be deleted. See error log.');
-        }
+		if ($this->mapadapter_data_service->delete($map_adapter) > 0) {
+			FlashMessages::addMessage(
+				I18N::translate('The map configuration has been successfully deleted.'),
+				'success'
+			);
+			//phpcs:ignore Generic.Files.LineLength.TooLong
+			Log::addConfigurationLog('Module ' . $this->module->title() . ' : Map Adapter “' . $map_adapter->id() . '” has been deleted.');
+		} else {
+			FlashMessages::addMessage(
+				I18N::translate('An error occured while deleting the map configuration.'),
+				'danger'
+			);
+			//phpcs:ignore Generic.Files.LineLength.TooLong
+			Log::addConfigurationLog('Module ' . $this->module->title() . ' : Map Adapter “' . $map_adapter->id() . '” could not be deleted. See error log.');
+		}
 
-        return redirect(route(GeoAnalysisViewEditPage::class, [
-            'tree'      => $tree->name(),
-            'view_id'   => $map_adapter->geoAnalysisViewId()
-        ]));
-    }
+		return redirect(route(GeoAnalysisViewEditPage::class, [
+			'tree'      => $tree->name(),
+			'view_id'   => $map_adapter->geoAnalysisViewId()
+		]));
+	}
 }