jon48 / webtrees-lib

app/Module/WelcomeBlock/Services/MatomoStatsService.php

Spacing +6 added lines, -6 removed lines

@@ -40,13 +40,13 @@ 
     public function visitsThisYear(WelcomeBlockModule $module, int $block_id): ?int
     {
         return Registry::cache()->file()->remember(
-            $module->name() . '-matomovisits-yearly-' . $block_id,
-            function () use ($module, $block_id): ?int {
+            $module->name().'-matomovisits-yearly-'.$block_id,
+            function() use ($module, $block_id) : ?int {
                 $visits_year = $this->visits($module, $block_id, 'year');
                 if ($visits_year === null) {
                     return null;
                 }
-                $visits_today = (int) $this->visits($module, $block_id, 'day');
+                $visits_today = (int)$this->visits($module, $block_id, 'day');
 
                 return $visits_year - $visits_today;
             },
@@ -64,8 +64,8 @@ 
     public function visitsToday(WelcomeBlockModule $module, int $block_id): ?int
     {
         return Registry::cache()->array()->remember(
-            $module->name() . '-matomovisits-daily-' . $block_id,
-            function () use ($module, $block_id): ?int {
+            $module->name().'-matomovisits-daily-'.$block_id,
+            function() use ($module, $block_id) : ?int {
                 return $this->visits($module, $block_id, 'day');
             }
         );
@@ -107,7 +107,7 @@ 
                 ]);
 
                 if ($response->getStatusCode() === StatusCodeInterface::STATUS_OK) {
-                    $result = json_decode((string) $response->getBody(), true)['value'] ?? null;
+                    $result = json_decode((string)$response->getBody(), true)['value'] ?? null;
                     if ($result !== null) {
                         return (int)$result;
                     }

Indentation +100 added lines, -100 removed lines

@@ -29,113 +29,113 @@
  */
 class MatomoStatsService
 {
-    protected ?HandlerStack $handler = null;
+	protected ?HandlerStack $handler = null;
 
-    /**
-     * Set or get the http handler for the service
-     *
-     * @param HandlerStack $handler
-     * @return HandlerStack
-     */
-    public function httpHandler(HandlerStack $handler = null): HandlerStack
-    {
-        if ($this->handler === null) {
-            $this->handler = HandlerStack::create();
-        }
-        if ($handler !== null) {
-            $this->handler = $handler;
-        }
-        return $this->handler;
-    }
+	/**
+	 * Set or get the http handler for the service
+	 *
+	 * @param HandlerStack $handler
+	 * @return HandlerStack
+	 */
+	public function httpHandler(HandlerStack $handler = null): HandlerStack
+	{
+		if ($this->handler === null) {
+			$this->handler = HandlerStack::create();
+		}
+		if ($handler !== null) {
+			$this->handler = $handler;
+		}
+		return $this->handler;
+	}
 
-    /**
-     * Returns the number of visits for the current year (up to the day before).
-     * That statistic is cached for the day, to avoid unecessary calls to Matomo API.
-     *
-     * @param WelcomeBlockModule $module
-     * @param int $block_id
-     * @return int|NULL
-     */
-    public function visitsThisYear(WelcomeBlockModule $module, int $block_id): ?int
-    {
-        return Registry::cache()->file()->remember(
-            $module->name() . '-matomovisits-yearly-' . $block_id,
-            function () use ($module, $block_id): ?int {
-                $visits_year = $this->visits($module, $block_id, 'year');
-                if ($visits_year === null) {
-                    return null;
-                }
-                $visits_today = (int) $this->visits($module, $block_id, 'day');
+	/**
+	 * Returns the number of visits for the current year (up to the day before).
+	 * That statistic is cached for the day, to avoid unecessary calls to Matomo API.
+	 *
+	 * @param WelcomeBlockModule $module
+	 * @param int $block_id
+	 * @return int|NULL
+	 */
+	public function visitsThisYear(WelcomeBlockModule $module, int $block_id): ?int
+	{
+		return Registry::cache()->file()->remember(
+			$module->name() . '-matomovisits-yearly-' . $block_id,
+			function () use ($module, $block_id): ?int {
+				$visits_year = $this->visits($module, $block_id, 'year');
+				if ($visits_year === null) {
+					return null;
+				}
+				$visits_today = (int) $this->visits($module, $block_id, 'day');
 
-                return $visits_year - $visits_today;
-            },
-            Carbon::now()->addDay()->startOfDay()->diffInSeconds(Carbon::now()) // Valid until midnight
-        );
-    }
+				return $visits_year - $visits_today;
+			},
+			Carbon::now()->addDay()->startOfDay()->diffInSeconds(Carbon::now()) // Valid until midnight
+		);
+	}
 
-    /**
-     * Returns the number of visits for the current day.
-     *
-     * @param WelcomeBlockModule $module
-     * @param int $block_id
-     * @return int|NULL
-     */
-    public function visitsToday(WelcomeBlockModule $module, int $block_id): ?int
-    {
-        return Registry::cache()->array()->remember(
-            $module->name() . '-matomovisits-daily-' . $block_id,
-            function () use ($module, $block_id): ?int {
-                return $this->visits($module, $block_id, 'day');
-            }
-        );
-    }
+	/**
+	 * Returns the number of visits for the current day.
+	 *
+	 * @param WelcomeBlockModule $module
+	 * @param int $block_id
+	 * @return int|NULL
+	 */
+	public function visitsToday(WelcomeBlockModule $module, int $block_id): ?int
+	{
+		return Registry::cache()->array()->remember(
+			$module->name() . '-matomovisits-daily-' . $block_id,
+			function () use ($module, $block_id): ?int {
+				return $this->visits($module, $block_id, 'day');
+			}
+		);
+	}
 
-    /**
-     * Invoke the Matomo API to retrieve the number of visits over a period.
-     *
-     * @param WelcomeBlockModule $module
-     * @param int $block_id
-     * @param string $period
-     * @return int|NULL
-     */
-    protected function visits(WelcomeBlockModule $module, int $block_id, string $period): ?int
-    {
-        $settings = $module->matomoSettings($block_id);
+	/**
+	 * Invoke the Matomo API to retrieve the number of visits over a period.
+	 *
+	 * @param WelcomeBlockModule $module
+	 * @param int $block_id
+	 * @param string $period
+	 * @return int|NULL
+	 */
+	protected function visits(WelcomeBlockModule $module, int $block_id, string $period): ?int
+	{
+		$settings = $module->matomoSettings($block_id);
 
-        if (
-            $settings['matomo_enabled'] === true
-            && mb_strlen($settings['matomo_url']) > 0
-            && mb_strlen($settings['matomo_token']) > 0
-            && $settings['matomo_siteid'] > 0
-        ) {
-            try {
-                $http_client = new Client([
-                    RequestOptions::TIMEOUT => 30,
-                    'handler'   => $this->handler
-                ]);
+		if (
+			$settings['matomo_enabled'] === true
+			&& mb_strlen($settings['matomo_url']) > 0
+			&& mb_strlen($settings['matomo_token']) > 0
+			&& $settings['matomo_siteid'] > 0
+		) {
+			try {
+				$http_client = new Client([
+					RequestOptions::TIMEOUT => 30,
+					'handler'   => $this->handler
+				]);
 
-                $response = $http_client->get($settings['matomo_url'], [
-                    'query' =>  [
-                        'module'    =>  'API',
-                        'method'    =>  'VisitsSummary.getVisits',
-                        'idSite'    =>  $settings['matomo_siteid'],
-                        'period'    =>  $period,
-                        'date'      =>  'today',
-                        'token_auth' =>  $settings['matomo_token'],
-                        'format'    =>  'json'
-                    ]
-                ]);
+				$response = $http_client->get($settings['matomo_url'], [
+					'query' =>  [
+						'module'    =>  'API',
+						'method'    =>  'VisitsSummary.getVisits',
+						'idSite'    =>  $settings['matomo_siteid'],
+						'period'    =>  $period,
+						'date'      =>  'today',
+						'token_auth' =>  $settings['matomo_token'],
+						'format'    =>  'json'
+					]
+				]);
 
-                if ($response->getStatusCode() === StatusCodeInterface::STATUS_OK) {
-                    $result = json_decode((string) $response->getBody(), true)['value'] ?? null;
-                    if ($result !== null) {
-                        return (int)$result;
-                    }
-                }
-            } catch (GuzzleException $ex) {
-            }
-        }
+				if ($response->getStatusCode() === StatusCodeInterface::STATUS_OK) {
+					$result = json_decode((string) $response->getBody(), true)['value'] ?? null;
+					if ($result !== null) {
+						return (int)$result;
+					}
+				}
+			} catch (GuzzleException $ex) {
+			}
+		}
 
-        return null;
-    }
+		return null;
+	}
 }

app/Module/IsSourced/Hooks/IsSourcedStatusColumnsHook.php

Indentation +171 added lines, -171 removed lines

@@ -30,183 +30,183 @@
  * Hook for adding columns with source statuses in datatables.
  */
 class IsSourcedStatusColumnsHook implements
-    FamilyDatatablesExtenderInterface,
-    IndividualDatatablesExtenderInterface,
-    SosaFamilyDatatablesExtenderInterface,
-    SosaIndividualDatatablesExtenderInterface,
-    SosaMissingDatatablesExtenderInterface
+	FamilyDatatablesExtenderInterface,
+	IndividualDatatablesExtenderInterface,
+	SosaFamilyDatatablesExtenderInterface,
+	SosaIndividualDatatablesExtenderInterface,
+	SosaMissingDatatablesExtenderInterface
 {
-    private ModuleInterface $module;
-    private SourceStatusService $source_status_service;
+	private ModuleInterface $module;
+	private SourceStatusService $source_status_service;
 
-    /**
-     * Constructor for IsSourcedStatusColumnsHook
-     *
-     * @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 IsSourcedStatusColumnsHook
+	 *
+	 * @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\IndividualDatatablesExtenderInterface::individualColumns()
-     */
-    public function individualColumns(iterable $records): array
-    {
-        $records = collect($records);
-        return [
-            'issourced' => [
-                'birth' => [
-                    'position' => 7,
-                    'column_def' => [ 'class' => 'text-center' ],
-                    'th' => view($this->module()->name() . '::components/column-th-issourced', [
-                        'title' => I18N::translate('%s sourced', Registry::elementFactory()->make('INDI:BIRT')->label())
-                    ]),
-                    'records' => $records->map(function (Individual $individual): array {
-                        $source_status = $this->source_status_service->sourceStatusForBirth($individual);
-                        return [
-                            'order' => $source_status->order(),
-                            'text' => view($this->module()->name() . '::icons/source-status', [
-                                'module_name' => $this->module()->name(),
-                                'source_status' => $source_status,
-                                'context'  => 'INDI:BIRT',
-                                'size_style' => '' ])
-                        ];
-                    })->toArray()
-                ],
-                'death' => [
-                    'position' => 12,
-                    'column_def' => [ 'class' => 'text-center' ],
-                    'th' => view($this->module()->name() . '::components/column-th-issourced', [
-                        'title' => I18N::translate('%s sourced', Registry::elementFactory()->make('INDI:DEAT')->label())
-                    ]),
-                    'records' => $records->map(function (Individual $individual): array {
-                        $source_status = $this->source_status_service->sourceStatusForDeath($individual);
-                        return $individual->isDead() ? [
-                            'order' =>  $source_status->order(),
-                            'text' => view($this->module()->name() . '::icons/source-status', [
-                                'module_name' => $this->module()->name(),
-                                'source_status' => $source_status,
-                                'context'  => 'INDI:DEAT',
-                                'size_style' => '' ])
-                        ] : ['order' => 0, 'text' => ''];
-                    })->toArray()
-                ]
-            ]
-        ];
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\Hooks\IndividualDatatablesExtenderInterface::individualColumns()
+	 */
+	public function individualColumns(iterable $records): array
+	{
+		$records = collect($records);
+		return [
+			'issourced' => [
+				'birth' => [
+					'position' => 7,
+					'column_def' => [ 'class' => 'text-center' ],
+					'th' => view($this->module()->name() . '::components/column-th-issourced', [
+						'title' => I18N::translate('%s sourced', Registry::elementFactory()->make('INDI:BIRT')->label())
+					]),
+					'records' => $records->map(function (Individual $individual): array {
+						$source_status = $this->source_status_service->sourceStatusForBirth($individual);
+						return [
+							'order' => $source_status->order(),
+							'text' => view($this->module()->name() . '::icons/source-status', [
+								'module_name' => $this->module()->name(),
+								'source_status' => $source_status,
+								'context'  => 'INDI:BIRT',
+								'size_style' => '' ])
+						];
+					})->toArray()
+				],
+				'death' => [
+					'position' => 12,
+					'column_def' => [ 'class' => 'text-center' ],
+					'th' => view($this->module()->name() . '::components/column-th-issourced', [
+						'title' => I18N::translate('%s sourced', Registry::elementFactory()->make('INDI:DEAT')->label())
+					]),
+					'records' => $records->map(function (Individual $individual): array {
+						$source_status = $this->source_status_service->sourceStatusForDeath($individual);
+						return $individual->isDead() ? [
+							'order' =>  $source_status->order(),
+							'text' => view($this->module()->name() . '::icons/source-status', [
+								'module_name' => $this->module()->name(),
+								'source_status' => $source_status,
+								'context'  => 'INDI:DEAT',
+								'size_style' => '' ])
+						] : ['order' => 0, 'text' => ''];
+					})->toArray()
+				]
+			]
+		];
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\Hooks\FamilyDatatablesExtenderInterface::familyColumns()
-     */
-    public function familyColumns(iterable $records): array
-    {
-        $records = collect($records);
-        return [
-            'issourced' => [
-                'marr' => [
-                    'position' => 10,
-                    'column_def' => [ 'class' => 'text-center' ],
-                    'th' => view($this->module()->name() . '::components/column-th-issourced', [
-                        'title' => I18N::translate('%s sourced', Registry::elementFactory()->make('FAM:MARR')->label())
-                    ]),
-                    'records' => $records->map(function (Family $family): array {
-                        $source_status = $this->source_status_service->sourceStatusForMarriage($family);
-                        return $family->getMarriage() !== null ? [
-                            'order' =>  $source_status->order(),
-                            'text' => view($this->module()->name() . '::icons/source-status', [
-                                'module_name' => $this->module()->name(),
-                                'source_status' => $source_status,
-                                'context'  => 'FAM:MARR',
-                                'size_style' => '' ])
-                        ] : ['order' => 0, 'text' => ''];
-                    })->toArray()
-                ]
-            ]
-        ];
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\Hooks\FamilyDatatablesExtenderInterface::familyColumns()
+	 */
+	public function familyColumns(iterable $records): array
+	{
+		$records = collect($records);
+		return [
+			'issourced' => [
+				'marr' => [
+					'position' => 10,
+					'column_def' => [ 'class' => 'text-center' ],
+					'th' => view($this->module()->name() . '::components/column-th-issourced', [
+						'title' => I18N::translate('%s sourced', Registry::elementFactory()->make('FAM:MARR')->label())
+					]),
+					'records' => $records->map(function (Family $family): array {
+						$source_status = $this->source_status_service->sourceStatusForMarriage($family);
+						return $family->getMarriage() !== null ? [
+							'order' =>  $source_status->order(),
+							'text' => view($this->module()->name() . '::icons/source-status', [
+								'module_name' => $this->module()->name(),
+								'source_status' => $source_status,
+								'context'  => 'FAM:MARR',
+								'size_style' => '' ])
+						] : ['order' => 0, 'text' => ''];
+					})->toArray()
+				]
+			]
+		];
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\Hooks\SosaIndividualDatatablesExtenderInterface::sosaIndividualColumns()
-     */
-    public function sosaIndividualColumns(iterable $records): array
-    {
-        $columns = $this->individualColumns($records);
-        $columns['issourced']['birth']['position'] = 5;
-        $columns['issourced']['death']['position'] = 8;
-        return $columns;
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\Hooks\SosaIndividualDatatablesExtenderInterface::sosaIndividualColumns()
+	 */
+	public function sosaIndividualColumns(iterable $records): array
+	{
+		$columns = $this->individualColumns($records);
+		$columns['issourced']['birth']['position'] = 5;
+		$columns['issourced']['death']['position'] = 8;
+		return $columns;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\Hooks\SosaFamilyDatatablesExtenderInterface::sosaFamilyColumns()
-     */
-    public function sosaFamilyColumns(iterable $records): array
-    {
-        return $this->familyColumns($records);
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\Hooks\SosaFamilyDatatablesExtenderInterface::sosaFamilyColumns()
+	 */
+	public function sosaFamilyColumns(iterable $records): array
+	{
+		return $this->familyColumns($records);
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\Hooks\SosaMissingDatatablesExtenderInterface::sosaMissingColumns()
-     */
-    public function sosaMissingColumns(iterable $records): array
-    {
-        $records = collect($records);
-        return [
-            'issourced' => [
-                'indi' => [
-                    'position' => 3,
-                    'column_def' => [ 'class' => 'text-center' ],
-                    'th' => view($this->module()->name() . '::components/column-th-issourced', [
-                        'title' => I18N::translate('%s sourced', Registry::elementFactory()->make('INDI')->label())
-                    ]),
-                    'records' => $records->map(function (Individual $individual): array {
-                        $source_status = $this->source_status_service->sourceStatusForRecord($individual);
-                        return [
-                            'order' => $source_status->order(),
-                            'text' => view($this->module()->name() . '::icons/source-status', [
-                                'module_name' => $this->module()->name(),
-                                'source_status' => $source_status,
-                                'context'  => 'INDI',
-                                'size_style' => '' ])
-                        ];
-                    })->toArray()
-                ],
-                'birth' => [
-                    'position' => 7,
-                    'column_def' => [ 'class' => 'text-center' ],
-                    'th' => view($this->module()->name() . '::components/column-th-issourced', [
-                        'title' => I18N::translate('%s sourced', Registry::elementFactory()->make('INDI:BIRT')->label())
-                    ]),
-                    'records' => $records->map(function (Individual $individual): array {
-                        $source_status = $this->source_status_service->sourceStatusForBirth($individual);
-                        return [
-                            'order' => $source_status->order(),
-                            'text' => view($this->module()->name() . '::icons/source-status', [
-                                'module_name' => $this->module()->name(),
-                                'source_status' => $source_status,
-                                'context'  => 'INDI:BIRT',
-                                'size_style' => '' ])
-                        ];
-                    })->toArray()
-                ]
-            ]
-        ];
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\Hooks\SosaMissingDatatablesExtenderInterface::sosaMissingColumns()
+	 */
+	public function sosaMissingColumns(iterable $records): array
+	{
+		$records = collect($records);
+		return [
+			'issourced' => [
+				'indi' => [
+					'position' => 3,
+					'column_def' => [ 'class' => 'text-center' ],
+					'th' => view($this->module()->name() . '::components/column-th-issourced', [
+						'title' => I18N::translate('%s sourced', Registry::elementFactory()->make('INDI')->label())
+					]),
+					'records' => $records->map(function (Individual $individual): array {
+						$source_status = $this->source_status_service->sourceStatusForRecord($individual);
+						return [
+							'order' => $source_status->order(),
+							'text' => view($this->module()->name() . '::icons/source-status', [
+								'module_name' => $this->module()->name(),
+								'source_status' => $source_status,
+								'context'  => 'INDI',
+								'size_style' => '' ])
+						];
+					})->toArray()
+				],
+				'birth' => [
+					'position' => 7,
+					'column_def' => [ 'class' => 'text-center' ],
+					'th' => view($this->module()->name() . '::components/column-th-issourced', [
+						'title' => I18N::translate('%s sourced', Registry::elementFactory()->make('INDI:BIRT')->label())
+					]),
+					'records' => $records->map(function (Individual $individual): array {
+						$source_status = $this->source_status_service->sourceStatusForBirth($individual);
+						return [
+							'order' => $source_status->order(),
+							'text' => view($this->module()->name() . '::icons/source-status', [
+								'module_name' => $this->module()->name(),
+								'source_status' => $source_status,
+								'context'  => 'INDI:BIRT',
+								'size_style' => '' ])
+						];
+					})->toArray()
+				]
+			]
+		];
+	}
 }

Spacing +25 added lines, -25 removed lines

@@ -71,37 +71,37 @@ 
             'issourced' => [
                 'birth' => [
                     'position' => 7,
-                    'column_def' => [ 'class' => 'text-center' ],
-                    'th' => view($this->module()->name() . '::components/column-th-issourced', [
+                    'column_def' => ['class' => 'text-center'],
+                    'th' => view($this->module()->name().'::components/column-th-issourced', [
                         'title' => I18N::translate('%s sourced', Registry::elementFactory()->make('INDI:BIRT')->label())
                     ]),
-                    'records' => $records->map(function (Individual $individual): array {
+                    'records' => $records->map(function(Individual $individual): array {
                         $source_status = $this->source_status_service->sourceStatusForBirth($individual);
                         return [
                             'order' => $source_status->order(),
-                            'text' => view($this->module()->name() . '::icons/source-status', [
+                            'text' => view($this->module()->name().'::icons/source-status', [
                                 'module_name' => $this->module()->name(),
                                 'source_status' => $source_status,
                                 'context'  => 'INDI:BIRT',
-                                'size_style' => '' ])
+                                'size_style' => ''])
                         ];
                     })->toArray()
                 ],
                 'death' => [
                     'position' => 12,
-                    'column_def' => [ 'class' => 'text-center' ],
-                    'th' => view($this->module()->name() . '::components/column-th-issourced', [
+                    'column_def' => ['class' => 'text-center'],
+                    'th' => view($this->module()->name().'::components/column-th-issourced', [
                         'title' => I18N::translate('%s sourced', Registry::elementFactory()->make('INDI:DEAT')->label())
                     ]),
-                    'records' => $records->map(function (Individual $individual): array {
+                    'records' => $records->map(function(Individual $individual): array {
                         $source_status = $this->source_status_service->sourceStatusForDeath($individual);
                         return $individual->isDead() ? [
                             'order' =>  $source_status->order(),
-                            'text' => view($this->module()->name() . '::icons/source-status', [
+                            'text' => view($this->module()->name().'::icons/source-status', [
                                 'module_name' => $this->module()->name(),
                                 'source_status' => $source_status,
                                 'context'  => 'INDI:DEAT',
-                                'size_style' => '' ])
+                                'size_style' => ''])
                         ] : ['order' => 0, 'text' => ''];
                     })->toArray()
                 ]
@@ -120,19 +120,19 @@ 
             'issourced' => [
                 'marr' => [
                     'position' => 10,
-                    'column_def' => [ 'class' => 'text-center' ],
-                    'th' => view($this->module()->name() . '::components/column-th-issourced', [
+                    'column_def' => ['class' => 'text-center'],
+                    'th' => view($this->module()->name().'::components/column-th-issourced', [
                         'title' => I18N::translate('%s sourced', Registry::elementFactory()->make('FAM:MARR')->label())
                     ]),
-                    'records' => $records->map(function (Family $family): array {
+                    'records' => $records->map(function(Family $family): array {
                         $source_status = $this->source_status_service->sourceStatusForMarriage($family);
                         return $family->getMarriage() !== null ? [
                             'order' =>  $source_status->order(),
-                            'text' => view($this->module()->name() . '::icons/source-status', [
+                            'text' => view($this->module()->name().'::icons/source-status', [
                                 'module_name' => $this->module()->name(),
                                 'source_status' => $source_status,
                                 'context'  => 'FAM:MARR',
-                                'size_style' => '' ])
+                                'size_style' => ''])
                         ] : ['order' => 0, 'text' => ''];
                     })->toArray()
                 ]
@@ -172,37 +172,37 @@ 
             'issourced' => [
                 'indi' => [
                     'position' => 3,
-                    'column_def' => [ 'class' => 'text-center' ],
-                    'th' => view($this->module()->name() . '::components/column-th-issourced', [
+                    'column_def' => ['class' => 'text-center'],
+                    'th' => view($this->module()->name().'::components/column-th-issourced', [
                         'title' => I18N::translate('%s sourced', Registry::elementFactory()->make('INDI')->label())
                     ]),
-                    'records' => $records->map(function (Individual $individual): array {
+                    'records' => $records->map(function(Individual $individual): array {
                         $source_status = $this->source_status_service->sourceStatusForRecord($individual);
                         return [
                             'order' => $source_status->order(),
-                            'text' => view($this->module()->name() . '::icons/source-status', [
+                            'text' => view($this->module()->name().'::icons/source-status', [
                                 'module_name' => $this->module()->name(),
                                 'source_status' => $source_status,
                                 'context'  => 'INDI',
-                                'size_style' => '' ])
+                                'size_style' => ''])
                         ];
                     })->toArray()
                 ],
                 'birth' => [
                     'position' => 7,
-                    'column_def' => [ 'class' => 'text-center' ],
-                    'th' => view($this->module()->name() . '::components/column-th-issourced', [
+                    'column_def' => ['class' => 'text-center'],
+                    'th' => view($this->module()->name().'::components/column-th-issourced', [
                         'title' => I18N::translate('%s sourced', Registry::elementFactory()->make('INDI:BIRT')->label())
                     ]),
-                    'records' => $records->map(function (Individual $individual): array {
+                    'records' => $records->map(function(Individual $individual): array {
                         $source_status = $this->source_status_service->sourceStatusForBirth($individual);
                         return [
                             'order' => $source_status->order(),
-                            'text' => view($this->module()->name() . '::icons/source-status', [
+                            'text' => view($this->module()->name().'::icons/source-status', [
                                 'module_name' => $this->module()->name(),
                                 'source_status' => $source_status,
                                 'context'  => 'INDI:BIRT',
-                                'size_style' => '' ])
+                                'size_style' => ''])
                         ];
                     })->toArray()
                 ]

app/Module/IsSourced/Data/SourceStatus.php

Indentation +144 added lines, -144 removed lines

@@ -22,148 +22,148 @@
  */
 class SourceStatus
 {
-    /**
-     * @var boolean $source_exist
-     */
-    private $source_exist = false;
-
-    /**
-     * @var boolean $has_document
-     */
-    private $has_document = false;
-
-    /**
-     * Return whether the SourceStatus object contains relevant data.
-     *
-     * @return bool
-     */
-    public function isSet(): bool
-    {
-        return true;
-    }
-
-    /**
-     * Returns whether the record contains a source.
-     *
-     * @return bool
-     */
-    public function hasSource(): bool
-    {
-        return $this->source_exist;
-    }
-
-    /**
-     *  Set whether the record contains a source.
-     *
-     * @param bool $source_exist
-     * @return $this
-     */
-    public function setHasSource(bool $source_exist): self
-    {
-        $this->source_exist = $source_exist;
-        return $this;
-    }
-
-    /**
-     * Combine whether the record contains a source with the previous status.
-     *
-     * @param bool $source_exist
-     * @return $this
-     */
-    public function addHasSource(bool $source_exist): self
-    {
-        $this->source_exist = $this->source_exist || $source_exist;
-        return $this;
-    }
-
-    /**
-     * Return whether the source citation is supported by a document.
-     * Uses the _ACT tag from the MyArtJaub Certificates module.
-     *
-     * @return bool
-     */
-    public function hasSupportingDocument(): bool
-    {
-        return $this->hasSource() && $this->has_document;
-    }
-
-    /**
-     * Set whether the source citation is supported by a document.
-     *
-     * @param bool $has_document
-     * @return $this
-     */
-    public function setHasSupportingDocument(bool $has_document): self
-    {
-        $this->has_document = $has_document;
-        return $this;
-    }
-
-    /**
-     * Combine whether the source citation is supported by a document with the previous status.
-     *
-     * @param bool $has_document
-     * @return $this
-     */
-    public function addHasSupportingDocument(bool $has_document): self
-    {
-        $this->has_document = $this->has_document || $has_document;
-        return $this;
-    }
-
-    /**
-     * Check whether all possible criteria for defining a sourced element have been met.
-     *
-     * @return bool
-     */
-    public function isFullySourced(): bool
-    {
-        return $this->hasSupportingDocument();
-    }
-
-    /**
-     * Get the label to display to describe the source status.
-     *
-     * @param string $context
-     * @return string
-     */
-    public function label(string $context): string
-    {
-        $context_label = Registry::elementFactory()->make($context)->label();
-
-        if (!$this->hasSource()) {
-            return I18N::translate('%s not sourced', $context_label);
-        }
-
-        if ($this->hasSupportingDocument()) {
-            return I18N::translate('%s sourced with a certificate', $context_label);
-        }
-
-        return I18N::translate('%s sourced', $context_label);
-    }
-
-    /**
-     * Get an indicative value to order source statuses
-     *
-     * @return int
-     */
-    public function order(): int
-    {
-        return ($this->hasSource() ? 1 : 0)  * (1 + ($this->hasSupportingDocument() ? 1 : 0));
-    }
-
-    /**
-     * Return an element combining properties of the current object with another SourceStatus.
-     * Do not use the initial object anymore, it may not appropriately describe the status anymore.
-     *
-     * @template T of SourceStatus
-     * @param T $other
-     * @return $this|T
-     */
-    public function combineWith(SourceStatus $other)
-    {
-        $this->addHasSource($other->hasSource());
-        $this->addHasSupportingDocument($other->hasSource());
-        return $this;
-    }
+	/**
+	 * @var boolean $source_exist
+	 */
+	private $source_exist = false;
+
+	/**
+	 * @var boolean $has_document
+	 */
+	private $has_document = false;
+
+	/**
+	 * Return whether the SourceStatus object contains relevant data.
+	 *
+	 * @return bool
+	 */
+	public function isSet(): bool
+	{
+		return true;
+	}
+
+	/**
+	 * Returns whether the record contains a source.
+	 *
+	 * @return bool
+	 */
+	public function hasSource(): bool
+	{
+		return $this->source_exist;
+	}
+
+	/**
+	 *  Set whether the record contains a source.
+	 *
+	 * @param bool $source_exist
+	 * @return $this
+	 */
+	public function setHasSource(bool $source_exist): self
+	{
+		$this->source_exist = $source_exist;
+		return $this;
+	}
+
+	/**
+	 * Combine whether the record contains a source with the previous status.
+	 *
+	 * @param bool $source_exist
+	 * @return $this
+	 */
+	public function addHasSource(bool $source_exist): self
+	{
+		$this->source_exist = $this->source_exist || $source_exist;
+		return $this;
+	}
+
+	/**
+	 * Return whether the source citation is supported by a document.
+	 * Uses the _ACT tag from the MyArtJaub Certificates module.
+	 *
+	 * @return bool
+	 */
+	public function hasSupportingDocument(): bool
+	{
+		return $this->hasSource() && $this->has_document;
+	}
+
+	/**
+	 * Set whether the source citation is supported by a document.
+	 *
+	 * @param bool $has_document
+	 * @return $this
+	 */
+	public function setHasSupportingDocument(bool $has_document): self
+	{
+		$this->has_document = $has_document;
+		return $this;
+	}
+
+	/**
+	 * Combine whether the source citation is supported by a document with the previous status.
+	 *
+	 * @param bool $has_document
+	 * @return $this
+	 */
+	public function addHasSupportingDocument(bool $has_document): self
+	{
+		$this->has_document = $this->has_document || $has_document;
+		return $this;
+	}
+
+	/**
+	 * Check whether all possible criteria for defining a sourced element have been met.
+	 *
+	 * @return bool
+	 */
+	public function isFullySourced(): bool
+	{
+		return $this->hasSupportingDocument();
+	}
+
+	/**
+	 * Get the label to display to describe the source status.
+	 *
+	 * @param string $context
+	 * @return string
+	 */
+	public function label(string $context): string
+	{
+		$context_label = Registry::elementFactory()->make($context)->label();
+
+		if (!$this->hasSource()) {
+			return I18N::translate('%s not sourced', $context_label);
+		}
+
+		if ($this->hasSupportingDocument()) {
+			return I18N::translate('%s sourced with a certificate', $context_label);
+		}
+
+		return I18N::translate('%s sourced', $context_label);
+	}
+
+	/**
+	 * Get an indicative value to order source statuses
+	 *
+	 * @return int
+	 */
+	public function order(): int
+	{
+		return ($this->hasSource() ? 1 : 0)  * (1 + ($this->hasSupportingDocument() ? 1 : 0));
+	}
+
+	/**
+	 * Return an element combining properties of the current object with another SourceStatus.
+	 * Do not use the initial object anymore, it may not appropriately describe the status anymore.
+	 *
+	 * @template T of SourceStatus
+	 * @param T $other
+	 * @return $this|T
+	 */
+	public function combineWith(SourceStatus $other)
+	{
+		$this->addHasSource($other->hasSource());
+		$this->addHasSupportingDocument($other->hasSource());
+		return $this;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -149,7 +149,7 @@
      */
     public function order(): int
     {
-        return ($this->hasSource() ? 1 : 0)  * (1 + ($this->hasSupportingDocument() ? 1 : 0));
+        return ($this->hasSource() ? 1 : 0) * (1 + ($this->hasSupportingDocument() ? 1 : 0));
     }
 
     /**

app/Module/IsSourced/Data/FactSourceStatus.php

Spacing +1 added lines, -1 removed lines

@@ -228,7 +228,7 @@
     public function order(): int
     {
         return ($this->factHasDate() ? 1 : 0) * ($this->hasSource() ? 1 : -1) *
-            ( 1 + ($this->factHasPreciseDate() ? 1 : 0) * (1 +
+            (1 + ($this->factHasPreciseDate() ? 1 : 0) * (1 +
                 0b010 * ($this->sourceMatchesFactDate() ? 1 : 0) +
                 0b100 * ($this->hasSupportingDocument() ? 1 : 0)
             )

Indentation +229 added lines, -229 removed lines

@@ -22,233 +22,233 @@
  */
 class FactSourceStatus extends SourceStatus
 {
-    /**
-     * @var boolean $has_date
-     */
-    private $has_date = false;
-
-    /**
-     * @var boolean $has_precise_date
-     */
-    private $has_precise_date = false;
-
-    /**
-     * @var boolean $has_source_date
-     */
-    private $has_source_date = false;
-
-    /**
-     * @var boolean $source_date_match
-     */
-    private $source_date_match = false;
-
-    /**
-     * Return whether the fact is dated.
-     *
-     * @return bool
-     */
-    public function factHasDate(): bool
-    {
-        return $this->has_date;
-    }
-
-    /**
-     * Set whether the fact is dated.
-     *
-     * @param bool $has_date
-     * @return $this
-     */
-    public function setFactHasDate(bool $has_date): self
-    {
-        $this->has_date = $has_date;
-        return $this;
-    }
-
-    /**
-     * Combinate whether the fact is dated with the previous status.
-     *
-     * @param bool $has_date
-     * @return $this
-     */
-    public function addFactHasDate(bool $has_date): self
-    {
-        $this->has_date = $this->has_date || $has_date;
-        return $this;
-    }
-
-    /**
-     * Return whether the fact is dated with a precise day.
-     * Any date modifier will be considered as not precise.
-     * A month or year will be considered as not precise.
-     *
-     * @return bool
-     */
-    public function factHasPreciseDate(): bool
-    {
-        return $this->has_date && $this->has_precise_date;
-    }
-
-    /**
-     * Set whather the fact is dated with a precise day.
-     *
-     * @param bool $has_precise_date
-     * @return $this
-     */
-    public function setFactHasPreciseDate(bool $has_precise_date): self
-    {
-        $this->has_precise_date = $has_precise_date;
-        return $this;
-    }
-
-    /**
-     * Combine whether the fact is dated with a precise day.
-     *
-     * @param bool $has_precise_date
-     * @return $this
-     */
-    public function addFactHasPreciseDate(bool $has_precise_date): self
-    {
-        $this->has_precise_date = $this->has_precise_date || $has_precise_date;
-        return $this;
-    }
-
-    /**
-     * Return whether the source citation is dated.
-     *
-     * @return bool
-     */
-    public function sourceHasDate(): bool
-    {
-        return $this->has_source_date;
-    }
-
-    /**
-     * Set whether the source citation is dated.
-     *
-     * @param bool $has_source_date
-     * @return $this
-     */
-    public function setSourceHasDate(bool $has_source_date): self
-    {
-        $this->has_source_date = $has_source_date;
-        return $this;
-    }
-
-    /**
-     * Combine whether the source citation is dated with the previous status.
-     *
-     * @param bool $has_source_date
-     * @return $this
-     */
-    public function addSourceHasDate(bool $has_source_date): self
-    {
-        $this->has_source_date = $this->has_source_date || $has_source_date;
-        return $this;
-    }
-
-    /**
-     * Return whether the source citation date is close to the fact date.
-     *
-     * @return bool
-     */
-    public function sourceMatchesFactDate(): bool
-    {
-        return $this->has_precise_date && $this->has_source_date && $this->source_date_match;
-    }
-
-    /**
-     * Set whether the source citation date is close to the fact date.
-     *
-     * @param bool $source_date_match
-     * @return $this
-     */
-    public function setSourceMatchesFactDate(bool $source_date_match): self
-    {
-        $this->source_date_match = $source_date_match;
-        return $this;
-    }
-
-    /**
-     * Combine whether the source citation date is close to the fact date with the previous status.
-     *
-     * @param bool $source_date_match
-     * @return $this
-     */
-    public function addSourceMatchesFactDate(bool $source_date_match): self
-    {
-        $this->source_date_match = $this->source_date_match || $source_date_match;
-        return $this;
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\IsSourced\Data\SourceStatus::isFullySourced()
-     */
-    public function isFullySourced(): bool
-    {
-        return parent::isFullySourced() && $this->sourceMatchesFactDate();
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\IsSourced\Data\SourceStatus::label()
-     */
-    public function label(string $context): string
-    {
-        $context_label = Registry::elementFactory()->make($context)->label();
-
-        if ($this->factHasPreciseDate()) {
-            if ($this->hasSource()) {
-                if ($this->hasSupportingDocument()) {
-                    if ($this->sourceMatchesFactDate()) {
-                        return I18N::translate('%s sourced with exact certificate', $context_label);
-                    } else {
-                        return I18N::translate('%s sourced with a certificate', $context_label);
-                    }
-                }
-
-                if ($this->sourceMatchesFactDate()) {
-                    return I18N::translate('%s precisely sourced', $context_label);
-                }
-                return I18N::translate('%s sourced', $context_label);
-            }
-            return I18N::translate('%s not sourced', $context_label);
-        }
-
-        if ($this->factHasDate()) {
-            return I18N::translate('%s not precise', $context_label);
-        }
-        return I18N::translate('%s not found', $context_label);
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\IsSourced\Data\SourceStatus::order()
-     */
-    public function order(): int
-    {
-        return ($this->factHasDate() ? 1 : 0) * ($this->hasSource() ? 1 : -1) *
-            ( 1 + ($this->factHasPreciseDate() ? 1 : 0) * (1 +
-                0b010 * ($this->sourceMatchesFactDate() ? 1 : 0) +
-                0b100 * ($this->hasSupportingDocument() ? 1 : 0)
-            )
-        );
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\IsSourced\Data\SourceStatus::combineWith()
-     */
-    public function combineWith(SourceStatus $other)
-    {
-        if ($other instanceof FactSourceStatus) {
-            $this->addFactHasDate($other->factHasDate());
-            $this->addFactHasPreciseDate($other->factHasPreciseDate());
-            $this->addSourceHasDate($other->sourceHasDate());
-            $this->addSourceMatchesFactDate($other->sourceMatchesFactDate());
-        }
-
-        parent::combineWith($other);
-        return $this;
-    }
+	/**
+	 * @var boolean $has_date
+	 */
+	private $has_date = false;
+
+	/**
+	 * @var boolean $has_precise_date
+	 */
+	private $has_precise_date = false;
+
+	/**
+	 * @var boolean $has_source_date
+	 */
+	private $has_source_date = false;
+
+	/**
+	 * @var boolean $source_date_match
+	 */
+	private $source_date_match = false;
+
+	/**
+	 * Return whether the fact is dated.
+	 *
+	 * @return bool
+	 */
+	public function factHasDate(): bool
+	{
+		return $this->has_date;
+	}
+
+	/**
+	 * Set whether the fact is dated.
+	 *
+	 * @param bool $has_date
+	 * @return $this
+	 */
+	public function setFactHasDate(bool $has_date): self
+	{
+		$this->has_date = $has_date;
+		return $this;
+	}
+
+	/**
+	 * Combinate whether the fact is dated with the previous status.
+	 *
+	 * @param bool $has_date
+	 * @return $this
+	 */
+	public function addFactHasDate(bool $has_date): self
+	{
+		$this->has_date = $this->has_date || $has_date;
+		return $this;
+	}
+
+	/**
+	 * Return whether the fact is dated with a precise day.
+	 * Any date modifier will be considered as not precise.
+	 * A month or year will be considered as not precise.
+	 *
+	 * @return bool
+	 */
+	public function factHasPreciseDate(): bool
+	{
+		return $this->has_date && $this->has_precise_date;
+	}
+
+	/**
+	 * Set whather the fact is dated with a precise day.
+	 *
+	 * @param bool $has_precise_date
+	 * @return $this
+	 */
+	public function setFactHasPreciseDate(bool $has_precise_date): self
+	{
+		$this->has_precise_date = $has_precise_date;
+		return $this;
+	}
+
+	/**
+	 * Combine whether the fact is dated with a precise day.
+	 *
+	 * @param bool $has_precise_date
+	 * @return $this
+	 */
+	public function addFactHasPreciseDate(bool $has_precise_date): self
+	{
+		$this->has_precise_date = $this->has_precise_date || $has_precise_date;
+		return $this;
+	}
+
+	/**
+	 * Return whether the source citation is dated.
+	 *
+	 * @return bool
+	 */
+	public function sourceHasDate(): bool
+	{
+		return $this->has_source_date;
+	}
+
+	/**
+	 * Set whether the source citation is dated.
+	 *
+	 * @param bool $has_source_date
+	 * @return $this
+	 */
+	public function setSourceHasDate(bool $has_source_date): self
+	{
+		$this->has_source_date = $has_source_date;
+		return $this;
+	}
+
+	/**
+	 * Combine whether the source citation is dated with the previous status.
+	 *
+	 * @param bool $has_source_date
+	 * @return $this
+	 */
+	public function addSourceHasDate(bool $has_source_date): self
+	{
+		$this->has_source_date = $this->has_source_date || $has_source_date;
+		return $this;
+	}
+
+	/**
+	 * Return whether the source citation date is close to the fact date.
+	 *
+	 * @return bool
+	 */
+	public function sourceMatchesFactDate(): bool
+	{
+		return $this->has_precise_date && $this->has_source_date && $this->source_date_match;
+	}
+
+	/**
+	 * Set whether the source citation date is close to the fact date.
+	 *
+	 * @param bool $source_date_match
+	 * @return $this
+	 */
+	public function setSourceMatchesFactDate(bool $source_date_match): self
+	{
+		$this->source_date_match = $source_date_match;
+		return $this;
+	}
+
+	/**
+	 * Combine whether the source citation date is close to the fact date with the previous status.
+	 *
+	 * @param bool $source_date_match
+	 * @return $this
+	 */
+	public function addSourceMatchesFactDate(bool $source_date_match): self
+	{
+		$this->source_date_match = $this->source_date_match || $source_date_match;
+		return $this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Module\IsSourced\Data\SourceStatus::isFullySourced()
+	 */
+	public function isFullySourced(): bool
+	{
+		return parent::isFullySourced() && $this->sourceMatchesFactDate();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Module\IsSourced\Data\SourceStatus::label()
+	 */
+	public function label(string $context): string
+	{
+		$context_label = Registry::elementFactory()->make($context)->label();
+
+		if ($this->factHasPreciseDate()) {
+			if ($this->hasSource()) {
+				if ($this->hasSupportingDocument()) {
+					if ($this->sourceMatchesFactDate()) {
+						return I18N::translate('%s sourced with exact certificate', $context_label);
+					} else {
+						return I18N::translate('%s sourced with a certificate', $context_label);
+					}
+				}
+
+				if ($this->sourceMatchesFactDate()) {
+					return I18N::translate('%s precisely sourced', $context_label);
+				}
+				return I18N::translate('%s sourced', $context_label);
+			}
+			return I18N::translate('%s not sourced', $context_label);
+		}
+
+		if ($this->factHasDate()) {
+			return I18N::translate('%s not precise', $context_label);
+		}
+		return I18N::translate('%s not found', $context_label);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Module\IsSourced\Data\SourceStatus::order()
+	 */
+	public function order(): int
+	{
+		return ($this->factHasDate() ? 1 : 0) * ($this->hasSource() ? 1 : -1) *
+			( 1 + ($this->factHasPreciseDate() ? 1 : 0) * (1 +
+				0b010 * ($this->sourceMatchesFactDate() ? 1 : 0) +
+				0b100 * ($this->hasSupportingDocument() ? 1 : 0)
+			)
+		);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Module\IsSourced\Data\SourceStatus::combineWith()
+	 */
+	public function combineWith(SourceStatus $other)
+	{
+		if ($other instanceof FactSourceStatus) {
+			$this->addFactHasDate($other->factHasDate());
+			$this->addFactHasPreciseDate($other->factHasPreciseDate());
+			$this->addSourceHasDate($other->sourceHasDate());
+			$this->addSourceMatchesFactDate($other->sourceMatchesFactDate());
+		}
+
+		parent::combineWith($other);
+		return $this;
+	}
 }

app/Module/IsSourced/Data/NullFactSourceStatus.php

Indentation +16 added lines, -16 removed lines

@@ -19,21 +19,21 @@
  */
 class NullFactSourceStatus extends FactSourceStatus
 {
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\IsSourced\Data\SourceStatus::isSet()
-     */
-    public function isSet(): bool
-    {
-        return false;
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Module\IsSourced\Data\SourceStatus::isSet()
+	 */
+	public function isSet(): bool
+	{
+		return false;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\IsSourced\Data\FactSourceStatus::combineWith()
-     */
-    public function combineWith(SourceStatus $other)
-    {
-        return $other;
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Module\IsSourced\Data\FactSourceStatus::combineWith()
+	 */
+	public function combineWith(SourceStatus $other)
+	{
+		return $other;
+	}
 }

app/Module/IsSourced/IsSourcedModule.php

Spacing +8 added lines, -8 removed lines

@@ -75,7 +75,7 @@ 
      */
     public function headContent(): string
     {
-        return '<link rel="stylesheet" href="' . e($this->moduleCssUrl()) . '">';
+        return '<link rel="stylesheet" href="'.e($this->moduleCssUrl()).'">';
     }
 
     /**
@@ -84,7 +84,7 @@ 
      */
     public function bodyContent(): string
     {
-        return '<script src="' . $this->assetUrl('js/issourced.min.js') . '"></script>';
+        return '<script src="'.$this->assetUrl('js/issourced.min.js').'"></script>';
     }
 
     /**
@@ -106,14 +106,14 @@ 
         $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)];
+            function(Family $sfamily) use ($source_status_service): array {
+                return [$sfamily, $source_status_service->sourceStatusForMarriage($sfamily)];
             }
-        )->filter(function (array $item): bool {
+        )->filter(function(array $item): bool {
             return $item[1]->isSet();
         });
 
-        return view($this->name() . '::sidebar/content', [
+        return view($this->name().'::sidebar/content', [
             'module_name'               => $this->name(),
             'individual'                =>  $individual,
             'source_status_individual'  =>  $source_status_service->sourceStatusForRecord($individual),
@@ -130,8 +130,8 @@ 
     public function listSubscribedHooks(): array
     {
         return [
-            app()->makeWith(IsSourcedStatusHook::class, [ 'module' => $this ]),
-            app()->makeWith(IsSourcedStatusColumnsHook::class, [ 'module' => $this ])
+            app()->makeWith(IsSourcedStatusHook::class, ['module' => $this]),
+            app()->makeWith(IsSourcedStatusColumnsHook::class, ['module' => $this])
         ];
     }
 }

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/Module/Hooks/HooksModule.php

Spacing +4 added lines, -4 removed lines

@@ -55,7 +55,7 @@ 
     // 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';
+    private const SCHEMA_MIGRATION_PREFIX = __NAMESPACE__.'\Schema';
 
     /**
      * {@inheritDoc}
@@ -96,11 +96,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/hooks', 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->attach('', '/config/admin', static function(Map $router): void {
 
                     $router->get(AdminConfigPage::class, '', AdminConfigPage::class);
                     $router->get(ModulesHooksPage::class, '/{hook_name}', ModulesHooksPage::class);

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/Hooks/Hooks/RecordNameTextExtenderCollector.php

Indentation +44 added lines, -44 removed lines

@@ -27,52 +27,52 @@
  */
 class RecordNameTextExtenderCollector extends AbstractHookCollector implements RecordNameTextExtenderInterface
 {
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Common\Hooks\AbstractHookCollector::title()
-     */
-    public function title(): string
-    {
-        return I18N::translate('Text extender for records’ name');
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Common\Hooks\AbstractHookCollector::title()
+	 */
+	public function title(): string
+	{
+		return I18N::translate('Text extender for records’ name');
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Common\Hooks\AbstractHookCollector::description()
-     */
-    public function description(): string
-    {
-        return I18N::translate('Extends the full name of GEDCOM records with additional text or icons.');
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Common\Hooks\AbstractHookCollector::description()
+	 */
+	public function description(): string
+	{
+		return I18N::translate('Extends the full name of GEDCOM records with additional text or icons.');
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Common\Hooks\AbstractHookCollector::hookInterface()
-     */
-    public function hookInterface(): string
-    {
-        return RecordNameTextExtenderInterface::class;
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Common\Hooks\AbstractHookCollector::hookInterface()
+	 */
+	public function hookInterface(): string
+	{
+		return RecordNameTextExtenderInterface::class;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\Hooks\RecordNameTextExtenderInterface::recordNamePrepend()
-     */
-    public function recordNamePrepend(GedcomRecord $record, bool $use_long = false, string $size = ''): string
-    {
-        return $this->hooks()
-            ->map(fn(RecordNameTextExtenderInterface $hook) => $hook->recordNamePrepend($record, $use_long, $size))
-            ->implode('');
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\Hooks\RecordNameTextExtenderInterface::recordNamePrepend()
+	 */
+	public function recordNamePrepend(GedcomRecord $record, bool $use_long = false, string $size = ''): string
+	{
+		return $this->hooks()
+			->map(fn(RecordNameTextExtenderInterface $hook) => $hook->recordNamePrepend($record, $use_long, $size))
+			->implode('');
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\Hooks\RecordNameTextExtenderInterface::recordNameAppend()
-     */
-    public function recordNameAppend(GedcomRecord $record, bool $use_long = false, string $size = ''): string
-    {
-        return $this->hooks()
-            ->map(fn(RecordNameTextExtenderInterface $hook) => $hook->recordNameAppend($record, $use_long, $size))
-            ->implode('');
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\Hooks\RecordNameTextExtenderInterface::recordNameAppend()
+	 */
+	public function recordNameAppend(GedcomRecord $record, bool $use_long = false, string $size = ''): string
+	{
+		return $this->hooks()
+			->map(fn(RecordNameTextExtenderInterface $hook) => $hook->recordNameAppend($record, $use_long, $size))
+			->implode('');
+	}
 }

app/Module/Hooks/Hooks/NameAccordionExtenderCollector.php

Indentation +34 added lines, -34 removed lines

@@ -27,41 +27,41 @@
  */
 class NameAccordionExtenderCollector extends AbstractHookCollector implements NameAccordionExtenderInterface
 {
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Common\Hooks\AbstractHookCollector::title()
-     */
-    public function title(): string
-    {
-        return I18N::translate('Individual names accordion extender');
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Common\Hooks\AbstractHookCollector::title()
+	 */
+	public function title(): string
+	{
+		return I18N::translate('Individual names accordion extender');
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Common\Hooks\AbstractHookCollector::description()
-     */
-    public function description(): string
-    {
-        return I18N::translate('Extends the names accordion of on an individual’s page.');
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Common\Hooks\AbstractHookCollector::description()
+	 */
+	public function description(): string
+	{
+		return I18N::translate('Extends the names accordion of on an individual’s page.');
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Common\Hooks\AbstractHookCollector::hookInterface()
-     */
-    public function hookInterface(): string
-    {
-        return NameAccordionExtenderInterface::class;
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Common\Hooks\AbstractHookCollector::hookInterface()
+	 */
+	public function hookInterface(): string
+	{
+		return NameAccordionExtenderInterface::class;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\Hooks\NameAccordionExtenderInterface::accordionCard()
-     */
-    public function accordionCard(Individual $individual): string
-    {
-        return $this->hooks()
-            ->map(fn(NameAccordionExtenderInterface $hook) => $hook->accordionCard($individual))
-            ->implode('');
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\Hooks\NameAccordionExtenderInterface::accordionCard()
+	 */
+	public function accordionCard(Individual $individual): string
+	{
+		return $this->hooks()
+			->map(fn(NameAccordionExtenderInterface $hook) => $hook->accordionCard($individual))
+			->implode('');
+	}
 }