tweak(Admin/Frontend/Cli): php 7.4 compatibility for deleteUserlessCo…

…ntainers
tine-groupware · Mar 18, 2024 · de4844c · de4844c
1 parent 2f253c9
commit de4844c
Showing 1 changed file with 17 additions and 14 deletions.
diff --git a/tine20/Admin/Frontend/Cli.php b/tine20/Admin/Frontend/Cli.php
@@ -235,9 +235,10 @@ public function deleteAccount(Zend_Console_Getopt $_opts): int
     /**
      * Delete containers with no users
      *
-     * @return void
+     * @param Zend_Console_Getopt $opts
+     * @return int
      */
-    public function deleteUserlessContainers(Zend_Console_Getopt $opts)
+    public function deleteUserlessContainers(Zend_Console_Getopt $opts): int
     {
         if ($opts->d) {
             echo "--DRY RUN--\n";
@@ -249,20 +250,22 @@ public function deleteUserlessContainers(Zend_Console_Getopt $opts)
         $containers = $jsonFrontend->searchContainers([], null);
 
         foreach ($containers['results'] as $container) {
-          // Check if the container has no users
-          if ($container['type'] == 'personal') {
-            try {
-              $user = Tinebase_User::getInstance()->getFullUserById($container['owner_id']);
-            } catch (Tinebase_Exception_NotFound) {
-              if ($opts->d) {
-                echo "--DRY RUN-- Found " . $container['name'] . PHP_EOL;
-              } else {
-                $jsonFrontend->deleteContainers([$container['id']]);
-                echo 'Deleted container ' . $container['name'] . ' with no users.' . PHP_EOL;
-              }
+            // Check if the container has no users
+            if ($container['type'] == 'personal') {
+                try {
+                    $user = Tinebase_User::getInstance()->getFullUserById($container['owner_id']);
+                } catch (Tinebase_Exception_NotFound $tenf) {
+                    if ($opts->d) {
+                        echo "--DRY RUN-- Found " . $container['name'] . PHP_EOL;
+                    } else {
+                        $jsonFrontend->deleteContainers([$container['id']]);
+                        echo 'Deleted container ' . $container['name'] . ' with no users.' . PHP_EOL;
+                    }
+                }
             }
-          }
         }
+
+        return 0;
     }
 
     /**