jon48 / webtrees-lib

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

Indentation +56 added lines, -56 removed lines

@@ -31,67 +31,67 @@
  */
 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();
 
-        if ($this->module === null) {
-            FlashMessages::addMessage(
-                I18N::translate('The attached module could not be found.'),
-                'danger'
-            );
-            return Registry::responseFactory()->redirect(AdminConfigPage::class, ['tree' => $tree->name()]);
-        }
+		if ($this->module === null) {
+			FlashMessages::addMessage(
+				I18N::translate('The attached module could not be found.'),
+				'danger'
+			);
+			return Registry::responseFactory()->redirect(AdminConfigPage::class, ['tree' => $tree->name()]);
+		}
 
-        $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 Registry::responseFactory()->redirect(AdminConfigPage::class, ['tree' => $tree->name()]);
-        }
+		if ($map_adapter === null) {
+			FlashMessages::addMessage(
+				I18N::translate('The map configuration with ID “%d” does not exist.', I18N::number($adapter_id)),
+				'danger'
+			);
+			return Registry::responseFactory()->redirect(AdminConfigPage::class, ['tree' => $tree->name()]);
+		}
 
-        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 Registry::responseFactory()->redirect(GeoAnalysisViewEditPage::class, [
-            'tree'      => $tree->name(),
-            'view_id'   => $map_adapter->geoAnalysisViewId()
-        ]);
-    }
+		return Registry::responseFactory()->redirect(GeoAnalysisViewEditPage::class, [
+			'tree'      => $tree->name(),
+			'view_id'   => $map_adapter->geoAnalysisViewId()
+		]);
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -79,14 +79,14 @@
                 'success'
             );
             //phpcs:ignore Generic.Files.LineLength.TooLong
-            Log::addConfigurationLog('Module ' . $this->module->title() . ' : Map Adapter “' . $map_adapter->id() . '” has been deleted.');
+            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.');
+            Log::addConfigurationLog('Module '.$this->module->title().' : Map Adapter “'.$map_adapter->id().'” could not be deleted. See error log.');
         }
 
         return Registry::responseFactory()->redirect(GeoAnalysisViewEditPage::class, [

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

Indentation +69 added lines, -69 removed lines

@@ -36,81 +36,81 @@
  */
 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();
 
-        if ($this->module === null) {
-            FlashMessages::addMessage(
-                I18N::translate('The attached module could not be found.'),
-                'danger'
-            );
-            return Registry::responseFactory()->redirect(AdminConfigPage::class, ['tree' => $tree->name()]);
-        }
+		if ($this->module === null) {
+			FlashMessages::addMessage(
+				I18N::translate('The attached module could not be found.'),
+				'danger'
+			);
+			return Registry::responseFactory()->redirect(AdminConfigPage::class, ['tree' => $tree->name()]);
+		}
 
-        $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 Registry::responseFactory()->redirect(AdminConfigPage::class, ['tree' => $tree->name()]);
-        }
+		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 Registry::responseFactory()->redirect(AdminConfigPage::class, ['tree' => $tree->name()]);
+		}
 
-        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 Registry::responseFactory()->redirect(
-                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 Registry::responseFactory()->redirect(AdminConfigPage::class, ['tree' => $tree->name()]);
-        }
-    }
+		$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 Registry::responseFactory()->redirect(
+				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 Registry::responseFactory()->redirect(AdminConfigPage::class, ['tree' => $tree->name()]);
+		}
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -98,10 +98,10 @@ 
                 'success'
             );
             //phpcs:ignore Generic.Files.LineLength.TooLong
-            Log::addConfigurationLog('Module ' . $this->module->title() . ' : View “' . $new_view_id . '” has been added.');
+            Log::addConfigurationLog('Module '.$this->module->title().' : View “'.$new_view_id.'” has been added.');
             return Registry::responseFactory()->redirect(
                 GeoAnalysisViewEditPage::class,
-                ['tree' => $tree->name(), 'view_id' => $new_view_id ]
+                ['tree' => $tree->name(), 'view_id' => $new_view_id]
             );
         } else {
             FlashMessages::addMessage(
@@ -109,7 +109,7 @@ 
                 'danger'
             );
             //phpcs:ignore Generic.Files.LineLength.TooLong
-            Log::addConfigurationLog('Module ' . $this->module->title() . ' : A new View could not be added. See error log.');
+            Log::addConfigurationLog('Module '.$this->module->title().' : A new View could not be added. See error log.');
             return Registry::responseFactory()->redirect(AdminConfigPage::class, ['tree' => $tree->name()]);
         }
     }

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

Indentation +83 added lines, -83 removed lines

@@ -34,87 +34,87 @@
  */
 class GeoAnalysisViewEditAction implements RequestHandlerInterface
 {
-    private ?GeoDispersionModule $module;
-    private GeoAnalysisViewDataService $geoview_data_service;
-
-    /**
-     * Constructor for GeoAnalysisViewEditAction 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();
-
-        if ($this->module === null) {
-            FlashMessages::addMessage(
-                I18N::translate('The attached module could not be found.'),
-                'danger'
-            );
-            return Registry::responseFactory()->redirect(AdminConfigPage::class, ['tree' => $tree->name()]);
-        }
-
-
-        $view_id = Validator::attributes($request)->integer('view_id', -1);
-        $view = $this->geoview_data_service->find($tree, $view_id, true);
-
-        $description    = Validator::parsedBody($request)->string('view_description', '');
-        $place_depth    = Validator::parsedBody($request)->integer('view_depth', 1);
-        $top_places     = Validator::parsedBody($request)->integer('view_top_places', 0);
-
-        $analysis = null;
-        try {
-            $analysis = app(Validator::parsedBody($request)->string('view_analysis', ''));
-        } catch (BindingResolutionException $ex) {
-        }
-
-        if (
-            $view === null
-            || $analysis === null || !($analysis instanceof GeoAnalysisInterface)
-            || $place_depth <= 0 && $top_places < 0
-        ) {
-            FlashMessages::addMessage(
-                I18N::translate('The parameters for view with ID “%s” are not valid.', I18N::number($view_id)),
-                'danger'
-            );
-            return Registry::responseFactory()->redirect(AdminConfigPage::class, ['tree' => $tree->name()]);
-        }
-
-        $new_view = $view
-            ->with($view->isEnabled(), $description, $analysis, $place_depth, $top_places)
-            ->withGlobalSettingsUpdate($request);
-
-        try {
-            $this->geoview_data_service->update($new_view);
-            FlashMessages::addMessage(
-                I18N::translate('The geographical dispersion analysis view has been successfully updated.'),
-                'success'
-            );
-            //phpcs:ignore Generic.Files.LineLength.TooLong
-            Log::addConfigurationLog('Module ' . $this->module->title() . ' : View “' . $view->id() . '” has been updated.');
-        } catch (Throwable $ex) {
-            FlashMessages::addMessage(
-                I18N::translate('An error occured while updating the geographical dispersion analysis view.'),
-                'danger'
-            );
-            //phpcs:ignore Generic.Files.LineLength.TooLong
-            Log::addErrorLog('Module ' . $this->module->title() . ' : Error when updating view “' . $view->id() . '”: ' . $ex->getMessage());
-        }
-
-        return Registry::responseFactory()->redirect(GeoAnalysisViewEditPage::class, [
-            'tree' => $tree->name(),
-            'view_id' => $view->id()
-        ]);
-    }
+	private ?GeoDispersionModule $module;
+	private GeoAnalysisViewDataService $geoview_data_service;
+
+	/**
+	 * Constructor for GeoAnalysisViewEditAction 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();
+
+		if ($this->module === null) {
+			FlashMessages::addMessage(
+				I18N::translate('The attached module could not be found.'),
+				'danger'
+			);
+			return Registry::responseFactory()->redirect(AdminConfigPage::class, ['tree' => $tree->name()]);
+		}
+
+
+		$view_id = Validator::attributes($request)->integer('view_id', -1);
+		$view = $this->geoview_data_service->find($tree, $view_id, true);
+
+		$description    = Validator::parsedBody($request)->string('view_description', '');
+		$place_depth    = Validator::parsedBody($request)->integer('view_depth', 1);
+		$top_places     = Validator::parsedBody($request)->integer('view_top_places', 0);
+
+		$analysis = null;
+		try {
+			$analysis = app(Validator::parsedBody($request)->string('view_analysis', ''));
+		} catch (BindingResolutionException $ex) {
+		}
+
+		if (
+			$view === null
+			|| $analysis === null || !($analysis instanceof GeoAnalysisInterface)
+			|| $place_depth <= 0 && $top_places < 0
+		) {
+			FlashMessages::addMessage(
+				I18N::translate('The parameters for view with ID “%s” are not valid.', I18N::number($view_id)),
+				'danger'
+			);
+			return Registry::responseFactory()->redirect(AdminConfigPage::class, ['tree' => $tree->name()]);
+		}
+
+		$new_view = $view
+			->with($view->isEnabled(), $description, $analysis, $place_depth, $top_places)
+			->withGlobalSettingsUpdate($request);
+
+		try {
+			$this->geoview_data_service->update($new_view);
+			FlashMessages::addMessage(
+				I18N::translate('The geographical dispersion analysis view has been successfully updated.'),
+				'success'
+			);
+			//phpcs:ignore Generic.Files.LineLength.TooLong
+			Log::addConfigurationLog('Module ' . $this->module->title() . ' : View “' . $view->id() . '” has been updated.');
+		} catch (Throwable $ex) {
+			FlashMessages::addMessage(
+				I18N::translate('An error occured while updating the geographical dispersion analysis view.'),
+				'danger'
+			);
+			//phpcs:ignore Generic.Files.LineLength.TooLong
+			Log::addErrorLog('Module ' . $this->module->title() . ' : Error when updating view “' . $view->id() . '”: ' . $ex->getMessage());
+		}
+
+		return Registry::responseFactory()->redirect(GeoAnalysisViewEditPage::class, [
+			'tree' => $tree->name(),
+			'view_id' => $view->id()
+		]);
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -102,14 +102,14 @@
                 'success'
             );
             //phpcs:ignore Generic.Files.LineLength.TooLong
-            Log::addConfigurationLog('Module ' . $this->module->title() . ' : View “' . $view->id() . '” has been updated.');
+            Log::addConfigurationLog('Module '.$this->module->title().' : View “'.$view->id().'” has been updated.');
         } catch (Throwable $ex) {
             FlashMessages::addMessage(
                 I18N::translate('An error occured while updating the geographical dispersion analysis view.'),
                 'danger'
             );
             //phpcs:ignore Generic.Files.LineLength.TooLong
-            Log::addErrorLog('Module ' . $this->module->title() . ' : Error when updating view “' . $view->id() . '”: ' . $ex->getMessage());
+            Log::addErrorLog('Module '.$this->module->title().' : Error when updating view “'.$view->id().'”: '.$ex->getMessage());
         }
 
         return Registry::responseFactory()->redirect(GeoAnalysisViewEditPage::class, [

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 Registry::responseFactory()->redirect(AdminConfigPage::class, ['tree' => $tree->name()]);
-        }
+		if ($this->module === null) {
+			FlashMessages::addMessage(
+				I18N::translate('The attached module could not be found.'),
+				'danger'
+			);
+			return Registry::responseFactory()->redirect(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 Registry::responseFactory()->redirect(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 Registry::responseFactory()->redirect(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 Registry::responseFactory()->redirect(GeoAnalysisViewEditPage::class, [
-            'tree'      => $tree->name(),
-            'view_id'   => $view_id
-        ]);
-    }
+		return Registry::responseFactory()->redirect(GeoAnalysisViewEditPage::class, [
+			'tree'      => $tree->name(),
+			'view_id'   => $view_id
+		]);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -100,7 +100,7 @@
                 'danger'
             );
             //phpcs:ignore Generic.Files.LineLength.TooLong
-            Log::addConfigurationLog('Module ' . $this->module->title() . ' : Error when deleting invalid map configurations: ' . $ex->getMessage());
+            Log::addConfigurationLog('Module '.$this->module->title().' : Error when deleting invalid map configurations: '.$ex->getMessage());
         }
 
         return Registry::responseFactory()->redirect(GeoAnalysisViewEditPage::class, [

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

Indentation +53 added lines, -53 removed lines

@@ -31,64 +31,64 @@
  */
 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();
 
-        if ($this->module === null) {
-            FlashMessages::addMessage(
-                I18N::translate('The attached module could not be found.'),
-                'danger'
-            );
-            return Registry::responseFactory()->redirect(AdminConfigPage::class, ['tree' => $tree->name()]);
-        }
+		if ($this->module === null) {
+			FlashMessages::addMessage(
+				I18N::translate('The attached module could not be found.'),
+				'danger'
+			);
+			return Registry::responseFactory()->redirect(AdminConfigPage::class, ['tree' => $tree->name()]);
+		}
 
-        $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 Registry::responseFactory()->redirect(AdminConfigPage::class, ['tree' => $tree->name()]);
-        }
+		if ($view === null) {
+			FlashMessages::addMessage(
+				I18N::translate('The view with ID “%s” does not exist.', I18N::number($view_id)),
+				'danger'
+			);
+			return Registry::responseFactory()->redirect(AdminConfigPage::class, ['tree' => $tree->name()]);
+		}
 
-        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 Registry::responseFactory()->redirect(AdminConfigPage::class, ['tree' => $tree->name()]);
-    }
+		return Registry::responseFactory()->redirect(AdminConfigPage::class, ['tree' => $tree->name()]);
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -79,14 +79,14 @@
                 'success'
             );
             //phpcs:ignore Generic.Files.LineLength.TooLong
-            Log::addConfigurationLog('Module ' . $this->module->title() . ' : View “' . $view->id() . '” has been deleted.');
+            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.');
+            Log::addConfigurationLog('Module '.$this->module->title().' : View “'.$view->id().'” could not be deleted. See error log.');
         }
 
         return Registry::responseFactory()->redirect(AdminConfigPage::class, ['tree' => $tree->name()]);

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

Spacing +4 added lines, -4 removed lines

@@ -55,8 +55,8 @@ 
         );
 
         return Registry::responseFactory()->response(Registry::cache()->file()->remember(
-            'map-properties-' . $map_id,
-            function () use ($map_id): array {
+            '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.'));
@@ -66,8 +66,8 @@ 
                 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 {
+                    ->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);
                     });
 

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

Indentation +66 added lines, -66 removed lines

@@ -32,74 +32,74 @@
  */
 class GeoAnalysisViewListData implements RequestHandlerInterface
 {
-    private ?GeoDispersionModule $module;
-    private GeoAnalysisViewDataService $geoview_data_service;
+	private ?GeoDispersionModule $module;
+	private GeoAnalysisViewDataService $geoview_data_service;
 
-    /**
-     * Constructor for GeoAnalysisViewListData 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 GeoAnalysisViewListData 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
-    {
-        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();
+		$tree = Validator::attributes($request)->tree();
 
-        $module = $this->module;
-        $module_name = $this->module->name();
-        return Registry::responseFactory()->response(['data' => $this->geoview_data_service->all($tree, true)
-            ->map(fn(AbstractGeoAnalysisView $view) => [
-                'edit' => view($module_name . '::admin/view-table-options', [
-                    'view_id' => $view->id(),
-                    'view_enabled' => $view->isEnabled(),
-                    'view_edit_route' => route(GeoAnalysisViewEditPage::class, [
-                        'tree' => $tree->name(),
-                        'view_id' => $view->id()
-                    ]),
-                    'view_delete_route' => route(GeoAnalysisViewDeleteAction::class, [
-                        'tree' => $tree->name(),
-                        'view_id' => $view->id()
-                    ]),
-                    'view_status_route' => route(GeoAnalysisViewStatusAction::class, [
-                        'tree' => $tree->name(),
-                        'view_id' => $view->id(),
-                        'enable' => $view->isEnabled() ? 0 : 1
-                    ]),
-                ]),
-                'enabled' =>  [
-                    'display' => view($module_name . '::components/yes-no-icons', ['yes' => $view->isEnabled()]),
-                    'raw' => $view->isEnabled() ? 0 : 1
-                ],
-                'type' =>  $view->icon($module),
-                'description' => [
-                    'display' => '<bdi>' . e($view->description()) . '</bdi>',
-                    'raw' => e($view->description())
-                ],
-                'analysis' => [
-                    'display' => '<bdi>' . e($view->analysis()->title()) . '</bdi>',
-                    'raw' => e($view->analysis()->title())
-                ],
-                'place_depth' => [
-                    'display' => I18N::number($view->placesDepth()),
-                    'raw' => $view->placesDepth()
-                ]
-            ])
-        ]);
-    }
+		$module = $this->module;
+		$module_name = $this->module->name();
+		return Registry::responseFactory()->response(['data' => $this->geoview_data_service->all($tree, true)
+			->map(fn(AbstractGeoAnalysisView $view) => [
+				'edit' => view($module_name . '::admin/view-table-options', [
+					'view_id' => $view->id(),
+					'view_enabled' => $view->isEnabled(),
+					'view_edit_route' => route(GeoAnalysisViewEditPage::class, [
+						'tree' => $tree->name(),
+						'view_id' => $view->id()
+					]),
+					'view_delete_route' => route(GeoAnalysisViewDeleteAction::class, [
+						'tree' => $tree->name(),
+						'view_id' => $view->id()
+					]),
+					'view_status_route' => route(GeoAnalysisViewStatusAction::class, [
+						'tree' => $tree->name(),
+						'view_id' => $view->id(),
+						'enable' => $view->isEnabled() ? 0 : 1
+					]),
+				]),
+				'enabled' =>  [
+					'display' => view($module_name . '::components/yes-no-icons', ['yes' => $view->isEnabled()]),
+					'raw' => $view->isEnabled() ? 0 : 1
+				],
+				'type' =>  $view->icon($module),
+				'description' => [
+					'display' => '<bdi>' . e($view->description()) . '</bdi>',
+					'raw' => e($view->description())
+				],
+				'analysis' => [
+					'display' => '<bdi>' . e($view->analysis()->title()) . '</bdi>',
+					'raw' => e($view->analysis()->title())
+				],
+				'place_depth' => [
+					'display' => I18N::number($view->placesDepth()),
+					'raw' => $view->placesDepth()
+				]
+			])
+		]);
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -65,7 +65,7 @@ 
         $module_name = $this->module->name();
         return Registry::responseFactory()->response(['data' => $this->geoview_data_service->all($tree, true)
             ->map(fn(AbstractGeoAnalysisView $view) => [
-                'edit' => view($module_name . '::admin/view-table-options', [
+                'edit' => view($module_name.'::admin/view-table-options', [
                     'view_id' => $view->id(),
                     'view_enabled' => $view->isEnabled(),
                     'view_edit_route' => route(GeoAnalysisViewEditPage::class, [
@@ -83,16 +83,16 @@ 
                     ]),
                 ]),
                 'enabled' =>  [
-                    'display' => view($module_name . '::components/yes-no-icons', ['yes' => $view->isEnabled()]),
+                    'display' => view($module_name.'::components/yes-no-icons', ['yes' => $view->isEnabled()]),
                     'raw' => $view->isEnabled() ? 0 : 1
                 ],
                 'type' =>  $view->icon($module),
                 'description' => [
-                    'display' => '<bdi>' . e($view->description()) . '</bdi>',
+                    'display' => '<bdi>'.e($view->description()).'</bdi>',
                     'raw' => e($view->description())
                 ],
                 'analysis' => [
-                    'display' => '<bdi>' . e($view->analysis()->title()) . '</bdi>',
+                    'display' => '<bdi>'.e($view->analysis()->title()).'</bdi>',
                     'raw' => e($view->analysis()->title())
                 ],
                 'place_depth' => [

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

Indentation +82 added lines, -82 removed lines

@@ -37,95 +37,95 @@
  */
 class MapAdapterAddAction implements RequestHandlerInterface
 {
-    private ?GeoDispersionModule $module;
-    private GeoAnalysisViewDataService $geoview_data_service;
-    private MapAdapterDataService $mapadapter_data_service;
-    private MapDefinitionsService $map_definition_service;
+	private ?GeoDispersionModule $module;
+	private GeoAnalysisViewDataService $geoview_data_service;
+	private MapAdapterDataService $mapadapter_data_service;
+	private MapDefinitionsService $map_definition_service;
 
-    /**
-     * Constructor for MapAdapterAddAction Request Handler
-     *
-     * @param ModuleService $module_service
-     * @param GeoAnalysisViewDataService $geoview_data_service
-     * @param MapAdapterDataService $mapadapter_data_service
-     * @param MapDefinitionsService $map_definition_service
-     */
-    public function __construct(
-        ModuleService $module_service,
-        GeoAnalysisViewDataService $geoview_data_service,
-        MapAdapterDataService $mapadapter_data_service,
-        MapDefinitionsService $map_definition_service
-    ) {
-        $this->module = $module_service->findByInterface(GeoDispersionModule::class)->first();
-        $this->geoview_data_service = $geoview_data_service;
-        $this->mapadapter_data_service = $mapadapter_data_service;
-        $this->map_definition_service = $map_definition_service;
-    }
+	/**
+	 * Constructor for MapAdapterAddAction Request Handler
+	 *
+	 * @param ModuleService $module_service
+	 * @param GeoAnalysisViewDataService $geoview_data_service
+	 * @param MapAdapterDataService $mapadapter_data_service
+	 * @param MapDefinitionsService $map_definition_service
+	 */
+	public function __construct(
+		ModuleService $module_service,
+		GeoAnalysisViewDataService $geoview_data_service,
+		MapAdapterDataService $mapadapter_data_service,
+		MapDefinitionsService $map_definition_service
+	) {
+		$this->module = $module_service->findByInterface(GeoDispersionModule::class)->first();
+		$this->geoview_data_service = $geoview_data_service;
+		$this->mapadapter_data_service = $mapadapter_data_service;
+		$this->map_definition_service = $map_definition_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 Registry::responseFactory()->redirect(AdminConfigPage::class, ['tree' => $tree->name()]);
-        }
+		if ($this->module === null) {
+			FlashMessages::addMessage(
+				I18N::translate('The attached module could not be found.'),
+				'danger'
+			);
+			return Registry::responseFactory()->redirect(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);
 
-        $map = $this->map_definition_service->find(Validator::parsedBody($request)->string('map_adapter_map', ''));
-        $mapping_property   = Validator::parsedBody($request)->string('map_adapter_property_selected', '');
+		$map = $this->map_definition_service->find(Validator::parsedBody($request)->string('map_adapter_map', ''));
+		$mapping_property   = Validator::parsedBody($request)->string('map_adapter_property_selected', '');
 
-        $mapper = null;
-        try {
-            $mapper = app(Validator::parsedBody($request)->string('map_adapter_mapper', ''));
-        } catch (BindingResolutionException $ex) {
-        }
+		$mapper = null;
+		try {
+			$mapper = app(Validator::parsedBody($request)->string('map_adapter_mapper', ''));
+		} catch (BindingResolutionException $ex) {
+		}
 
-        if ($view === null || $map === null || $mapper === null || !($mapper instanceof PlaceMapperInterface)) {
-            FlashMessages::addMessage(
-                I18N::translate('The parameters for the map configuration are not valid.'),
-                'danger'
-            );
-            return Registry::responseFactory()->redirect(AdminConfigPage::class, ['tree' => $tree->name()]);
-        }
+		if ($view === null || $map === null || $mapper === null || !($mapper instanceof PlaceMapperInterface)) {
+			FlashMessages::addMessage(
+				I18N::translate('The parameters for the map configuration are not valid.'),
+				'danger'
+			);
+			return Registry::responseFactory()->redirect(AdminConfigPage::class, ['tree' => $tree->name()]);
+		}
 
-        $new_adapter_id = $this->mapadapter_data_service->insertGetId(
-            new GeoAnalysisMapAdapter(
-                0,
-                $view_id,
-                $map,
-                $mapper,
-                new MapViewConfig($mapping_property, $mapper->config()->withConfigUpdate($request))
-            )
-        );
-        if ($new_adapter_id > 0) {
-            FlashMessages::addMessage(
-                I18N::translate('The map configuration has been successfully added.'),
-                'success'
-            );
-            //phpcs:ignore Generic.Files.LineLength.TooLong
-            Log::addConfigurationLog('Module ' . $this->module->title() . ' : Map Adapter “' . $new_adapter_id . '” has been added.');
-        } else {
-            FlashMessages::addMessage(
-                I18N::translate('An error occured while adding a new map configuration.'),
-                'danger'
-            );
-            //phpcs:ignore Generic.Files.LineLength.TooLong
-            Log::addConfigurationLog('Module ' . $this->module->title() . ' : Map Adapter could not be added. See error log.');
-        }
+		$new_adapter_id = $this->mapadapter_data_service->insertGetId(
+			new GeoAnalysisMapAdapter(
+				0,
+				$view_id,
+				$map,
+				$mapper,
+				new MapViewConfig($mapping_property, $mapper->config()->withConfigUpdate($request))
+			)
+		);
+		if ($new_adapter_id > 0) {
+			FlashMessages::addMessage(
+				I18N::translate('The map configuration has been successfully added.'),
+				'success'
+			);
+			//phpcs:ignore Generic.Files.LineLength.TooLong
+			Log::addConfigurationLog('Module ' . $this->module->title() . ' : Map Adapter “' . $new_adapter_id . '” has been added.');
+		} else {
+			FlashMessages::addMessage(
+				I18N::translate('An error occured while adding a new map configuration.'),
+				'danger'
+			);
+			//phpcs:ignore Generic.Files.LineLength.TooLong
+			Log::addConfigurationLog('Module ' . $this->module->title() . ' : Map Adapter could not be added. See error log.');
+		}
 
-        return Registry::responseFactory()->redirect(GeoAnalysisViewEditPage::class, [
-            'tree' => $tree->name(),
-            'view_id' => $view_id
-        ]);
-    }
+		return Registry::responseFactory()->redirect(GeoAnalysisViewEditPage::class, [
+			'tree' => $tree->name(),
+			'view_id' => $view_id
+		]);
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -82,7 +82,7 @@ 
         $view = $this->geoview_data_service->find($tree, $view_id);
 
         $map = $this->map_definition_service->find(Validator::parsedBody($request)->string('map_adapter_map', ''));
-        $mapping_property   = Validator::parsedBody($request)->string('map_adapter_property_selected', '');
+        $mapping_property = Validator::parsedBody($request)->string('map_adapter_property_selected', '');
 
         $mapper = null;
         try {
@@ -113,14 +113,14 @@ 
                 'success'
             );
             //phpcs:ignore Generic.Files.LineLength.TooLong
-            Log::addConfigurationLog('Module ' . $this->module->title() . ' : Map Adapter “' . $new_adapter_id . '” has been added.');
+            Log::addConfigurationLog('Module '.$this->module->title().' : Map Adapter “'.$new_adapter_id.'” has been added.');
         } else {
             FlashMessages::addMessage(
                 I18N::translate('An error occured while adding a new map configuration.'),
                 'danger'
             );
             //phpcs:ignore Generic.Files.LineLength.TooLong
-            Log::addConfigurationLog('Module ' . $this->module->title() . ' : Map Adapter could not be added. See error log.');
+            Log::addConfigurationLog('Module '.$this->module->title().' : Map Adapter could not be added. See error log.');
         }
 
         return Registry::responseFactory()->redirect(GeoAnalysisViewEditPage::class, [

app/Module/GeoDispersion/PlaceMappers/Config/FilteredTopPlaceMapperConfig.php

Indentation +99 added lines, -99 removed lines

@@ -29,111 +29,111 @@
  */
 class FilteredTopPlaceMapperConfig extends GenericPlaceMapperConfig
 {
-    private TreeService $tree_service;
+	private TreeService $tree_service;
 
-    /**
-     * FilteredTopPlaceMapperConfig
-     *
-     * @param TreeService $tree_service
-     */
-    public function __construct(TreeService $tree_service)
-    {
-        $this->tree_service = $tree_service;
-    }
+	/**
+	 * FilteredTopPlaceMapperConfig
+	 *
+	 * @param TreeService $tree_service
+	 */
+	public function __construct(TreeService $tree_service)
+	{
+		$this->tree_service = $tree_service;
+	}
 
-    /**
-     * Get the configured Top Places to filter on
-     *
-     * @return Collection<Place>
-     */
-    public function topPlaces(): Collection
-    {
-        return collect($this->get('topPlaces', []))
-            ->filter(
-                /** @psalm-suppress MissingClosureParamType */
-                fn($item): bool => $item instanceof Place
-            );
-    }
+	/**
+	 * Get the configured Top Places to filter on
+	 *
+	 * @return Collection<Place>
+	 */
+	public function topPlaces(): Collection
+	{
+		return collect($this->get('topPlaces', []))
+			->filter(
+				/** @psalm-suppress MissingClosureParamType */
+				fn($item): bool => $item instanceof Place
+			);
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Common\GeoDispersion\Config\GenericPlaceMapperConfig::jsonSerializeConfig()
-     */
-    public function jsonSerializeConfig()
-    {
-        return [
-            'topPlaces' => $this->topPlaces()
-                ->map(fn(Place $place): array => [ $place->tree()->id(), $place->gedcomName() ])
-                ->toArray()
-        ];
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Common\GeoDispersion\Config\GenericPlaceMapperConfig::jsonSerializeConfig()
+	 */
+	public function jsonSerializeConfig()
+	{
+		return [
+			'topPlaces' => $this->topPlaces()
+				->map(fn(Place $place): array => [ $place->tree()->id(), $place->gedcomName() ])
+				->toArray()
+		];
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Common\GeoDispersion\Config\GenericPlaceMapperConfig::jsonDeserialize()
-     *
-     * @param mixed $config
-     * @return $this
-     */
-    public function jsonDeserialize($config): self
-    {
-        if (is_string($config)) {
-            return $this->jsonDeserialize(json_decode($config));
-        }
-        if (is_array($config)) {
-            $this->setConfig([
-                'topPlaces' => collect($config['topPlaces'] ?? [])
-                    ->filter(
-                        /** @psalm-suppress MissingClosureParamType */
-                        fn($item): bool => is_array($item) && count($item) === 2
-                    )->map(function (array $item): ?Place {
-                        try {
-                            return new Place($item[1], $this->tree_service->find($item[0]));
-                        } catch (RuntimeException $ex) {
-                            return null;
-                        }
-                    })
-                    ->filter()
-                    ->toArray()
-                ]);
-        }
-        return $this;
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Common\GeoDispersion\Config\GenericPlaceMapperConfig::jsonDeserialize()
+	 *
+	 * @param mixed $config
+	 * @return $this
+	 */
+	public function jsonDeserialize($config): self
+	{
+		if (is_string($config)) {
+			return $this->jsonDeserialize(json_decode($config));
+		}
+		if (is_array($config)) {
+			$this->setConfig([
+				'topPlaces' => collect($config['topPlaces'] ?? [])
+					->filter(
+						/** @psalm-suppress MissingClosureParamType */
+						fn($item): bool => is_array($item) && count($item) === 2
+					)->map(function (array $item): ?Place {
+						try {
+							return new Place($item[1], $this->tree_service->find($item[0]));
+						} catch (RuntimeException $ex) {
+							return null;
+						}
+					})
+					->filter()
+					->toArray()
+				]);
+		}
+		return $this;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Common\GeoDispersion\Config\GenericPlaceMapperConfig::configContent()
-     */
-    public function configContent(ModuleInterface $module, Tree $tree): string
-    {
-        return view($module->name() . '::mappers/filtered-top-config', [
-            'tree'          =>  $tree,
-            'top_places'    =>  $this->topPlaces()
-        ]);
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Common\GeoDispersion\Config\GenericPlaceMapperConfig::configContent()
+	 */
+	public function configContent(ModuleInterface $module, Tree $tree): string
+	{
+		return view($module->name() . '::mappers/filtered-top-config', [
+			'tree'          =>  $tree,
+			'top_places'    =>  $this->topPlaces()
+		]);
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Common\GeoDispersion\Config\GenericPlaceMapperConfig::withConfigUpdate()
-     * @return $this
-     */
-    public function withConfigUpdate(ServerRequestInterface $request): self
-    {
-        $tree = Validator::attributes($request)->treeOptional();
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Common\GeoDispersion\Config\GenericPlaceMapperConfig::withConfigUpdate()
+	 * @return $this
+	 */
+	public function withConfigUpdate(ServerRequestInterface $request): self
+	{
+		$tree = Validator::attributes($request)->treeOptional();
 
-        if ($tree === null) {
-            return $this;
-        }
+		if ($tree === null) {
+			return $this;
+		}
 
-        $top_places = Validator::parsedBody($request)->array('mapper_filt_top_places');
-        $config = ['topPlaces' => []];
-        foreach ($top_places as $top_place_id) {
-            $place = Place::find((int) $top_place_id, $tree);
-            if (mb_strlen($place->gedcomName()) > 0) {
-                $config['topPlaces'][] = $place;
-            }
-        }
-        $this->setConfig($config);
-        return $this;
-    }
+		$top_places = Validator::parsedBody($request)->array('mapper_filt_top_places');
+		$config = ['topPlaces' => []];
+		foreach ($top_places as $top_place_id) {
+			$place = Place::find((int) $top_place_id, $tree);
+			if (mb_strlen($place->gedcomName()) > 0) {
+				$config['topPlaces'][] = $place;
+			}
+		}
+		$this->setConfig($config);
+		return $this;
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -63,7 +63,7 @@ 
     {
         return [
             'topPlaces' => $this->topPlaces()
-                ->map(fn(Place $place): array => [ $place->tree()->id(), $place->gedcomName() ])
+                ->map(fn(Place $place): array => [$place->tree()->id(), $place->gedcomName()])
                 ->toArray()
         ];
     }
@@ -86,7 +86,7 @@ 
                     ->filter(
                         /** @psalm-suppress MissingClosureParamType */
                         fn($item): bool => is_array($item) && count($item) === 2
-                    )->map(function (array $item): ?Place {
+                    )->map(function(array $item): ?Place {
                         try {
                             return new Place($item[1], $this->tree_service->find($item[0]));
                         } catch (RuntimeException $ex) {
@@ -106,7 +106,7 @@ 
      */
     public function configContent(ModuleInterface $module, Tree $tree): string
     {
-        return view($module->name() . '::mappers/filtered-top-config', [
+        return view($module->name().'::mappers/filtered-top-config', [
             'tree'          =>  $tree,
             'top_places'    =>  $this->topPlaces()
         ]);
@@ -128,7 +128,7 @@ 
         $top_places = Validator::parsedBody($request)->array('mapper_filt_top_places');
         $config = ['topPlaces' => []];
         foreach ($top_places as $top_place_id) {
-            $place = Place::find((int) $top_place_id, $tree);
+            $place = Place::find((int)$top_place_id, $tree);
             if (mb_strlen($place->gedcomName()) > 0) {
                 $config['topPlaces'][] = $place;
             }