jon48 / webtrees-lib

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

app/Module/GeoDispersion/GeoAnalyses/AllEventsByTypeGeoAnalysis.php

Indentation +45 added lines, -45 removed lines

@@ -26,55 +26,55 @@
  */
 class AllEventsByTypeGeoAnalysis implements GeoAnalysisInterface
 {
-    private GeoAnalysisDataService $geoanalysis_data_service;
+	private GeoAnalysisDataService $geoanalysis_data_service;
 
-    /**
-     * Constructor for AllEventsByTypeGeoAnalysis
-     *
-     * @param GeoAnalysisDataService $geoanalysis_data_service
-     */
-    public function __construct(GeoAnalysisDataService $geoanalysis_data_service)
-    {
-        $this->geoanalysis_data_service = $geoanalysis_data_service;
-    }
+	/**
+	 * Constructor for AllEventsByTypeGeoAnalysis
+	 *
+	 * @param GeoAnalysisDataService $geoanalysis_data_service
+	 */
+	public function __construct(GeoAnalysisDataService $geoanalysis_data_service)
+	{
+		$this->geoanalysis_data_service = $geoanalysis_data_service;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\GeoAnalysisInterface::title()
-     */
-    public function title(): string
-    {
-        return I18N::translate('All events places by event type');
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\GeoAnalysisInterface::title()
+	 */
+	public function title(): string
+	{
+		return I18N::translate('All events places by event type');
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\GeoAnalysisInterface::itemsDescription()
-     */
-    public function itemsDescription(): callable
-    {
-        return fn(int $count): string => I18N::plural('event', 'events', $count);
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\GeoAnalysisInterface::itemsDescription()
+	 */
+	public function itemsDescription(): callable
+	{
+		return fn(int $count): string => I18N::plural('event', 'events', $count);
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\GeoAnalysisInterface::results()
-     */
-    public function results(Tree $tree, int $depth): GeoAnalysisResults
-    {
-        $results = new GeoAnalysisResults();
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\GeoAnalysisInterface::results()
+	 */
+	public function results(Tree $tree, int $depth): GeoAnalysisResults
+	{
+		$results = new GeoAnalysisResults();
 
-        foreach ($this->geoanalysis_data_service->individualsAndFamilies($tree) as $record) {
-            foreach ($record->facts([]) as $fact) {
-                $place = new GeoAnalysisPlace($tree, $fact->place(), $depth);
-                if ($place->isUnknown()) {
-                    continue;
-                }
-                $results->addPlace($place);
-                $results->addPlaceInCategory($fact->label(), 0, $place);
-            }
-        }
+		foreach ($this->geoanalysis_data_service->individualsAndFamilies($tree) as $record) {
+			foreach ($record->facts([]) as $fact) {
+				$place = new GeoAnalysisPlace($tree, $fact->place(), $depth);
+				if ($place->isUnknown()) {
+					continue;
+				}
+				$results->addPlace($place);
+				$results->addPlaceInCategory($fact->label(), 0, $place);
+			}
+		}
 
-        return $results;
-    }
+		return $results;
+	}
 }

app/Module/GeoDispersion/GeoAnalyses/AllEventsByCenturyGeoAnalysis.php

Indentation +56 added lines, -56 removed lines

@@ -28,66 +28,66 @@
  */
 class AllEventsByCenturyGeoAnalysis implements GeoAnalysisInterface
 {
-    private GeoAnalysisDataService $geoanalysis_data_service;
-    private CenturyService $century_service;
+	private GeoAnalysisDataService $geoanalysis_data_service;
+	private CenturyService $century_service;
 
-    /**
-     * Constructor for AllEventsByCenturyGeoAnalysis
-     *
-     * @param GeoAnalysisDataService $geoanalysis_data_service
-     * @param CenturyService $century_service
-     */
-    public function __construct(GeoAnalysisDataService $geoanalysis_data_service, CenturyService $century_service)
-    {
-        $this->geoanalysis_data_service = $geoanalysis_data_service;
-        $this->century_service = $century_service;
-    }
+	/**
+	 * Constructor for AllEventsByCenturyGeoAnalysis
+	 *
+	 * @param GeoAnalysisDataService $geoanalysis_data_service
+	 * @param CenturyService $century_service
+	 */
+	public function __construct(GeoAnalysisDataService $geoanalysis_data_service, CenturyService $century_service)
+	{
+		$this->geoanalysis_data_service = $geoanalysis_data_service;
+		$this->century_service = $century_service;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\GeoAnalysisInterface::title()
-     */
-    public function title(): string
-    {
-        return I18N::translate('All events places by century');
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\GeoAnalysisInterface::title()
+	 */
+	public function title(): string
+	{
+		return I18N::translate('All events places by century');
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\GeoAnalysisInterface::itemsDescription()
-     */
-    public function itemsDescription(): callable
-    {
-        return fn(int $count): string => I18N::plural('event', 'events', $count);
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\GeoAnalysisInterface::itemsDescription()
+	 */
+	public function itemsDescription(): callable
+	{
+		return fn(int $count): string => I18N::plural('event', 'events', $count);
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\GeoAnalysisInterface::results()
-     */
-    public function results(Tree $tree, int $depth): GeoAnalysisResults
-    {
-        $results = new GeoAnalysisResults();
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\GeoAnalysisInterface::results()
+	 */
+	public function results(Tree $tree, int $depth): GeoAnalysisResults
+	{
+		$results = new GeoAnalysisResults();
 
-        foreach ($this->geoanalysis_data_service->individualsAndFamilies($tree) as $record) {
-            foreach ($record->facts([]) as $fact) {
-                $place = new GeoAnalysisPlace($tree, $fact->place(), $depth);
-                if ($place->isUnknown()) {
-                    continue;
-                }
-                $results->addPlace($place);
-                $date = $fact->date();
-                if ($date->isOK()) {
-                    $century = intdiv($date->gregorianYear(), 100);
-                    $results->addPlaceInCategory(
-                        I18N::translate('%s century', $this->century_service->centuryName($century)),
-                        $century,
-                        $place
-                    );
-                }
-            }
-        }
+		foreach ($this->geoanalysis_data_service->individualsAndFamilies($tree) as $record) {
+			foreach ($record->facts([]) as $fact) {
+				$place = new GeoAnalysisPlace($tree, $fact->place(), $depth);
+				if ($place->isUnknown()) {
+					continue;
+				}
+				$results->addPlace($place);
+				$date = $fact->date();
+				if ($date->isOK()) {
+					$century = intdiv($date->gregorianYear(), 100);
+					$results->addPlaceInCategory(
+						I18N::translate('%s century', $this->century_service->centuryName($century)),
+						$century,
+						$place
+					);
+				}
+			}
+		}
 
-        return $results;
-    }
+		return $results;
+	}
 }

app/Module/GeoDispersion/PlaceMappers/SimplePlaceMapper.php

Indentation +17 added lines, -17 removed lines

@@ -24,23 +24,23 @@
  */
 class SimplePlaceMapper implements PlaceMapperInterface
 {
-    use PlaceMapperTrait;
+	use PlaceMapperTrait;
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperInterface::title()
-     */
-    public function title(): string
-    {
-        return I18N::translate('Mapping on place name');
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperInterface::title()
+	 */
+	public function title(): string
+	{
+		return I18N::translate('Mapping on place name');
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperInterface::map()
-     */
-    public function map(Place $place, string $feature_property): ?string
-    {
-        return $place->firstParts(1)->first();
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperInterface::map()
+	 */
+	public function map(Place $place, string $feature_property): ?string
+	{
+		return $place->firstParts(1)->first();
+	}
 }

app/Module/GeoDispersion/PlaceMappers/SimpleTopFilteredPlaceMapper.php

Indentation +43 added lines, -43 removed lines

@@ -28,51 +28,51 @@
  */
 class SimpleTopFilteredPlaceMapper extends SimplePlaceMapper implements PlaceMapperInterface
 {
-    use TopFilteredPlaceMapperTrait;
+	use TopFilteredPlaceMapperTrait;
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\GeoDispersion\PlaceMappers\SimplePlaceMapper::title()
-     */
-    public function title(): string
-    {
-        return I18N::translate('Mapping on place name with filter');
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Module\GeoDispersion\PlaceMappers\SimplePlaceMapper::title()
+	 */
+	public function title(): string
+	{
+		return I18N::translate('Mapping on place name with filter');
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperInterface::boot()
-     */
-    public function boot(): void
-    {
-        parent::boot();
-        $top_places = $this->config()->get('topPlaces');
-        if (is_array($top_places)) {
-            $this->setTopPlaces($top_places);
-        }
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperInterface::boot()
+	 */
+	public function boot(): void
+	{
+		parent::boot();
+		$top_places = $this->config()->get('topPlaces');
+		if (is_array($top_places)) {
+			$this->setTopPlaces($top_places);
+		}
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperInterface::config()
-     */
-    public function config(): PlaceMapperConfigInterface
-    {
-        if (!(parent::config() instanceof FilteredTopPlaceMapperConfig)) {
-            $this->setConfig(app(FilteredTopPlaceMapperConfig::class));
-        }
-        return parent::config();
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperInterface::config()
+	 */
+	public function config(): PlaceMapperConfigInterface
+	{
+		if (!(parent::config() instanceof FilteredTopPlaceMapperConfig)) {
+			$this->setConfig(app(FilteredTopPlaceMapperConfig::class));
+		}
+		return parent::config();
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\GeoDispersion\PlaceMappers\SimplePlaceMapper::map()
-     */
-    public function map(Place $place, string $feature_property): ?string
-    {
-        if (!$this->belongsToTopLevels($place)) {
-            return null;
-        }
-        return parent::map($place, $feature_property);
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Module\GeoDispersion\PlaceMappers\SimplePlaceMapper::map()
+	 */
+	public function map(Place $place, string $feature_property): ?string
+	{
+		if (!$this->belongsToTopLevels($place)) {
+			return null;
+		}
+		return parent::map($place, $feature_property);
+	}
 }

app/Module/Certificates/Elements/SourceCertificate.php

Indentation +52 added lines, -52 removed lines

@@ -28,61 +28,61 @@
  */
 class SourceCertificate extends AbstractElement
 {
-    protected CertificatesModule $module;
-    protected CertificateFilesystemService $certif_filesystem;
-    protected UrlObfuscatorService $url_obfuscator_service;
+	protected CertificatesModule $module;
+	protected CertificateFilesystemService $certif_filesystem;
+	protected UrlObfuscatorService $url_obfuscator_service;
 
-    /**
-     * Constructor for SourceCertificate element
-     *
-     * @param string $label
-     * @param CertificatesModule $module
-     * @param CertificateFilesystemService $certif_filesystem
-     * @param UrlObfuscatorService $url_obfuscator_service
-     */
-    public function __construct(
-        string $label,
-        CertificatesModule $module,
-        CertificateFilesystemService $certif_filesystem = null,
-        UrlObfuscatorService $url_obfuscator_service = null
-    ) {
-        parent::__construct($label, null);
-        $this->module = $module;
-        $this->certif_filesystem = $certif_filesystem ?? app(CertificateFilesystemService::class);
-        $this->url_obfuscator_service = $url_obfuscator_service ?? app(UrlObfuscatorService::class);
-    }
+	/**
+	 * Constructor for SourceCertificate element
+	 *
+	 * @param string $label
+	 * @param CertificatesModule $module
+	 * @param CertificateFilesystemService $certif_filesystem
+	 * @param UrlObfuscatorService $url_obfuscator_service
+	 */
+	public function __construct(
+		string $label,
+		CertificatesModule $module,
+		CertificateFilesystemService $certif_filesystem = null,
+		UrlObfuscatorService $url_obfuscator_service = null
+	) {
+		parent::__construct($label, null);
+		$this->module = $module;
+		$this->certif_filesystem = $certif_filesystem ?? app(CertificateFilesystemService::class);
+		$this->url_obfuscator_service = $url_obfuscator_service ?? app(UrlObfuscatorService::class);
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Elements\AbstractElement::canonical()
-     */
-    public function canonical($value): string
-    {
-        return strtr($value, '\\', '/');
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Elements\AbstractElement::canonical()
+	 */
+	public function canonical($value): string
+	{
+		return strtr($value, '\\', '/');
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Elements\AbstractElement::edit()
-     */
-    public function edit(string $id, string $name, string $value, Tree $tree): string
-    {
-        list($city, $file) = explode('/', $this->canonical($value), 2) + ['', ''];
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Elements\AbstractElement::edit()
+	 */
+	public function edit(string $id, string $name, string $value, Tree $tree): string
+	{
+		list($city, $file) = explode('/', $this->canonical($value), 2) + ['', ''];
 
-        $cities = array_map(function (string $item): array {
-            return [$this->url_obfuscator_service->obfuscate($item), $item];
-        }, $this->certif_filesystem->cities($tree));
+		$cities = array_map(function (string $item): array {
+			return [$this->url_obfuscator_service->obfuscate($item), $item];
+		}, $this->certif_filesystem->cities($tree));
 
-        return view($this->module->name() . '::components/edit-certificate', [
-            'module_name'   =>  $this->module->name(),
-            'tree'          =>  $tree,
-            'id'            =>  $id,
-            'name'          =>  $name,
-            'cities'        =>  $cities,
-            'value'         =>  $this->canonical($value),
-            'value_city'    =>  $city,
-            'value_file'    =>  $file,
-            'js_script_url' =>  $this->module->assetUrl('js/certificates.min.js')
-        ]);
-    }
+		return view($this->module->name() . '::components/edit-certificate', [
+			'module_name'   =>  $this->module->name(),
+			'tree'          =>  $tree,
+			'id'            =>  $id,
+			'name'          =>  $name,
+			'cities'        =>  $cities,
+			'value'         =>  $this->canonical($value),
+			'value_city'    =>  $city,
+			'value_file'    =>  $file,
+			'js_script_url' =>  $this->module->assetUrl('js/certificates.min.js')
+		]);
+	}
 }

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

Indentation +37 added lines, -37 removed lines

@@ -29,47 +29,47 @@
  */
 class AdminConfigPage implements RequestHandlerInterface
 {
-    use ViewResponseTrait;
+	use ViewResponseTrait;
 
-    private ?AdminTasksModule $module;
-    private TokenService $token_service;
+	private ?AdminTasksModule $module;
+	private TokenService $token_service;
 
-    /**
-     * Constructor for Admin Config request handler
-     *
-     * @param ModuleService $module_service
-     */
-    public function __construct(ModuleService $module_service, TokenService $token_service)
-    {
-        $this->module = $module_service->findByInterface(AdminTasksModule::class)->first();
-        $this->token_service = $token_service;
-    }
+	/**
+	 * Constructor for Admin Config request handler
+	 *
+	 * @param ModuleService $module_service
+	 */
+	public function __construct(ModuleService $module_service, TokenService $token_service)
+	{
+		$this->module = $module_service->findByInterface(AdminTasksModule::class)->first();
+		$this->token_service = $token_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.'));
+		}
 
-        $token = $this->module->getPreference('MAJ_AT_FORCE_EXEC_TOKEN');
-        if ($token === '') {
-            $token = $this->token_service->generateRandomToken();
-            $this->module->setPreference('PAT_FORCE_EXEC_TOKEN', $token);
-        }
+		$token = $this->module->getPreference('MAJ_AT_FORCE_EXEC_TOKEN');
+		if ($token === '') {
+			$token = $this->token_service->generateRandomToken();
+			$this->module->setPreference('PAT_FORCE_EXEC_TOKEN', $token);
+		}
 
-        return $this->viewResponse($this->module->name() . '::admin/config', [
-            'title'             =>  $this->module->title(),
-            'trigger_token'     =>  $token,
-            'trigger_route'     =>  route(TaskTrigger::class, ['task' => '__TASKNAME__', 'force' => '__TOKEN__']),
-            'new_token_route'   =>  route(TokenGenerate::class),
-            'tasks_data_route'  =>  route(TasksList::class),
-            'js_script_url'     =>  $this->module->assetUrl('js/admintasks.min.js')
-        ]);
-    }
+		return $this->viewResponse($this->module->name() . '::admin/config', [
+			'title'             =>  $this->module->title(),
+			'trigger_token'     =>  $token,
+			'trigger_route'     =>  route(TaskTrigger::class, ['task' => '__TASKNAME__', 'force' => '__TOKEN__']),
+			'new_token_route'   =>  route(TokenGenerate::class),
+			'tasks_data_route'  =>  route(TasksList::class),
+			'js_script_url'     =>  $this->module->assetUrl('js/admintasks.min.js')
+		]);
+	}
 }

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

Indentation +30 added lines, -30 removed lines

@@ -30,34 +30,34 @@
  */
 class TokenGenerate implements RequestHandlerInterface
 {
-    private ?AdminTasksModule $module;
-    private TokenService $token_service;
-
-    /**
-     * Constructor for TokenGenerate request handler
-     *
-     * @param ModuleService $module_service
-     */
-    public function __construct(ModuleService $module_service, TokenService $token_service)
-    {
-        $this->module = $module_service->findByInterface(AdminTasksModule::class)->first();
-        $this->token_service = $token_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.'));
-        }
-
-        $token = $this->token_service->generateRandomToken();
-        $this->module->setPreference('MAJ_AT_FORCE_EXEC_TOKEN', $token);
-        Log::addConfigurationLog($this->module->title() . ' : New token generated.');
-
-        return response(['token' => $token]);
-    }
+	private ?AdminTasksModule $module;
+	private TokenService $token_service;
+
+	/**
+	 * Constructor for TokenGenerate request handler
+	 *
+	 * @param ModuleService $module_service
+	 */
+	public function __construct(ModuleService $module_service, TokenService $token_service)
+	{
+		$this->module = $module_service->findByInterface(AdminTasksModule::class)->first();
+		$this->token_service = $token_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.'));
+		}
+
+		$token = $this->token_service->generateRandomToken();
+		$this->module->setPreference('MAJ_AT_FORCE_EXEC_TOKEN', $token);
+		Log::addConfigurationLog($this->module->title() . ' : New token generated.');
+
+		return response(['token' => $token]);
+	}
 }

app/Module/AdminTasks/Services/TokenService.php

Indentation +28 added lines, -28 removed lines

@@ -20,32 +20,32 @@
  */
 class TokenService
 {
-    /**
-     * Returns a random-ish generated token of a given size
-     *
-     * @param int $length Length of the token, default to 32
-     * @return string Random token
-     */
-    public function generateRandomToken(int $length = 32): string
-    {
-        $chars = str_split('abcdefghijkmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789');
-        $len_chars = count($chars);
-        $token = '';
-
-        for ($i = 0; $i < $length; $i++) {
-            $token .= $chars[mt_rand(0, $len_chars - 1)];
-        }
-
-        # Number of 32 char chunks
-        $chunks = ceil(strlen($token) / 32);
-        $md5token = '';
-
-        # Run each chunk through md5
-        for ($i = 1; $i <= $chunks; $i++) {
-            $md5token .= md5(substr($token, $i * 32 - 32, 32));
-        }
-
-        # Trim the token to the required length
-        return substr($md5token, 0, $length);
-    }
+	/**
+	 * Returns a random-ish generated token of a given size
+	 *
+	 * @param int $length Length of the token, default to 32
+	 * @return string Random token
+	 */
+	public function generateRandomToken(int $length = 32): string
+	{
+		$chars = str_split('abcdefghijkmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789');
+		$len_chars = count($chars);
+		$token = '';
+
+		for ($i = 0; $i < $length; $i++) {
+			$token .= $chars[mt_rand(0, $len_chars - 1)];
+		}
+
+		# Number of 32 char chunks
+		$chunks = ceil(strlen($token) / 32);
+		$md5token = '';
+
+		# Run each chunk through md5
+		for ($i = 1; $i <= $chunks; $i++) {
+			$md5token .= md5(substr($token, $i * 32 - 32, 32));
+		}
+
+		# Trim the token to the required length
+		return substr($md5token, 0, $length);
+	}
 }