jon48 / webtrees-lib

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

Spacing +7 added lines, -7 removed lines

@@ -195,14 +195,14 @@ 
         $query = DB::table('maj_admintasks')
             ->select()
             ->where('majat_status', '=', 'enabled')
-            ->where(function (Builder $query): void {
+            ->where(function(Builder $query): void {
 
                 $query->where('majat_running', '=', 0)
                 ->orWhere('majat_last_run', '<=', Carbon::now()->subSeconds(self::TASK_TIME_OUT));
             });
 
         if (!$force) {
-            $query->where(function (Builder $query): void {
+            $query->where(function(Builder $query): void {
 
                 $query->where('majat_running', '=', 0)
                     ->orWhereRaw('DATE_ADD(majat_last_run, INTERVAL majat_frequency MINUTE) <= NOW()');
@@ -268,17 +268,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

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): void {
+            ->joinSub($this->allGedcomRecords($tree), 'gedrecords', function(JoinClause $join) use ($tree): void {
 
                 $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): void {
+            ->where(function(Builder $query) use ($tree): void {
                 $query->where('gedcom_id', '=', $tree->id())
                     ->orWhereNull('gedcom_id');
             })

src/Webtrees/Module/Sosa/Http/RequestHandlers/SosaConfigAction.php

Spacing +3 added lines, -3 removed lines

@@ -58,12 +58,12 @@
         assert($tree instanceof Tree);
         
         $params = $request->getParsedBody();
-        $user_id = (int) $params['sosa-userid'];
+        $user_id = (int)$params['sosa-userid'];
         $root_id = $params['sosa-rootid'] ?? '';
         
-        if(Auth::id() == $user_id || ($user_id == -1 && Auth::isManager($tree))) {
+        if (Auth::id() == $user_id || ($user_id == -1 && Auth::isManager($tree))) {
             $user = $user_id == -1 ? new DefaultUser() : $this->user_service->find($user_id);
-            if($user !== null && $root_indi = Registry::individualFactory()->make($root_id, $tree)) {
+            if ($user !== null && $root_indi = Registry::individualFactory()->make($root_id, $tree)) {
                 $tree->setUserPreference($user, 'MAJ_SOSA_ROOT_ID', $root_indi->xref());
                 FlashMessages::addMessage(I18N::translate('The root individual has been updated.'));
                 return redirect(route(SosaConfig::class, [

src/Webtrees/Module/Sosa/Http/RequestHandlers/SosaStatistics.php

Spacing +4 added lines, -4 removed lines

@@ -70,7 +70,7 @@ 
         /** @var SosaStatisticsService $sosa_stats_service */
         $sosa_stats_service = app()->makeWith(SosaStatisticsService::class, ['tree' => $tree, 'user' => $user]);
         
-        return $this->viewResponse($this->module->name() . '::statistics-page', [
+        return $this->viewResponse($this->module->name().'::statistics-page', [
             'module_name'       =>  $this->module->name(),
             'title'             =>  I18N::translate('Sosa Statistics'),
             'tree'              =>  $tree,
@@ -121,8 +121,8 @@ 
         
         $generation_stats = array();
         
-        foreach($stats_by_gen as $gen => $stats_gen){
-            $gen_diff = $gen > 1 ?$stats_gen['diffSosaTotalCount'] - $stats_by_gen[$gen - 1]['diffSosaTotalCount'] : 1;
+        foreach ($stats_by_gen as $gen => $stats_gen) {
+            $gen_diff = $gen > 1 ? $stats_gen['diffSosaTotalCount'] - $stats_by_gen[$gen - 1]['diffSosaTotalCount'] : 1;
             $generation_stats[$gen] = array(
                 'gen_min_birth' => $stats_gen['firstBirth'] ?? $stats_gen['firstEstimatedBirth'],
                 'gen_max_birth' => $stats_gen['lastBirth'] ?? $stats_gen['lastEstimatedBirth'],
@@ -130,7 +130,7 @@ 
                 'known' => $stats_gen['sosaCount'],
                 'perc_known' => $this->safeDivision($stats_gen['sosaCount'], pow(2, $gen - 1)),
                 'missing' => $gen > 1 ? 2 * $stats_by_gen[$gen - 1]['sosaCount'] - $stats_gen['sosaCount'] : 0,
-                'perc_missing' => $gen > 1 ? 1 - $this->safeDivision($stats_gen['sosaCount'],  2 * $stats_by_gen[$gen - 1]['sosaCount']) : 0,
+                'perc_missing' => $gen > 1 ? 1 - $this->safeDivision($stats_gen['sosaCount'], 2 * $stats_by_gen[$gen - 1]['sosaCount']) : 0,
                 'total_known' => $stats_gen['sosaTotalCount'],
                 'perc_total_known' => $this->safeDivision($stats_gen['sosaTotalCount'], pow(2, $gen) - 1),
                 'different' => $gen_diff,

src/Webtrees/Module/Sosa/Http/RequestHandlers/SosaComputeAction.php

Spacing +4 added lines, -4 removed lines

@@ -56,16 +56,16 @@
         $tree = $request->getAttribute('tree');
         assert($tree instanceof Tree);
         
-        $user_id = (int) ($request->getParsedBody()['user_id'] ?? 0);
+        $user_id = (int)($request->getParsedBody()['user_id'] ?? 0);
         $partial_from = $request->getParsedBody()['partial_from'] ?? null;
         
-        if(($user_id == -1 && Auth::isManager($tree)) || Auth::id() == $user_id) {
+        if (($user_id == -1 && Auth::isManager($tree)) || Auth::id() == $user_id) {
             $user = $user_id == -1 ? new DefaultUser() : $this->user_service->find($user_id);
             
             /** @var SosaCalculatorService $sosa_calc_service */
-            $sosa_calc_service = app()->makeWith(SosaCalculatorService::class, [ 'tree' => $tree, 'user' => $user]);
+            $sosa_calc_service = app()->makeWith(SosaCalculatorService::class, ['tree' => $tree, 'user' => $user]);
             
-            if($partial_from !== null && $sosa_from = Registry::individualFactory()->make($partial_from, $tree)) {
+            if ($partial_from !== null && $sosa_from = Registry::individualFactory()->make($partial_from, $tree)) {
                 $res = $sosa_calc_service->computeFromIndividual($sosa_from);
             } else {
                 $res = $sosa_calc_service->computeAll();

src/Webtrees/Module/Sosa/Http/RequestHandlers/SosaConfig.php

Spacing +4 added lines, -4 removed lines

@@ -65,23 +65,23 @@
         assert($tree instanceof Tree);
         
         $users_root = array();
-        if(Auth::check()) {
+        if (Auth::check()) {
             /** @var \Fisharebest\Webtrees\User $user */
             $user = Auth::user();
             $users_root[] = ['user' => $user, 'root_id' => $tree->getUserPreference($user, 'MAJ_SOSA_ROOT_ID')];
             
-            if(Auth::isManager($tree)) {
+            if (Auth::isManager($tree)) {
                 $default_user = new DefaultUser();
                 $users_root[] = ['user' => $default_user, 'root_id' => $tree->getUserPreference($default_user, 'MAJ_SOSA_ROOT_ID')];
             }
         }
         
-        return $this->viewResponse($this->module->name() . '::config-page', [
+        return $this->viewResponse($this->module->name().'::config-page', [
             'module_name'       =>  $this->module->name(),
             'title'             =>  I18N::translate('Sosa Configuration'),
             'tree'              =>  $tree,
             'user_id'           =>  $request->getAttribute('user'),
-            'selected_user_id'  =>  (int) ($request->getQueryParams()['user_id'] ?? 0),
+            'selected_user_id'  =>  (int)($request->getQueryParams()['user_id'] ?? 0),
             'immediate_compute' =>  ($request->getQueryParams()['compute'] ?? '') == 'yes',
             'users_root'        =>  $users_root
         ]);

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;