jon48 / webtrees-lib

src/Webtrees/Module/PatronymicLineage/Http/RequestHandlers/SurnamesList.php

Indentation +57 added lines, -57 removed lines

@@ -30,71 +30,71 @@
  */
 class SurnamesList implements RequestHandlerInterface
 {
-    use ViewResponseTrait;
+	use ViewResponseTrait;
 
-    /**
-     * @var PatronymicLineageModule $module
-     */
-    private $module;
+	/**
+	 * @var PatronymicLineageModule $module
+	 */
+	private $module;
     
-    /**
-     * @var IndividualListService $indilist_service
-     */
-    private $indilist_service;
+	/**
+	 * @var IndividualListService $indilist_service
+	 */
+	private $indilist_service;
     
-    /**
-     * Constructor for SurnamesList Request Handler
-     *
-     * @param ModuleService $module_service
-     * @param IndividualListService $indilist_service
-     */
-    public function __construct(ModuleService $module_service, IndividualListService $indilist_service)
-    {
-        $this->module = $module_service->findByInterface(PatronymicLineageModule::class)->first();
-        $this->indilist_service = $indilist_service;
-    }
+	/**
+	 * Constructor for SurnamesList Request Handler
+	 *
+	 * @param ModuleService $module_service
+	 * @param IndividualListService $indilist_service
+	 */
+	public function __construct(ModuleService $module_service, IndividualListService $indilist_service)
+	{
+		$this->module = $module_service->findByInterface(PatronymicLineageModule::class)->first();
+		$this->indilist_service = $indilist_service;
+	}
     
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        if ($this->module === null) {
-            throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
-        }
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		if ($this->module === null) {
+			throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
+		}
         
-        $tree = $request->getAttribute('tree');
-        assert($tree instanceof Tree);
+		$tree = $request->getAttribute('tree');
+		assert($tree instanceof Tree);
         
-        $initial = $request->getAttribute('alpha');
-        $initials_list = collect($this->indilist_service->surnameAlpha(false, false, I18N::locale()))
-            ->reject(function ($count, $initial) {
+		$initial = $request->getAttribute('alpha');
+		$initials_list = collect($this->indilist_service->surnameAlpha(false, false, I18N::locale()))
+			->reject(function ($count, $initial) {
 
-                return $initial === '@' || $initial === ',';
-            });
+				return $initial === '@' || $initial === ',';
+			});
             
-        $show_all = $request->getQueryParams()['show_all'] ?? 'no';
+		$show_all = $request->getQueryParams()['show_all'] ?? 'no';
         
-        if ($show_all === 'yes') {
-            $title = I18N::translate('Patronymic Lineages') . ' — ' . I18N::translate('All');
-            $surnames = $this->indilist_service->surnames('', '', false, false, I18N::locale());
-        } elseif ($initial !== null && mb_strlen($initial) == 1) {
-            $title = I18N::translate('Patronymic Lineages') . ' — ' . $initial;
-            $surnames = $this->indilist_service->surnames('', $initial, false, false, I18N::locale());
-        } else {
-            $title =  I18N::translate('Patronymic Lineages');
-            $surnames = [];
-        }
+		if ($show_all === 'yes') {
+			$title = I18N::translate('Patronymic Lineages') . ' — ' . I18N::translate('All');
+			$surnames = $this->indilist_service->surnames('', '', false, false, I18N::locale());
+		} elseif ($initial !== null && mb_strlen($initial) == 1) {
+			$title = I18N::translate('Patronymic Lineages') . ' — ' . $initial;
+			$surnames = $this->indilist_service->surnames('', $initial, false, false, I18N::locale());
+		} else {
+			$title =  I18N::translate('Patronymic Lineages');
+			$surnames = [];
+		}
         
-        return $this->viewResponse($this->module->name() . '::surnames-page', [
-            'title'         =>  $title,
-            'module'        =>  $this->module,
-            'tree'          =>  $tree,
-            'initials_list' =>  $initials_list,
-            'initial'       =>  $initial,
-            'show_all'      =>  $show_all,
-            'surnames'      =>  $surnames
-        ]);
-    }
+		return $this->viewResponse($this->module->name() . '::surnames-page', [
+			'title'         =>  $title,
+			'module'        =>  $this->module,
+			'tree'          =>  $tree,
+			'initials_list' =>  $initials_list,
+			'initial'       =>  $initial,
+			'show_all'      =>  $show_all,
+			'surnames'      =>  $surnames
+		]);
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -69,7 +69,7 @@ 
         
         $initial = $request->getAttribute('alpha');
         $initials_list = collect($this->indilist_service->surnameAlpha(false, false, I18N::locale()))
-            ->reject(function ($count, $initial) {
+            ->reject(function($count, $initial) {
 
                 return $initial === '@' || $initial === ',';
             });
@@ -77,17 +77,17 @@ 
         $show_all = $request->getQueryParams()['show_all'] ?? 'no';
         
         if ($show_all === 'yes') {
-            $title = I18N::translate('Patronymic Lineages') . ' — ' . I18N::translate('All');
+            $title = I18N::translate('Patronymic Lineages').' — '.I18N::translate('All');
             $surnames = $this->indilist_service->surnames('', '', false, false, I18N::locale());
         } elseif ($initial !== null && mb_strlen($initial) == 1) {
-            $title = I18N::translate('Patronymic Lineages') . ' — ' . $initial;
+            $title = I18N::translate('Patronymic Lineages').' — '.$initial;
             $surnames = $this->indilist_service->surnames('', $initial, false, false, I18N::locale());
         } else {
-            $title =  I18N::translate('Patronymic Lineages');
+            $title = I18N::translate('Patronymic Lineages');
             $surnames = [];
         }
         
-        return $this->viewResponse($this->module->name() . '::surnames-page', [
+        return $this->viewResponse($this->module->name().'::surnames-page', [
             'title'         =>  $title,
             'module'        =>  $this->module,
             'tree'          =>  $tree,

src/Webtrees/Module/PatronymicLineage/Http/RequestHandlers/LineagesPage.php

Indentation +51 added lines, -51 removed lines

@@ -31,66 +31,66 @@
  */
 class LineagesPage implements RequestHandlerInterface
 {
-    use ViewResponseTrait;
+	use ViewResponseTrait;
 
-    /**
-     * @var PatronymicLineageModule $module
-     */
-    private $module;
+	/**
+	 * @var PatronymicLineageModule $module
+	 */
+	private $module;
     
-    /**
-     * @var IndividualListService $indilist_service
-     */
-    private $indilist_service;
+	/**
+	 * @var IndividualListService $indilist_service
+	 */
+	private $indilist_service;
     
-    /**
-     * Constructor for LineagesPage Request handler
-     *
-     * @param ModuleService $module_service
-     * @param IndividualListService $indilist_service
-     */
-    public function __construct(ModuleService $module_service, IndividualListService $indilist_service)
-    {
-            $this->module = $module_service->findByInterface(PatronymicLineageModule::class)->first();
-        $this->indilist_service = $indilist_service;
-    }
+	/**
+	 * Constructor for LineagesPage Request handler
+	 *
+	 * @param ModuleService $module_service
+	 * @param IndividualListService $indilist_service
+	 */
+	public function __construct(ModuleService $module_service, IndividualListService $indilist_service)
+	{
+			$this->module = $module_service->findByInterface(PatronymicLineageModule::class)->first();
+		$this->indilist_service = $indilist_service;
+	}
     
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        if ($this->module === null) {
-            throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
-        }
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		if ($this->module === null) {
+			throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
+		}
         
-        $tree = $request->getAttribute('tree');
-        assert($tree instanceof Tree);
+		$tree = $request->getAttribute('tree');
+		assert($tree instanceof Tree);
         
-        $surname = $request->getAttribute('surname');
+		$surname = $request->getAttribute('surname');
         
-        $initial = mb_substr($surname, 0, 1);
-        $initials_list = collect($this->indilist_service->surnameAlpha(false, false, I18N::locale()))
-            ->reject(function ($count, $initial) {
+		$initial = mb_substr($surname, 0, 1);
+		$initials_list = collect($this->indilist_service->surnameAlpha(false, false, I18N::locale()))
+			->reject(function ($count, $initial) {
 
-                return $initial === '@' || $initial === ',';
-            });
+				return $initial === '@' || $initial === ',';
+			});
             
-        $title = I18N::translate('Patronymic Lineages') . ' — ' . $surname;
+		$title = I18N::translate('Patronymic Lineages') . ' — ' . $surname;
         
-        $lineages = app()->make(LineageBuilder::class, ['surname' => $surname])->buildLineages();
+		$lineages = app()->make(LineageBuilder::class, ['surname' => $surname])->buildLineages();
         
-        return $this->viewResponse($this->module->name() . '::lineages-page', [
-            'title'         =>  $title,
-            'module'        =>  $this->module,
-            'tree'          =>  $tree,
-            'initials_list' =>  $initials_list,
-            'initial'       =>  $initial,
-            'show_all'      =>  'no',
-            'surname'       =>  $surname,
-            'lineages'      =>  $lineages,
-            'nb_lineages'   =>  $lineages->count()
-        ]);
-    }
+		return $this->viewResponse($this->module->name() . '::lineages-page', [
+			'title'         =>  $title,
+			'module'        =>  $this->module,
+			'tree'          =>  $tree,
+			'initials_list' =>  $initials_list,
+			'initial'       =>  $initial,
+			'show_all'      =>  'no',
+			'surname'       =>  $surname,
+			'lineages'      =>  $lineages,
+			'nb_lineages'   =>  $lineages->count()
+		]);
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -72,16 +72,16 @@
         
         $initial = mb_substr($surname, 0, 1);
         $initials_list = collect($this->indilist_service->surnameAlpha(false, false, I18N::locale()))
-            ->reject(function ($count, $initial) {
+            ->reject(function($count, $initial) {
 
                 return $initial === '@' || $initial === ',';
             });
             
-        $title = I18N::translate('Patronymic Lineages') . ' — ' . $surname;
+        $title = I18N::translate('Patronymic Lineages').' — '.$surname;
         
         $lineages = app()->make(LineageBuilder::class, ['surname' => $surname])->buildLineages();
         
-        return $this->viewResponse($this->module->name() . '::lineages-page', [
+        return $this->viewResponse($this->module->name().'::lineages-page', [
             'title'         =>  $title,
             'module'        =>  $this->module,
             'tree'          =>  $tree,

src/Webtrees/Module/PatronymicLineage/PatronymicLineageModule.php

Indentation +71 added lines, -71 removed lines

@@ -33,86 +33,86 @@
  */
 class PatronymicLineageModule extends AbstractModuleMaj implements ModuleListInterface, ModuleGlobalInterface
 {
-    use ModuleListTrait;
-    use ModuleGlobalTrait;
+	use ModuleListTrait;
+	use ModuleGlobalTrait;
 
-     /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\AbstractModule::title()
-     */
-    public function title(): string
-    {
-        return /* I18N: Name of the “Patronymic lineage” module */ I18N::translate('Patronymic Lineages');
-    }
+	 /**
+	  * {@inheritDoc}
+	  * @see \Fisharebest\Webtrees\Module\AbstractModule::title()
+	  */
+	public function title(): string
+	{
+		return /* I18N: Name of the “Patronymic lineage” module */ I18N::translate('Patronymic Lineages');
+	}
     
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\AbstractModule::description()
-     */
-    public function description(): string
-    {
-        //phpcs:ignore Generic.Files.LineLength.TooLong
-        return /* I18N: Description of the “Patronymic lineage” module */ I18N::translate('Display lineages of people holding the same surname.');
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\AbstractModule::description()
+	 */
+	public function description(): string
+	{
+		//phpcs:ignore Generic.Files.LineLength.TooLong
+		return /* I18N: Description of the “Patronymic lineage” module */ I18N::translate('Display lineages of people holding the same surname.');
+	}
     
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\AbstractModuleMaj::loadRoutes()
-     */
-    public function loadRoutes(Map $router): void
-    {
-        $router->attach('', '', static function (Map $router) {
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Module\AbstractModuleMaj::loadRoutes()
+	 */
+	public function loadRoutes(Map $router): void
+	{
+		$router->attach('', '', static function (Map $router) {
 
-            $router->attach('', '/module-maj/lineages', static function (Map $router) {
+			$router->attach('', '/module-maj/lineages', static function (Map $router) {
 
-                $router->attach('', '/Page', static function (Map $router) {
+				$router->attach('', '/Page', static function (Map $router) {
 
-                    $router->get(SurnamesList::class, '/{tree}/list{/alpha}', SurnamesList::class);
-                    $router->get(LineagesPage::class, '/{tree}/lineage/{surname}', LineagesPage::class);
-                });
-            });
-        });
-    }
+					$router->get(SurnamesList::class, '/{tree}/list{/alpha}', SurnamesList::class);
+					$router->get(LineagesPage::class, '/{tree}/lineage/{surname}', LineagesPage::class);
+				});
+			});
+		});
+	}
     
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleListInterface::listUrl()
-     */
-    public function listUrl(Tree $tree, array $parameters = []): string
-    {
-        $surname = $parameters['surname'] ?? '';
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleListInterface::listUrl()
+	 */
+	public function listUrl(Tree $tree, array $parameters = []): string
+	{
+		$surname = $parameters['surname'] ?? '';
         
-        $xref = app(ServerRequestInterface::class)->getAttribute('xref', '');
-        if ($xref !== '' && $individual = Factory::individual()->make($xref, $tree)) {
-            $surname = $individual->getAllNames()[$individual->getPrimaryName()]['surname'];
-        }
+		$xref = app(ServerRequestInterface::class)->getAttribute('xref', '');
+		if ($xref !== '' && $individual = Factory::individual()->make($xref, $tree)) {
+			$surname = $individual->getAllNames()[$individual->getPrimaryName()]['surname'];
+		}
         
-        if ($surname !== '') {
-            return route(LineagesPage::class, [
-                'tree'      =>  $tree->name(),
-                'surname'   =>  $surname
-            ] + $parameters);
-        }
-        return route(SurnamesList::class, [
-            'tree'  =>  $tree->name()
-        ] + $parameters);
-    }
+		if ($surname !== '') {
+			return route(LineagesPage::class, [
+				'tree'      =>  $tree->name(),
+				'surname'   =>  $surname
+			] + $parameters);
+		}
+		return route(SurnamesList::class, [
+			'tree'  =>  $tree->name()
+		] + $parameters);
+	}
     
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleListInterface::listMenuClass()
-     */
-    public function listMenuClass(): string
-    {
-        return 'menu-maj-patrolineage';
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleListInterface::listMenuClass()
+	 */
+	public function listMenuClass(): string
+	{
+		return 'menu-maj-patrolineage';
+	}
     
-    /**
-     * {@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()) . '">';
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -61,11 +61,11 @@ 
      */
     public function loadRoutes(Map $router): void
     {
-        $router->attach('', '', static function (Map $router) {
+        $router->attach('', '', static function(Map $router) {
 
-            $router->attach('', '/module-maj/lineages', static function (Map $router) {
+            $router->attach('', '/module-maj/lineages', static function(Map $router) {
 
-                $router->attach('', '/Page', static function (Map $router) {
+                $router->attach('', '/Page', static function(Map $router) {
 
                     $router->get(SurnamesList::class, '/{tree}/list{/alpha}', SurnamesList::class);
                     $router->get(LineagesPage::class, '/{tree}/lineage/{surname}', LineagesPage::class);
@@ -113,6 +113,6 @@ 
      */
     public function headContent(): string
     {
-        return '<link rel="stylesheet" href="' . e($this->moduleCssUrl()) . '">';
+        return '<link rel="stylesheet" href="'.e($this->moduleCssUrl()).'">';
     }
 }

src/Webtrees/Module/PatronymicLineage/Model/LineageRootNode.php

Indentation +58 added lines, -58 removed lines

@@ -24,68 +24,68 @@
 class LineageRootNode extends LineageNode
 {
     
-    /**
-     * @var Collection $places Places for the lineage node
-     */
-    private $places;
+	/**
+	 * @var Collection $places Places for the lineage node
+	 */
+	private $places;
    
-    /**
-     * @var int $nb_children Number of node childs
-     */
-    private $nb_children;
+	/**
+	 * @var int $nb_children Number of node childs
+	 */
+	private $nb_children;
   
-    /**
-     * Constructor for LineageRootNode
-     *
-     * @param Individual|null $node_indi
-     */
-    public function __construct(?Individual $node_indi = null)
-    {
-        parent::__construct($node_indi, $this);
-        $this->places = new Collection();
-        $this->nb_children = 0;
-    }
+	/**
+	 * Constructor for LineageRootNode
+	 *
+	 * @param Individual|null $node_indi
+	 */
+	public function __construct(?Individual $node_indi = null)
+	{
+		parent::__construct($node_indi, $this);
+		$this->places = new Collection();
+		$this->nb_children = 0;
+	}
    
-    /**
-     * Adds a place to the list of lineage's place
-     *
-     * @param Place $place
-     */
-    public function addPlace(Place $place): void
-    {
-        $place_name = $place->gedcomName();
-        if (mb_strlen($place_name) > 0) {
-            $this->places->put($place_name, $this->places->get($place_name, 0) + 1);
-        }
-    }
+	/**
+	 * Adds a place to the list of lineage's place
+	 *
+	 * @param Place $place
+	 */
+	public function addPlace(Place $place): void
+	{
+		$place_name = $place->gedcomName();
+		if (mb_strlen($place_name) > 0) {
+			$this->places->put($place_name, $this->places->get($place_name, 0) + 1);
+		}
+	}
     
-    /**
-     * Returns the number of child nodes.
-     * This number is more to be used as indication rather than an accurate one.
-     *
-     * @return int
-     */
-    public function numberChildNodes(): int
-    {
-        return $this->nb_children;
-    }
+	/**
+	 * Returns the number of child nodes.
+	 * This number is more to be used as indication rather than an accurate one.
+	 *
+	 * @return int
+	 */
+	public function numberChildNodes(): int
+	{
+		return $this->nb_children;
+	}
    
-    /**
-     * Increments the number of child nodes by one
-     *
-     */
-    public function incrementChildNodes(): void
-    {
-        $this->nb_children++;
-    }
+	/**
+	 * Increments the number of child nodes by one
+	 *
+	 */
+	public function incrementChildNodes(): void
+	{
+		$this->nb_children++;
+	}
    
-    /**
-     * Returns the list of place for the lineage
-     *
-     * @return Collection
-     */
-    public function places(): Collection
-    {
-        return $this->places;
-    }
+	/**
+	 * Returns the list of place for the lineage
+	 *
+	 * @return Collection
+	 */
+	public function places(): Collection
+	{
+		return $this->places;
+	}
 }

src/Webtrees/Module/PatronymicLineage/Model/LineageNode.php

Indentation +102 added lines, -102 removed lines

@@ -24,117 +24,117 @@
 class LineageNode
 {
   
-    /**
-     * @var Collection $linked_fams Spouse families linked to the node
-     */
-    private $linked_fams;
+	/**
+	 * @var Collection $linked_fams Spouse families linked to the node
+	 */
+	private $linked_fams;
   
-    /**
-     * @var ?Individual $node_indi Reference individual for the node
-     */
-    private $node_indi;
+	/**
+	 * @var ?Individual $node_indi Reference individual for the node
+	 */
+	private $node_indi;
    
-    /**
-     * @var LineageRootNode $root_node Root node of the lineage
-     */
-    private $root_node;
+	/**
+	 * @var LineageRootNode $root_node Root node of the lineage
+	 */
+	private $root_node;
    
-    /**
-     * @var ?string $alt_surname Linked surname, used to link to another lineage
-     */
-    private $alt_surname;
+	/**
+	 * @var ?string $alt_surname Linked surname, used to link to another lineage
+	 */
+	private $alt_surname;
  
-    /**
-     * Constructor for Lineage node
-     *
-     * @param Individual $node_indi Main individual
-     * @param LineageRootNode $root_node Node of the lineage root
-     * @param null|string $alt_surname Follow-up surname
-     */
-    public function __construct(?Individual $node_indi = null, LineageRootNode $root_node, $alt_surname = null)
-    {
-        $this->node_indi = $node_indi;
-        $this->root_node = $root_node;
-        $this->alt_surname = $alt_surname;
-        $this->linked_fams = new Collection();
-    }
+	/**
+	 * Constructor for Lineage node
+	 *
+	 * @param Individual $node_indi Main individual
+	 * @param LineageRootNode $root_node Node of the lineage root
+	 * @param null|string $alt_surname Follow-up surname
+	 */
+	public function __construct(?Individual $node_indi = null, LineageRootNode $root_node, $alt_surname = null)
+	{
+		$this->node_indi = $node_indi;
+		$this->root_node = $root_node;
+		$this->alt_surname = $alt_surname;
+		$this->linked_fams = new Collection();
+	}
   
-    /**
-     * Add a spouse family to the node
-     *
-     * @param Family $fams
-     * @return object
-     */
-    public function addFamily(Family $fams): object
-    {
-        if (!$this->linked_fams->has($fams->xref())) {
-            $this->linked_fams->put($fams->xref(), (object) [
-                'family'   =>  $fams,
-                'children' =>  new Collection()
-            ]);
-        }
-        return $this->linked_fams->get($fams->xref());
-    }
+	/**
+	 * Add a spouse family to the node
+	 *
+	 * @param Family $fams
+	 * @return object
+	 */
+	public function addFamily(Family $fams): object
+	{
+		if (!$this->linked_fams->has($fams->xref())) {
+			$this->linked_fams->put($fams->xref(), (object) [
+				'family'   =>  $fams,
+				'children' =>  new Collection()
+			]);
+		}
+		return $this->linked_fams->get($fams->xref());
+	}
     
-    /**
-     * Add a child LineageNode to the node
-     *
-     * @param Family $fams
-     * @param LineageNode $child
-     */
-    public function addChild(Family $fams, LineageNode $child = null): void
-    {
-        $this->addFamily($fams)->children->push($child);
-        $this->root_node->incrementChildNodes();
-    }
+	/**
+	 * Add a child LineageNode to the node
+	 *
+	 * @param Family $fams
+	 * @param LineageNode $child
+	 */
+	public function addChild(Family $fams, LineageNode $child = null): void
+	{
+		$this->addFamily($fams)->children->push($child);
+		$this->root_node->incrementChildNodes();
+	}
    
-    /**
-     * Returns the node individual
-     *
-     * @return Individual|NULL
-     */
-    public function individual(): ?Individual
-    {
-        return $this->node_indi;
-    }
+	/**
+	 * Returns the node individual
+	 *
+	 * @return Individual|NULL
+	 */
+	public function individual(): ?Individual
+	{
+		return $this->node_indi;
+	}
    
-    /**
-     * Returns the lineage root node individual
-     *
-     * @return LineageRootNode
-     */
-    public function rootNode(): LineageRootNode
-    {
-        return $this->root_node;
-    }
+	/**
+	 * Returns the lineage root node individual
+	 *
+	 * @return LineageRootNode
+	 */
+	public function rootNode(): LineageRootNode
+	{
+		return $this->root_node;
+	}
     
-    /**
-     * Returns the spouse families linked to the node
-     *
-     * @return Collection
-     */
-    public function families(): Collection
-    {
-        return $this->linked_fams;
-    }
+	/**
+	 * Returns the spouse families linked to the node
+	 *
+	 * @return Collection
+	 */
+	public function families(): Collection
+	{
+		return $this->linked_fams;
+	}
   
-    /**
-     * Returns the follow-up surname
-     *
-     * @return string
-     */
-    public function followUpSurname(): string
-    {
-        return $this->alt_surname ?? '';
-    }
+	/**
+	 * Returns the follow-up surname
+	 *
+	 * @return string
+	 */
+	public function followUpSurname(): string
+	{
+		return $this->alt_surname ?? '';
+	}
     
-    /**
-     * Indicates whether the node has a follow up surname
-     *
-     * @return boolean
-     */
-    public function hasFollowUpSurname(): bool
-    {
-        return mb_strlen($this->followUpSurname()) > 0 ;
-    }
+	/**
+	 * Indicates whether the node has a follow up surname
+	 *
+	 * @return boolean
+	 */
+	public function hasFollowUpSurname(): bool
+	{
+		return mb_strlen($this->followUpSurname()) > 0 ;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -68,7 +68,7 @@ 
     public function addFamily(Family $fams): object
     {
         if (!$this->linked_fams->has($fams->xref())) {
-            $this->linked_fams->put($fams->xref(), (object) [
+            $this->linked_fams->put($fams->xref(), (object)[
                 'family'   =>  $fams,
                 'children' =>  new Collection()
             ]);
@@ -135,6 +135,6 @@ 
      */
     public function hasFollowUpSurname(): bool
     {
-        return mb_strlen($this->followUpSurname()) > 0 ;
+        return mb_strlen($this->followUpSurname()) > 0;
     }
 }

src/Webtrees/Module/PatronymicLineage/Model/LineageBuilder.php

Indentation +187 added lines, -187 removed lines

@@ -29,212 +29,212 @@
 class LineageBuilder
 {
     
-    /**
-     * @var string $surname Reference surname
-     */
-    private $surname;
+	/**
+	 * @var string $surname Reference surname
+	 */
+	private $surname;
     
-    /**
-     * @var Tree $tree Reference tree
-     */
-    private $tree;
+	/**
+	 * @var Tree $tree Reference tree
+	 */
+	private $tree;
    
-    /**
-     * @var IndividualListService $indilist_service
-     */
-    private $indilist_service;
+	/**
+	 * @var IndividualListService $indilist_service
+	 */
+	private $indilist_service;
     
-    /**
-     * @var Collection $used_indis Individuals already processed
-     */
-    private $used_indis;
+	/**
+	 * @var Collection $used_indis Individuals already processed
+	 */
+	private $used_indis;
  
-    /**
-     * Constructor for Lineage Builder
-     *
-     * @param string $surname Reference surname
-     * @param Tree $tree Gedcom tree
-     */
-    public function __construct($surname, Tree $tree, IndividualListService $indilist_service)
-    {
-        $this->surname = $surname;
-        $this->tree = $tree;
-        $this->indilist_service = $indilist_service;
-        $this->used_indis = new Collection();
-    }
+	/**
+	 * Constructor for Lineage Builder
+	 *
+	 * @param string $surname Reference surname
+	 * @param Tree $tree Gedcom tree
+	 */
+	public function __construct($surname, Tree $tree, IndividualListService $indilist_service)
+	{
+		$this->surname = $surname;
+		$this->tree = $tree;
+		$this->indilist_service = $indilist_service;
+		$this->used_indis = new Collection();
+	}
   
-    /**
-     * Build all patronymic lineages for the reference surname.
-     *
-     * @return Collection|NULL List of root patronymic lineages
-     */
-    public function buildLineages(): ?Collection
-    {
-        $indis = $this->indilist_service->individuals($this->surname, '', '', false, false, I18N::locale());
-        //Warning - the IndividualListService returns a clone of individuals objects. Cannot be used for object equality
-        if (count($indis) == 0) {
-            return null;
-        }
+	/**
+	 * Build all patronymic lineages for the reference surname.
+	 *
+	 * @return Collection|NULL List of root patronymic lineages
+	 */
+	public function buildLineages(): ?Collection
+	{
+		$indis = $this->indilist_service->individuals($this->surname, '', '', false, false, I18N::locale());
+		//Warning - the IndividualListService returns a clone of individuals objects. Cannot be used for object equality
+		if (count($indis) == 0) {
+			return null;
+		}
       
-        $root_lineages = new Collection();
+		$root_lineages = new Collection();
         
-        foreach ($indis as $indi) {
-            /** @var Individual $indi */
-            if (!$this->used_indis->get($indi->xref(), false)) {
-                $indi_first = $this->getLineageRootIndividual($indi);
-                if ($indi_first !== null) {
-                    // The root lineage needs to be recreated from the Factory, to retrieve the proper object
-                    $indi_first = Factory::individual()->make($indi_first->xref(), $this->tree);
-                }
-                if ($indi_first === null) {
-                    continue;
-                }
-                $this->used_indis->put($indi_first->xref(), true);
-                if ($indi_first->canShow()) {
-                    //Check if the root individual has brothers and sisters, without parents
-                    $indi_first_child_family = $indi_first->childFamilies()->first();
-                    if ($indi_first_child_family !== null) {
-                                $root_node = new LineageRootNode(null);
-                                $root_node->addFamily($indi_first_child_family);
-                    } else {
-                        $root_node = new LineageRootNode($indi_first);
-                    }
-                    $root_node = $this->buildLineage($root_node);
-                    if ($root_node !== null) {
-                        $root_lineages->add($root_node);
-                    }
-                }
-            }
-        }
+		foreach ($indis as $indi) {
+			/** @var Individual $indi */
+			if (!$this->used_indis->get($indi->xref(), false)) {
+				$indi_first = $this->getLineageRootIndividual($indi);
+				if ($indi_first !== null) {
+					// The root lineage needs to be recreated from the Factory, to retrieve the proper object
+					$indi_first = Factory::individual()->make($indi_first->xref(), $this->tree);
+				}
+				if ($indi_first === null) {
+					continue;
+				}
+				$this->used_indis->put($indi_first->xref(), true);
+				if ($indi_first->canShow()) {
+					//Check if the root individual has brothers and sisters, without parents
+					$indi_first_child_family = $indi_first->childFamilies()->first();
+					if ($indi_first_child_family !== null) {
+								$root_node = new LineageRootNode(null);
+								$root_node->addFamily($indi_first_child_family);
+					} else {
+						$root_node = new LineageRootNode($indi_first);
+					}
+					$root_node = $this->buildLineage($root_node);
+					if ($root_node !== null) {
+						$root_lineages->add($root_node);
+					}
+				}
+			}
+		}
       
-        return $root_lineages->sort(function (LineageRootNode $a, LineageRootNode $b) {
+		return $root_lineages->sort(function (LineageRootNode $a, LineageRootNode $b) {
 
-            if ($a->numberChildNodes() == $b->numberChildNodes()) {
-                return 0;
-            }
-            return ($a->numberChildNodes() > $b->numberChildNodes()) ? -1 : 1;
-        });
-    }
+			if ($a->numberChildNodes() == $b->numberChildNodes()) {
+				return 0;
+			}
+			return ($a->numberChildNodes() > $b->numberChildNodes()) ? -1 : 1;
+		});
+	}
  
-    /**
-     * Retrieve the root individual, from any individual, by recursion.
-     * The Root individual is the individual without a father, or without a mother holding the same name.
-     *
-     * @param Individual $indi
-     * @return Individual|NULL Root individual
-     */
-    private function getLineageRootIndividual(Individual $indi): ?Individual
-    {
-        $child_families = $indi->childFamilies();
-        if ($this->used_indis->get($indi->xref(), false)) {
-            return null;
-        }
+	/**
+	 * Retrieve the root individual, from any individual, by recursion.
+	 * The Root individual is the individual without a father, or without a mother holding the same name.
+	 *
+	 * @param Individual $indi
+	 * @return Individual|NULL Root individual
+	 */
+	private function getLineageRootIndividual(Individual $indi): ?Individual
+	{
+		$child_families = $indi->childFamilies();
+		if ($this->used_indis->get($indi->xref(), false)) {
+			return null;
+		}
         
-        foreach ($child_families as $child_family) {
-            /** @var Family $child_family */
-            $child_family->husband();
-            if ($husb = $child_family->husband()) {
-                if ($husb->isPendingAddition() && $husb->privatizeGedcom(Auth::PRIV_HIDE) == '') {
-                    return $indi;
-                }
-                return $this->getLineageRootIndividual($husb);
-            } elseif ($wife = $child_family->wife()) {
-                if (!($wife->isPendingAddition() && $wife->privatizeGedcom(Auth::PRIV_HIDE) == '')) {
-                    $indi_surname = $indi->getAllNames()[$indi->getPrimaryName()]['surname'];
-                    $wife_surname = $wife->getAllNames()[$wife->getPrimaryName()]['surname'];
-                    if (
-                        $indi->canShowName()
-                        && $wife->canShowName()
-                        && I18N::strcasecmp($indi_surname, $wife_surname) == 0
-                    ) {
-                            return $this->getLineageRootIndividual($wife);
-                    }
-                }
-                return $indi;
-            }
-        }
-        return $indi;
-    }
+		foreach ($child_families as $child_family) {
+			/** @var Family $child_family */
+			$child_family->husband();
+			if ($husb = $child_family->husband()) {
+				if ($husb->isPendingAddition() && $husb->privatizeGedcom(Auth::PRIV_HIDE) == '') {
+					return $indi;
+				}
+				return $this->getLineageRootIndividual($husb);
+			} elseif ($wife = $child_family->wife()) {
+				if (!($wife->isPendingAddition() && $wife->privatizeGedcom(Auth::PRIV_HIDE) == '')) {
+					$indi_surname = $indi->getAllNames()[$indi->getPrimaryName()]['surname'];
+					$wife_surname = $wife->getAllNames()[$wife->getPrimaryName()]['surname'];
+					if (
+						$indi->canShowName()
+						&& $wife->canShowName()
+						&& I18N::strcasecmp($indi_surname, $wife_surname) == 0
+					) {
+							return $this->getLineageRootIndividual($wife);
+					}
+				}
+				return $indi;
+			}
+		}
+		return $indi;
+	}
     
-    /**
-     * Computes descendent Lineage from a node.
-     * Uses recursion to build the lineage tree
-     *
-     * @param LineageNode $node
-     * @return LineageNode Computed lineage
-     */
-    private function buildLineage(LineageNode $node): LineageNode
-    {
-        $indi_surname = '';
+	/**
+	 * Computes descendent Lineage from a node.
+	 * Uses recursion to build the lineage tree
+	 *
+	 * @param LineageNode $node
+	 * @return LineageNode Computed lineage
+	 */
+	private function buildLineage(LineageNode $node): LineageNode
+	{
+		$indi_surname = '';
         
-        $indi_node = $node->individual();
-        if ($indi_node !== null) {
-            if ($node->families()->count() == 0) {
-                foreach ($indi_node->spouseFamilies() as $spouse_family) {
-                    $node->addFamily($spouse_family);
-                }
-            }
+		$indi_node = $node->individual();
+		if ($indi_node !== null) {
+			if ($node->families()->count() == 0) {
+				foreach ($indi_node->spouseFamilies() as $spouse_family) {
+					$node->addFamily($spouse_family);
+				}
+			}
           
-            $indi_surname = $indi_node->getAllNames()[$indi_node->getPrimaryName()]['surname'] ?? '';
-            $node->rootNode()->addPlace($indi_node->getBirthPlace());
+			$indi_surname = $indi_node->getAllNames()[$indi_node->getPrimaryName()]['surname'] ?? '';
+			$node->rootNode()->addPlace($indi_node->getBirthPlace());
                
-            //Tag the individual as used
-            $this->used_indis->put($indi_node->xref(), true);
-        }
+			//Tag the individual as used
+			$this->used_indis->put($indi_node->xref(), true);
+		}
       
-        foreach ($node->families() as $family_node) {
-            /** @var Family $spouse_family */
-            $spouse_family = $family_node->family;
-            $spouse_surname = '';
-            $spouse = null;
-            if ($indi_node !== null && ($spouse = $spouse_family->spouse($indi_node)) && $spouse->canShowName()) {
-                $spouse_surname = $spouse->getAllNames()[$spouse->getPrimaryName()]['surname'] ?? '';
-            }
+		foreach ($node->families() as $family_node) {
+			/** @var Family $spouse_family */
+			$spouse_family = $family_node->family;
+			$spouse_surname = '';
+			$spouse = null;
+			if ($indi_node !== null && ($spouse = $spouse_family->spouse($indi_node)) && $spouse->canShowName()) {
+				$spouse_surname = $spouse->getAllNames()[$spouse->getPrimaryName()]['surname'] ?? '';
+			}
            
-            $nb_children = $nb_natural = 0;
+			$nb_children = $nb_natural = 0;
            
-            foreach ($spouse_family->children() as $child) {
-                if (!($child->isPendingAddition() && $child->privatizeGedcom(Auth::PRIV_HIDE) == '')) {
-                    $child_surname = $child->getAllNames()[$child->getPrimaryName()]['surname'] ?? '';
+			foreach ($spouse_family->children() as $child) {
+				if (!($child->isPendingAddition() && $child->privatizeGedcom(Auth::PRIV_HIDE) == '')) {
+					$child_surname = $child->getAllNames()[$child->getPrimaryName()]['surname'] ?? '';
                     
-                    $nb_children++;
-                    if ($indi_node !== null && $indi_node->sex() == 'F') { //If the root individual is the mother
-                        //Print only lineages of children with the same surname as their mother
-                        //(supposing they are natural children)
-                        if (!$spouse || ($spouse_surname && I18N::strcasecmp($child_surname, $spouse_surname) != 0)) {
-                            if (I18N::strcasecmp($child_surname, $indi_surname) == 0) {
-                                $nb_natural++;
-                                $node_child = new LineageNode($child, $node->rootNode());
-                                $node_child = $this->buildLineage($node_child);
-                                $node->addChild($spouse_family, $node_child);
-                            }
-                        }
-                    } else { //If the root individual is the father
-                        $nb_natural++;
-                        //Print if the children does not bear the same name as his mother
-                        //(and different from his father)
-                        if (
-                            mb_strlen($child_surname) == 0 ||
-                            mb_strlen($indi_surname) == 0 || mb_strlen($spouse_surname) == 0 ||
-                            I18N::strcasecmp($child_surname, $indi_surname) == 0 ||
-                            I18N::strcasecmp($child_surname, $spouse_surname) != 0
-                        ) {
-                            $node_child = new LineageNode($child, $node->rootNode());
-                            $node_child = $this->buildLineage($node_child);
-                        } else {
-                            $node_child = new LineageNode($child, $node->rootNode(), $child_surname);
-                        }
-                        $node->addChild($spouse_family, $node_child);
-                    }
-                }
-            }
+					$nb_children++;
+					if ($indi_node !== null && $indi_node->sex() == 'F') { //If the root individual is the mother
+						//Print only lineages of children with the same surname as their mother
+						//(supposing they are natural children)
+						if (!$spouse || ($spouse_surname && I18N::strcasecmp($child_surname, $spouse_surname) != 0)) {
+							if (I18N::strcasecmp($child_surname, $indi_surname) == 0) {
+								$nb_natural++;
+								$node_child = new LineageNode($child, $node->rootNode());
+								$node_child = $this->buildLineage($node_child);
+								$node->addChild($spouse_family, $node_child);
+							}
+						}
+					} else { //If the root individual is the father
+						$nb_natural++;
+						//Print if the children does not bear the same name as his mother
+						//(and different from his father)
+						if (
+							mb_strlen($child_surname) == 0 ||
+							mb_strlen($indi_surname) == 0 || mb_strlen($spouse_surname) == 0 ||
+							I18N::strcasecmp($child_surname, $indi_surname) == 0 ||
+							I18N::strcasecmp($child_surname, $spouse_surname) != 0
+						) {
+							$node_child = new LineageNode($child, $node->rootNode());
+							$node_child = $this->buildLineage($node_child);
+						} else {
+							$node_child = new LineageNode($child, $node->rootNode(), $child_surname);
+						}
+						$node->addChild($spouse_family, $node_child);
+					}
+				}
+			}
             
-            //Do not print other children
-            if (($nb_children - $nb_natural) > 0) {
-                $node->addChild($spouse_family, null);
-            }
-        }
+			//Do not print other children
+			if (($nb_children - $nb_natural) > 0) {
+				$node->addChild($spouse_family, null);
+			}
+		}
        
-        return $node;
-    }
+		return $node;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -107,7 +107,7 @@
             }
         }
       
-        return $root_lineages->sort(function (LineageRootNode $a, LineageRootNode $b) {
+        return $root_lineages->sort(function(LineageRootNode $a, LineageRootNode $b) {
 
             if ($a->numberChildNodes() == $b->numberChildNodes()) {
                 return 0;

src/Webtrees/Module/AbstractModuleMaj.php

Indentation +72 added lines, -72 removed lines

@@ -26,89 +26,89 @@
  */
 abstract class AbstractModuleMaj extends AbstractModule implements ModuleCustomInterface
 {    
-    use ModuleCustomTrait;
+	use ModuleCustomTrait;
     
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\AbstractModule::boot()
-     */
-    public function boot() : void
-    {
-        View::registerNamespace($this->name(), $this->resourcesFolder() . 'views/');
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\AbstractModule::boot()
+	 */
+	public function boot() : void
+	{
+		View::registerNamespace($this->name(), $this->resourcesFolder() . 'views/');
         
-        $this->loadRoutes(app(RouterContainer::class)->getMap());
-    }
+		$this->loadRoutes(app(RouterContainer::class)->getMap());
+	}
     
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\AbstractModule::resourcesFolder()
-     */
-    public function resourcesFolder(): string
-    {
-        return Webtrees::MODULES_DIR . trim($this->name(), '_') . '/resources/';
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\AbstractModule::resourcesFolder()
+	 */
+	public function resourcesFolder(): string
+	{
+		return Webtrees::MODULES_DIR . trim($this->name(), '_') . '/resources/';
+	}
     
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleCustomInterface::customModuleAuthorName()
-     */
-    public function customModuleAuthorName() : string
-    {
-        return 'Jonathan Jaubart';
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleCustomInterface::customModuleAuthorName()
+	 */
+	public function customModuleAuthorName() : string
+	{
+		return 'Jonathan Jaubart';
+	}
     
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleCustomInterface::customModuleSupportUrl()
-     */
-    public function customModuleSupportUrl() : string
-    {
-        return 'https://github.com/jon48/webtrees-lib';
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleCustomInterface::customModuleSupportUrl()
+	 */
+	public function customModuleSupportUrl() : string
+	{
+		return 'https://github.com/jon48/webtrees-lib';
+	}
     
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleCustomInterface::customTranslations()
-     */
-    public function customTranslations(string $language) : array
-    {
-        $translation_file = $this->resourcesFolder() . 'lang/' . $language . '/messages.php';
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleCustomInterface::customTranslations()
+	 */
+	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) { }
+		try {
+			$translation  = new Translation($translation_file);
+			return $translation->asArray();
+		} catch (\Exception $e) { }
         
-        return array();
-    }
+		return array();
+	}
     
-    /**
-     * Add module routes to webtrees route loader
-     * 
-     * @param Map $router
-     */
-    public abstract function loadRoutes(Map $router) : void;
+	/**
+	 * Add module routes to webtrees route loader
+	 * 
+	 * @param Map $router
+	 */
+	public abstract function loadRoutes(Map $router) : void;
     
-    /**
-     * Returns the URL of the module specific stylesheets.
-     * It will look for a CSS file matching the theme name (e.g. xenea.min.css),
-     * and fallback to default.min.css if none are found
-     * 
-     * @return string
-     */
-    public function moduleCssUrl() : string
-    {
-        /** @var ModuleThemeInterface $theme */
-        $theme = app(ModuleThemeInterface::class);
-        $css_file = $this->resourcesFolder() . 'css/' . $theme->name() . '.min.css';
+	/**
+	 * Returns the URL of the module specific stylesheets.
+	 * It will look for a CSS file matching the theme name (e.g. xenea.min.css),
+	 * and fallback to default.min.css if none are found
+	 * 
+	 * @return string
+	 */
+	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');
-        }
-    }
+		if(file_exists($css_file)) {
+			return $this->assetUrl('css/' . $theme->name() . '.min.css');
+		}
+		else {
+			return $this->assetUrl('css/default.min.css');
+		}
+	}
     
 }
  
\ No newline at end of file

Spacing +6 added lines, -6 removed lines

@@ -34,7 +34,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());
     }
@@ -45,7 +45,7 @@ 
      */
     public function resourcesFolder(): string
     {
-        return Webtrees::MODULES_DIR . trim($this->name(), '_') . '/resources/';
+        return Webtrees::MODULES_DIR.trim($this->name(), '_').'/resources/';
     }
     
     /**
@@ -72,7 +72,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);
@@ -100,10 +100,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');
+        if (file_exists($css_file)) {
+            return $this->assetUrl('css/'.$theme->name().'.min.css');
         }
         else {
             return $this->assetUrl('css/default.min.css');

Braces +1 added lines, -2 removed lines

@@ -104,8 +104,7 @@
         
         if(file_exists($css_file)) {
             return $this->assetUrl('css/' . $theme->name() . '.min.css');
-        }
-        else {
+        } else {
             return $this->assetUrl('css/default.min.css');
         }
     }

src/Webtrees/Module/AdminTasks/Services/TaskScheduleService.php

Indentation +222 added lines, -222 removed lines

@@ -33,252 +33,252 @@
  */
 class TaskScheduleService
 {
-    /**
-     * Time-out after which the task will be considered not running any more.
-     * In seconds, default 5 mins.
-     * @var integer
-     */
-    public const TASK_TIME_OUT = 600;
+	/**
+	 * Time-out after which the task will be considered not running any more.
+	 * In seconds, default 5 mins.
+	 * @var integer
+	 */
+	public const TASK_TIME_OUT = 600;
     
-    /**
-     * @var Collection $available_tasks
-     */
-    private $available_tasks;
+	/**
+	 * @var Collection $available_tasks
+	 */
+	private $available_tasks;
     
-    /**
-     * Returns all Tasks schedules in database.
-     * Stored records can be synchronised with the tasks actually available to the system.
-     *
-     * @param bool $sync_available Should tasks synchronised with available ones
-     * @param bool $include_disabled Should disabled tasks be returned
-     * @return Collection Collection of TaskSchedule
-     */
-    public function all(bool $sync_available = false, bool $include_disabled = true): Collection
-    {
-        $tasks_schedules = DB::table('maj_admintasks')
-        ->select()
-        ->get()
-        ->map(self::rowMapper());
+	/**
+	 * Returns all Tasks schedules in database.
+	 * Stored records can be synchronised with the tasks actually available to the system.
+	 *
+	 * @param bool $sync_available Should tasks synchronised with available ones
+	 * @param bool $include_disabled Should disabled tasks be returned
+	 * @return Collection Collection of TaskSchedule
+	 */
+	public function all(bool $sync_available = false, bool $include_disabled = true): Collection
+	{
+		$tasks_schedules = DB::table('maj_admintasks')
+		->select()
+		->get()
+		->map(self::rowMapper());
         
-        if ($sync_available) {
-            $available_tasks = clone $this->available();
-            foreach ($tasks_schedules as $task_schedule) {
-                /** @var TaskSchedule $task_schedule */
-                if ($available_tasks->has($task_schedule->taskId())) {
-                    $available_tasks->forget($task_schedule->taskId());
-                } else {
-                    $this->delete($task_schedule);
-                }
-            }
+		if ($sync_available) {
+			$available_tasks = clone $this->available();
+			foreach ($tasks_schedules as $task_schedule) {
+				/** @var TaskSchedule $task_schedule */
+				if ($available_tasks->has($task_schedule->taskId())) {
+					$available_tasks->forget($task_schedule->taskId());
+				} else {
+					$this->delete($task_schedule);
+				}
+			}
             
-            foreach ($available_tasks as $task_name => $task) {
-                /** @var TaskInterface $task */
-                $this->insertTask($task_name, $task->defaultFrequency());
-            }
+			foreach ($available_tasks as $task_name => $task) {
+				/** @var TaskInterface $task */
+				$this->insertTask($task_name, $task->defaultFrequency());
+			}
             
-            return $this->all(false, $include_disabled);
-        }
+			return $this->all(false, $include_disabled);
+		}
         
-        return $tasks_schedules;
-    }
+		return $tasks_schedules;
+	}
     
-    /**
-     * Returns tasks exposed through modules implementing ModuleTasksProviderInterface.
-     *
-     * @return Collection
-     */
-    public function available(): Collection
-    {
-        if ($this->available_tasks === null) {
-            $tasks_providers = app(ModuleService::class)->findByInterface(ModuleTasksProviderInterface::class);
+	/**
+	 * Returns tasks exposed through modules implementing ModuleTasksProviderInterface.
+	 *
+	 * @return Collection
+	 */
+	public function available(): Collection
+	{
+		if ($this->available_tasks === null) {
+			$tasks_providers = app(ModuleService::class)->findByInterface(ModuleTasksProviderInterface::class);
             
-            $this->available_tasks = new Collection();
-            foreach ($tasks_providers as $task_provider) {
-                $this->available_tasks = $this->available_tasks->merge($task_provider->listTasks());
-            }
-        }
-        return $this->available_tasks;
-    }
+			$this->available_tasks = new Collection();
+			foreach ($tasks_providers as $task_provider) {
+				$this->available_tasks = $this->available_tasks->merge($task_provider->listTasks());
+			}
+		}
+		return $this->available_tasks;
+	}
     
-    /**
-     * Find a task schedule by its ID.
-     *
-     * @param int $task_schedule_id
-     * @return TaskSchedule|NULL
-     */
-    public function find(int $task_schedule_id): ?TaskSchedule
-    {
-        return DB::table('maj_admintasks')
-            ->select()
-            ->where('majat_id', '=', $task_schedule_id)
-            ->get()
-            ->map(self::rowMapper())
-            ->first();
-    }
+	/**
+	 * Find a task schedule by its ID.
+	 *
+	 * @param int $task_schedule_id
+	 * @return TaskSchedule|NULL
+	 */
+	public function find(int $task_schedule_id): ?TaskSchedule
+	{
+		return DB::table('maj_admintasks')
+			->select()
+			->where('majat_id', '=', $task_schedule_id)
+			->get()
+			->map(self::rowMapper())
+			->first();
+	}
     
-    /**
-     * Add a new task schedule with the specified task ID, and frequency if defined.
-     * Uses default for other settings.
-     *
-     * @param string $task_id
-     * @param int $frequency
-     * @return bool
-     */
-    public function insertTask(string $task_id, int $frequency = 0): bool
-    {
-        $values = ['majat_task_id' => $task_id];
-        if ($frequency > 0) {
-            $values['majat_frequency'] = $frequency;
-        }
+	/**
+	 * Add a new task schedule with the specified task ID, and frequency if defined.
+	 * Uses default for other settings.
+	 *
+	 * @param string $task_id
+	 * @param int $frequency
+	 * @return bool
+	 */
+	public function insertTask(string $task_id, int $frequency = 0): bool
+	{
+		$values = ['majat_task_id' => $task_id];
+		if ($frequency > 0) {
+			$values['majat_frequency'] = $frequency;
+		}
         
-        return DB::table('maj_admintasks')
-            ->insert($values);
-    }
+		return DB::table('maj_admintasks')
+			->insert($values);
+	}
     
-    /**
-     * Update a task schedule.
-     * Returns the number of tasks schedules updated.
-     *
-     * @param TaskSchedule $task_schedule
-     * @return int
-     */
-    public function update(TaskSchedule $task_schedule): int
-    {
-        return DB::table('maj_admintasks')
-            ->where('majat_id', '=', $task_schedule->id())
-            ->update([
-                'majat_status'      =>  $task_schedule->isEnabled() ? 'enabled' : 'disabled',
-                'majat_last_run'    =>  $task_schedule->lastRunTime(),
-                'majat_last_result' =>  $task_schedule->wasLastRunSuccess(),
-                'majat_frequency'   =>  $task_schedule->frequency()->totalMinutes,
-                'majat_nb_occur'    =>  $task_schedule->remainingOccurences(),
-                'majat_running'     =>  $task_schedule->isRunning()
-            ]);
-    }
+	/**
+	 * Update a task schedule.
+	 * Returns the number of tasks schedules updated.
+	 *
+	 * @param TaskSchedule $task_schedule
+	 * @return int
+	 */
+	public function update(TaskSchedule $task_schedule): int
+	{
+		return DB::table('maj_admintasks')
+			->where('majat_id', '=', $task_schedule->id())
+			->update([
+				'majat_status'      =>  $task_schedule->isEnabled() ? 'enabled' : 'disabled',
+				'majat_last_run'    =>  $task_schedule->lastRunTime(),
+				'majat_last_result' =>  $task_schedule->wasLastRunSuccess(),
+				'majat_frequency'   =>  $task_schedule->frequency()->totalMinutes,
+				'majat_nb_occur'    =>  $task_schedule->remainingOccurences(),
+				'majat_running'     =>  $task_schedule->isRunning()
+			]);
+	}
     
-    /**
-     * Delete a task schedule.
-     *
-     * @param TaskSchedule $task_schedule
-     * @return int
-     */
-    public function delete(TaskSchedule $task_schedule): int
-    {
-        return DB::table('maj_admintasks')
-            ->where('majat_id', '=', $task_schedule->id())
-            ->delete();
-    }
+	/**
+	 * Delete a task schedule.
+	 *
+	 * @param TaskSchedule $task_schedule
+	 * @return int
+	 */
+	public function delete(TaskSchedule $task_schedule): int
+	{
+		return DB::table('maj_admintasks')
+			->where('majat_id', '=', $task_schedule->id())
+			->delete();
+	}
     
-    /**
-     * Find a task by its name
-     *
-     * @param string $task_id
-     * @return TaskInterface|NULL
-     */
-    public function findTask(string $task_id): ?TaskInterface
-    {
-        if ($this->available()->has($task_id)) {
-            return app($this->available()->get($task_id));
-        }
-        return null;
-    }
+	/**
+	 * Find a task by its name
+	 *
+	 * @param string $task_id
+	 * @return TaskInterface|NULL
+	 */
+	public function findTask(string $task_id): ?TaskInterface
+	{
+		if ($this->available()->has($task_id)) {
+			return app($this->available()->get($task_id));
+		}
+		return null;
+	}
     
-    /**
-     * Retrieve all tasks that are candidates to be run.
-     *
-     * @param bool $force Should the run be forced
-     * @param string $task_id Specific task ID to be run
-     * @return Collection
-     */
-    public function findTasksToRun(bool $force, string $task_id = null): Collection
-    {
-        $query = DB::table('maj_admintasks')
-            ->select()
-            ->where('majat_status', '=', 'enabled')
-            ->where(function (Builder $query) {
+	/**
+	 * Retrieve all tasks that are candidates to be run.
+	 *
+	 * @param bool $force Should the run be forced
+	 * @param string $task_id Specific task ID to be run
+	 * @return Collection
+	 */
+	public function findTasksToRun(bool $force, string $task_id = null): Collection
+	{
+		$query = DB::table('maj_admintasks')
+			->select()
+			->where('majat_status', '=', 'enabled')
+			->where(function (Builder $query) {
 
-                $query->where('majat_running', '=', 0)
-                ->orWhere('majat_last_run', '<=', Carbon::now()->subSeconds(self::TASK_TIME_OUT));
-            });
+				$query->where('majat_running', '=', 0)
+				->orWhere('majat_last_run', '<=', Carbon::now()->subSeconds(self::TASK_TIME_OUT));
+			});
             
-        if (!$force) {
-            $query->where(function (Builder $query) {
+		if (!$force) {
+			$query->where(function (Builder $query) {
 
-                $query->where('majat_running', '=', 0)
-                    ->orWhereRaw('DATE_ADD(majat_last_run, INTERVAL majat_frequency MINUTE) <= NOW()');
-            });
-        }
+				$query->where('majat_running', '=', 0)
+					->orWhereRaw('DATE_ADD(majat_last_run, INTERVAL majat_frequency MINUTE) <= NOW()');
+			});
+		}
         
-        if ($task_id !== null) {
-            $query->where('majat_task_id', '=', $task_id);
-        }
+		if ($task_id !== null) {
+			$query->where('majat_task_id', '=', $task_id);
+		}
         
-        return $query->get()->map(self::rowMapper());
-    }
+		return $query->get()->map(self::rowMapper());
+	}
     
-    /**
-     * Run the task associated with the schedule.
-     * The task will run if either forced to, or its next scheduled run time has been exceeded.
-     * The last run time is recorded only if the task is successful.
-     *
-     * @param TaskSchedule $task_schedule
-     * @param boolean $force
-     */
-    public function run(TaskSchedule $task_schedule, $force = false): void
-    {
-        /** @var TaskSchedule $task_schedule */
-        $task_schedule = DB::table('maj_admintasks')
-            ->select()
-            ->where('majat_id', '=', $task_schedule->id())
-            ->lockForUpdate()
-            ->get()
-            ->map(self::rowMapper())
-            ->first();
+	/**
+	 * Run the task associated with the schedule.
+	 * The task will run if either forced to, or its next scheduled run time has been exceeded.
+	 * The last run time is recorded only if the task is successful.
+	 *
+	 * @param TaskSchedule $task_schedule
+	 * @param boolean $force
+	 */
+	public function run(TaskSchedule $task_schedule, $force = false): void
+	{
+		/** @var TaskSchedule $task_schedule */
+		$task_schedule = DB::table('maj_admintasks')
+			->select()
+			->where('majat_id', '=', $task_schedule->id())
+			->lockForUpdate()
+			->get()
+			->map(self::rowMapper())
+			->first();
         
-        if (
-            !$task_schedule->isRunning() &&
-            ($force || $task_schedule->lastRunTime()->add($task_schedule->frequency())->lessThan(Carbon::now())) &&
-            $task_schedule->setLastResult(false) &&  // @phpstan-ignore-line  Used as setter, not as a condition
-            $task = $this->findTask($task_schedule->taskId())
-        ) {
-            $task_schedule->startRunning();
-            $this->update($task_schedule);
+		if (
+			!$task_schedule->isRunning() &&
+			($force || $task_schedule->lastRunTime()->add($task_schedule->frequency())->lessThan(Carbon::now())) &&
+			$task_schedule->setLastResult(false) &&  // @phpstan-ignore-line  Used as setter, not as a condition
+			$task = $this->findTask($task_schedule->taskId())
+		) {
+			$task_schedule->startRunning();
+			$this->update($task_schedule);
             
-            try {
-                $task_schedule->setLastResult($task->run($task_schedule));
-            } catch (Exception $ex) {
-            }
+			try {
+				$task_schedule->setLastResult($task->run($task_schedule));
+			} catch (Exception $ex) {
+			}
             
-            if ($task_schedule->wasLastRunSuccess()) {
-                $task_schedule->setLastRunTime(Carbon::now());
-                $task_schedule->decrementRemainingOccurences();
-            }
-            $task_schedule->stopRunning();
-            $this->update($task_schedule);
-        } else {
-            $this->update($task_schedule);
-        }
-    }
+			if ($task_schedule->wasLastRunSuccess()) {
+				$task_schedule->setLastRunTime(Carbon::now());
+				$task_schedule->decrementRemainingOccurences();
+			}
+			$task_schedule->stopRunning();
+			$this->update($task_schedule);
+		} else {
+			$this->update($task_schedule);
+		}
+	}
 
-    /**
-     * Mapper to return a TaskSchedule object from an object.
-     *
-     * @return Closure
-     */
-    public static function rowMapper(): Closure
-    {
-        return static function (stdClass $row): TaskSchedule {
+	/**
+	 * Mapper to return a TaskSchedule object from an object.
+	 *
+	 * @return Closure
+	 */
+	public static function rowMapper(): Closure
+	{
+		return static function (stdClass $row): TaskSchedule {
 
-            return new TaskSchedule(
-                (int) $row->majat_id,
-                $row->majat_task_id,
-                $row->majat_status === 'enabled',
-                Carbon::parse($row->majat_last_run),
-                (bool) $row->majat_last_result,
-                CarbonInterval::minutes($row->majat_frequency),
-                (int) $row->majat_nb_occur,
-                (bool) $row->majat_running
-            );
-        };
-    }
+			return new TaskSchedule(
+				(int) $row->majat_id,
+				$row->majat_task_id,
+				$row->majat_status === 'enabled',
+				Carbon::parse($row->majat_last_run),
+				(bool) $row->majat_last_result,
+				CarbonInterval::minutes($row->majat_frequency),
+				(int) $row->majat_nb_occur,
+				(bool) $row->majat_running
+			);
+		};
+	}
 }

Spacing +8 added lines, -8 removed lines

@@ -195,14 +195,14 @@ 
         $query = DB::table('maj_admintasks')
             ->select()
             ->where('majat_status', '=', 'enabled')
-            ->where(function (Builder $query) {
+            ->where(function(Builder $query) {
 
                 $query->where('majat_running', '=', 0)
                 ->orWhere('majat_last_run', '<=', Carbon::now()->subSeconds(self::TASK_TIME_OUT));
             });
             
         if (!$force) {
-            $query->where(function (Builder $query) {
+            $query->where(function(Builder $query) {
 
                 $query->where('majat_running', '=', 0)
                     ->orWhereRaw('DATE_ADD(majat_last_run, INTERVAL majat_frequency MINUTE) <= NOW()');
@@ -238,7 +238,7 @@ 
         if (
             !$task_schedule->isRunning() &&
             ($force || $task_schedule->lastRunTime()->add($task_schedule->frequency())->lessThan(Carbon::now())) &&
-            $task_schedule->setLastResult(false) &&  // @phpstan-ignore-line  Used as setter, not as a condition
+            $task_schedule->setLastResult(false) && // @phpstan-ignore-line  Used as setter, not as a condition
             $task = $this->findTask($task_schedule->taskId())
         ) {
             $task_schedule->startRunning();
@@ -267,17 +267,17 @@ 
      */
     public static function rowMapper(): Closure
     {
-        return static function (stdClass $row): TaskSchedule {
+        return static function(stdClass $row): TaskSchedule {
 
             return new TaskSchedule(
-                (int) $row->majat_id,
+                (int)$row->majat_id,
                 $row->majat_task_id,
                 $row->majat_status === 'enabled',
                 Carbon::parse($row->majat_last_run),
-                (bool) $row->majat_last_result,
+                (bool)$row->majat_last_result,
                 CarbonInterval::minutes($row->majat_frequency),
-                (int) $row->majat_nb_occur,
-                (bool) $row->majat_running
+                (int)$row->majat_nb_occur,
+                (bool)$row->majat_running
             );
         };
     }

src/Webtrees/Module/AdminTasks/Services/HealthCheckService.php

Indentation +93 added lines, -93 removed lines

@@ -27,101 +27,101 @@
  */
 class HealthCheckService
 {
-    /**
-     * Returns a query collating all gedcom records, for use in other queries
-     *
-     * @param Tree $tree
-     * @return Builder
-     */
-    private function allGedcomRecords(Tree $tree): Builder
-    {
-        return DB::table('individuals')
-            ->select(DB::raw("'indi' AS ged_type"), 'i_id AS ged_id')->where('i_file', '=', $tree->id())
-            ->unionAll(DB::table('families')
-                ->select(DB::raw("'fam' AS ged_type"), 'f_id AS ged_id')->where('f_file', '=', $tree->id()))
-            ->unionAll(DB::table('sources')
-                ->select(DB::raw("'sour' AS ged_type"), 's_id AS ged_id')->where('s_file', '=', $tree->id()))
-            ->unionAll(DB::table('media')
-                ->select(DB::raw("'media' AS ged_type"), 'm_id AS ged_id')->where('m_file', '=', $tree->id()))
-            ->unionAll(DB::table('other')
-                ->select(DB::raw('LOWER(o_type) AS ged_type'), 'o_id AS ged_id')->where('o_file', '=', $tree->id()));
-    }
+	/**
+	 * Returns a query collating all gedcom records, for use in other queries
+	 *
+	 * @param Tree $tree
+	 * @return Builder
+	 */
+	private function allGedcomRecords(Tree $tree): Builder
+	{
+		return DB::table('individuals')
+			->select(DB::raw("'indi' AS ged_type"), 'i_id AS ged_id')->where('i_file', '=', $tree->id())
+			->unionAll(DB::table('families')
+				->select(DB::raw("'fam' AS ged_type"), 'f_id AS ged_id')->where('f_file', '=', $tree->id()))
+			->unionAll(DB::table('sources')
+				->select(DB::raw("'sour' AS ged_type"), 's_id AS ged_id')->where('s_file', '=', $tree->id()))
+			->unionAll(DB::table('media')
+				->select(DB::raw("'media' AS ged_type"), 'm_id AS ged_id')->where('m_file', '=', $tree->id()))
+			->unionAll(DB::table('other')
+				->select(DB::raw('LOWER(o_type) AS ged_type'), 'o_id AS ged_id')->where('o_file', '=', $tree->id()));
+	}
     
-    /**
-     * Returns the count of gedcom records by type in a Tree, as a keyed Collection.
-     *
-     * Collection output:
-     *      - Key : gedcom record type
-     *      - Value: count of records
-     *
-     * @param Tree $tree
-     * @return Collection
-     */
-    public function countByRecordType(Tree $tree): Collection
-    {
-        return DB::query()
-            ->fromSub($this->allGedcomRecords($tree), 'gedrecords')
-            ->select('ged_type', new Expression('COUNT(ged_id) AS total'))
-            ->groupBy('ged_type')
-            ->pluck('total', 'ged_type');
-    }
+	/**
+	 * Returns the count of gedcom records by type in a Tree, as a keyed Collection.
+	 *
+	 * Collection output:
+	 *      - Key : gedcom record type
+	 *      - Value: count of records
+	 *
+	 * @param Tree $tree
+	 * @return Collection
+	 */
+	public function countByRecordType(Tree $tree): Collection
+	{
+		return DB::query()
+			->fromSub($this->allGedcomRecords($tree), 'gedrecords')
+			->select('ged_type', new Expression('COUNT(ged_id) AS total'))
+			->groupBy('ged_type')
+			->pluck('total', 'ged_type');
+	}
     
-    /**
-     * Returns the count of gedcom records changes by type in a Tree across a number of days, as a keyed Collection.
-     *
-     * Collection output:
-     *      - Key : gedcom record type
-     *      - Value: count of changes
-     *
-     * @param Tree $tree
-     * @return Collection
-     */
-    public function changesByRecordType(Tree $tree, int $nb_days): Collection
-    {
-        return DB::table('change')
-            ->joinSub($this->allGedcomRecords($tree), 'gedrecords', function (JoinClause $join) use ($tree) {
+	/**
+	 * Returns the count of gedcom records changes by type in a Tree across a number of days, as a keyed Collection.
+	 *
+	 * Collection output:
+	 *      - Key : gedcom record type
+	 *      - Value: count of changes
+	 *
+	 * @param Tree $tree
+	 * @return Collection
+	 */
+	public function changesByRecordType(Tree $tree, int $nb_days): Collection
+	{
+		return DB::table('change')
+			->joinSub($this->allGedcomRecords($tree), 'gedrecords', function (JoinClause $join) use ($tree) {
 
-                $join->on('change.xref', '=', 'gedrecords.ged_id')
-                    ->where('change.gedcom_id', '=', $tree->id());
-            })
-            ->select('ged_type AS type', new Expression('COUNT(change_id) AS count'))
-            ->where('change.status', '', 'accepted')
-            ->where('change.change_time', '>=', Carbon::now()->subDays($nb_days))
-            ->groupBy('ged_type')
-            ->pluck('total', 'ged_type');
-    }
+				$join->on('change.xref', '=', 'gedrecords.ged_id')
+					->where('change.gedcom_id', '=', $tree->id());
+			})
+			->select('ged_type AS type', new Expression('COUNT(change_id) AS count'))
+			->where('change.status', '', 'accepted')
+			->where('change.change_time', '>=', Carbon::now()->subDays($nb_days))
+			->groupBy('ged_type')
+			->pluck('total', 'ged_type');
+	}
     
-    /**
-     * Return the error logs associated with a tree across a number of days, grouped by error message, as a Collection.
-     *
-     * Collection output:
-     *      - Value: stdClass object
-     *          - log message:  Error log message
-     *          - type:         'site' if no associated Tree, the Tree ID otherwise
-     *          - nblogs:       The number of occurence of the same error message
-     *          - lastoccurred: Date/time of the last occurence of the error message
-     *
-     * @param Tree $tree
-     * @param int $nb_days
-     * @return Collection
-     */
-    public function errorLogs(Tree $tree, int $nb_days): Collection
-    {
-        return DB::table('log')
-            ->select(
-                'log_message',
-                new Expression("IFNULL(gedcom_id, 'site') as type"),
-                new Expression('COUNT(log_id) AS nblogs'),
-                new Expression('MAX(log_time) AS lastoccurred')
-            )
-            ->where('log_type', '=', 'error')
-            ->where(function (Builder $query) use ($tree) {
-                $query->where('gedcom_id', '=', $tree->id())
-                    ->orWhereNull('gedcom_id');
-            })
-            ->where('log_time', '>=', Carbon::now()->subDays($nb_days))
-            ->groupBy('log_message', 'gedcom_id')
-            ->orderByDesc('lastoccurred')
-            ->get();
-    }
+	/**
+	 * Return the error logs associated with a tree across a number of days, grouped by error message, as a Collection.
+	 *
+	 * Collection output:
+	 *      - Value: stdClass object
+	 *          - log message:  Error log message
+	 *          - type:         'site' if no associated Tree, the Tree ID otherwise
+	 *          - nblogs:       The number of occurence of the same error message
+	 *          - lastoccurred: Date/time of the last occurence of the error message
+	 *
+	 * @param Tree $tree
+	 * @param int $nb_days
+	 * @return Collection
+	 */
+	public function errorLogs(Tree $tree, int $nb_days): Collection
+	{
+		return DB::table('log')
+			->select(
+				'log_message',
+				new Expression("IFNULL(gedcom_id, 'site') as type"),
+				new Expression('COUNT(log_id) AS nblogs'),
+				new Expression('MAX(log_time) AS lastoccurred')
+			)
+			->where('log_type', '=', 'error')
+			->where(function (Builder $query) use ($tree) {
+				$query->where('gedcom_id', '=', $tree->id())
+					->orWhereNull('gedcom_id');
+			})
+			->where('log_time', '>=', Carbon::now()->subDays($nb_days))
+			->groupBy('log_message', 'gedcom_id')
+			->orderByDesc('lastoccurred')
+			->get();
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -79,7 +79,7 @@ 
     public function changesByRecordType(Tree $tree, int $nb_days): Collection
     {
         return DB::table('change')
-            ->joinSub($this->allGedcomRecords($tree), 'gedrecords', function (JoinClause $join) use ($tree) {
+            ->joinSub($this->allGedcomRecords($tree), 'gedrecords', function(JoinClause $join) use ($tree) {
 
                 $join->on('change.xref', '=', 'gedrecords.ged_id')
                     ->where('change.gedcom_id', '=', $tree->id());
@@ -115,7 +115,7 @@ 
                 new Expression('MAX(log_time) AS lastoccurred')
             )
             ->where('log_type', '=', 'error')
-            ->where(function (Builder $query) use ($tree) {
+            ->where(function(Builder $query) use ($tree) {
                 $query->where('gedcom_id', '=', $tree->id())
                     ->orWhereNull('gedcom_id');
             })