make deleteWithObjects() work with empty containers

1) use getObjectCount() to check container size, 2) return early if empty container deleted, 3) conditional syntax changed for PSR-2 compliance, and 4) removed "and all its objects" from container exception message since we can assume objects in container were successfully deleted by deleteAllObjects();

Author: joshrencher

lib/OpenCloud/ObjectStore/Resource/Container.php

@@ -180,37 +180,36 @@ public function delete($deleteObjects = false)
     public function deleteWithObjects($secondsToWait = null)
     {
         // If container is empty, just delete it
-        $numObjects = (int) $this->retrieveMetadata()->getProperty('Object-Count');
-        if ($numObjects === 0) $response = $this->delete();
-        
-        // Else attempt to delete all objects first, then delete container
-        else {
-            // If timeout (seconds to wait) is not specified by caller, try to
-            // estimate it based on number of objects in container
-            if (null === $secondsToWait) $secondsToWait = round($numObjects / 2);
-        
-            // Attempt to delete all objects and container
-            $endTime = time() + $secondsToWait;
-            $containerDeleted = false;
-            while ((time() < $endTime) && !$containerDeleted) {
-                $this->deleteAllObjects();
-                try {
-                    $response = $this->delete();
+        $numObjects = $this->getObjectCount();
+        if ($numObjects === 0) {
+            return $this->delete();
+        }
+        // If timeout ($secondsToWait) is not specified by caller,
+        // try to estimate it based on number of objects in container
+        if (null === $secondsToWait) {
+            $secondsToWait = round($numObjects / 2);
+        }    
+        // Attempt to delete all objects and container
+        $endTime = time() + $secondsToWait;
+        $containerDeleted = false;
+        while ((time() < $endTime) && !$containerDeleted) {
+            $this->deleteAllObjects();
+            try {
+                $response = $this->delete();
+                $containerDeleted = true;
+            } catch (ContainerException $e) {
+                // Ignore exception and try again
+            } catch (ClientErrorResponseException $e) {
+                if ($e->getResponse()->getStatusCode() == 404) {
+                    // Container has been deleted
                     $containerDeleted = true;
-                } catch (ContainerException $e) {
-                    // Ignore exception and try again
-                } catch (ClientErrorResponseException $e) {
-                    if ($e->getResponse()->getStatusCode() == 404) {
-                        // Container has been deleted
-                        $containerDeleted = true;
-                    } else {
-                        throw $e;
-                    }
+                } else {
+                    throw $e;
                 }
             }
-            if (!$containerDeleted) {
-                throw new ContainerException('Container and all its objects could not be deleted.');
-            }
+        }
+        if (!$containerDeleted) {
+            throw new ContainerException('Container could not be deleted.');
         }
         return $response;
     }