jon48 / webtrees-lib

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'] ?? '');

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

Indentation +31 added lines, -31 removed lines

@@ -28,35 +28,35 @@
  */
 class AdminConfigPage implements RequestHandlerInterface
 {
-    use ViewResponseTrait;
-
-    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();
-    }
-
-    /**
-     * {@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.'));
-        }
-
-        return $this->viewResponse($this->module->name() . '::admin/config', [
-            'module'    =>  $this->module,
-            'title'     =>  $this->module->title()
-        ]);
-    }
+	use ViewResponseTrait;
+
+	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();
+	}
+
+	/**
+	 * {@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.'));
+		}
+
+		return $this->viewResponse($this->module->name() . '::admin/config', [
+			'module'    =>  $this->module,
+			'title'     =>  $this->module->title()
+		]);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -54,7 +54,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', [
             'module'    =>  $this->module,
             'title'     =>  $this->module->title()
         ]);

app/Module/MiscExtensions/MiscExtensionsModule.php

Indentation +74 added lines, -74 removed lines

@@ -32,89 +32,89 @@
  * Provide miscellaneous improvements to webtrees.
  */
 class MiscExtensionsModule extends AbstractModule implements
-    ModuleMyArtJaubInterface,
-    ModuleConfigInterface,
-    ModuleHookSubscriberInterface
+	ModuleMyArtJaubInterface,
+	ModuleConfigInterface,
+	ModuleHookSubscriberInterface
 {
-    use ModuleMyArtJaubTrait {
-        boot as traitBoot;
-    }
-    use ModuleConfigTrait;
+	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::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::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');
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\AbstractModule::boot()
+	 */
+	public function boot(): void
+	{
+		$this->traitBoot();
+		View::registerCustomView('::modules/privacy-policy/page', $this->name() . '::privacy-policy');
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\ModuleMyArtJaubInterface::loadRoutes()
-     */
-    public function loadRoutes(Map $router): void
-    {
-        $router->attach('', '', static function (Map $router): void {
+	/**
+	 * {@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('', '/module-maj/misc', static function (Map $router): void {
 
-                $router->attach('', '/config/admin', 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);
-                });
-            });
-        });
-    }
+					$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.0-v.1';
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleCustomInterface::customModuleVersion()
+	 */
+	public function customModuleVersion(): string
+	{
+		return '2.1.0-v.1';
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleConfigInterface::getConfigLink()
-     */
-    public function getConfigLink(): string
-    {
-        return route(AdminConfigPage::class);
-    }
+	/**
+	 * {@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 ])
-        ];
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\Hooks\ModuleHookSubscriberInterface::listSubscribedHooks()
+	 */
+	public function listSubscribedHooks(): array
+	{
+		return [
+			app()->makeWith(TitlesCardHook::class, [ 'module' => $this ])
+		];
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -67,7 +67,7 @@ 
     public function boot(): void
     {
         $this->traitBoot();
-        View::registerCustomView('::modules/privacy-policy/page', $this->name() . '::privacy-policy');
+        View::registerCustomView('::modules/privacy-policy/page', $this->name().'::privacy-policy');
     }
 
     /**
@@ -76,11 +76,11 @@ 
      */
     public function loadRoutes(Map $router): void
     {
-        $router->attach('', '', static function (Map $router): void {
+        $router->attach('', '', static function(Map $router): void {
 
-            $router->attach('', '/module-maj/misc', 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->attach('', '/config/admin', static function(Map $router): void {
 
                     $router->get(AdminConfigPage::class, '', AdminConfigPage::class);
                     $router->post(AdminConfigAction::class, '', AdminConfigAction::class);
@@ -114,7 +114,7 @@ 
     public function listSubscribedHooks(): array
     {
         return [
-            app()->makeWith(TitlesCardHook::class, [ 'module' => $this ])
+            app()->makeWith(TitlesCardHook::class, ['module' => $this])
         ];
     }
 }

app/Module/ModuleMyArtJaubTrait.php

Spacing +5 added lines, -5 removed lines

@@ -33,7 +33,7 @@ 
      */
     public function boot(): void
     {
-        View::registerNamespace($this->name(), $this->resourcesFolder() . 'views/');
+        View::registerNamespace($this->name(), $this->resourcesFolder().'views/');
 
         $this->loadRoutes(app(RouterContainer::class)->getMap());
     }
@@ -43,7 +43,7 @@ 
      */
     public function resourcesFolder(): string
     {
-        return Webtrees::MODULES_DIR . trim($this->name(), '_') . '/resources/';
+        return Webtrees::MODULES_DIR.trim($this->name(), '_').'/resources/';
     }
 
     /**
@@ -69,7 +69,7 @@ 
      */
     public function customTranslations(string $language): array
     {
-        $translation_file = $this->resourcesFolder() . 'lang/' . $language . '/messages.php';
+        $translation_file = $this->resourcesFolder().'lang/'.$language.'/messages.php';
 
         try {
             $translation  = new Translation($translation_file);
@@ -94,10 +94,10 @@ 
     {
         /** @var ModuleThemeInterface $theme */
         $theme = app(ModuleThemeInterface::class);
-        $css_file = $this->resourcesFolder() . 'css/' . $theme->name() . '.min.css';
+        $css_file = $this->resourcesFolder().'css/'.$theme->name().'.min.css';
 
         if (file_exists($css_file)) {
-            return $this->assetUrl('css/' . $theme->name() . '.min.css');
+            return $this->assetUrl('css/'.$theme->name().'.min.css');
         } else {
             return $this->assetUrl('css/default.min.css');
         }

Indentation +78 added lines, -78 removed lines

@@ -26,82 +26,82 @@
  */
 trait ModuleMyArtJaubTrait
 {
-    use ModuleCustomTrait;
-
-    /**
-     * @see \Fisharebest\Webtrees\Module\AbstractModule::boot()
-     */
-    public function boot(): void
-    {
-        View::registerNamespace($this->name(), $this->resourcesFolder() . 'views/');
-
-        $this->loadRoutes(app(RouterContainer::class)->getMap());
-    }
-
-    /**
-     * @see \Fisharebest\Webtrees\Module\AbstractModule::resourcesFolder()
-     */
-    public function resourcesFolder(): string
-    {
-        return Webtrees::MODULES_DIR . trim($this->name(), '_') . '/resources/';
-    }
-
-    /**
-     * @see \Fisharebest\Webtrees\Module\ModuleCustomInterface::customModuleAuthorName()
-     */
-    public function customModuleAuthorName(): string
-    {
-        return 'Jonathan Jaubart';
-    }
-
-    /**
-     * @see \Fisharebest\Webtrees\Module\ModuleCustomInterface::customModuleSupportUrl()
-     */
-    public function customModuleSupportUrl(): string
-    {
-        return 'https://github.com/jon48/webtrees-lib';
-    }
-
-    /**
-     * @see \Fisharebest\Webtrees\Module\ModuleCustomInterface::customTranslations()
-     *
-     * @return array<string, string>
-     */
-    public function customTranslations(string $language): array
-    {
-        $translation_file = $this->resourcesFolder() . 'lang/' . $language . '/messages.php';
-
-        try {
-            $translation  = new Translation($translation_file);
-            return $translation->asArray();
-        } catch (\Exception $e) {
-        }
-
-        return [];
-    }
-
-    /**
-     * @see \MyArtJaub\Webtrees\Module\ModuleMyArtJaubInterface::loadRoutes
-     *
-     * @param Map<\Aura\Router\Route> $router
-     */
-    public function loadRoutes(Map $router): void
-    {
-    }
-
-    /**
-     * @see \MyArtJaub\Webtrees\Module\ModuleMyArtJaubInterface::moduleCssUrl
-     */
-    public function moduleCssUrl(): string
-    {
-        /** @var ModuleThemeInterface $theme */
-        $theme = app(ModuleThemeInterface::class);
-        $css_file = $this->resourcesFolder() . 'css/' . $theme->name() . '.min.css';
-
-        if (file_exists($css_file)) {
-            return $this->assetUrl('css/' . $theme->name() . '.min.css');
-        } else {
-            return $this->assetUrl('css/default.min.css');
-        }
-    }
+	use ModuleCustomTrait;
+
+	/**
+	 * @see \Fisharebest\Webtrees\Module\AbstractModule::boot()
+	 */
+	public function boot(): void
+	{
+		View::registerNamespace($this->name(), $this->resourcesFolder() . 'views/');
+
+		$this->loadRoutes(app(RouterContainer::class)->getMap());
+	}
+
+	/**
+	 * @see \Fisharebest\Webtrees\Module\AbstractModule::resourcesFolder()
+	 */
+	public function resourcesFolder(): string
+	{
+		return Webtrees::MODULES_DIR . trim($this->name(), '_') . '/resources/';
+	}
+
+	/**
+	 * @see \Fisharebest\Webtrees\Module\ModuleCustomInterface::customModuleAuthorName()
+	 */
+	public function customModuleAuthorName(): string
+	{
+		return 'Jonathan Jaubart';
+	}
+
+	/**
+	 * @see \Fisharebest\Webtrees\Module\ModuleCustomInterface::customModuleSupportUrl()
+	 */
+	public function customModuleSupportUrl(): string
+	{
+		return 'https://github.com/jon48/webtrees-lib';
+	}
+
+	/**
+	 * @see \Fisharebest\Webtrees\Module\ModuleCustomInterface::customTranslations()
+	 *
+	 * @return array<string, string>
+	 */
+	public function customTranslations(string $language): array
+	{
+		$translation_file = $this->resourcesFolder() . 'lang/' . $language . '/messages.php';
+
+		try {
+			$translation  = new Translation($translation_file);
+			return $translation->asArray();
+		} catch (\Exception $e) {
+		}
+
+		return [];
+	}
+
+	/**
+	 * @see \MyArtJaub\Webtrees\Module\ModuleMyArtJaubInterface::loadRoutes
+	 *
+	 * @param Map<\Aura\Router\Route> $router
+	 */
+	public function loadRoutes(Map $router): void
+	{
+	}
+
+	/**
+	 * @see \MyArtJaub\Webtrees\Module\ModuleMyArtJaubInterface::moduleCssUrl
+	 */
+	public function moduleCssUrl(): string
+	{
+		/** @var ModuleThemeInterface $theme */
+		$theme = app(ModuleThemeInterface::class);
+		$css_file = $this->resourcesFolder() . 'css/' . $theme->name() . '.min.css';
+
+		if (file_exists($css_file)) {
+			return $this->assetUrl('css/' . $theme->name() . '.min.css');
+		} else {
+			return $this->assetUrl('css/default.min.css');
+		}
+	}
 }

app/Module/Sosa/Hooks/SosaIconHook.php

Indentation +43 added lines, -43 removed lines

@@ -26,51 +26,51 @@
  */
 class SosaIconHook implements RecordNameTextExtenderInterface
 {
-    private ModuleInterface $module;
-    private SosaRecordsService $sosa_records_service;
+	private ModuleInterface $module;
+	private SosaRecordsService $sosa_records_service;
 
-    /**
-     * Constructor for SosaIconHook
-     *
-     * @param ModuleInterface $module
-     * @param SosaRecordsService $sosa_records_service
-     */
-    public function __construct(ModuleInterface $module, SosaRecordsService $sosa_records_service)
-    {
-        $this->module = $module;
-        $this->sosa_records_service = $sosa_records_service;
-    }
+	/**
+	 * Constructor for SosaIconHook
+	 *
+	 * @param ModuleInterface $module
+	 * @param SosaRecordsService $sosa_records_service
+	 */
+	public function __construct(ModuleInterface $module, SosaRecordsService $sosa_records_service)
+	{
+		$this->module = $module;
+		$this->sosa_records_service = $sosa_records_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 (
-            $record instanceof Individual &&
-            $this->sosa_records_service->isSosa($record->tree(), Auth::user(), $record)
-        ) {
-            return view($this->module->name() . '::icons/sosa', [ '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 (
+			$record instanceof Individual &&
+			$this->sosa_records_service->isSosa($record->tree(), Auth::user(), $record)
+		) {
+			return view($this->module->name() . '::icons/sosa', [ 'size_style' => $size ]);
+		}
+		return '';
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -69,7 +69,7 @@
             $record instanceof Individual &&
             $this->sosa_records_service->isSosa($record->tree(), Auth::user(), $record)
         ) {
-            return view($this->module->name() . '::icons/sosa', [ 'size_style' => $size ]);
+            return view($this->module->name().'::icons/sosa', ['size_style' => $size]);
         }
         return '';
     }