jon48 / webtrees-lib

app/Module/PatronymicLineage/Model/LineageRootNode.php

Indentation +58 added lines, -58 removed lines

@@ -23,68 +23,68 @@
  */
 class LineageRootNode extends LineageNode
 {
-    /**
-     * @var Collection<string, int> $places Places for the lineage node
-     */
-    private $places;
+	/**
+	 * @var Collection<string, int> $places Places for the lineage node
+	 */
+	private $places;
 
-    /**
-     * @var int $nb_children Number of node childs
-     */
-    private $nb_children;
+	/**
+	 * @var int $nb_children Number of node childs
+	 */
+	private $nb_children;
 
-    /**
-     * Constructor for LineageRootNode
-     *
-     * @param Individual|null $node_indi
-     */
-    public function __construct(?Individual $node_indi = null)
-    {
-        parent::__construct($node_indi, $this);
-        $this->places = new Collection();
-        $this->nb_children = 0;
-    }
+	/**
+	 * Constructor for LineageRootNode
+	 *
+	 * @param Individual|null $node_indi
+	 */
+	public function __construct(?Individual $node_indi = null)
+	{
+		parent::__construct($node_indi, $this);
+		$this->places = new Collection();
+		$this->nb_children = 0;
+	}
 
-    /**
-     * Adds a place to the list of lineage's place
-     *
-     * @param Place $place
-     */
-    public function addPlace(Place $place): void
-    {
-        $place_name = $place->gedcomName();
-        if (mb_strlen($place_name) > 0) {
-            $this->places->put($place_name, $this->places->get($place_name, 0) + 1);
-        }
-    }
+	/**
+	 * Adds a place to the list of lineage's place
+	 *
+	 * @param Place $place
+	 */
+	public function addPlace(Place $place): void
+	{
+		$place_name = $place->gedcomName();
+		if (mb_strlen($place_name) > 0) {
+			$this->places->put($place_name, $this->places->get($place_name, 0) + 1);
+		}
+	}
 
-    /**
-     * Returns the number of child nodes.
-     * This number is more to be used as indication rather than an accurate one.
-     *
-     * @return int
-     */
-    public function numberChildNodes(): int
-    {
-        return $this->nb_children;
-    }
+	/**
+	 * Returns the number of child nodes.
+	 * This number is more to be used as indication rather than an accurate one.
+	 *
+	 * @return int
+	 */
+	public function numberChildNodes(): int
+	{
+		return $this->nb_children;
+	}
 
-    /**
-     * Increments the number of child nodes by one
-     *
-     */
-    public function incrementChildNodes(): void
-    {
-        $this->nb_children++;
-    }
+	/**
+	 * Increments the number of child nodes by one
+	 *
+	 */
+	public function incrementChildNodes(): void
+	{
+		$this->nb_children++;
+	}
 
-    /**
-     * Returns the list of place for the lineage
-     *
-     * @return Collection<string, int>
-     */
-    public function places(): Collection
-    {
-        return $this->places;
-    }
+	/**
+	 * Returns the list of place for the lineage
+	 *
+	 * @return Collection<string, int>
+	 */
+	public function places(): Collection
+	{
+		return $this->places;
+	}
 }

app/Module/AdminTasks/Schema/Migration0.php

Indentation +8 added lines, -8 removed lines

@@ -21,12 +21,12 @@
  */
 class Migration0 implements MigrationInterface
 {
-    /**
-     * {@inheritDoc}
-     * @see MigrationInterface::upgrade()
-     */
-    public function upgrade(): void
-    {
-        // These migrations have been merged into migration 1.
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see MigrationInterface::upgrade()
+	 */
+	public function upgrade(): void
+	{
+		// These migrations have been merged into migration 1.
+	}
 }

app/Module/AdminTasks/Http/RequestHandlers/TaskEditPage.php

Indentation +44 added lines, -44 removed lines

@@ -31,58 +31,58 @@
  */
 class TaskEditPage implements RequestHandlerInterface
 {
-    use ViewResponseTrait;
+	use ViewResponseTrait;
 
-    private ?AdminTasksModule $module;
-    private TaskScheduleService $taskschedules_service;
+	private ?AdminTasksModule $module;
+	private TaskScheduleService $taskschedules_service;
 
-    /**
-     * Constructor for TaskEditPage Request Handler
-     *
-     * @param ModuleService $module_service
-     * @param TaskScheduleService $taskschedules_service
-     */
-    public function __construct(ModuleService $module_service, TaskScheduleService $taskschedules_service)
-    {
-        $this->module = $module_service->findByInterface(AdminTasksModule::class)->first();
-        $this->taskschedules_service = $taskschedules_service;
-    }
+	/**
+	 * Constructor for TaskEditPage Request Handler
+	 *
+	 * @param ModuleService $module_service
+	 * @param TaskScheduleService $taskschedules_service
+	 */
+	public function __construct(ModuleService $module_service, TaskScheduleService $taskschedules_service)
+	{
+		$this->module = $module_service->findByInterface(AdminTasksModule::class)->first();
+		$this->taskschedules_service = $taskschedules_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.'));
+		}
 
-        $task_sched_id = Validator::attributes($request)->integer('task', -1);
-        $task_schedule = $this->taskschedules_service->find($task_sched_id);
+		$task_sched_id = Validator::attributes($request)->integer('task', -1);
+		$task_schedule = $this->taskschedules_service->find($task_sched_id);
 
-        if ($task_schedule === null) {
-            throw new HttpNotFoundException(I18N::translate('The Task schedule could not be found.'));
-        }
+		if ($task_schedule === null) {
+			throw new HttpNotFoundException(I18N::translate('The Task schedule could not be found.'));
+		}
 
-        $task = $this->taskschedules_service->findTask($task_schedule->taskId());
+		$task = $this->taskschedules_service->findTask($task_schedule->taskId());
 
-        if ($task === null) {
-            throw new HttpNotFoundException(I18N::translate('The Task schedule could not be found.'));
-        }
+		if ($task === null) {
+			throw new HttpNotFoundException(I18N::translate('The Task schedule could not be found.'));
+		}
 
-        $has_task_config = $task instanceof ConfigurableTaskInterface;
-        /** @var \MyArtJaub\Webtrees\Contracts\Tasks\TaskInterface&\MyArtJaub\Webtrees\Contracts\Tasks\ConfigurableTaskInterface $task */
+		$has_task_config = $task instanceof ConfigurableTaskInterface;
+		/** @var \MyArtJaub\Webtrees\Contracts\Tasks\TaskInterface&\MyArtJaub\Webtrees\Contracts\Tasks\ConfigurableTaskInterface $task */
 
-        return $this->viewResponse($this->module->name() . '::admin/tasks-edit', [
-            'module'            =>  $this->module,
-            'title'             =>  I18N::translate('Edit the administrative task') . ' - ' . $task->name(),
-            'task_schedule'     =>  $task_schedule,
-            'task'              =>  $task,
-            'has_task_config'   =>  $has_task_config,
-            'task_config_view'  =>  $has_task_config ? $task->configView($request) : ''
-        ]);
-    }
+		return $this->viewResponse($this->module->name() . '::admin/tasks-edit', [
+			'module'            =>  $this->module,
+			'title'             =>  I18N::translate('Edit the administrative task') . ' - ' . $task->name(),
+			'task_schedule'     =>  $task_schedule,
+			'task'              =>  $task,
+			'has_task_config'   =>  $has_task_config,
+			'task_config_view'  =>  $has_task_config ? $task->configView($request) : ''
+		]);
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -76,9 +76,9 @@
         $has_task_config = $task instanceof ConfigurableTaskInterface;
         /** @var \MyArtJaub\Webtrees\Contracts\Tasks\TaskInterface&\MyArtJaub\Webtrees\Contracts\Tasks\ConfigurableTaskInterface $task */
 
-        return $this->viewResponse($this->module->name() . '::admin/tasks-edit', [
+        return $this->viewResponse($this->module->name().'::admin/tasks-edit', [
             'module'            =>  $this->module,
-            'title'             =>  I18N::translate('Edit the administrative task') . ' - ' . $task->name(),
+            'title'             =>  I18N::translate('Edit the administrative task').' - '.$task->name(),
             'task_schedule'     =>  $task_schedule,
             'task'              =>  $task,
             'has_task_config'   =>  $has_task_config,

app/Module/GeoDispersion/Views/GeoAnalysisMap.php

Indentation +113 added lines, -113 removed lines

@@ -32,117 +32,117 @@
  */
 class GeoAnalysisMap extends AbstractGeoAnalysisView
 {
-    private ?MapColorsConfig $colors_config = null;
-
-    public function type(): string
-    {
-        return I18N::translateContext('GEODISPERSION', 'Map');
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\GeoDispersion\Views\AbstractGeoAnalysisView::icon()
-     */
-    public function icon(ModuleInterface $module): string
-    {
-        return view($module->name() . '::icons/view-map', ['type' => $this->type()]);
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\GeoDispersion\Views\AbstractGeoAnalysisView::globalSettingsContent()
-     */
-    public function globalSettingsContent(ModuleInterface $module): string
-    {
-        return view($module->name() . '::admin/view-edit-map', [
-            'module_name'   =>  $module->name(),
-            'view'          =>  $this,
-            'colors'        =>  $this->colors(),
-            'map_adapters'  =>  app(MapAdapterDataService::class)->allForView($this, true)
-        ]);
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\GeoDispersion\Views\AbstractGeoAnalysisView::withGlobalSettingsUpdate()
-     * @return static
-     */
-    public function withGlobalSettingsUpdate(ServerRequestInterface $request): self
-    {
-        $default_color  = Validator::parsedBody($request)->string('view_map_color_default', '');
-        $stroke_color   = Validator::parsedBody($request)->string('view_map_color_stroke', '');
-        $maxvalue_color  = Validator::parsedBody($request)->string('view_map_color_maxvalue', '');
-        $hover_color  = Validator::parsedBody($request)->string('view_map_color_hover', '');
-
-        try {
-            return $this->withColors(new MapColorsConfig(
-                Hex::fromString($default_color),
-                Hex::fromString($stroke_color),
-                Hex::fromString($maxvalue_color),
-                Hex::fromString($hover_color)
-            ));
-        } catch (InvalidColorValue $ex) {
-        }
-
-        return $this;
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\GeoDispersion\Views\AbstractGeoAnalysisView::globalTabContent()
-     */
-    public function globalTabContent(GeoDispersionModule $module, GeoAnalysisResult $result, array $params): string
-    {
-        $map_adapters = app(MapAdapterDataService::class)->allForView($this);
-
-        $adapter_result = null;
-        foreach ($map_adapters as $map_adapter) {
-            $adapter_result_tmp = $map_adapter->convert($result);
-            $adapter_result = $adapter_result === null ?
-                $adapter_result_tmp :
-                $adapter_result->merge($adapter_result_tmp);
-        }
-
-        if ($adapter_result === null) {
-            return view($module->name() . '::errors/tab-error', [
-                'message'   =>  I18N::translate('The map could not be loaded.'),
-            ]);
-        }
-
-        return view($module->name() . '::geoanalysisview-tab-glb-map', $params + [
-            'result'            =>  $adapter_result->geoAnalysisResult(),
-            'features'          =>  $adapter_result->features(),
-            'colors'            =>  $this->colors(),
-            'leaflet_config'    =>  app(LeafletJsService::class)->config(),
-            'js_script_url'     =>  $module->assetUrl('js/geodispersion.min.js')
-        ]);
-    }
-
-    /**
-     * Get the color scheme configuration for the map view
-     *
-     * @return MapColorsConfig
-     */
-    public function colors(): MapColorsConfig
-    {
-        return $this->colors_config ?? new MapColorsConfig(
-            new Rgb(245, 245, 245),
-            new Rgb(213, 213, 213),
-            new Rgb(4, 147, 171),
-            new Rgb(255, 102, 0)
-        );
-    }
-
-    /**
-     * Returns a map view with a new color scheme configuration
-     *
-     * @param MapColorsConfig $config
-     * @return static
-     */
-    public function withColors(?MapColorsConfig $config): self
-    {
-        $new = clone $this;
-        $new->colors_config = $config;
-        return $new;
-    }
+	private ?MapColorsConfig $colors_config = null;
+
+	public function type(): string
+	{
+		return I18N::translateContext('GEODISPERSION', 'Map');
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Module\GeoDispersion\Views\AbstractGeoAnalysisView::icon()
+	 */
+	public function icon(ModuleInterface $module): string
+	{
+		return view($module->name() . '::icons/view-map', ['type' => $this->type()]);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Module\GeoDispersion\Views\AbstractGeoAnalysisView::globalSettingsContent()
+	 */
+	public function globalSettingsContent(ModuleInterface $module): string
+	{
+		return view($module->name() . '::admin/view-edit-map', [
+			'module_name'   =>  $module->name(),
+			'view'          =>  $this,
+			'colors'        =>  $this->colors(),
+			'map_adapters'  =>  app(MapAdapterDataService::class)->allForView($this, true)
+		]);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Module\GeoDispersion\Views\AbstractGeoAnalysisView::withGlobalSettingsUpdate()
+	 * @return static
+	 */
+	public function withGlobalSettingsUpdate(ServerRequestInterface $request): self
+	{
+		$default_color  = Validator::parsedBody($request)->string('view_map_color_default', '');
+		$stroke_color   = Validator::parsedBody($request)->string('view_map_color_stroke', '');
+		$maxvalue_color  = Validator::parsedBody($request)->string('view_map_color_maxvalue', '');
+		$hover_color  = Validator::parsedBody($request)->string('view_map_color_hover', '');
+
+		try {
+			return $this->withColors(new MapColorsConfig(
+				Hex::fromString($default_color),
+				Hex::fromString($stroke_color),
+				Hex::fromString($maxvalue_color),
+				Hex::fromString($hover_color)
+			));
+		} catch (InvalidColorValue $ex) {
+		}
+
+		return $this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Module\GeoDispersion\Views\AbstractGeoAnalysisView::globalTabContent()
+	 */
+	public function globalTabContent(GeoDispersionModule $module, GeoAnalysisResult $result, array $params): string
+	{
+		$map_adapters = app(MapAdapterDataService::class)->allForView($this);
+
+		$adapter_result = null;
+		foreach ($map_adapters as $map_adapter) {
+			$adapter_result_tmp = $map_adapter->convert($result);
+			$adapter_result = $adapter_result === null ?
+				$adapter_result_tmp :
+				$adapter_result->merge($adapter_result_tmp);
+		}
+
+		if ($adapter_result === null) {
+			return view($module->name() . '::errors/tab-error', [
+				'message'   =>  I18N::translate('The map could not be loaded.'),
+			]);
+		}
+
+		return view($module->name() . '::geoanalysisview-tab-glb-map', $params + [
+			'result'            =>  $adapter_result->geoAnalysisResult(),
+			'features'          =>  $adapter_result->features(),
+			'colors'            =>  $this->colors(),
+			'leaflet_config'    =>  app(LeafletJsService::class)->config(),
+			'js_script_url'     =>  $module->assetUrl('js/geodispersion.min.js')
+		]);
+	}
+
+	/**
+	 * Get the color scheme configuration for the map view
+	 *
+	 * @return MapColorsConfig
+	 */
+	public function colors(): MapColorsConfig
+	{
+		return $this->colors_config ?? new MapColorsConfig(
+			new Rgb(245, 245, 245),
+			new Rgb(213, 213, 213),
+			new Rgb(4, 147, 171),
+			new Rgb(255, 102, 0)
+		);
+	}
+
+	/**
+	 * Returns a map view with a new color scheme configuration
+	 *
+	 * @param MapColorsConfig $config
+	 * @return static
+	 */
+	public function withColors(?MapColorsConfig $config): self
+	{
+		$new = clone $this;
+		$new->colors_config = $config;
+		return $new;
+	}
 }

Spacing +7 added lines, -8 removed lines

@@ -45,7 +45,7 @@ 
      */
     public function icon(ModuleInterface $module): string
     {
-        return view($module->name() . '::icons/view-map', ['type' => $this->type()]);
+        return view($module->name().'::icons/view-map', ['type' => $this->type()]);
     }
 
     /**
@@ -54,7 +54,7 @@ 
      */
     public function globalSettingsContent(ModuleInterface $module): string
     {
-        return view($module->name() . '::admin/view-edit-map', [
+        return view($module->name().'::admin/view-edit-map', [
             'module_name'   =>  $module->name(),
             'view'          =>  $this,
             'colors'        =>  $this->colors(),
@@ -71,8 +71,8 @@ 
     {
         $default_color  = Validator::parsedBody($request)->string('view_map_color_default', '');
         $stroke_color   = Validator::parsedBody($request)->string('view_map_color_stroke', '');
-        $maxvalue_color  = Validator::parsedBody($request)->string('view_map_color_maxvalue', '');
-        $hover_color  = Validator::parsedBody($request)->string('view_map_color_hover', '');
+        $maxvalue_color = Validator::parsedBody($request)->string('view_map_color_maxvalue', '');
+        $hover_color = Validator::parsedBody($request)->string('view_map_color_hover', '');
 
         try {
             return $this->withColors(new MapColorsConfig(
@@ -99,17 +99,16 @@ 
         foreach ($map_adapters as $map_adapter) {
             $adapter_result_tmp = $map_adapter->convert($result);
             $adapter_result = $adapter_result === null ?
-                $adapter_result_tmp :
-                $adapter_result->merge($adapter_result_tmp);
+                $adapter_result_tmp : $adapter_result->merge($adapter_result_tmp);
         }
 
         if ($adapter_result === null) {
-            return view($module->name() . '::errors/tab-error', [
+            return view($module->name().'::errors/tab-error', [
                 'message'   =>  I18N::translate('The map could not be loaded.'),
             ]);
         }
 
-        return view($module->name() . '::geoanalysisview-tab-glb-map', $params + [
+        return view($module->name().'::geoanalysisview-tab-glb-map', $params + [
             'result'            =>  $adapter_result->geoAnalysisResult(),
             'features'          =>  $adapter_result->features(),
             'colors'            =>  $this->colors(),

app/Module/GeoDispersion/Schema/Migration0.php

Indentation +8 added lines, -8 removed lines

@@ -21,12 +21,12 @@
  */
 class Migration0 implements MigrationInterface
 {
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Schema\MigrationInterface::upgrade()
-     */
-    public function upgrade(): void
-    {
-        // This migration has been superseded by migration 1.
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Schema\MigrationInterface::upgrade()
+	 */
+	public function upgrade(): void
+	{
+		// This migration has been superseded by migration 1.
+	}
 }

app/Module/GeoDispersion/Schema/Migration1.php

Indentation +37 added lines, -37 removed lines

@@ -23,41 +23,41 @@
  */
 class Migration1 implements MigrationInterface
 {
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Schema\MigrationInterface::upgrade()
-     */
-    public function upgrade(): void
-    {
-        $in_transaction = DB::connection()->getPdo()->inTransaction();
-
-        DB::schema()->create('maj_geodisp_views', static function (Blueprint $table): void {
-            $table->integer('majgv_id')->autoIncrement();
-            $table->integer('majgv_gedcom_id')->index();
-            $table->string('majgv_view_class', 255);
-            $table->enum('majgv_status', ['enabled', 'disabled'])->default('enabled');
-            $table->string('majgv_descr', 248);
-            $table->string('majgv_analysis', 255);
-            $table->tinyInteger('majgv_place_depth')->default(1);
-            $table->tinyInteger('majgv_top_places')->default(0);
-            $table->json('majgv_colors')->nullable();
-
-            $table->foreign('majgv_gedcom_id')->references('gedcom_id')->on('gedcom')->onDelete('cascade');
-        });
-
-        DB::schema()->create('maj_geodisp_mapviews', static function (Blueprint $table): void {
-            $table->integer('majgm_id')->autoIncrement();
-            $table->integer('majgm_majgv_id')->index();
-            $table->string('majgm_map_id', 127);
-            $table->string('majgm_mapper', 255);
-            $table->string('majgm_feature_prop', 31);
-            $table->json('majgm_config')->nullable();
-
-            $table->foreign('majgm_majgv_id')->references('majgv_id')->on('maj_geodisp_views')->onDelete('cascade');
-        });
-
-        if ($in_transaction && !DB::connection()->getPdo()->inTransaction()) {
-            DB::connection()->beginTransaction();
-        }
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Schema\MigrationInterface::upgrade()
+	 */
+	public function upgrade(): void
+	{
+		$in_transaction = DB::connection()->getPdo()->inTransaction();
+
+		DB::schema()->create('maj_geodisp_views', static function (Blueprint $table): void {
+			$table->integer('majgv_id')->autoIncrement();
+			$table->integer('majgv_gedcom_id')->index();
+			$table->string('majgv_view_class', 255);
+			$table->enum('majgv_status', ['enabled', 'disabled'])->default('enabled');
+			$table->string('majgv_descr', 248);
+			$table->string('majgv_analysis', 255);
+			$table->tinyInteger('majgv_place_depth')->default(1);
+			$table->tinyInteger('majgv_top_places')->default(0);
+			$table->json('majgv_colors')->nullable();
+
+			$table->foreign('majgv_gedcom_id')->references('gedcom_id')->on('gedcom')->onDelete('cascade');
+		});
+
+		DB::schema()->create('maj_geodisp_mapviews', static function (Blueprint $table): void {
+			$table->integer('majgm_id')->autoIncrement();
+			$table->integer('majgm_majgv_id')->index();
+			$table->string('majgm_map_id', 127);
+			$table->string('majgm_mapper', 255);
+			$table->string('majgm_feature_prop', 31);
+			$table->json('majgm_config')->nullable();
+
+			$table->foreign('majgm_majgv_id')->references('majgv_id')->on('maj_geodisp_views')->onDelete('cascade');
+		});
+
+		if ($in_transaction && !DB::connection()->getPdo()->inTransaction()) {
+			DB::connection()->beginTransaction();
+		}
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
     {
         $in_transaction = DB::connection()->getPdo()->inTransaction();
 
-        DB::schema()->create('maj_geodisp_views', static function (Blueprint $table): void {
+        DB::schema()->create('maj_geodisp_views', static function(Blueprint $table): void {
             $table->integer('majgv_id')->autoIncrement();
             $table->integer('majgv_gedcom_id')->index();
             $table->string('majgv_view_class', 255);
@@ -45,7 +45,7 @@ 
             $table->foreign('majgv_gedcom_id')->references('gedcom_id')->on('gedcom')->onDelete('cascade');
         });
 
-        DB::schema()->create('maj_geodisp_mapviews', static function (Blueprint $table): void {
+        DB::schema()->create('maj_geodisp_mapviews', static function(Blueprint $table): void {
             $table->integer('majgm_id')->autoIncrement();
             $table->integer('majgm_majgv_id')->index();
             $table->string('majgm_map_id', 127);

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

Indentation +39 added lines, -39 removed lines

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

Spacing +1 added lines, -1 removed lines

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

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

Indentation +56 added lines, -56 removed lines

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

Spacing +1 added lines, -1 removed lines

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

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

Indentation +54 added lines, -54 removed lines

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