jon48 / webtrees-lib

app/Module/MiscExtensions/MiscExtensionsModule.php

Indentation +88 added lines, -88 removed lines

@@ -34,93 +34,93 @@
  * Provide miscellaneous improvements to webtrees.
  */
 class MiscExtensionsModule extends AbstractModule implements
-    ModuleMyArtJaubInterface,
-    ModuleConfigInterface,
-    ModuleHookSubscriberInterface
+	ModuleMyArtJaubInterface,
+	ModuleConfigInterface,
+	ModuleHookSubscriberInterface
 {
-    use ModuleMyArtJaubTrait {
-        boot as traitBoot;
-    }
-    use ModuleConfigTrait;
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\AbstractModule::title()
-     */
-    public function title(): string
-    {
-        return /* I18N: Name of the “MiscExtensions” module */ I18N::translate('Miscellaneous extensions');
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\AbstractModule::description()
-     */
-    public function description(): string
-    {
-        //phpcs:ignore Generic.Files.LineLength.TooLong
-        return /* I18N: Description of the “MiscExtensions” module */ I18N::translate('Miscellaneous extensions for webtrees.');
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\AbstractModule::boot()
-     */
-    public function boot(): void
-    {
-        $this->traitBoot();
-        View::registerCustomView('::modules/privacy-policy/page', $this->name() . '::privacy-policy');
-
-        if ((int) $this->getPreference('MAJ_USE_LEGACY_XREF') === 1) {
-            Registry::xrefFactory(new LegacyXrefFactory());
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\ModuleMyArtJaubInterface::loadRoutes()
-     */
-    public function loadRoutes(Map $router): void
-    {
-        $router->attach('', '', static function (Map $router): void {
-
-            $router->attach('', '/module-maj/misc', static function (Map $router): void {
-
-                $router->attach('', '/config/admin', static function (Map $router): void {
-
-                    $router->get(AdminConfigPage::class, '', AdminConfigPage::class);
-                    $router->post(AdminConfigAction::class, '', AdminConfigAction::class);
-                });
-            });
-        });
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleCustomInterface::customModuleVersion()
-     */
-    public function customModuleVersion(): string
-    {
-        return '2.1.3-v.2';
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleConfigInterface::getConfigLink()
-     */
-    public function getConfigLink(): string
-    {
-        return route(AdminConfigPage::class);
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\Hooks\ModuleHookSubscriberInterface::listSubscribedHooks()
-     */
-    public function listSubscribedHooks(): array
-    {
-        return [
-            app()->makeWith(TitlesCardHook::class, [ 'module' => $this ])
-        ];
-    }
+	use ModuleMyArtJaubTrait {
+		boot as traitBoot;
+	}
+	use ModuleConfigTrait;
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\AbstractModule::title()
+	 */
+	public function title(): string
+	{
+		return /* I18N: Name of the “MiscExtensions” module */ I18N::translate('Miscellaneous extensions');
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\AbstractModule::description()
+	 */
+	public function description(): string
+	{
+		//phpcs:ignore Generic.Files.LineLength.TooLong
+		return /* I18N: Description of the “MiscExtensions” module */ I18N::translate('Miscellaneous extensions for webtrees.');
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\AbstractModule::boot()
+	 */
+	public function boot(): void
+	{
+		$this->traitBoot();
+		View::registerCustomView('::modules/privacy-policy/page', $this->name() . '::privacy-policy');
+
+		if ((int) $this->getPreference('MAJ_USE_LEGACY_XREF') === 1) {
+			Registry::xrefFactory(new LegacyXrefFactory());
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Module\ModuleMyArtJaubInterface::loadRoutes()
+	 */
+	public function loadRoutes(Map $router): void
+	{
+		$router->attach('', '', static function (Map $router): void {
+
+			$router->attach('', '/module-maj/misc', static function (Map $router): void {
+
+				$router->attach('', '/config/admin', static function (Map $router): void {
+
+					$router->get(AdminConfigPage::class, '', AdminConfigPage::class);
+					$router->post(AdminConfigAction::class, '', AdminConfigAction::class);
+				});
+			});
+		});
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleCustomInterface::customModuleVersion()
+	 */
+	public function customModuleVersion(): string
+	{
+		return '2.1.3-v.2';
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleConfigInterface::getConfigLink()
+	 */
+	public function getConfigLink(): string
+	{
+		return route(AdminConfigPage::class);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\Hooks\ModuleHookSubscriberInterface::listSubscribedHooks()
+	 */
+	public function listSubscribedHooks(): array
+	{
+		return [
+			app()->makeWith(TitlesCardHook::class, [ 'module' => $this ])
+		];
+	}
 }

app/Module/MiscExtensions/Factories/LegacyXrefFactory.php

Indentation +53 added lines, -53 removed lines

@@ -23,67 +23,67 @@
  */
 class LegacyXrefFactory extends XrefFactory
 {
-    protected const TYPE_TO_PREFIX = [
-        'INDI' => 'I',
-        'FAM'  => 'F',
-        'OBJE' => 'M',
-        'NOTE' => 'N',
-        'SOUR' => 'S',
-        'REPO' => 'R',
-    ];
+	protected const TYPE_TO_PREFIX = [
+		'INDI' => 'I',
+		'FAM'  => 'F',
+		'OBJE' => 'M',
+		'NOTE' => 'N',
+		'SOUR' => 'S',
+		'REPO' => 'R',
+	];
 
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Factories\XrefFactory::make()
-     */
-    public function make(string $record_type): string
-    {
-        $prefix = static::TYPE_TO_PREFIX[$record_type] ?? 'X';
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Factories\XrefFactory::make()
+	 */
+	public function make(string $record_type): string
+	{
+		$prefix = static::TYPE_TO_PREFIX[$record_type] ?? 'X';
 
-        return $this->generate($prefix, '');
-    }
+		return $this->generate($prefix, '');
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Factories\XrefFactory::generate()
-     */
-    protected function generate($prefix, $suffix): string
-    {
-        $tree = app(Tree::class);
-        if (!$tree instanceof Tree) {
-            return parent::generate($prefix, $suffix);
-        }
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Factories\XrefFactory::generate()
+	 */
+	protected function generate($prefix, $suffix): string
+	{
+		$tree = app(Tree::class);
+		if (!$tree instanceof Tree) {
+			return parent::generate($prefix, $suffix);
+		}
 
-        $setting_name = 'MAJ_MISC_XREF_NEXT_' . $prefix;
-        // Lock the row, so that only one new XREF may be generated at a time.
-        DB::table('gedcom_setting')
-            ->where('gedcom_id', '=', $tree->id())
-            ->where('setting_name', '=', $setting_name)
-            ->lockForUpdate()
-            ->get();
+		$setting_name = 'MAJ_MISC_XREF_NEXT_' . $prefix;
+		// Lock the row, so that only one new XREF may be generated at a time.
+		DB::table('gedcom_setting')
+			->where('gedcom_id', '=', $tree->id())
+			->where('setting_name', '=', $setting_name)
+			->lockForUpdate()
+			->get();
 
-        $increment = 1.0;
-        do {
-            $num = (int) $tree->getPreference($setting_name) + (int) $increment;
+		$increment = 1.0;
+		do {
+			$num = (int) $tree->getPreference($setting_name) + (int) $increment;
 
-            // This exponential increment allows us to scan over large blocks of
-            // existing data in a reasonable time.
-            $increment *= 1.01;
+			// This exponential increment allows us to scan over large blocks of
+			// existing data in a reasonable time.
+			$increment *= 1.01;
 
-            $xref = $prefix . $num . $suffix;
+			$xref = $prefix . $num . $suffix;
 
-            // Records may already exist with this sequence number.
-            $already_used =
-                DB::table('individuals')->where('i_file', '=', $tree->id())->where('i_id', '=', $xref)->exists() ||
-                DB::table('families')->where('f_file', '=', $tree->id())->where('f_id', '=', $xref)->exists() ||
-                DB::table('sources')->where('s_file', '=', $tree->id())->where('s_id', '=', $xref)->exists() ||
-                DB::table('media')->where('m_file', '=', $tree->id())->where('m_id', '=', $xref)->exists() ||
-                DB::table('other')->where('o_file', '=', $tree->id())->where('o_id', '=', $xref)->exists() ||
-                DB::table('change')->where('gedcom_id', '=', $tree->id())->where('xref', '=', $xref)->exists();
-        } while ($already_used);
+			// Records may already exist with this sequence number.
+			$already_used =
+				DB::table('individuals')->where('i_file', '=', $tree->id())->where('i_id', '=', $xref)->exists() ||
+				DB::table('families')->where('f_file', '=', $tree->id())->where('f_id', '=', $xref)->exists() ||
+				DB::table('sources')->where('s_file', '=', $tree->id())->where('s_id', '=', $xref)->exists() ||
+				DB::table('media')->where('m_file', '=', $tree->id())->where('m_id', '=', $xref)->exists() ||
+				DB::table('other')->where('o_file', '=', $tree->id())->where('o_id', '=', $xref)->exists() ||
+				DB::table('change')->where('gedcom_id', '=', $tree->id())->where('xref', '=', $xref)->exists();
+		} while ($already_used);
 
-        $tree->setPreference($setting_name, (string) $num);
+		$tree->setPreference($setting_name, (string) $num);
 
-        return $xref;
-    }
+		return $xref;
+	}
 }

app/Module/MiscExtensions/Http/RequestHandlers/AdminConfigAction.php

Indentation +45 added lines, -45 removed lines

@@ -29,54 +29,54 @@
  */
 class AdminConfigAction implements RequestHandlerInterface
 {
-    private ?MiscExtensionsModule $module;
+	private ?MiscExtensionsModule $module;
 
-    /**
-     * Constructor for AdminConfigPage Request Handler
-     *
-     * @param ModuleService $module_service
-     */
-    public function __construct(ModuleService $module_service)
-    {
-        $this->module = $module_service->findByInterface(MiscExtensionsModule::class)->first();
-    }
+	/**
+	 * Constructor for AdminConfigPage Request Handler
+	 *
+	 * @param ModuleService $module_service
+	 */
+	public function __construct(ModuleService $module_service)
+	{
+		$this->module = $module_service->findByInterface(MiscExtensionsModule::class)->first();
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        if ($this->module === null) {
-            FlashMessages::addMessage(
-                I18N::translate('The attached module could not be found.'),
-                'danger'
-            );
-            return Registry::responseFactory()->redirect(AdminConfigPage::class);
-        }
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		if ($this->module === null) {
+			FlashMessages::addMessage(
+				I18N::translate('The attached module could not be found.'),
+				'danger'
+			);
+			return Registry::responseFactory()->redirect(AdminConfigPage::class);
+		}
 
-        $this->module->setPreference(
-            'MAJ_TITLE_PREFIX',
-            Validator::parsedBody($request)->string('MAJ_TITLE_PREFIX', '')
-        );
-        $this->module->setPreference(
-            'MAJ_DISPLAY_CNIL',
-            (string) Validator::parsedBody($request)->integer('MAJ_DISPLAY_CNIL', 0)
-        );
-        $this->module->setPreference(
-            'MAJ_CNIL_REFERENCE',
-            Validator::parsedBody($request)->string('MAJ_CNIL_REFERENCE', '')
-        );
-        $this->module->setPreference(
-            'MAJ_USE_LEGACY_XREF',
-            (string) Validator::parsedBody($request)->integer('MAJ_USE_LEGACY_XREF', 0)
-        );
+		$this->module->setPreference(
+			'MAJ_TITLE_PREFIX',
+			Validator::parsedBody($request)->string('MAJ_TITLE_PREFIX', '')
+		);
+		$this->module->setPreference(
+			'MAJ_DISPLAY_CNIL',
+			(string) Validator::parsedBody($request)->integer('MAJ_DISPLAY_CNIL', 0)
+		);
+		$this->module->setPreference(
+			'MAJ_CNIL_REFERENCE',
+			Validator::parsedBody($request)->string('MAJ_CNIL_REFERENCE', '')
+		);
+		$this->module->setPreference(
+			'MAJ_USE_LEGACY_XREF',
+			(string) Validator::parsedBody($request)->integer('MAJ_USE_LEGACY_XREF', 0)
+		);
 
-        FlashMessages::addMessage(
-            I18N::translate('The preferences for the module “%s” have been updated.', $this->module->title()),
-            'success'
-        );
+		FlashMessages::addMessage(
+			I18N::translate('The preferences for the module “%s” have been updated.', $this->module->title()),
+			'success'
+		);
 
-        return Registry::responseFactory()->redirect(AdminConfigPage::class);
-    }
+		return Registry::responseFactory()->redirect(AdminConfigPage::class);
+	}
 }