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

app/Module/Hooks/HooksModule.php

Indentation +101 added lines, -101 removed lines

@@ -42,106 +42,106 @@
  * Provide entry points to extend core webtrees code.
  */
 class HooksModule extends AbstractModule implements
-    ModuleMyArtJaubInterface,
-    ModuleConfigInterface,
-    ModuleHookSubscriberInterface
+	ModuleMyArtJaubInterface,
+	ModuleConfigInterface,
+	ModuleHookSubscriberInterface
 {
-    use ModuleMyArtJaubTrait {
-        boot as traitBoot;
-    }
-    use ModuleConfigTrait;
-
-    // How to update the database schema for this module
-    private const SCHEMA_TARGET_VERSION   = 2;
-    private const SCHEMA_SETTING_NAME     = 'MAJ_HOOKS_SCHEMA_VERSION';
-    private const SCHEMA_MIGRATION_PREFIX = __NAMESPACE__ . '\Schema';
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\AbstractModule::title()
-     */
-    public function title(): string
-    {
-        return /* I18N: Name of the “Hooks” module */ I18N::translate('Hooks');
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\AbstractModule::description()
-     */
-    public function description(): string
-    {
-        return /* I18N: Description of the “Hooks” module */ I18N::translate('Implements hooks management.');
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\AbstractModule::boot()
-     */
-    public function boot(): void
-    {
-        $this->traitBoot();
-        app()->bind(HookServiceInterface::class, HookService::class);
-        app(MigrationService::class)->updateSchema(
-            self::SCHEMA_MIGRATION_PREFIX,
-            self::SCHEMA_SETTING_NAME,
-            self::SCHEMA_TARGET_VERSION
-        );
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\ModuleMyArtJaubInterface::loadRoutes()
-     */
-    public function loadRoutes(Map $router): void
-    {
-        $router->attach('', '', static function (Map $router): void {
-
-            $router->attach('', '/module-maj/hooks', static function (Map $router): void {
-
-                $router->attach('', '/config/admin', static function (Map $router): void {
-
-                    $router->get(AdminConfigPage::class, '', AdminConfigPage::class);
-                    $router->get(ModulesHooksPage::class, '/{hook_name}', ModulesHooksPage::class);
-                    $router->post(ModulesHooksAction::class, '/{hook_name}', ModulesHooksAction::class);
-                });
-            });
-        });
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleCustomInterface::customModuleVersion()
-     */
-    public function customModuleVersion(): string
-    {
-        return '2.1.6-v.1';
-    }
-
-    /**
-     * {@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(FactSourceTextExtenderCollector::class, ['module' => $this]),
-            app()->makeWith(FamilyDatatablesExtenderCollector::class, ['module' => $this]),
-            app()->makeWith(IndividualDatatablesExtenderCollector::class, ['module' => $this]),
-            app()->makeWith(NameAccordionExtenderCollector::class, ['module' => $this]),
-            app()->makeWith(RecordNameTextExtenderCollector::class, ['module' => $this]),
-            app()->makeWith(SosaFamilyDatatablesExtenderCollector::class, ['module' => $this]),
-            app()->makeWith(SosaIndividualDatatablesExtenderCollector::class, ['module' => $this]),
-            app()->makeWith(SosaMissingDatatablesExtenderCollector::class, ['module' => $this])
-        ];
-    }
+	use ModuleMyArtJaubTrait {
+		boot as traitBoot;
+	}
+	use ModuleConfigTrait;
+
+	// How to update the database schema for this module
+	private const SCHEMA_TARGET_VERSION   = 2;
+	private const SCHEMA_SETTING_NAME     = 'MAJ_HOOKS_SCHEMA_VERSION';
+	private const SCHEMA_MIGRATION_PREFIX = __NAMESPACE__ . '\Schema';
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\AbstractModule::title()
+	 */
+	public function title(): string
+	{
+		return /* I18N: Name of the “Hooks” module */ I18N::translate('Hooks');
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\AbstractModule::description()
+	 */
+	public function description(): string
+	{
+		return /* I18N: Description of the “Hooks” module */ I18N::translate('Implements hooks management.');
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\AbstractModule::boot()
+	 */
+	public function boot(): void
+	{
+		$this->traitBoot();
+		app()->bind(HookServiceInterface::class, HookService::class);
+		app(MigrationService::class)->updateSchema(
+			self::SCHEMA_MIGRATION_PREFIX,
+			self::SCHEMA_SETTING_NAME,
+			self::SCHEMA_TARGET_VERSION
+		);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Module\ModuleMyArtJaubInterface::loadRoutes()
+	 */
+	public function loadRoutes(Map $router): void
+	{
+		$router->attach('', '', static function (Map $router): void {
+
+			$router->attach('', '/module-maj/hooks', static function (Map $router): void {
+
+				$router->attach('', '/config/admin', static function (Map $router): void {
+
+					$router->get(AdminConfigPage::class, '', AdminConfigPage::class);
+					$router->get(ModulesHooksPage::class, '/{hook_name}', ModulesHooksPage::class);
+					$router->post(ModulesHooksAction::class, '/{hook_name}', ModulesHooksAction::class);
+				});
+			});
+		});
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleCustomInterface::customModuleVersion()
+	 */
+	public function customModuleVersion(): string
+	{
+		return '2.1.6-v.1';
+	}
+
+	/**
+	 * {@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(FactSourceTextExtenderCollector::class, ['module' => $this]),
+			app()->makeWith(FamilyDatatablesExtenderCollector::class, ['module' => $this]),
+			app()->makeWith(IndividualDatatablesExtenderCollector::class, ['module' => $this]),
+			app()->makeWith(NameAccordionExtenderCollector::class, ['module' => $this]),
+			app()->makeWith(RecordNameTextExtenderCollector::class, ['module' => $this]),
+			app()->makeWith(SosaFamilyDatatablesExtenderCollector::class, ['module' => $this]),
+			app()->makeWith(SosaIndividualDatatablesExtenderCollector::class, ['module' => $this]),
+			app()->makeWith(SosaMissingDatatablesExtenderCollector::class, ['module' => $this])
+		];
+	}
 }

app/Module/IsSourced/Hooks/IsSourcedStatusHook.php

Indentation +45 added lines, -45 removed lines

@@ -25,53 +25,53 @@
  */
 class IsSourcedStatusHook implements RecordNameTextExtenderInterface
 {
-    private ModuleInterface $module;
-    private SourceStatusService $source_status_service;
+	private ModuleInterface $module;
+	private SourceStatusService $source_status_service;
 
-    /**
-     * Constructor for IsSourcedStatusHook
-     *
-     * @param ModuleInterface $module
-     * @param SourceStatusService $source_status_service
-     */
-    public function __construct(ModuleInterface $module, SourceStatusService $source_status_service)
-    {
-        $this->module = $module;
-        $this->source_status_service = $source_status_service;
-    }
+	/**
+	 * Constructor for IsSourcedStatusHook
+	 *
+	 * @param ModuleInterface $module
+	 * @param SourceStatusService $source_status_service
+	 */
+	public function __construct(ModuleInterface $module, SourceStatusService $source_status_service)
+	{
+		$this->module = $module;
+		$this->source_status_service = $source_status_service;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\Hooks\HookInterface::module()
-     */
-    public function module(): ModuleInterface
-    {
-        return $this->module;
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\Hooks\HookInterface::module()
+	 */
+	public function module(): ModuleInterface
+	{
+		return $this->module;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\Hooks\RecordNameTextExtenderInterface::recordNamePrepend()
-     */
-    public function recordNamePrepend(GedcomRecord $record, bool $use_long = false, string $size = ''): string
-    {
-        return '';
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\Hooks\RecordNameTextExtenderInterface::recordNamePrepend()
+	 */
+	public function recordNamePrepend(GedcomRecord $record, bool $use_long = false, string $size = ''): string
+	{
+		return '';
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\Hooks\RecordNameTextExtenderInterface::recordNameAppend()
-     */
-    public function recordNameAppend(GedcomRecord $record, bool $use_long = false, string $size = ''): string
-    {
-        if ($use_long && $record instanceof Individual) {
-            return view($this->module()->name() . '::hooks/name-append', [
-                'module_name'           =>  $this->module()->name(),
-                'source_status_service' =>  $this->source_status_service,
-                'individual'            =>  $record,
-                'size_style'            =>  $size
-            ]);
-        }
-        return '';
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\Hooks\RecordNameTextExtenderInterface::recordNameAppend()
+	 */
+	public function recordNameAppend(GedcomRecord $record, bool $use_long = false, string $size = ''): string
+	{
+		if ($use_long && $record instanceof Individual) {
+			return view($this->module()->name() . '::hooks/name-append', [
+				'module_name'           =>  $this->module()->name(),
+				'source_status_service' =>  $this->source_status_service,
+				'individual'            =>  $record,
+				'size_style'            =>  $size
+			]);
+		}
+		return '';
+	}
 }

app/Module/IsSourced/IsSourcedModule.php

Indentation +90 added lines, -90 removed lines

@@ -33,105 +33,105 @@
  * IsSourced Module
  */
 class IsSourcedModule extends AbstractModule implements
-    ModuleMyArtJaubInterface,
-    ModuleGlobalInterface,
-    ModuleSidebarInterface,
-    ModuleHookSubscriberInterface
+	ModuleMyArtJaubInterface,
+	ModuleGlobalInterface,
+	ModuleSidebarInterface,
+	ModuleHookSubscriberInterface
 {
-    use ModuleMyArtJaubTrait;
-    use ModuleGlobalTrait;
-    use ModuleSidebarTrait;
+	use ModuleMyArtJaubTrait;
+	use ModuleGlobalTrait;
+	use ModuleSidebarTrait;
 
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\AbstractModule::title()
-     */
-    public function title(): string
-    {
-        return I18N::translate('Sourced events');
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\AbstractModule::title()
+	 */
+	public function title(): string
+	{
+		return I18N::translate('Sourced events');
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\AbstractModule::description()
-     */
-    public function description(): string
-    {
-        return I18N::translate('Indicate if events related to an record are sourced.');
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\AbstractModule::description()
+	 */
+	public function description(): string
+	{
+		return I18N::translate('Indicate if events related to an record are sourced.');
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleCustomInterface::customModuleVersion()
-     */
-    public function customModuleVersion(): string
-    {
-        return '2.1.6-v.1';
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleCustomInterface::customModuleVersion()
+	 */
+	public function customModuleVersion(): string
+	{
+		return '2.1.6-v.1';
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleGlobalInterface::headContent()
-     */
-    public function headContent(): string
-    {
-        return '<link rel="stylesheet" href="' . e($this->moduleCssUrl()) . '">';
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleGlobalInterface::headContent()
+	 */
+	public function headContent(): string
+	{
+		return '<link rel="stylesheet" href="' . e($this->moduleCssUrl()) . '">';
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleGlobalInterface::bodyContent()
-     */
-    public function bodyContent(): string
-    {
-        return '<script src="' . $this->assetUrl('js/issourced.min.js') . '"></script>';
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleGlobalInterface::bodyContent()
+	 */
+	public function bodyContent(): string
+	{
+		return '<script src="' . $this->assetUrl('js/issourced.min.js') . '"></script>';
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleSidebarInterface::hasSidebarContent()
-     */
-    public function hasSidebarContent(Individual $individual): bool
-    {
-        return true;
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleSidebarInterface::hasSidebarContent()
+	 */
+	public function hasSidebarContent(Individual $individual): bool
+	{
+		return true;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleSidebarInterface::getSidebarContent()
-     */
-    public function getSidebarContent(Individual $individual): string
-    {
-        /** @var SourceStatusService $source_status_service */
-        $source_status_service = app(SourceStatusService::class);
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleSidebarInterface::getSidebarContent()
+	 */
+	public function getSidebarContent(Individual $individual): string
+	{
+		/** @var SourceStatusService $source_status_service */
+		$source_status_service = app(SourceStatusService::class);
 
-        $spouse_families_status = $individual->spouseFamilies()->map(
-            function (Family $sfamily) use ($source_status_service): array {
-                return [ $sfamily, $source_status_service->sourceStatusForMarriage($sfamily)];
-            }
-        )->filter(function (array $item): bool {
-            return $item[1]->isSet();
-        });
+		$spouse_families_status = $individual->spouseFamilies()->map(
+			function (Family $sfamily) use ($source_status_service): array {
+				return [ $sfamily, $source_status_service->sourceStatusForMarriage($sfamily)];
+			}
+		)->filter(function (array $item): bool {
+			return $item[1]->isSet();
+		});
 
-        return view($this->name() . '::sidebar/content', [
-            'module_name'               => $this->name(),
-            'individual'                =>  $individual,
-            'source_status_individual'  =>  $source_status_service->sourceStatusForRecord($individual),
-            'source_status_birth'       =>  $source_status_service->sourceStatusForBirth($individual),
-            'source_status_marriages'   =>  $spouse_families_status,
-            'source_status_death'       =>  $source_status_service->sourceStatusForDeath($individual)
-        ]);
-    }
+		return view($this->name() . '::sidebar/content', [
+			'module_name'               => $this->name(),
+			'individual'                =>  $individual,
+			'source_status_individual'  =>  $source_status_service->sourceStatusForRecord($individual),
+			'source_status_birth'       =>  $source_status_service->sourceStatusForBirth($individual),
+			'source_status_marriages'   =>  $spouse_families_status,
+			'source_status_death'       =>  $source_status_service->sourceStatusForDeath($individual)
+		]);
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\Hooks\ModuleHookSubscriberInterface::listSubscribedHooks()
-     */
-    public function listSubscribedHooks(): array
-    {
-        return [
-            app()->makeWith(IsSourcedStatusHook::class, [ 'module' => $this ]),
-            app()->makeWith(IsSourcedStatusColumnsHook::class, [ 'module' => $this ])
-        ];
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\Hooks\ModuleHookSubscriberInterface::listSubscribedHooks()
+	 */
+	public function listSubscribedHooks(): array
+	{
+		return [
+			app()->makeWith(IsSourcedStatusHook::class, [ 'module' => $this ]),
+			app()->makeWith(IsSourcedStatusColumnsHook::class, [ 'module' => $this ])
+		];
+	}
 }

app/Common/Hooks/AbstractHookCollector.php

Indentation +64 added lines, -64 removed lines

@@ -27,77 +27,77 @@
  */
 abstract class AbstractHookCollector implements HookCollectorInterface, HookInterface
 {
-    /** @var Collection<int, array<THook>> $hooks */
-    protected Collection $hooks;
+	/** @var Collection<int, array<THook>> $hooks */
+	protected Collection $hooks;
 
-    private ModuleInterface $module;
+	private ModuleInterface $module;
 
-    /**
-     * Constructor for AbstractHookCollector
-     *
-     * @param ModuleInterface $module
-     */
-    public function __construct(ModuleInterface $module)
-    {
-        $this->hooks = new Collection();
-        $this->module = $module;
-    }
+	/**
+	 * Constructor for AbstractHookCollector
+	 *
+	 * @param ModuleInterface $module
+	 */
+	public function __construct(ModuleInterface $module)
+	{
+		$this->hooks = new Collection();
+		$this->module = $module;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\Hooks\HookInterface::module()
-     */
-    public function module(): ModuleInterface
-    {
-        return $this->module;
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\Hooks\HookInterface::module()
+	 */
+	public function module(): ModuleInterface
+	{
+		return $this->module;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\Hooks\HookCollectorInterface::name()
-     */
-    public function name(): string
-    {
-        return $this->module->name() . '-' .
-            mb_substr(str_replace('collector', '', mb_strtolower((new ReflectionClass($this))->getShortName())), 0, 64);
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\Hooks\HookCollectorInterface::name()
+	 */
+	public function name(): string
+	{
+		return $this->module->name() . '-' .
+			mb_substr(str_replace('collector', '', mb_strtolower((new ReflectionClass($this))->getShortName())), 0, 64);
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\Hooks\HookCollectorInterface::title()
-     */
-    abstract public function title(): string;
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\Hooks\HookCollectorInterface::title()
+	 */
+	abstract public function title(): string;
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\Hooks\HookCollectorInterface::description()
-     */
-    abstract public function description(): string;
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\Hooks\HookCollectorInterface::description()
+	 */
+	abstract public function description(): string;
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\Hooks\HookCollectorInterface::hookInterface()
-     */
-    abstract public function hookInterface(): string;
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\Hooks\HookCollectorInterface::hookInterface()
+	 */
+	abstract public function hookInterface(): string;
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\Hooks\HookCollectorInterface::register()
-     */
-    public function register(HookInterface $hook_instance, int $order): void
-    {
-        $this->hooks->put($order, [...$this->hooks->get($order, []), $hook_instance]);
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\Hooks\HookCollectorInterface::register()
+	 */
+	public function register(HookInterface $hook_instance, int $order): void
+	{
+		$this->hooks->put($order, [...$this->hooks->get($order, []), $hook_instance]);
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\Hooks\HookCollectorInterface::hooks()
-     *
-     * @return Collection<THook>
-     */
-    public function hooks(): Collection
-    {
-        /** @var Collection<THook> */
-        return $this->hooks->sortKeys()->flatten();
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\Hooks\HookCollectorInterface::hooks()
+	 *
+	 * @return Collection<THook>
+	 */
+	public function hooks(): Collection
+	{
+		/** @var Collection<THook> */
+		return $this->hooks->sortKeys()->flatten();
+	}
 }