jon48 / webtrees-lib

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

Spacing +14 added lines, -17 removed lines

@@ -71,7 +71,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,
@@ -126,37 +126,34 @@ 
 
         foreach ($stats_by_gen as $gen => $stats_gen) {
             $gen_diff = $gen > 1 ?
-                (int) $stats_gen['diffSosaTotalCount'] - (int) $stats_by_gen[$gen - 1]['diffSosaTotalCount'] :
-                1;
+                (int)$stats_gen['diffSosaTotalCount'] - (int)$stats_by_gen[$gen - 1]['diffSosaTotalCount'] : 1;
             $generation_stats[$gen] = array(
-                'gen_min_birth' => $stats_gen['firstBirth'] ?? (int) $stats_gen['firstEstimatedBirth'],
-                'gen_max_birth' => $stats_gen['lastBirth'] ?? (int) $stats_gen['lastEstimatedBirth'],
+                'gen_min_birth' => $stats_gen['firstBirth'] ?? (int)$stats_gen['firstEstimatedBirth'],
+                'gen_max_birth' => $stats_gen['lastBirth'] ?? (int)$stats_gen['lastEstimatedBirth'],
                 'theoretical' => BigInteger::of(2)->power($gen - 1)->toInt(),
-                'known' => (int) $stats_gen['sosaCount'],
+                'known' => (int)$stats_gen['sosaCount'],
                 'perc_known' => $this->safeDivision(
-                    BigInteger::of((int) $stats_gen['sosaCount']),
+                    BigInteger::of((int)$stats_gen['sosaCount']),
                     BigInteger::of(2)->power($gen - 1)
                 ),
                 'missing' => $gen > 1 ?
-                    2 * (int) $stats_by_gen[$gen - 1]['sosaCount'] - (int) $stats_gen['sosaCount'] :
-                    0,
+                    2 * (int)$stats_by_gen[$gen - 1]['sosaCount'] - (int)$stats_gen['sosaCount'] : 0,
                 'perc_missing' => $gen > 1 ?
                     1 - $this->safeDivision(
-                        BigInteger::of((int) $stats_gen['sosaCount']),
-                        BigInteger::of(2 * (int) $stats_by_gen[$gen - 1]['sosaCount'])
-                    ) :
-                    0,
-                'total_known' => (int) $stats_gen['sosaTotalCount'],
+                        BigInteger::of((int)$stats_gen['sosaCount']),
+                        BigInteger::of(2 * (int)$stats_by_gen[$gen - 1]['sosaCount'])
+                    ) : 0,
+                'total_known' => (int)$stats_gen['sosaTotalCount'],
                 'perc_total_known' => $this->safeDivision(
-                    BigInteger::of((int) $stats_gen['sosaTotalCount']),
+                    BigInteger::of((int)$stats_gen['sosaTotalCount']),
                     BigInteger::of(2)->power($gen)->minus(1)
                 ),
                 'different' => $gen_diff,
                 'perc_different' => $this->safeDivision(
                     BigInteger::of($gen_diff),
-                    BigInteger::of((int) $stats_gen['sosaCount'])
+                    BigInteger::of((int)$stats_gen['sosaCount'])
                 ),
-                'total_different' => (int) $stats_gen['diffSosaTotalCount']
+                'total_different' => (int)$stats_gen['diffSosaTotalCount']
             );
         }
 

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

Spacing +2 added lines, -2 removed lines

@@ -67,10 +67,10 @@
         $sosa_stats_service = app()->makeWith(SosaStatisticsService::class, ['tree' => $tree, 'user' => $user]);
         $pedi_collapse_data = $sosa_stats_service->pedigreeCollapseByGenerationData();
 
-        $response = [ 'cells' => [] ];
+        $response = ['cells' => []];
         $last_pedi_collapse = 0;
         foreach ($pedi_collapse_data as $gen => $rec) {
-            $response['cells'][$gen] = view($this->module->name() . '::components/pedigree-collapse-cell', [
+            $response['cells'][$gen] = view($this->module->name().'::components/pedigree-collapse-cell', [
                 'pedi_collapse_roots'   =>  $rec['pedi_collapse_roots'],
                 'pedi_collapse_xgen'    =>  $rec['pedi_collapse_xgen']
             ]);

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

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
         $params = $request->getParsedBody();
         assert(is_array($params));
 
-        $user_id = (int) $params['sosa-userid'];
+        $user_id = (int)$params['sosa-userid'];
         $root_id = $params['sosa-rootid'] ?? '';
         $max_gen = $params['sosa-maxgen'] ?? '';
 

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

Spacing +3 added lines, -4 removed lines

@@ -86,16 +86,15 @@
         $max_gen_system = app(SosaRecordsService::class)->maxSystemGenerations();
         foreach ($users_root as $key => $user_root) {
             $users_root[$key]['max_gen'] = is_numeric($user_root['max_gen']) ?
-                (int) $user_root['max_gen'] :
-                $max_gen_system;
+                (int)$user_root['max_gen'] : $max_gen_system;
         };
 
-        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/ModuleMyArtJaubTrait.php

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

src/Webtrees/Family.php

Spacing +2 added lines, -2 removed lines

@@ -30,10 +30,10 @@
 	 * @param string $gedcom
 	 * @return NULL|\MyArtJaub\Webtrees\Family
 	 */
-	public static function getIntance($xref, Tree $tree, $gedcom = null){
+	public static function getIntance($xref, Tree $tree, $gedcom = null) {
 		$dfam = null;
 		$fam = fw\Family::getInstance($xref, $tree, $gedcom);
-		if($fam){
+		if ($fam) {
 			$dfam = new Family($fam);
 		}
 		return $dfam;

src/Webtrees/GedcomRecord.php

Spacing +3 added lines, -3 removed lines

@@ -27,7 +27,7 @@ 
 	 *
 	 * @param \Fisharebest\Webtrees\GedcomRecord $gedcomrecord_in The GedcomRecord to extend
 	 */
-	public function __construct(\Fisharebest\Webtrees\GedcomRecord $gedcomrecord_in){
+	public function __construct(\Fisharebest\Webtrees\GedcomRecord $gedcomrecord_in) {
 		$this->gedcomrecord = $gedcomrecord_in;
 	}
 
@@ -36,7 +36,7 @@ 
 	 *
 	 * @return \Fisharebest\Webtrees\GedcomRecord Embedded gedcom record
 	 */
-	public function getDerivedRecord(){
+	public function getDerivedRecord() {
 		return $this->gedcomrecord;
 	}
 	
@@ -67,7 +67,7 @@ 
 			if (($fact->getDate() || $fact->getPlace()) && $fact->canShow()) {
 				switch ($style) {
 					case 10:
-					    return '<i>'.$fact->getLabel().' '. \MyArtJaub\Webtrees\Functions\FunctionsPrint::formatFactDateShort($fact) .'&nbsp;'. \MyArtJaub\Webtrees\Functions\FunctionsPrint::formatFactPlaceShort($fact, '%1') .'</i>';
+					    return '<i>'.$fact->getLabel().' '.\MyArtJaub\Webtrees\Functions\FunctionsPrint::formatFactDateShort($fact).'&nbsp;'.\MyArtJaub\Webtrees\Functions\FunctionsPrint::formatFactPlaceShort($fact, '%1').'</i>';
 					default:
 						return $this->gedcomrecord->formatFirstMajorFact($facts, $style);
 				}

src/Webtrees/Http/Middleware/AuthTreePreference.php

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
         // Permissions are configured
         if (is_numeric($permission_level)) {
             // Logged in with the correct role?
-            if (Auth::accessLevel($tree, $user) <= (int) $permission_level) {
+            if (Auth::accessLevel($tree, $user) <= (int)$permission_level) {
                     return $handler->handle($request);
             }
 

src/Webtrees/Individual.php

Spacing +22 added lines, -22 removed lines

@@ -21,7 +21,7 @@ 
 class Individual extends GedcomRecord {
 
 	/** @var array|null List of titles the individal holds */	
-	protected $titles=null;
+	protected $titles = null;
 	
 	/** @var string|null Individual's primary surname, without any privacy applied to it */
 	protected $unprotected_prim_surname = null;
@@ -35,9 +35,9 @@ 
 	 * @param null|string $gedcom
 	 * @return null|Individual
 	 */
-	public static function getIntance($xref, Tree $tree, $gedcom = null){
+	public static function getIntance($xref, Tree $tree, $gedcom = null) {
 		$indi = \Fisharebest\Webtrees\Individual::getInstance($xref, $tree, $gedcom);
-		if($indi){
+		if ($indi) {
 			return new Individual($indi);
 		}
 		return null;
@@ -48,18 +48,18 @@ 
 	 * 
 	 * @return array Array of titles
 	 */
-	public function getTitles(){
-		if(is_null($this->titles) && $module = Module::getModuleByName(Constants::MODULE_MAJ_MISC_NAME)){
+	public function getTitles() {
+		if (is_null($this->titles) && $module = Module::getModuleByName(Constants::MODULE_MAJ_MISC_NAME)) {
 			$pattern = '/(.*) (('.$module->getSetting('MAJ_TITLE_PREFIX', '').')(.*))/';
-			$this->titles=array();
+			$this->titles = array();
 			$titlefacts = $this->gedcomrecord->getFacts('TITL');
-			foreach($titlefacts as $titlefact){
+			foreach ($titlefacts as $titlefact) {
 				$ct2 = preg_match_all($pattern, $titlefact->getValue(), $match2);
-				if($ct2>0){
-					$this->titles[$match2[1][0]][]= trim($match2[2][0]);
+				if ($ct2 > 0) {
+					$this->titles[$match2[1][0]][] = trim($match2[2][0]);
 				}
-				else{
-					$this->titles[$titlefact->getValue()][]='';
+				else {
+					$this->titles[$titlefact->getValue()][] = '';
 				}
 			}
 		}
@@ -73,8 +73,8 @@ 
 	 * @return string Primary surname
 	 */
 	public function getUnprotectedPrimarySurname() {
-		if(!$this->unprotected_prim_surname){
-			$tmp=$this->gedcomrecord->getAllNames();
+		if (!$this->unprotected_prim_surname) {
+			$tmp = $this->gedcomrecord->getAllNames();
 			$this->unprotected_prim_surname = $tmp[$this->gedcomrecord->getPrimaryName()]['surname'];
 		}
 		return $this->unprotected_prim_surname;
@@ -86,12 +86,12 @@ 
 	 * @param boolean $perc Should the coefficient of reliability be returned
 	 * @return string|array Estimated birth place if found, null otherwise
 	 */
-	public function getEstimatedBirthPlace($perc=false){
-		if($bplace = $this->gedcomrecord->getBirthPlace()){
-			if($perc){
-				return array ($bplace, 1);
+	public function getEstimatedBirthPlace($perc = false) {
+		if ($bplace = $this->gedcomrecord->getBirthPlace()) {
+			if ($perc) {
+				return array($bplace, 1);
 			}
-			else{
+			else {
 				return $bplace;
 			}
 		}
@@ -104,8 +104,8 @@ 
 	 * @param boolean $perc Should the coefficient of reliability be returned
 	 * @return string|array Estimated birth place if found, null otherwise
 	 */
-	public function getSignificantPlace(){
-	    if($bplace = $this->gedcomrecord->getBirthPlace()){
+	public function getSignificantPlace() {
+	    if ($bplace = $this->gedcomrecord->getBirthPlace()) {
 	        return $bplace;
 	    }
 	
@@ -115,11 +115,11 @@ 
 	        }
 	    }
 	
-	    if($dplace = $this->gedcomrecord->getDeathPlace()){
+	    if ($dplace = $this->gedcomrecord->getDeathPlace()) {
 	        return $dplace;
 	    }
 	
-	    foreach($this->gedcomrecord->getSpouseFamilies() as $fams) {
+	    foreach ($this->gedcomrecord->getSpouseFamilies() as $fams) {
 	        foreach ($fams->getAllEventPlaces('RESI') as $rplace) {
 	            if ($rplace) {
 	                return $rplace;