mdaniels5757 / waca

includes/DataObjects/EmailTemplate.php

Braces +4 added lines, -8 removed lines

@@ -88,11 +88,9 @@ 
         if ($defaultAction === false) {
             $statement = $database->prepare(
                 "SELECT * FROM `emailtemplate` WHERE defaultaction NOT IN ('created', 'not created') AND active = 1 AND domain = :domain;");
-        }
-        elseif ($defaultAction === null) {
+        } elseif ($defaultAction === null) {
             $statement = $database->prepare("SELECT * FROM `emailtemplate` WHERE active = 1 AND domain = :domain;");
-        }
-        else {
+        } else {
             $statement = $database->prepare("SELECT * FROM `emailtemplate` WHERE defaultaction = :forcreated AND active = 1 AND domain = :domain;");
             $statement->bindValue(":forcreated", $defaultAction);
         }
@@ -195,12 +193,10 @@ 
 
             if ($statement->execute()) {
                 $this->id = (int)$this->dbObject->lastInsertId();
-            }
-            else {
+            } else {
                 throw new Exception($statement->errorInfo());
             }
-        }
-        else {
+        } else {
             // update
             $statement = $this->dbObject->prepare(<<<SQL
 UPDATE `emailtemplate`

includes/DataObjects/RequestData.php

Braces +2 added lines, -4 removed lines

@@ -79,12 +79,10 @@
 
             if ($statement->execute()) {
                 $this->id = (int)$this->dbObject->lastInsertId();
-            }
-            else {
+            } else {
                 throw new Exception($statement->errorInfo());
             }
-        }
-        else {
+        } else {
             // update
             throw new ApplicationLogicException('Updates to RequestData are not supported.');
         }

includes/DataObjects/User.php

Braces +6 added lines, -12 removed lines

@@ -56,12 +56,10 @@ 
 
                 if ($user === false) {
                     self::$currentUser = new CommunityUser();
-                }
-                else {
+                } else {
                     self::$currentUser = $user;
                 }
-            }
-            else {
+            } else {
                 $anonymousCoward = new CommunityUser();
 
                 self::$currentUser = $anonymousCoward;
@@ -189,12 +187,10 @@ 
 
             if ($statement->execute()) {
                 $this->id = (int)$this->dbObject->lastInsertId();
-            }
-            else {
+            } else {
                 throw new Exception($statement->errorInfo());
             }
-        }
-        else {
+        } else {
             // update
             $statement = $this->dbObject->prepare(<<<SQL
 				UPDATE `user` SET 
@@ -393,12 +389,10 @@ 
         if ($this->forceidentified === 0 || $this->forceidentified === "0") {
             // User forced to unidentified in the database.
             return false;
-        }
-        elseif ($this->forceidentified === 1 || $this->forceidentified === "1") {
+        } elseif ($this->forceidentified === 1 || $this->forceidentified === "1") {
             // User forced to identified in the database.
             return true;
-        }
-        else {
+        } else {
             // User not forced to any particular identified status; consult IdentificationVerifier
             return $iv->isUserIdentified($this->getOnWikiName());
         }

includes/DataObjects/Comment.php

Braces +2 added lines, -4 removed lines

@@ -108,12 +108,10 @@
 
             if ($statement->execute()) {
                 $this->id = (int)$this->dbObject->lastInsertId();
-            }
-            else {
+            } else {
                 throw new Exception($statement->errorInfo());
             }
-        }
-        else {
+        } else {
             // update
             $statement = $this->dbObject->prepare(<<<SQL
 UPDATE comment

includes/DataObjects/UserPreference.php

Braces +6 added lines, -5 removed lines

@@ -28,7 +28,8 @@ 
     /** @var ?mixed */
     private $value;
 
-    public static function getLocalPreference(PdoDatabase $database, int $user, string $preference, int $domain) {
+    public static function getLocalPreference(PdoDatabase $database, int $user, string $preference, int $domain)
+    {
         $statement = $database->prepare('SELECT * FROM userpreference WHERE preference = :preference AND USER = :user AND domain = :domain');
         $statement->execute([
             ':user' => $user,
@@ -45,7 +46,8 @@ 
         return $resultObject;
     }
 
-    public static function getGlobalPreference(PdoDatabase $database, int $user, string $preference) {
+    public static function getGlobalPreference(PdoDatabase $database, int $user, string $preference)
+    {
         $statement = $database->prepare('SELECT * FROM userpreference WHERE preference = :preference AND USER = :user AND domain IS NULL');
         $statement->execute([
             ':user' => $user,
@@ -84,11 +86,10 @@ 
 
             if ($statement->execute()) {
                 $this->id = (int)$this->dbObject->lastInsertId();
-            }
-            else {
+            } else {
                 throw new Exception($statement->errorInfo());
             }
-        }else{
+        } else {
             // update
             $statement = $this->dbObject->prepare(<<<SQL
                 UPDATE `userpreference` SET 

includes/DataObjects/JobQueue.php

Braces +2 added lines, -4 removed lines

@@ -101,12 +101,10 @@
 
             if ($statement->execute()) {
                 $this->id = (int)$this->dbObject->lastInsertId();
-            }
-            else {
+            } else {
                 throw new Exception($statement->errorInfo());
             }
-        }
-        else {
+        } else {
             // update
             $statement = $this->dbObject->prepare(<<<SQL
                 UPDATE jobqueue SET 

includes/DataObjects/RequestQueue.php

Braces +2 added lines, -4 removed lines

@@ -258,12 +258,10 @@
 
             if ($statement->execute()) {
                 $this->id = (int)$this->dbObject->lastInsertId();
-            }
-            else {
+            } else {
                 throw new Exception($statement->errorInfo());
             }
-        }
-        else {
+        } else {
             $statement = $this->dbObject->prepare(<<<SQL
                 UPDATE requestqueue SET
                     enabled = :enabled,

includes/DataObjects/Domain.php

Braces +6 added lines, -9 removed lines

@@ -52,12 +52,10 @@ 
 
                 if ($domain === false) {
                     self::$currentDomain = self::getById(1, $database); // FIXME: #594 User::getCurrent($database)->getDefaultDomain();
-                }
-                else {
+                } else {
                     self::$currentDomain = $domain;
                 }
-            }
-            else {
+            } else {
                 self::$currentDomain = self::getById(1, $database); // FIXME: #594 User::getCurrent($database)->getDefaultDomain();
             }
         }
@@ -86,7 +84,8 @@ 
         return $result;
     }
 
-    public static function getAll(PdoDatabase $database) {
+    public static function getAll(PdoDatabase $database)
+    {
         $statement = $database->prepare("SELECT * FROM domain;");
         $statement->execute();
 
@@ -155,12 +154,10 @@ 
 
             if ($statement->execute()) {
                 $this->id = (int)$this->dbObject->lastInsertId();
-            }
-            else {
+            } else {
                 throw new Exception($statement->errorInfo());
             }
-        }
-        else {
+        } else {
             $statement = $this->dbObject->prepare(<<<SQL
                 UPDATE domain SET
                     longname = :longname,

includes/Tasks/PageBase.php

Braces +1 added lines, -2 removed lines

@@ -264,8 +264,7 @@
         // Are we changing script?
         if ($script === null || substr($currentScriptName, -1 * count($script)) === $script) {
             $targetScriptName = $currentScriptName;
-        }
-        else {
+        } else {
             $targetScriptName = $this->getSiteConfiguration()->getBaseUrl() . '/' . $script;
         }