[#431] Fix calling sizeof on non-countable.

This warning has become an error in PHP 8. We also remove some unused code.
Igalia · Mar 8, 2023 · 4d307f2 · 4d307f2
1 parent 426b6e6
commit 4d307f2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 14 deletions.
diff --git a/model/dao/BelongsDAO/PostgreSQLBelongsDAO.php b/model/dao/BelongsDAO/PostgreSQLBelongsDAO.php
@@ -197,23 +197,22 @@ public function getByUserGroupName($userGroupName) {
      * @throws {@link SQLQueryErrorException}
      */
     public function create($userId, $userGroupId) {
-    $affectedRows = 0;
+        $affectedRows = 0;
 
-    // Check for a belongs entry ID.
+        // Check for a belongs entry ID.
         $currBelongs = $this->getByIds($userId, $userGroupId);
 
         // If it doesn't exist, then create.
-        if(sizeof($currBelongs) == 0) {
-        $sql = "INSERT INTO belongs (usrid, user_groupid) VALUES (" . $userId . ", " . $userGroupId . ")";
+        if(!isset($currBelongs) || sizeof($currBelongs) == 0) {
+            $sql = "INSERT INTO belongs (usrid, user_groupid) VALUES (" . $userId . ", " . $userGroupId . ")";
 
             $res = pg_query($this->connect, $sql);
-        if ($res == NULL) throw new SQLQueryErrorException(pg_last_error());
-
-        $affectedRows = pg_affected_rows($res);
-    }
+            if ($res == NULL) throw new SQLQueryErrorException(pg_last_error());
 
-    return $affectedRows;
+            $affectedRows = pg_affected_rows($res);
+        }
 
+        return $affectedRows;
     }
 
     /** Belongs relationship entry deleter by User id and User Group id for PostgreSQL.
@@ -234,7 +233,7 @@ public function delete($userId, $userGroupId) {
         $currBelongs = $this->getByIds($userId, $userGroupId);
 
         // If it exists, then delete.
-        if(sizeof($currBelongs) > 0) {
+        if(isset($currBelongs) && sizeof($currBelongs) > 0) {
             $sql = "DELETE FROM belongs WHERE usrid=" . $userId . " AND user_groupid=" . $userGroupId;
 
             $res = pg_query($this->connect, $sql);

diff --git a/model/dao/UserDAO/PostgreSQLUserDAO.php b/model/dao/UserDAO/PostgreSQLUserDAO.php
@@ -413,7 +413,7 @@ public function update(UserVO $userVO) {
         }
 
         // If the query returned a row then update
-        if(sizeof($currUserVO) > 0) {
+        if(isset($currUserVO)) {
 
             $sql = "UPDATE usr SET login=" . DBPostgres::checkStringNull($userVO->getLogin());
 
@@ -486,7 +486,7 @@ public function delete(UserVO $userVO) {
         }
 
         // Otherwise delete a user.
-        if(sizeof($currUserVO) > 0) {
+        if(isset($currUserVO)) {
             $sql = "DELETE FROM usr WHERE id=".$userVO->getId();
 
             $res = pg_query($this->connect, $sql);
@@ -497,8 +497,6 @@ public function delete(UserVO $userVO) {
         }
 
         return $affectedRows;
-        if (!is_numeric($userId))
-        throw new SQLIncorrectTypeException($userId);
     }
 }