jon48 / webtrees-lib

src/Webtrees/Module/Sosa/Schema/Migration2.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 	    // Clean up previous sosa table if it exists
 	    DB::schema()->dropIfExists('maj_sosa');
 	    
-	    DB::schema()->create('maj_sosa', static function (Blueprint $table): void {
+	    DB::schema()->create('maj_sosa', static function(Blueprint $table): void {
 	        
 	        $table->integer('majs_gedcom_id');
 	        $table->integer('majs_user_id')->default(-1);

src/Webtrees/Module/Sosa/Services/SosaRecordsService.php

Spacing +12 added lines, -12 removed lines

@@ -41,7 +41,7 @@ 
      */
     public function generation(int $sosa) : int
     {
-        return (int) log($sosa, 2) + 1;
+        return (int)log($sosa, 2) + 1;
     }
     
     /**
@@ -105,10 +105,10 @@ 
         $mass_update = DB::connection()->getDriverName() === 'mysql';
         
         $bindings_placeholders = $bindings_values = [];
-        foreach($sosa_records as $i => $row) {
+        foreach ($sosa_records as $i => $row) {
             $gen = $this->generation($row['sosa']);
-            if($gen <=  self::MAX_DB_GENERATIONS) {
-                if($mass_update) {
+            if ($gen <= self::MAX_DB_GENERATIONS) {
+                if ($mass_update) {
                     $bindings_placeholders[] = '(:tree_id'.$i.', :user_id'.$i.', :sosa'.$i.','.
                         ' :indi_id'.$i.', :gen'.$i.', :byear'.$i.', :byearest'.$i.', :dyear'.$i.', :dyearest'.$i.')';
                     $bindings_values = array_merge(
@@ -126,7 +126,7 @@ 
                         ]);
                 } else {
                     DB::table('maj_sosa')->updateOrInsert(
-                        [ 'majs_gedcom_id' => $tree->id(), 'majs_user_id' => $user->id(), 'majs_sosa' => $row['sosa']],
+                        ['majs_gedcom_id' => $tree->id(), 'majs_user_id' => $user->id(), 'majs_sosa' => $row['sosa']],
                         [
                             'majs_i_id' => $row['indi'],
                             'majs_gen' => $gen,
@@ -139,14 +139,14 @@ 
             }
         }
         
-        if($mass_update) {
+        if ($mass_update) {
             DB::connection()->statement(
-                'INSERT INTO `' . DB::connection()->getTablePrefix() . 'maj_sosa`' .
-                ' (majs_gedcom_id, majs_user_id, majs_sosa,' .
-                '   majs_i_id, majs_gen, majs_birth_year, majs_birth_year_est, majs_death_year, majs_death_year_est)' .
-                ' VALUES ' . implode(',', $bindings_placeholders) .
-                ' ON DUPLICATE KEY UPDATE majs_i_id = VALUES(majs_i_id), majs_gen = VALUES(majs_gen),' .
-                '   majs_birth_year = VALUES(majs_birth_year), majs_birth_year_est = VALUES(majs_birth_year_est),' . 
+                'INSERT INTO `'.DB::connection()->getTablePrefix().'maj_sosa`'.
+                ' (majs_gedcom_id, majs_user_id, majs_sosa,'.
+                '   majs_i_id, majs_gen, majs_birth_year, majs_birth_year_est, majs_death_year, majs_death_year_est)'.
+                ' VALUES '.implode(',', $bindings_placeholders).
+                ' ON DUPLICATE KEY UPDATE majs_i_id = VALUES(majs_i_id), majs_gen = VALUES(majs_gen),'.
+                '   majs_birth_year = VALUES(majs_birth_year), majs_birth_year_est = VALUES(majs_birth_year_est),'. 
                 '   majs_death_year = VALUES(majs_death_year), majs_death_year_est = VALUES(majs_death_year_est)',
                 $bindings_values);
         }

src/Webtrees/Module/Sosa/Services/SosaStatisticsService.php

Spacing +19 added lines, -20 removed lines

@@ -122,8 +122,7 @@ 
             ->selectRaw('SUM(majs_gen * majs_gen) AS sum_x2')
             ->get()->first();
         
-        return $row->n == 0 ? 0 :
-            -($row->n * $row->sum_xy - $row->sum_x * $row->sum_y) / ($row->n * $row->sum_x2 - pow($row->sum_x, 2));
+        return $row->n == 0 ? 0 : -($row->n * $row->sum_xy - $row->sum_x * $row->sum_y) / ($row->n * $row->sum_x2 - pow($row->sum_x, 2));
     }
     
     /**
@@ -146,11 +145,11 @@ 
         $cumul_stats_by_gen = $this->statisticsByGenerationCumulativeData();
         
         $statistics_by_gen = [];
-        foreach($stats_by_gen as $gen => $stats_gen) {
-            $statistics_by_gen[(int) $stats_gen->gen] = array(
-                'sosaCount'				=>	(int) $stats_gen->total_sosa,
-                'sosaTotalCount'		=>	(int) $cumul_stats_by_gen[$gen]->total_cumul,
-                'diffSosaTotalCount'	=>	(int) $cumul_stats_by_gen[$gen]->total_distinct_cumul,
+        foreach ($stats_by_gen as $gen => $stats_gen) {
+            $statistics_by_gen[(int)$stats_gen->gen] = array(
+                'sosaCount'				=>	(int)$stats_gen->total_sosa,
+                'sosaTotalCount'		=>	(int)$cumul_stats_by_gen[$gen]->total_cumul,
+                'diffSosaTotalCount'	=>	(int)$cumul_stats_by_gen[$gen]->total_distinct_cumul,
                 'firstBirth'			=>	$stats_gen->first_year,
                 'firstEstimatedBirth'	=>	$stats_gen->first_est_year,
                 'lastBirth'				=>	$stats_gen->last_year,
@@ -228,17 +227,17 @@ 
     {
         $table_prefix = DB::connection()->getTablePrefix();
         $missing_ancestors_by_gen = DB::table('maj_sosa AS sosa')
-            ->selectRaw($table_prefix. 'sosa.majs_gen - ? AS majs_gen_norm', [$gen])
-            ->selectRaw('FLOOR(((' . $table_prefix .'sosa.majs_sosa / POW(2, ' . $table_prefix .'sosa.majs_gen -1 )) - 1) * POWER(2, ? - 1)) + POWER(2, ? - 1) AS root_ancestor', [$gen, $gen])
-            ->selectRaw('SUM(CASE WHEN ' . $table_prefix .'sosa_fat.majs_i_id IS NULL AND ' . $table_prefix .'sosa_mot.majs_i_id IS NULL THEN 1 ELSE 0 END) AS full_root_count')
-            ->selectRaw('SUM(CASE WHEN ' . $table_prefix .'sosa_fat.majs_i_id IS NULL AND ' . $table_prefix .'sosa_mot.majs_i_id IS NULL THEN 0 ELSE 1 END) As semi_root_count')
+            ->selectRaw($table_prefix.'sosa.majs_gen - ? AS majs_gen_norm', [$gen])
+            ->selectRaw('FLOOR((('.$table_prefix.'sosa.majs_sosa / POW(2, '.$table_prefix.'sosa.majs_gen -1 )) - 1) * POWER(2, ? - 1)) + POWER(2, ? - 1) AS root_ancestor', [$gen, $gen])
+            ->selectRaw('SUM(CASE WHEN '.$table_prefix.'sosa_fat.majs_i_id IS NULL AND '.$table_prefix.'sosa_mot.majs_i_id IS NULL THEN 1 ELSE 0 END) AS full_root_count')
+            ->selectRaw('SUM(CASE WHEN '.$table_prefix.'sosa_fat.majs_i_id IS NULL AND '.$table_prefix.'sosa_mot.majs_i_id IS NULL THEN 0 ELSE 1 END) As semi_root_count')
             ->leftJoin('maj_sosa AS sosa_fat', function(JoinClause $join) use ($table_prefix) : void {    // Link to sosa's father
-                $join->whereRaw($table_prefix . 'sosa_fat.majs_sosa = 2 * ' . $table_prefix . 'sosa.majs_sosa')
+                $join->whereRaw($table_prefix.'sosa_fat.majs_sosa = 2 * '.$table_prefix.'sosa.majs_sosa')
                 ->where('sosa_fat.majs_gedcom_id', '=', $this->tree->id())
                 ->where('sosa_fat.majs_user_id', '=', $this->user->id());
             })
             ->leftJoin('maj_sosa AS sosa_mot', function(JoinClause $join) use ($table_prefix) : void {    // Link to sosa's mother
-                $join->whereRaw($table_prefix . 'sosa_mot.majs_sosa = 2 * ' . $table_prefix . 'sosa.majs_sosa + 1')
+                $join->whereRaw($table_prefix.'sosa_mot.majs_sosa = 2 * '.$table_prefix.'sosa.majs_sosa + 1')
                 ->where('sosa_mot.majs_gedcom_id', '=', $this->tree->id())
                 ->where('sosa_mot.majs_user_id', '=', $this->user->id());
             })
@@ -287,14 +286,14 @@ 
         $table_prefix = DB::connection()->getTablePrefix();
         $multiple_ancestors = DB::table('maj_sosa AS sosa')
             ->select('sosa.majs_i_id AS sosa_i_id')
-            ->selectRaw('COUNT('. $table_prefix .'sosa.majs_sosa) AS sosa_count')
+            ->selectRaw('COUNT('.$table_prefix.'sosa.majs_sosa) AS sosa_count')
             ->leftJoin('maj_sosa AS sosa_fat', function(JoinClause $join) use ($table_prefix) : void {    // Link to sosa's father
-                $join->whereRaw($table_prefix . 'sosa_fat.majs_sosa = 2 * ' . $table_prefix . 'sosa.majs_sosa')
+                $join->whereRaw($table_prefix.'sosa_fat.majs_sosa = 2 * '.$table_prefix.'sosa.majs_sosa')
                     ->where('sosa_fat.majs_gedcom_id', '=', $this->tree->id())
                     ->where('sosa_fat.majs_user_id', '=', $this->user->id());
             })
             ->leftJoin('maj_sosa AS sosa_mot', function(JoinClause $join) use ($table_prefix) : void {    // Link to sosa's mother
-                $join->whereRaw($table_prefix . 'sosa_mot.majs_sosa = 2 * ' . $table_prefix . 'sosa.majs_sosa + 1')
+                $join->whereRaw($table_prefix.'sosa_mot.majs_sosa = 2 * '.$table_prefix.'sosa.majs_sosa + 1')
                 ->where('sosa_mot.majs_gedcom_id', '=', $this->tree->id())
                 ->where('sosa_mot.majs_user_id', '=', $this->user->id());
             })
@@ -303,16 +302,16 @@ 
             ->whereNull('sosa_fat.majs_sosa')   // We keep only root individuals, i.e. those with no father or mother
             ->whereNull('sosa_mot.majs_sosa')
             ->groupBy('sosa.majs_i_id')
-            ->havingRaw('COUNT('. $table_prefix .'sosa.majs_sosa) > 1')    // Limit to the duplicate sosas.
-            ->orderByRaw('COUNT('. $table_prefix .'sosa.majs_sosa) DESC, MIN('. $table_prefix .'sosa.majs_sosa) ASC')
+            ->havingRaw('COUNT('.$table_prefix.'sosa.majs_sosa) > 1')    // Limit to the duplicate sosas.
+            ->orderByRaw('COUNT('.$table_prefix.'sosa.majs_sosa) DESC, MIN('.$table_prefix.'sosa.majs_sosa) ASC')
             ->limit($limit + 1)     // We want to select one more than required, for ties
             ->get();
             
-        if($multiple_ancestors->count() > $limit)
+        if ($multiple_ancestors->count() > $limit)
         {
             $last_count = $multiple_ancestors->last()->sosa_count;
             $multiple_ancestors = $multiple_ancestors->reject(function($element) use ($last_count) : bool {
-                return $element->sosa_count ==  $last_count;
+                return $element->sosa_count == $last_count;
             });
         }
         return $multiple_ancestors;

src/Webtrees/Module/Sosa/Services/SosaCalculatorService.php

Spacing +7 added lines, -7 removed lines

@@ -77,7 +77,7 @@ 
     public function computeAll(): bool
     {
         $root_id = $this->tree->getUserPreference($this->user, 'MAJ_SOSA_ROOT_ID');
-        if($indi = Registry::individualFactory()->make($root_id, $this->tree)) {
+        if ($indi = Registry::individualFactory()->make($root_id, $this->tree)) {
             $this->sosa_records_service->deleteAll($this->tree, $this->user);
             $this->addNode($indi, 1);
             $this->flushTmpSosaTable(true);
@@ -95,7 +95,7 @@ 
     public function computeFromIndividual(Individual $indi) : bool
     {
         $current_sosas = $this->sosa_records_service->getSosaNumbers($indi);
-        foreach(array_keys($current_sosas) as $sosa) {
+        foreach (array_keys($current_sosas) as $sosa) {
             $this->sosa_records_service->deleteAncestorsFrom($this->tree, $this->user, $sosa);
             $this->addNode($indi, $sosa);
         }
@@ -128,10 +128,10 @@ 
         
         $this->flushTmpSosaTable();
         
-        if(($fam = $indi->childFamilies()->first()) !== null) {
+        if (($fam = $indi->childFamilies()->first()) !== null) {
             /** @var \Fisharebest\Webtrees\Family $fam */
-            if($husb = $fam->husband()) $this->addNode($husb, 2 * $sosa);
-            if($wife = $fam->wife()) $this->addNode($wife, 2 * $sosa + 1);
+            if ($husb = $fam->husband()) $this->addNode($husb, 2 * $sosa);
+            if ($wife = $fam->wife()) $this->addNode($wife, 2 * $sosa + 1);
         }
     }
     
@@ -141,8 +141,8 @@ 
      * @param bool $force Should the flush be forced
      */
     private function flushTmpSosaTable($force = false) {
-        if( count($this->tmp_sosa_table)> 0 &&
-            ($force ||  count($this->tmp_sosa_table) >= self::TMP_SOSA_TABLE_LIMIT)){
+        if (count($this->tmp_sosa_table) > 0 &&
+            ($force || count($this->tmp_sosa_table) >= self::TMP_SOSA_TABLE_LIMIT)) {
                 $this->sosa_records_service->insertOrUpdate($this->tree, $this->user, $this->tmp_sosa_table);
                 $this->tmp_sosa_table = array();
         }

src/Webtrees/Module/Sosa/SosaModule.php

Spacing +6 added lines, -6 removed lines

@@ -43,7 +43,7 @@ 
     // How to update the database schema for this module
     private const SCHEMA_TARGET_VERSION   = 3;
     private const SCHEMA_SETTING_NAME     = 'MAJ_SOSA_SCHEMA_VERSION';
-    private const SCHEMA_MIGRATION_PREFIX = __NAMESPACE__ . '\Schema';
+    private const SCHEMA_MIGRATION_PREFIX = __NAMESPACE__.'\Schema';
     
     /**
      * {@inheritDoc}
@@ -85,7 +85,7 @@ 
     {
         $router->attach('', '', static function(Map $router) : void {
             $router->attach('', '/module-maj/sosa', static function(Map $router) : void {
-                $router->attach('', '/list', static function (Map $router) : void {
+                $router->attach('', '/list', static function(Map $router) : void {
                     
                     $router->get(AncestorsList::class, '/ancestors/{tree}/{/gen}', AncestorsList::class);
                     $router->get(MissingAncestorsList::class, '/missing/{tree}/{/gen}', MissingAncestorsList::class);
@@ -93,7 +93,7 @@ 
                 
                 $router->get(SosaStatistics::class, '/statistics/{tree}', SosaStatistics::class);
                 
-                $router->attach('', '/config/{tree}', static function (Map $router) : void {
+                $router->attach('', '/config/{tree}', static function(Map $router) : void {
                     
                     $router->get(SosaConfig::class, '', SosaConfig::class);
                     $router->post(SosaConfigAction::class, '', SosaConfigAction::class);
@@ -133,11 +133,11 @@ 
         
         $menu->setSubmenus([
             new Menu(I18N::translate('Sosa Ancestors'), route(AncestorsList::class, ['tree' => $tree->name()]), 'menu-maj-sosa-list', ['rel' => 'nofollow']),
-            new Menu(I18N::translate('Missing Ancestors'), route(MissingAncestorsList::class, ['tree' => $tree->name()]),  'menu-maj-sosa-missing', ['rel' => 'nofollow']),
+            new Menu(I18N::translate('Missing Ancestors'), route(MissingAncestorsList::class, ['tree' => $tree->name()]), 'menu-maj-sosa-missing', ['rel' => 'nofollow']),
             new Menu(I18N::translate('Sosa Statistics'), route(SosaStatistics::class, ['tree' => $tree->name()]), 'menu-maj-sosa-stats')
         ]);
         
-        if(Auth::check()) {
+        if (Auth::check()) {
             $menu->addSubmenu(
                 new Menu(I18N::translate('Sosa Configuration'), route(SosaConfig::class, ['tree' => $tree->name()]), 'menu-maj-sosa-config')
             );
@@ -152,7 +152,7 @@ 
      */
     public function headContent(): string
     {
-        return '<link rel="stylesheet" href="' . e($this->moduleCssUrl()) . '">';
+        return '<link rel="stylesheet" href="'.e($this->moduleCssUrl()).'">';
     }
 }
  
\ No newline at end of file