jon48 / webtrees-lib

src/Webtrees/Module/GeoDispersion/Http/RequestHandlers/GeoAnalysisViewsList.php

Indentation +37 added lines, -37 removed lines

@@ -32,47 +32,47 @@
  */
 class GeoAnalysisViewsList implements RequestHandlerInterface
 {
-    use ViewResponseTrait;
+	use ViewResponseTrait;
 
-    private ?GeoDispersionModule $module;
-    private GeoAnalysisViewDataService $geoviewdata_service;
+	private ?GeoDispersionModule $module;
+	private GeoAnalysisViewDataService $geoviewdata_service;
 
-    /**
-     * Constructor for GeoAnalysisViewsList 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 GeoAnalysisViewsList 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 = $request->getAttribute('tree');
-        assert($tree instanceof Tree);
+		$tree = $request->getAttribute('tree');
+		assert($tree instanceof Tree);
 
-        $views_list = $this->geoviewdata_service
-            ->all($tree)
-            ->sortBy(fn(AbstractGeoAnalysisView $view) => $view->description());
+		$views_list = $this->geoviewdata_service
+			->all($tree)
+			->sortBy(fn(AbstractGeoAnalysisView $view) => $view->description());
 
-        return $this->viewResponse($this->module->name() . '::geoanalysisviews-list', [
-            'module'        =>  $this->module,
-            'title'         =>  I18N::translate('Geographical dispersion'),
-            'tree'          =>  $tree,
-            'views_list'    =>  $views_list,
-            'js_script_url' =>  $this->module->assetUrl('js/geodispersion.min.js')
-        ]);
-    }
+		return $this->viewResponse($this->module->name() . '::geoanalysisviews-list', [
+			'module'        =>  $this->module,
+			'title'         =>  I18N::translate('Geographical dispersion'),
+			'tree'          =>  $tree,
+			'views_list'    =>  $views_list,
+			'js_script_url' =>  $this->module->assetUrl('js/geodispersion.min.js')
+		]);
+	}
 }

src/Webtrees/Module/GeoDispersion/Http/RequestHandlers/GeoAnalysisViewPage.php

Indentation +35 added lines, -35 removed lines

@@ -31,45 +31,45 @@
  */
 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 = $request->getAttribute('tree');
-        assert($tree instanceof Tree);
+		$tree = $request->getAttribute('tree');
+		assert($tree instanceof Tree);
 
-        $view_id = $request->getAttribute('view_id');
-        $view_id = is_numeric($view_id) ? (int) $view_id : 0;
+		$view_id = $request->getAttribute('view_id');
+		$view_id = is_numeric($view_id) ? (int) $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)
+		]);
+	}
 }

src/Webtrees/Module/GeoDispersion/PlaceMappers/TopFilteredPlaceMapperTrait.php

Indentation +57 added lines, -57 removed lines

@@ -21,65 +21,65 @@
  */
 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 array $top_places
-     */
-    public function setTopPlaces(array $top_places): void
-    {
-        $this->top_places = collect($top_places)
-            ->filter(
-                /** @psalm-suppress MissingClosureParamType */
-                fn($top_places) => $top_places instanceof Place
-            )->toArray();
-    }
+	/**
+	 * Set the list of defined top level places.
+	 *
+	 * @param array $top_places
+	 */
+	public function setTopPlaces(array $top_places): void
+	{
+		$this->top_places = collect($top_places)
+			->filter(
+				/** @psalm-suppress MissingClosureParamType */
+				fn($top_places) => $top_places instanceof Place
+			)->toArray();
+	}
 
-    /**
-     * Check whether a string ($haystack) ends with another string ($needle)
-     *
-     * {@internal This is redundant with the function str_ends_with in PHP8}
-     *
-     * @param string $haystack
-     * @param string $needle
-     * @return bool
-     */
-    private function endsWith(string $haystack, string $needle): bool
-    {
-        return substr_compare($haystack, $needle, -strlen($needle)) === 0;
-    }
+	/**
+	 * Check whether a string ($haystack) ends with another string ($needle)
+	 *
+	 * {@internal This is redundant with the function str_ends_with in PHP8}
+	 *
+	 * @param string $haystack
+	 * @param string $needle
+	 * @return bool
+	 */
+	private function endsWith(string $haystack, string $needle): bool
+	{
+		return substr_compare($haystack, $needle, -strlen($needle)) === 0;
+	}
 
-    /**
-     * 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() &&
-                $this->endsWith($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() &&
+				$this->endsWith($place->gedcomName(), $top_place->gedcomName())
+			) {
+					return true;
+			}
+		}
+		return false;
+	}
 }

src/Webtrees/Module/GeoDispersion/PlaceMappers/PlaceMapperTrait.php

Indentation +56 added lines, -56 removed lines

@@ -24,65 +24,65 @@
  */
 trait PlaceMapperTrait
 {
-    private ?PlaceMapperConfigInterface $config = null;
-    private array $data = [];
+	private ?PlaceMapperConfigInterface $config = null;
+	private array $data = [];
 
-    /**
-     * Implementation of PlaceMapperInterface::boot
-     *
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperInterface::boot()
-     */
-    public function boot(): void
-    {
-    }
+	/**
+	 * Implementation of PlaceMapperInterface::boot
+	 *
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperInterface::boot()
+	 */
+	public function boot(): void
+	{
+	}
 
-    /**
-     * Implementation of PlaceMapperInterface::config
-     *
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperInterface::config()
-     *
-     * @return PlaceMapperConfigInterface
-     */
-    public function config(): PlaceMapperConfigInterface
-    {
-        return $this->config ?? new NullPlaceMapperConfig();
-    }
+	/**
+	 * Implementation of PlaceMapperInterface::config
+	 *
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperInterface::config()
+	 *
+	 * @return PlaceMapperConfigInterface
+	 */
+	public function config(): PlaceMapperConfigInterface
+	{
+		return $this->config ?? new NullPlaceMapperConfig();
+	}
 
-    /**
-     * Implementation of PlaceMapperInterface::setConfig
-     *
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperInterface::setConfig()
-     *
-     * @param PlaceMapperConfigInterface $config
-     */
-    public function setConfig(PlaceMapperConfigInterface $config): void
-    {
-        $this->config = $config;
-    }
+	/**
+	 * Implementation of PlaceMapperInterface::setConfig
+	 *
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperInterface::setConfig()
+	 *
+	 * @param PlaceMapperConfigInterface $config
+	 */
+	public function setConfig(PlaceMapperConfigInterface $config): void
+	{
+		$this->config = $config;
+	}
 
-    /**
-     * Implementation of PlaceMapperInterface::data
-     *
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperInterface::data()
-     *
-     * @param string $key
-     * @return NULL|mixed
-     */
-    public function data(string $key)
-    {
-        return $this->data[$key] ?? null;
-    }
+	/**
+	 * Implementation of PlaceMapperInterface::data
+	 *
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperInterface::data()
+	 *
+	 * @param string $key
+	 * @return NULL|mixed
+	 */
+	public function data(string $key)
+	{
+		return $this->data[$key] ?? null;
+	}
 
-    /**
-     * Implementation of PlaceMapperInterface::setData
-     *
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperInterface::setData()
-     *
-     * @param string $key
-     * @param mixed|null $data
-     */
-    public function setData(string $key, $data): void
-    {
-        $this->data[$key] = $data;
-    }
+	/**
+	 * Implementation of PlaceMapperInterface::setData
+	 *
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperInterface::setData()
+	 *
+	 * @param string $key
+	 * @param mixed|null $data
+	 */
+	public function setData(string $key, $data): void
+	{
+		$this->data[$key] = $data;
+	}
 }

src/Webtrees/Module/GeoDispersion/Schema/Migration1.php

Indentation +31 added lines, -31 removed lines

@@ -24,35 +24,35 @@
 class Migration1 implements MigrationInterface
 {
 
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Schema\MigrationInterface::upgrade()
-     */
-    public function upgrade(): 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);
-            $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');
-        });
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Schema\MigrationInterface::upgrade()
+	 */
+	public function upgrade(): 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);
+			$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');
+		});
+	}
 }

src/Webtrees/Module/GeoDispersion/Schema/Migration0.php

Indentation +8 added lines, -8 removed lines

@@ -22,12 +22,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.
+	}
 }

src/Webtrees/Module/GeoDispersion/Services/MapDefinitionsService.php

Indentation +39 added lines, -39 removed lines

@@ -25,46 +25,46 @@
  */
 class MapDefinitionsService
 {
-    private ModuleService $module_service;
+	private ModuleService $module_service;
 
-    /**
-     * Constructor for MapDefinitionsService
-     *
-     * @param ModuleService $module_service
-     */
-    public function __construct(ModuleService $module_service)
-    {
-        $this->module_service = $module_service;
-    }
+	/**
+	 * Constructor for MapDefinitionsService
+	 *
+	 * @param ModuleService $module_service
+	 */
+	public function __construct(ModuleService $module_service)
+	{
+		$this->module_service = $module_service;
+	}
 
-    /**
-     * Find a map definition by ID.
-     *
-     * @param string $id
-     * @return MapDefinitionInterface|NULL
-     */
-    public function find(string $id): ?MapDefinitionInterface
-    {
-        return $this->all()->get($id);
-    }
+	/**
+	 * Find a map definition by ID.
+	 *
+	 * @param string $id
+	 * @return MapDefinitionInterface|NULL
+	 */
+	public function find(string $id): ?MapDefinitionInterface
+	{
+		return $this->all()->get($id);
+	}
 
-    /**
-     * Get all map definitions available.
-     *
-     * {@internal The list is generated based on the modules exposing ModuleMapDefinitionProviderInterface,
-     * and the result is cached}
-     *
-     * @param bool $include_disabled
-     * @return Collection<string, MapDefinitionInterface>
-     */
-    public function all(bool $include_disabled = false): Collection
-    {
-        return Registry::cache()->array()->remember(
-            'maj-geodisp-maps-all',
-            fn() => $this->module_service
-                ->findByInterface(ModuleMapDefinitionProviderInterface::class, $include_disabled)
-                ->flatMap(fn(ModuleMapDefinitionProviderInterface $module) => $module->listMapDefinition())
-                ->mapWithKeys(fn(MapDefinitionInterface $map) => [ $map->id() => $map ])
-        );
-    }
+	/**
+	 * Get all map definitions available.
+	 *
+	 * {@internal The list is generated based on the modules exposing ModuleMapDefinitionProviderInterface,
+	 * and the result is cached}
+	 *
+	 * @param bool $include_disabled
+	 * @return Collection<string, MapDefinitionInterface>
+	 */
+	public function all(bool $include_disabled = false): Collection
+	{
+		return Registry::cache()->array()->remember(
+			'maj-geodisp-maps-all',
+			fn() => $this->module_service
+				->findByInterface(ModuleMapDefinitionProviderInterface::class, $include_disabled)
+				->flatMap(fn(ModuleMapDefinitionProviderInterface $module) => $module->listMapDefinition())
+				->mapWithKeys(fn(MapDefinitionInterface $map) => [ $map->id() => $map ])
+		);
+	}
 }

src/Webtrees/Module/GeoDispersion/Services/PlacesReferenceTableService.php

Indentation +89 added lines, -89 removed lines

@@ -21,102 +21,102 @@
  */
 class PlacesReferenceTableService
 {
-    /**
-     * Mapping format placeholder tags => table column names
-     * @var array<string, string>
-     */
-    private const COLUMN_MAPPING = [
-        'name'  =>  'majgr_place_name',
-        'id'    =>  'majgr_place_admin_id',
-        'zip'   =>  'majgr_place_zip',
-        'gov'   =>  'majgr_place_gov_id',
-        'mls'   =>  'majgr_place_mls_id'
-    ];
+	/**
+	 * Mapping format placeholder tags => table column names
+	 * @var array<string, string>
+	 */
+	private const COLUMN_MAPPING = [
+		'name'  =>  'majgr_place_name',
+		'id'    =>  'majgr_place_admin_id',
+		'zip'   =>  'majgr_place_zip',
+		'gov'   =>  'majgr_place_gov_id',
+		'mls'   =>  'majgr_place_mls_id'
+	];
 
-    /**
-     * Get the formatted target mapping value of a place defined by a source format.
-     *
-     * @param string $source
-     * @param string $source_format
-     * @param string $target_format
-     * @return string|NULL
-     */
-    public function targetId(string $source, string $source_format, string $target_format): ?string
-    {
-        // Extract parts for the WHERE clause
-        $source_format = str_replace(['{', '}'], ['{#', '#}'], $source_format);
-        $source_parts = preg_split('/[{}]/i', $source_format);
-        if ($source_parts === false) {
-            return null;
-        }
-        $source_parts = array_map(function (string $part): string {
-            if (preg_match('/^#([^#]+)#$/i', $part, $column_id) === 1) {
-                return $this->columnName($column_id[1]);
-            }
-            return $this->sanitizeString(str_replace(['?', '*'], ['_', '%'], $part));
-        }, array_filter($source_parts));
-        $source_parts[] = "'%'";
-        $concat_statement = 'CONCAT(' . implode(', ', $source_parts) . ')';
+	/**
+	 * Get the formatted target mapping value of a place defined by a source format.
+	 *
+	 * @param string $source
+	 * @param string $source_format
+	 * @param string $target_format
+	 * @return string|NULL
+	 */
+	public function targetId(string $source, string $source_format, string $target_format): ?string
+	{
+		// Extract parts for the WHERE clause
+		$source_format = str_replace(['{', '}'], ['{#', '#}'], $source_format);
+		$source_parts = preg_split('/[{}]/i', $source_format);
+		if ($source_parts === false) {
+			return null;
+		}
+		$source_parts = array_map(function (string $part): string {
+			if (preg_match('/^#([^#]+)#$/i', $part, $column_id) === 1) {
+				return $this->columnName($column_id[1]);
+			}
+			return $this->sanitizeString(str_replace(['?', '*'], ['_', '%'], $part));
+		}, array_filter($source_parts));
+		$source_parts[] = "'%'";
+		$concat_statement = 'CONCAT(' . implode(', ', $source_parts) . ')';
 
-        // Extract columns used in target
-        $columns = [];
-        if (preg_match_all('/{(.*?)}/i', $target_format, $columns_select) === 1) {
-            $columns = array_unique(array_filter(array_map(fn($id) => $this->columnName($id), $columns_select[1])));
-        }
+		// Extract columns used in target
+		$columns = [];
+		if (preg_match_all('/{(.*?)}/i', $target_format, $columns_select) === 1) {
+			$columns = array_unique(array_filter(array_map(fn($id) => $this->columnName($id), $columns_select[1])));
+		}
 
-        // Get the mapping
-        $rows = DB::table('maj_geodata_ref')  //DB::table('maj_geodata_ref')
-            ->select($columns)
-            ->whereRaw($this->sanitizeString($source) . " LIKE " . $concat_statement)
-            ->get();
+		// Get the mapping
+		$rows = DB::table('maj_geodata_ref')  //DB::table('maj_geodata_ref')
+			->select($columns)
+			->whereRaw($this->sanitizeString($source) . " LIKE " . $concat_statement)
+			->get();
 
-        // Format the output ID
-        if ($rows->count() === 0) {
-            return null;
-        }
+		// Format the output ID
+		if ($rows->count() === 0) {
+			return null;
+		}
 
-        $mapping = (array) $rows->first();
-        if (count($columns_select) === 0) {
-            return $target_format;
-        }
+		$mapping = (array) $rows->first();
+		if (count($columns_select) === 0) {
+			return $target_format;
+		}
 
-        return str_replace(
-            array_map(fn($tag) => '{' . $tag . '}', $columns_select[1]),
-            array_map(fn($tag) => $mapping[$this->columnName($tag)] ?? '', $columns_select[1]),
-            $target_format
-        );
-    }
+		return str_replace(
+			array_map(fn($tag) => '{' . $tag . '}', $columns_select[1]),
+			array_map(fn($tag) => $mapping[$this->columnName($tag)] ?? '', $columns_select[1]),
+			$target_format
+		);
+	}
 
-    /**
-     * Get the column name for a format placeholder tag
-     *
-     * @param string $placeholder
-     * @return string
-     */
-    private function columnName(string $placeholder): string
-    {
-        return self::COLUMN_MAPPING[$placeholder] ?? '';
-    }
+	/**
+	 * Get the column name for a format placeholder tag
+	 *
+	 * @param string $placeholder
+	 * @return string
+	 */
+	private function columnName(string $placeholder): string
+	{
+		return self::COLUMN_MAPPING[$placeholder] ?? '';
+	}
 
-    /**
-     * Get the placeholder tag for a column_name
-     *
-     * @param string $column_name
-     * @return string
-     */
-    private function tagName(string $column_name): string
-    {
-        return array_flip(self::COLUMN_MAPPING)[$column_name] ?? '';
-    }
+	/**
+	 * Get the placeholder tag for a column_name
+	 *
+	 * @param string $column_name
+	 * @return string
+	 */
+	private function tagName(string $column_name): string
+	{
+		return array_flip(self::COLUMN_MAPPING)[$column_name] ?? '';
+	}
 
-    /**
-     * Sanitize string for use in a SQL query.
-     *
-     * @param string $string
-     * @return string
-     */
-    private function sanitizeString(string $string): string
-    {
-        return DB::connection()->getPdo()->quote($string);
-    }
+	/**
+	 * Sanitize string for use in a SQL query.
+	 *
+	 * @param string $string
+	 * @return string
+	 */
+	private function sanitizeString(string $string): string
+	{
+		return DB::connection()->getPdo()->quote($string);
+	}
 }

src/Webtrees/Module/AdminTasks/Http/RequestHandlers/TaskEditPage.php

Indentation +61 added lines, -61 removed lines

@@ -31,65 +31,65 @@
  */
 class TaskEditPage implements RequestHandlerInterface
 {
-    use ViewResponseTrait;
-
-    /**
-     * @var AdminTasksModule|null $module
-     */
-    private $module;
-
-    /**
-     * @var TaskScheduleService $taskschedules_service
-     */
-    private $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';
-
-        if ($this->module === null) {
-            throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
-        }
-
-        $task_sched_id = (int) $request->getAttribute('task');
-        $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.'));
-        }
-
-        $task = $this->taskschedules_service->findTask($task_schedule->taskId());
-
-        if ($task === null) {
-            throw new HttpNotFoundException(I18N::translate('The Task schedule could not be found.'));
-        }
-
-        $has_task_config = $task instanceof ConfigurableTaskInterface;
-        /** @var TaskInterface&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) : ''
-        ]);
-    }
+	use ViewResponseTrait;
+
+	/**
+	 * @var AdminTasksModule|null $module
+	 */
+	private $module;
+
+	/**
+	 * @var TaskScheduleService $taskschedules_service
+	 */
+	private $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';
+
+		if ($this->module === null) {
+			throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
+		}
+
+		$task_sched_id = (int) $request->getAttribute('task');
+		$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.'));
+		}
+
+		$task = $this->taskschedules_service->findTask($task_schedule->taskId());
+
+		if ($task === null) {
+			throw new HttpNotFoundException(I18N::translate('The Task schedule could not be found.'));
+		}
+
+		$has_task_config = $task instanceof ConfigurableTaskInterface;
+		/** @var TaskInterface&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) : ''
+		]);
+	}
 }