jon48 / webtrees-lib

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

Indentation +56 added lines, -56 removed lines

@@ -33,68 +33,68 @@
  */
 class MapAdapterAddPage implements RequestHandlerInterface
 {
-    use ViewResponseTrait;
+	use ViewResponseTrait;
 
-    private ?GeoDispersionModule $module;
-    private GeoAnalysisViewDataService $geoview_data_service;
-    private MapDefinitionsService $map_definition_service;
-    private PlaceMapperService $place_mapper_service;
+	private ?GeoDispersionModule $module;
+	private GeoAnalysisViewDataService $geoview_data_service;
+	private MapDefinitionsService $map_definition_service;
+	private PlaceMapperService $place_mapper_service;
 
-    /**
-     * Constructor for MapAdapterAddPage Request Handler
-     *
-     * @param ModuleService $module_service
-     * @param GeoAnalysisViewDataService $geoview_data_service
-     * @param MapDefinitionsService $map_definition_service
-     * @param PlaceMapperService $place_mapper_service
-     */
-    public function __construct(
-        ModuleService $module_service,
-        GeoAnalysisViewDataService $geoview_data_service,
-        MapDefinitionsService $map_definition_service,
-        PlaceMapperService $place_mapper_service
-    ) {
-        $this->module = $module_service->findByInterface(GeoDispersionModule::class)->first();
-        $this->geoview_data_service = $geoview_data_service;
-        $this->map_definition_service = $map_definition_service;
-        $this->place_mapper_service = $place_mapper_service;
-    }
+	/**
+	 * Constructor for MapAdapterAddPage Request Handler
+	 *
+	 * @param ModuleService $module_service
+	 * @param GeoAnalysisViewDataService $geoview_data_service
+	 * @param MapDefinitionsService $map_definition_service
+	 * @param PlaceMapperService $place_mapper_service
+	 */
+	public function __construct(
+		ModuleService $module_service,
+		GeoAnalysisViewDataService $geoview_data_service,
+		MapDefinitionsService $map_definition_service,
+		PlaceMapperService $place_mapper_service
+	) {
+		$this->module = $module_service->findByInterface(GeoDispersionModule::class)->first();
+		$this->geoview_data_service = $geoview_data_service;
+		$this->map_definition_service = $map_definition_service;
+		$this->place_mapper_service = $place_mapper_service;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        $this->layout = 'layouts/administration';
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		$this->layout = 'layouts/administration';
 
-        if ($this->module === null) {
-            throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
-        }
+		if ($this->module === null) {
+			throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
+		}
 
-        $tree = Validator::attributes($request)->tree();
+		$tree = Validator::attributes($request)->tree();
 
-        $view_id = Validator::attributes($request)->integer('view_id', -1);
-        $view = $this->geoview_data_service->find($tree, $view_id, true);
+		$view_id = Validator::attributes($request)->integer('view_id', -1);
+		$view = $this->geoview_data_service->find($tree, $view_id, true);
 
-        if ($view === null) {
-            throw new HttpNotFoundException(
-                I18N::translate('The geographical dispersion analysis view could not be found.')
-            );
-        }
+		if ($view === null) {
+			throw new HttpNotFoundException(
+				I18N::translate('The geographical dispersion analysis view could not be found.')
+			);
+		}
 
-        return $this->viewResponse($this->module->name() . '::admin/map-adapter-edit', [
-            'module'            =>  $this->module,
-            'title'             =>  I18N::translate('Add a map configuration'),
-            'tree'              =>  $tree,
-            'view_id'           =>  $view_id,
-            'map_adapter'       =>  null,
-            'maps_list'         =>  $this->map_definition_service->all(),
-            'mappers_list'      =>  $this->place_mapper_service->all(),
-            'route_edit'        =>  route(MapAdapterAddAction::class, [
-                                        'tree'      => $tree->name(),
-                                        'view_id'   => $view_id
-                                    ])
-        ]);
-    }
+		return $this->viewResponse($this->module->name() . '::admin/map-adapter-edit', [
+			'module'            =>  $this->module,
+			'title'             =>  I18N::translate('Add a map configuration'),
+			'tree'              =>  $tree,
+			'view_id'           =>  $view_id,
+			'map_adapter'       =>  null,
+			'maps_list'         =>  $this->map_definition_service->all(),
+			'mappers_list'      =>  $this->place_mapper_service->all(),
+			'route_edit'        =>  route(MapAdapterAddAction::class, [
+										'tree'      => $tree->name(),
+										'view_id'   => $view_id
+									])
+		]);
+	}
 }

Spacing +1 added lines, -1 removed lines

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

app/Module/GeoDispersion/Http/RequestHandlers/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()
+		]));
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -81,14 +81,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 redirect(route(GeoAnalysisViewEditPage::class, [

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 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);
 
-        $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 redirect(route(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 redirect(route(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 redirect(route(GeoAnalysisViewEditPage::class, [
-            'tree' => $tree->name(),
-            'view_id' => $view_id
-        ]));
-    }
+		return redirect(route(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 redirect(route(GeoAnalysisViewEditPage::class, [

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

Indentation +33 added lines, -33 removed lines

@@ -32,42 +32,42 @@
  */
 class GeoAnalysisViewPage implements RequestHandlerInterface
 {
-    use ViewResponseTrait;
+	use ViewResponseTrait;
 
-    private ?GeoDispersionModule $module;
-    private GeoAnalysisViewDataService $geoviewdata_service;
+	private ?GeoDispersionModule $module;
+	private GeoAnalysisViewDataService $geoviewdata_service;
 
-    /**
-     * Constructor for GeoAnalysisViewPage Request Handler
-     *
-     * @param ModuleService $module_service
-     */
-    public function __construct(
-        ModuleService $module_service,
-        GeoAnalysisViewDataService $geoviewdata_service
-    ) {
-        $this->module = $module_service->findByInterface(GeoDispersionModule::class)->first();
-        $this->geoviewdata_service = $geoviewdata_service;
-    }
+	/**
+	 * Constructor for GeoAnalysisViewPage Request Handler
+	 *
+	 * @param ModuleService $module_service
+	 */
+	public function __construct(
+		ModuleService $module_service,
+		GeoAnalysisViewDataService $geoviewdata_service
+	) {
+		$this->module = $module_service->findByInterface(GeoDispersionModule::class)->first();
+		$this->geoviewdata_service = $geoviewdata_service;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        if ($this->module === null) {
-            throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
-        }
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		if ($this->module === null) {
+			throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
+		}
 
-        $tree = Validator::attributes($request)->tree();
-        $view_id = Validator::attributes($request)->integer('view_id', 0);
+		$tree = Validator::attributes($request)->tree();
+		$view_id = Validator::attributes($request)->integer('view_id', 0);
 
-        return $this->viewResponse($this->module->name() . '::geoanalysisview-page', [
-            'module_name'           =>  $this->module->name(),
-            'title'                 =>  I18N::translate('Geographical dispersion'),
-            'tree'                  =>  $tree,
-            'view'                  =>  $this->geoviewdata_service->find($tree, $view_id)
-        ]);
-    }
+		return $this->viewResponse($this->module->name() . '::geoanalysisview-page', [
+			'module_name'           =>  $this->module->name(),
+			'title'                 =>  I18N::translate('Geographical dispersion'),
+			'tree'                  =>  $tree,
+			'view'                  =>  $this->geoviewdata_service->find($tree, $view_id)
+		]);
+	}
 }

Spacing +1 added lines, -1 removed lines

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

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

Indentation +46 added lines, -46 removed lines

@@ -31,58 +31,58 @@
  */
 class GeoAnalysisViewTabs implements RequestHandlerInterface
 {
-    private ?GeoDispersionModule $module;
-    private GeoAnalysisViewDataService $geoviewdata_service;
+	private ?GeoDispersionModule $module;
+	private GeoAnalysisViewDataService $geoviewdata_service;
 
-    /**
-     * Constructor for GeoAnalysisMapsList Request Handler
-     *
-     * @param ModuleService $module_service
-     */
-    public function __construct(
-        ModuleService $module_service,
-        GeoAnalysisViewDataService $geoviewdata_service
-    ) {
-        $this->module = $module_service->findByInterface(GeoDispersionModule::class)->first();
-        $this->geoviewdata_service = $geoviewdata_service;
-    }
+	/**
+	 * Constructor for GeoAnalysisMapsList Request Handler
+	 *
+	 * @param ModuleService $module_service
+	 */
+	public function __construct(
+		ModuleService $module_service,
+		GeoAnalysisViewDataService $geoviewdata_service
+	) {
+		$this->module = $module_service->findByInterface(GeoDispersionModule::class)->first();
+		$this->geoviewdata_service = $geoviewdata_service;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        if ($this->module === null) {
-            throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
-        }
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		if ($this->module === null) {
+			throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
+		}
 
-        $tree = Validator::attributes($request)->tree();
-        $view_id = Validator::attributes($request)->integer('view_id', -1);
+		$tree = Validator::attributes($request)->tree();
+		$view_id = Validator::attributes($request)->integer('view_id', -1);
 
-        $view = $this->geoviewdata_service->find($tree, $view_id);
+		$view = $this->geoviewdata_service->find($tree, $view_id);
 
-        if ($view === null) {
-            throw new HttpNotFoundException(I18N::translate('The requested dispersion analysis does not exist.'));
-        }
+		if ($view === null) {
+			throw new HttpNotFoundException(I18N::translate('The requested dispersion analysis does not exist.'));
+		}
 
-        $results = $view->analysis()->results($tree, $view->placesDepth());
+		$results = $view->analysis()->results($tree, $view->placesDepth());
 
-        $params = [
-            'module_name'   =>  $this->module->name(),
-            'tree'          =>  $tree,
-            'view'          =>  $view,
-            'items_descr'   =>  $view->analysis()->itemsDescription()
-        ];
-        $response = [
-            'global'    =>  view('layouts/ajax', [
-                'content' =>    $view->globalTabContent($this->module, $results->global(), $params)
-            ]),
-            'detailed'  => view('layouts/ajax', [
-                'content' =>    $view->detailedTabContent($this->module, $results->sortedDetailed(), $params)
-            ])
-        ];
+		$params = [
+			'module_name'   =>  $this->module->name(),
+			'tree'          =>  $tree,
+			'view'          =>  $view,
+			'items_descr'   =>  $view->analysis()->itemsDescription()
+		];
+		$response = [
+			'global'    =>  view('layouts/ajax', [
+				'content' =>    $view->globalTabContent($this->module, $results->global(), $params)
+			]),
+			'detailed'  => view('layouts/ajax', [
+				'content' =>    $view->detailedTabContent($this->module, $results->sortedDetailed(), $params)
+			])
+		];
 
-        return response($response);
-    }
+		return response($response);
+	}
 }

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

Indentation +55 added lines, -55 removed lines

@@ -32,67 +32,67 @@
  */
 class GeoAnalysisViewStatusAction implements RequestHandlerInterface
 {
-    private ?GeoDispersionModule $module;
-    private GeoAnalysisViewDataService $geoview_data_service;
+	private ?GeoDispersionModule $module;
+	private GeoAnalysisViewDataService $geoview_data_service;
 
-    /**
-     * Constructor for GeoAnalysisViewStatusAction 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 GeoAnalysisViewStatusAction 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);
+		}
 
-        try {
-            $this->geoview_data_service->updateStatus($view, Validator::attributes($request)->boolean('enable', false));
-            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());
-        }
+		try {
+			$this->geoview_data_service->updateStatus($view, Validator::attributes($request)->boolean('enable', false));
+			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 redirect($admin_config_route);
-    }
+		return redirect($admin_config_route);
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -104,14 +104,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 redirect($admin_config_route);

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

Indentation +52 added lines, -52 removed lines

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

Spacing +1 added lines, -1 removed lines

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

app/Module/GeoDispersion/PlaceMappers/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;
             }

app/Module/GeoDispersion/PlaceMappers/TopFilteredPlaceMapperTrait.php

Indentation +44 added lines, -44 removed lines

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