fisharebest / webtrees

app/Individual.php

Spacing +8 added lines, -8 removed lines

@@ -45,11 +45,11 @@ 
     protected const string ROUTE_NAME = IndividualPage::class;
 
     /** Used in some lists to keep track of this individual’s generation in that list */
-    public int|null $generation = null;
+    public int | null $generation = null;
 
-    private Date|null $estimated_birth_date = null;
+    private Date | null $estimated_birth_date = null;
 
-    private Date|null $estimated_death_date = null;
+    private Date | null $estimated_death_date = null;
 
     /**
      * A closure which will compare individuals by birth date.
@@ -78,7 +78,7 @@ 
      *
      * @return bool
      */
-    public function canShowName(int|null $access_level = null): bool
+    public function canShowName(int | null $access_level = null): bool
     {
         $access_level ??= Auth::accessLevel($this->tree);
 
@@ -312,7 +312,7 @@ 
     /**
      * Find the highlighted media object for an individual
      */
-    public function findHighlightedMediaFile(): MediaFile|null
+    public function findHighlightedMediaFile(): MediaFile | null
     {
         $fact = $this->facts(['OBJE'])
             ->first(static function (Fact $fact): bool {
@@ -663,7 +663,7 @@ 
      *
      * @return Collection<int,Family>
      */
-    public function spouseFamilies(int|null $access_level = null): Collection
+    public function spouseFamilies(int | null $access_level = null): Collection
     {
         $access_level ??= Auth::accessLevel($this->tree);
 
@@ -690,7 +690,7 @@ 
      *
      * @return Individual|null
      */
-    public function getCurrentSpouse(): Individual|null
+    public function getCurrentSpouse(): Individual | null
     {
         $family = $this->spouseFamilies()->last();
 
@@ -729,7 +729,7 @@ 
      *
      * @return Collection<int,Family>
      */
-    public function childFamilies(int|null $access_level = null): Collection
+    public function childFamilies(int | null $access_level = null): Collection
     {
         $access_level ??= Auth::accessLevel($this->tree);
 

app/User.php

Indentation +7 added lines, -7 removed lines

@@ -123,8 +123,8 @@ 
         $qrinfo = array();
         $google2fa = new Google2FA();
         $qrinfo['secret'] = $google2fa->generateSecretKey();
-	$servername = $_SERVER['SERVER_NAME'];
-	settype($servername, "string");
+    $servername = $_SERVER['SERVER_NAME'];
+    settype($servername, "string");
         $data = 'otpauth://totp/' . $this->user_id . '?secret=' . $qrinfo['secret'] . '&issuer=' . $servername;
         $qrcode = new QRCode();
         $qrinfo['qrcode'] = $qrcode->render($data);
@@ -291,12 +291,12 @@ 
     public function check2facode(string $code2fa): bool
     {
         $secret = DB::table('user')
-             ->where('user_id', '=', $this->id())
-             ->value('secret');
-	settype($secret, "string");
+                ->where('user_id', '=', $this->id())
+                ->value('secret');
+    settype($secret, "string");
         $google2fa = new Google2FA();
-	$googleverifystatus = $google2fa->verifyKey($secret, $code2fa);
-	settype($googleverifystatus, "bool");
+    $googleverifystatus = $google2fa->verifyKey($secret, $code2fa);
+    settype($googleverifystatus, "bool");
         if ($googleverifystatus) {
             return true;
         }