jon48 / webtrees-lib

app/Module/Hooks/Hooks/FamilyDatatablesExtenderCollector.php

Indentation +37 added lines, -37 removed lines

@@ -25,45 +25,45 @@
  * @extends AbstractHookCollector<FamilyDatatablesExtenderInterface>
  */
 class FamilyDatatablesExtenderCollector extends AbstractHookCollector implements
-    FamilyDatatablesExtenderInterface
+	FamilyDatatablesExtenderInterface
 {
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Common\Hooks\AbstractHookCollector::title()
-     */
-    public function title(): string
-    {
-        return I18N::translate('Columns extender for tables of families');
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Common\Hooks\AbstractHookCollector::title()
+	 */
+	public function title(): string
+	{
+		return I18N::translate('Columns extender for tables of families');
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Common\Hooks\AbstractHookCollector::description()
-     */
-    public function description(): string
-    {
-        return I18N::translate('Add additional columns to tables of families');
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Common\Hooks\AbstractHookCollector::description()
+	 */
+	public function description(): string
+	{
+		return I18N::translate('Add additional columns to tables of families');
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Common\Hooks\AbstractHookCollector::hookInterface()
-     */
-    public function hookInterface(): string
-    {
-        return FamilyDatatablesExtenderInterface::class;
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Common\Hooks\AbstractHookCollector::hookInterface()
+	 */
+	public function hookInterface(): string
+	{
+		return FamilyDatatablesExtenderInterface::class;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\Hooks\FamilyDatatablesExtenderInterface::familyColumns()
-     */
-    public function familyColumns(iterable $records): array
-    {
-        $result = [];
-        foreach ($this->hooks() as $hook) {
-            $result = array_merge($result, $hook->familyColumns($records));
-        }
-        return $result;
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\Hooks\FamilyDatatablesExtenderInterface::familyColumns()
+	 */
+	public function familyColumns(iterable $records): array
+	{
+		$result = [];
+		foreach ($this->hooks() as $hook) {
+			$result = array_merge($result, $hook->familyColumns($records));
+		}
+		return $result;
+	}
 }

app/Module/Hooks/Http/RequestHandlers/ModulesHooksAction.php

Indentation +48 added lines, -48 removed lines

@@ -29,61 +29,61 @@
  */
 class ModulesHooksAction extends AbstractModuleComponentAction
 {
-    protected HookService $hook_service;
+	protected HookService $hook_service;
 
-    /**
-     * Constructor for ModulesHooksAction Request Handler
-     *
-     * @param ModuleService $module_service
-     * @param TreeService $tree_service
-     * @param HookService $hook_service
-     */
-    public function __construct(ModuleService $module_service, TreeService $tree_service, HookService $hook_service)
-    {
-        parent::__construct($module_service, $tree_service);
-        $this->hook_service = $hook_service;
-    }
+	/**
+	 * Constructor for ModulesHooksAction Request Handler
+	 *
+	 * @param ModuleService $module_service
+	 * @param TreeService $tree_service
+	 * @param HookService $hook_service
+	 */
+	public function __construct(ModuleService $module_service, TreeService $tree_service, HookService $hook_service)
+	{
+		parent::__construct($module_service, $tree_service);
+		$this->hook_service = $hook_service;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        $hook_name = $request->getAttribute('hook_name');
-        $hook_collector = $this->hook_service->find($hook_name, true);
-        if ($hook_collector === null) {
-            FlashMessages::addMessage(I18N::translate('The hook with name “%s” does not exist.', $hook_name), 'danger');
-            return redirect(AdminConfigPage::class);
-        }
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		$hook_name = $request->getAttribute('hook_name');
+		$hook_collector = $this->hook_service->find($hook_name, true);
+		if ($hook_collector === null) {
+			FlashMessages::addMessage(I18N::translate('The hook with name “%s” does not exist.', $hook_name), 'danger');
+			return redirect(AdminConfigPage::class);
+		}
 
-        foreach ($hook_collector->hooks() as $hook) {
-            $this->updateStatus(get_class($hook->module()), $request);
-        }
+		foreach ($hook_collector->hooks() as $hook) {
+			$this->updateStatus(get_class($hook->module()), $request);
+		}
 
-        $this->updateHookOrder($hook_collector, $request);
+		$this->updateHookOrder($hook_collector, $request);
 
-        FlashMessages::addMessage(I18N::translate('The hook preferences have been updated.'), 'success');
+		FlashMessages::addMessage(I18N::translate('The hook preferences have been updated.'), 'success');
 
-        return redirect(route(ModulesHooksPage::class, ['hook_name' => $hook_name]));
-    }
+		return redirect(route(ModulesHooksPage::class, ['hook_name' => $hook_name]));
+	}
 
-    /**
-     * Update the order of modules for a hook interface.
-     *
-     * @template THook of \MyArtJaub\Webtrees\Contracts\Hooks\HookInterface
-     * @param HookCollectorInterface<THook> $hook_collector
-     * @param ServerRequestInterface $request
-     */
-    protected function updateHookOrder(HookCollectorInterface $hook_collector, ServerRequestInterface $request): void
-    {
-        $params = (array) $request->getParsedBody();
+	/**
+	 * Update the order of modules for a hook interface.
+	 *
+	 * @template THook of \MyArtJaub\Webtrees\Contracts\Hooks\HookInterface
+	 * @param HookCollectorInterface<THook> $hook_collector
+	 * @param ServerRequestInterface $request
+	 */
+	protected function updateHookOrder(HookCollectorInterface $hook_collector, ServerRequestInterface $request): void
+	{
+		$params = (array) $request->getParsedBody();
 
-        $order = (array) ($params['order'] ?? []);
-        $order = array_flip($order);
+		$order = (array) ($params['order'] ?? []);
+		$order = array_flip($order);
 
-        foreach ($hook_collector->hooks() as $hook) {
-            $this->hook_service->updateOrder($hook_collector, $hook->module(), $order[$hook->module()->name()] ?? 0);
-        }
-    }
+		foreach ($hook_collector->hooks() as $hook) {
+			$this->hook_service->updateOrder($hook_collector, $hook->module(), $order[$hook->module()->name()] ?? 0);
+		}
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -77,9 +77,9 @@
      */
     protected function updateHookOrder(HookCollectorInterface $hook_collector, ServerRequestInterface $request): void
     {
-        $params = (array) $request->getParsedBody();
+        $params = (array)$request->getParsedBody();
 
-        $order = (array) ($params['order'] ?? []);
+        $order = (array)($params['order'] ?? []);
         $order = array_flip($order);
 
         foreach ($hook_collector->hooks() as $hook) {

app/Module/Hooks/Http/RequestHandlers/ModulesHooksPage.php

Indentation +34 added lines, -34 removed lines

@@ -28,44 +28,44 @@
  */
 class ModulesHooksPage implements RequestHandlerInterface
 {
-    use ViewResponseTrait;
+	use ViewResponseTrait;
 
-    protected HookService $hook_service;
+	protected HookService $hook_service;
 
-    /**
-     * Constructor for ModulesHooksPage request handler
-     *
-     * @param HookService $hook_service
-     */
-    public function __construct(HookService $hook_service)
-    {
-        $this->hook_service = $hook_service;
-    }
+	/**
+	 * Constructor for ModulesHooksPage request handler
+	 *
+	 * @param HookService $hook_service
+	 */
+	public function __construct(HookService $hook_service)
+	{
+		$this->hook_service = $hook_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';
 
-        $hook_name = $request->getAttribute('hook_name');
-        $hook = $this->hook_service->find($hook_name, true);
-        if ($hook === null) {
-            throw new HttpNotFoundException(I18N::translate('The hook with name “%s” does not exist.', $hook_name));
-        }
+		$hook_name = $request->getAttribute('hook_name');
+		$hook = $this->hook_service->find($hook_name, true);
+		if ($hook === null) {
+			throw new HttpNotFoundException(I18N::translate('The hook with name “%s” does not exist.', $hook_name));
+		}
 
-        $modules = $hook->hooks()
-            ->sortKeys()
-            ->mapWithKeys(fn(HookInterface $hook) => [$hook->module()->name() => $hook->module()]);
+		$modules = $hook->hooks()
+			->sortKeys()
+			->mapWithKeys(fn(HookInterface $hook) => [$hook->module()->name() => $hook->module()]);
 
-        return $this->viewResponse('admin/components', [
-            'description'    => $hook->description(),
-            'modules'        => $modules,
-            'title'          => $hook->title(),
-            'uses_access'    => false,
-            'uses_sorting'   => true
-        ]);
-    }
+		return $this->viewResponse('admin/components', [
+			'description'    => $hook->description(),
+			'modules'        => $modules,
+			'title'          => $hook->title(),
+			'uses_access'    => false,
+			'uses_sorting'   => true
+		]);
+	}
 }

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

Indentation +29 added lines, -29 removed lines

@@ -29,38 +29,38 @@
  */
 class AdminConfigPage implements RequestHandlerInterface
 {
-    use ViewResponseTrait;
+	use ViewResponseTrait;
 
-    private ?HooksModule $module;
-    private HookService $hook_service;
+	private ?HooksModule $module;
+	private HookService $hook_service;
 
-    /**
-     * Constructor for AdminConfigPage Request Handler
-     *
-     * @param ModuleService $module_service
-     * @param HookService $hook_service
-     */
-    public function __construct(ModuleService $module_service, HookService $hook_service)
-    {
-        $this->module = $module_service->findByInterface(HooksModule::class)->first();
-        $this->hook_service = $hook_service;
-    }
+	/**
+	 * Constructor for AdminConfigPage Request Handler
+	 *
+	 * @param ModuleService $module_service
+	 * @param HookService $hook_service
+	 */
+	public function __construct(ModuleService $module_service, HookService $hook_service)
+	{
+		$this->module = $module_service->findByInterface(HooksModule::class)->first();
+		$this->hook_service = $hook_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.'));
+		}
 
-        return $this->viewResponse($this->module->name() . '::admin/config', [
-            'title'                 =>  $this->module->title(),
-            'hook_interfaces_list'  =>  $this->hook_service->all(true)
-        ]);
-    }
+		return $this->viewResponse($this->module->name() . '::admin/config', [
+			'title'                 =>  $this->module->title(),
+			'hook_interfaces_list'  =>  $this->hook_service->all(true)
+		]);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
             throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
         }
 
-        return $this->viewResponse($this->module->name() . '::admin/config', [
+        return $this->viewResponse($this->module->name().'::admin/config', [
             'title'                 =>  $this->module->title(),
             'hook_interfaces_list'  =>  $this->hook_service->all(true)
         ]);

app/Module/Hooks/Schema/Migration1.php

Indentation +18 added lines, -18 removed lines

@@ -24,22 +24,22 @@
 class Migration1 implements MigrationInterface
 {
 
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Schema\MigrationInterface::upgrade()
-     */
-    public function upgrade(): void
-    {
-        if (DB::schema()->hasTable('maj_hooks')) {
-            DB::schema()->drop('maj_hooks');
-        }
-
-        DB::schema()->create('maj_hook_order', static function (Blueprint $table): void {
-            $table->string('majho_module_name', 32);
-            $table->string('majho_hook_name', 64);
-            $table->integer('majho_hook_order')->nullable();
-
-            $table->primary(['majho_module_name', 'majho_hook_name']);
-        });
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Schema\MigrationInterface::upgrade()
+	 */
+	public function upgrade(): void
+	{
+		if (DB::schema()->hasTable('maj_hooks')) {
+			DB::schema()->drop('maj_hooks');
+		}
+
+		DB::schema()->create('maj_hook_order', static function (Blueprint $table): void {
+			$table->string('majho_module_name', 32);
+			$table->string('majho_hook_name', 64);
+			$table->integer('majho_hook_order')->nullable();
+
+			$table->primary(['majho_module_name', 'majho_hook_name']);
+		});
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
             DB::schema()->drop('maj_hooks');
         }
 
-        DB::schema()->create('maj_hook_order', static function (Blueprint $table): void {
+        DB::schema()->create('maj_hook_order', static function(Blueprint $table): void {
             $table->string('majho_module_name', 32);
             $table->string('majho_hook_name', 64);
             $table->integer('majho_hook_order')->nullable();

app/Module/Hooks/Schema/Migration0.php

Indentation +8 added lines, -8 removed lines

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

app/Module/Hooks/Services/HookService.php

Indentation +91 added lines, -91 removed lines

@@ -30,104 +30,104 @@
  */
 class HookService implements HookServiceInterface
 {
-    private ModuleService $module_service;
+	private ModuleService $module_service;
 
-    /**
-     * Constructor for HookService
-     *
-     * @param ModuleService $module_service
-     */
-    public function __construct(ModuleService $module_service)
-    {
-        $this->module_service = $module_service;
-    }
+	/**
+	 * Constructor for HookService
+	 *
+	 * @param ModuleService $module_service
+	 */
+	public function __construct(ModuleService $module_service)
+	{
+		$this->module_service = $module_service;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\Hooks\HookServiceInterface::use()
-     */
-    public function use(string $hook_interface): ?HookCollectorInterface
-    {
-        return $this->all()->get($hook_interface);
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\Hooks\HookServiceInterface::use()
+	 */
+	public function use(string $hook_interface): ?HookCollectorInterface
+	{
+		return $this->all()->get($hook_interface);
+	}
 
 
-    /**
-     * Find a hook collector by its name, with or without the disabled ones.
-     *
-     * @template THook of HookInterface
-     * @param string $hook_name
-     * @return HookCollectorInterface<THook>|null
-     */
-    public function find(string $hook_name, bool $include_disabled = false): ?HookCollectorInterface
-    {
-        return $this->all($include_disabled)
-            ->first(fn(HookCollectorInterface $hook_collector) => $hook_collector->name() === $hook_name);
-    }
+	/**
+	 * Find a hook collector by its name, with or without the disabled ones.
+	 *
+	 * @template THook of HookInterface
+	 * @param string $hook_name
+	 * @return HookCollectorInterface<THook>|null
+	 */
+	public function find(string $hook_name, bool $include_disabled = false): ?HookCollectorInterface
+	{
+		return $this->all($include_disabled)
+			->first(fn(HookCollectorInterface $hook_collector) => $hook_collector->name() === $hook_name);
+	}
 
-    /**
-     * Get all hook collectors subscribed by modules, with hooks ordered, with or without the disabled ones.
-     *
-     * @template THook of HookInterface
-     * @param bool $include_disabled
-     * @return Collection<string, HookCollectorInterface<THook>>
-     */
-    public function all(bool $include_disabled = false): Collection
-    {
-        return Registry::cache()->array()->remember('all-hooks', function () use ($include_disabled): Collection {
-            $hooks_info = DB::table('maj_hook_order')
-                ->get()
-                ->groupBy(['majho_hook_name', 'majho_module_name']);
+	/**
+	 * Get all hook collectors subscribed by modules, with hooks ordered, with or without the disabled ones.
+	 *
+	 * @template THook of HookInterface
+	 * @param bool $include_disabled
+	 * @return Collection<string, HookCollectorInterface<THook>>
+	 */
+	public function all(bool $include_disabled = false): Collection
+	{
+		return Registry::cache()->array()->remember('all-hooks', function () use ($include_disabled): Collection {
+			$hooks_info = DB::table('maj_hook_order')
+				->get()
+				->groupBy(['majho_hook_name', 'majho_module_name']);
 
-            $hooks = $this->module_service
-                ->findByInterface(ModuleHookSubscriberInterface::class, $include_disabled)
-                ->flatMap(fn(ModuleHookSubscriberInterface $module) => $module->listSubscribedHooks());
+			$hooks = $this->module_service
+				->findByInterface(ModuleHookSubscriberInterface::class, $include_disabled)
+				->flatMap(fn(ModuleHookSubscriberInterface $module) => $module->listSubscribedHooks());
 
-            $hook_collectors = collect();
-            $hook_instances = collect();
-            foreach ($hooks as $hook) {
-                if (!($hook instanceof HookInterface)) {
-                    continue;
-                }
-                if ($hook instanceof HookCollectorInterface) {
-                    $hook_collectors->put($hook->hookInterface(), $hook);
-                } else {
-                    $hook_instances->add($hook);
-                }
-            }
+			$hook_collectors = collect();
+			$hook_instances = collect();
+			foreach ($hooks as $hook) {
+				if (!($hook instanceof HookInterface)) {
+					continue;
+				}
+				if ($hook instanceof HookCollectorInterface) {
+					$hook_collectors->put($hook->hookInterface(), $hook);
+				} else {
+					$hook_instances->add($hook);
+				}
+			}
 
-            foreach ($hook_collectors as $hook_interface => $hook_collector) {
-                $hook_info = $hooks_info->get($hook_collector->name()) ?? collect();
-                foreach (
-                    $hook_instances->filter(
-                        fn(HookInterface $hook): bool => $hook instanceof $hook_interface
-                    ) as $hook_instance
-                ) {
-                    $hook_module_info = $hook_info->get($hook_instance->module()->name(), collect())->first();
-                    $hook_order = $hook_module_info instanceof stdClass ? (int) $hook_module_info->majho_hook_order : 0;
-                    $hook_collector->register($hook_instance, $hook_order);
-                }
-            }
-            return $hook_collectors;
-        });
-    }
+			foreach ($hook_collectors as $hook_interface => $hook_collector) {
+				$hook_info = $hooks_info->get($hook_collector->name()) ?? collect();
+				foreach (
+					$hook_instances->filter(
+						fn(HookInterface $hook): bool => $hook instanceof $hook_interface
+					) as $hook_instance
+				) {
+					$hook_module_info = $hook_info->get($hook_instance->module()->name(), collect())->first();
+					$hook_order = $hook_module_info instanceof stdClass ? (int) $hook_module_info->majho_hook_order : 0;
+					$hook_collector->register($hook_instance, $hook_order);
+				}
+			}
+			return $hook_collectors;
+		});
+	}
 
-    /**
-     * Update the order of the modules implementing a hook in the database.
-     *
-     * @template THook of HookInterface
-     * @param HookCollectorInterface<THook> $hook_collector
-     * @param ModuleInterface $module
-     * @param int $order
-     * @return int
-     */
-    public function updateOrder(HookCollectorInterface $hook_collector, ModuleInterface $module, int $order): int
-    {
-        return DB::table('maj_hook_order')
-            ->upsert([
-                'majho_module_name' =>  $module->name(),
-                'majho_hook_name'   =>  $hook_collector->name(),
-                'majho_hook_order'  =>  $order
-            ], ['majho_module_name', 'majho_hook_name'], ['majho_hook_order']);
-    }
+	/**
+	 * Update the order of the modules implementing a hook in the database.
+	 *
+	 * @template THook of HookInterface
+	 * @param HookCollectorInterface<THook> $hook_collector
+	 * @param ModuleInterface $module
+	 * @param int $order
+	 * @return int
+	 */
+	public function updateOrder(HookCollectorInterface $hook_collector, ModuleInterface $module, int $order): int
+	{
+		return DB::table('maj_hook_order')
+			->upsert([
+				'majho_module_name' =>  $module->name(),
+				'majho_hook_name'   =>  $hook_collector->name(),
+				'majho_hook_order'  =>  $order
+			], ['majho_module_name', 'majho_hook_name'], ['majho_hook_order']);
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -74,7 +74,7 @@ 
      */
     public function all(bool $include_disabled = false): Collection
     {
-        return Registry::cache()->array()->remember('all-hooks', function () use ($include_disabled): Collection {
+        return Registry::cache()->array()->remember('all-hooks', function() use ($include_disabled): Collection {
             $hooks_info = DB::table('maj_hook_order')
                 ->get()
                 ->groupBy(['majho_hook_name', 'majho_module_name']);
@@ -104,7 +104,7 @@ 
                     ) as $hook_instance
                 ) {
                     $hook_module_info = $hook_info->get($hook_instance->module()->name(), collect())->first();
-                    $hook_order = $hook_module_info instanceof stdClass ? (int) $hook_module_info->majho_hook_order : 0;
+                    $hook_order = $hook_module_info instanceof stdClass ? (int)$hook_module_info->majho_hook_order : 0;
                     $hook_collector->register($hook_instance, $hook_order);
                 }
             }

app/Module/MiscExtensions/Hooks/TitlesCardHook.php

Indentation +57 added lines, -57 removed lines

@@ -25,68 +25,68 @@
  */
 class TitlesCardHook implements NameAccordionExtenderInterface
 {
-    private ModuleInterface $module;
+	private ModuleInterface $module;
 
-    /**
-     * Constructor for TitlesCardHook
-     *
-     * @param ModuleInterface $module
-     */
-    public function __construct(ModuleInterface $module)
-    {
-        $this->module = $module;
-    }
+	/**
+	 * Constructor for TitlesCardHook
+	 *
+	 * @param ModuleInterface $module
+	 */
+	public function __construct(ModuleInterface $module)
+	{
+		$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\NameAccordionExtenderInterface::accordionCard()
-     */
-    public function accordionCard(Individual $individual): string
-    {
-        $title_separator = $this->module->getPreference('MAJ_TITLE_PREFIX');
-        if ($title_separator === '') {
-            return '';
-        }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\Hooks\NameAccordionExtenderInterface::accordionCard()
+	 */
+	public function accordionCard(Individual $individual): string
+	{
+		$title_separator = $this->module->getPreference('MAJ_TITLE_PREFIX');
+		if ($title_separator === '') {
+			return '';
+		}
 
-        $titles = $this->individualTitles($individual, '/(.*?) ((' . $title_separator .  ')(.*))/i');
+		$titles = $this->individualTitles($individual, '/(.*?) ((' . $title_separator .  ')(.*))/i');
 
-        return count($titles) === 0 ? '' :
-            view($this->module()->name() . '::components/card-titles', [ 'titles' => $titles ]);
-    }
+		return count($titles) === 0 ? '' :
+			view($this->module()->name() . '::components/card-titles', [ 'titles' => $titles ]);
+	}
 
-    /**
-     * Extract the individual titles from the TITL tags.
-     * Split the title based on a pattern to identify the title and the land it refers to.
-     *
-     * @param Individual $individual
-     * @param string $pattern
-     * @return array<string, string[]>
-     */
-    protected function individualTitles(Individual $individual, string $pattern): array
-    {
-        $titles_list = [];
-        /** @var \Illuminate\Support\Collection<string> $titles */
-        $titles = $individual->facts(['TITL'])
-            ->sortByDesc(fn(Fact $fact) => $fact->date()->julianDay())
-            ->map(fn(Fact $fact) => $fact->value());
+	/**
+	 * Extract the individual titles from the TITL tags.
+	 * Split the title based on a pattern to identify the title and the land it refers to.
+	 *
+	 * @param Individual $individual
+	 * @param string $pattern
+	 * @return array<string, string[]>
+	 */
+	protected function individualTitles(Individual $individual, string $pattern): array
+	{
+		$titles_list = [];
+		/** @var \Illuminate\Support\Collection<string> $titles */
+		$titles = $individual->facts(['TITL'])
+			->sortByDesc(fn(Fact $fact) => $fact->date()->julianDay())
+			->map(fn(Fact $fact) => $fact->value());
 
-        foreach ($titles as $title) {
-            if (preg_match($pattern, $title, $match) === 1) {
-                /** @var array<int, string> $match */
-                $titles_list[$match[1]][] = trim($match[2]);
-            } else {
-                $titles_list[$title][] = '';
-            }
-        }
-        return $titles_list;
-    }
+		foreach ($titles as $title) {
+			if (preg_match($pattern, $title, $match) === 1) {
+				/** @var array<int, string> $match */
+				$titles_list[$match[1]][] = trim($match[2]);
+			} else {
+				$titles_list[$title][] = '';
+			}
+		}
+		return $titles_list;
+	}
 }

Spacing +2 added lines, -3 removed lines

@@ -57,10 +57,9 @@
             return '';
         }
 
-        $titles = $this->individualTitles($individual, '/(.*?) ((' . $title_separator .  ')(.*))/i');
+        $titles = $this->individualTitles($individual, '/(.*?) (('.$title_separator.')(.*))/i');
 
-        return count($titles) === 0 ? '' :
-            view($this->module()->name() . '::components/card-titles', [ 'titles' => $titles ]);
+        return count($titles) === 0 ? '' : view($this->module()->name().'::components/card-titles', ['titles' => $titles]);
     }
 
     /**

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

Indentation +33 added lines, -33 removed lines

@@ -27,43 +27,43 @@
  */
 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 redirect(route(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 redirect(route(AdminConfigPage::class));
+		}
 
-        $params = (array) $request->getParsedBody();
+		$params = (array) $request->getParsedBody();
 
-        $this->module->setPreference('MAJ_TITLE_PREFIX', $params['MAJ_TITLE_PREFIX'] ?? '');
-        $this->module->setPreference('MAJ_DISPLAY_CNIL', $params['MAJ_DISPLAY_CNIL'] ?? '');
-        $this->module->setPreference('MAJ_CNIL_REFERENCE', $params['MAJ_CNIL_REFERENCE' ?? '']);
+		$this->module->setPreference('MAJ_TITLE_PREFIX', $params['MAJ_TITLE_PREFIX'] ?? '');
+		$this->module->setPreference('MAJ_DISPLAY_CNIL', $params['MAJ_DISPLAY_CNIL'] ?? '');
+		$this->module->setPreference('MAJ_CNIL_REFERENCE', $params['MAJ_CNIL_REFERENCE' ?? '']);
 
-        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 redirect(route(AdminConfigPage::class));
-    }
+		return redirect(route(AdminConfigPage::class));
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
             return redirect(route(AdminConfigPage::class));
         }
 
-        $params = (array) $request->getParsedBody();
+        $params = (array)$request->getParsedBody();
 
         $this->module->setPreference('MAJ_TITLE_PREFIX', $params['MAJ_TITLE_PREFIX'] ?? '');
         $this->module->setPreference('MAJ_DISPLAY_CNIL', $params['MAJ_DISPLAY_CNIL'] ?? '');