Merge pull request #21 from josemalonsom/fix-cleanup-does-not-count-current-backup

QuantityCleaner now includes current backup to amount of backups

Author: sebastianfeldmann

src/Backup/Cleaner/Quantity.php

@@ -62,13 +62,11 @@ public function cleanup(Target $target, Collector $collector, Result $result)
     {
         $files = $collector->getBackupFiles();
 
-        // backups exceed capacity?
-        if (count($files) > $this->amount) {
+        if ($this->isCapacityExceeded($files)) {
             // oldest backups first
             ksort($files);
 
-            // add one for current backup
-            while (count($files) + 1 > $this->amount) {
+            while ($this->isCapacityExceeded($files)) {
                 $file = array_shift($files);
                 $result->debug(sprintf('delete %s', $file->getPathname()));
                 if (!$file->isWritable()) {
@@ -79,4 +77,18 @@ public function cleanup(Target $target, Collector $collector, Result $result)
             }
         }
     }
+
+    /**
+     * Returns true when the capacity is exceeded.
+     *
+     * @return boolean
+     */
+    private function isCapacityExceeded(array $files)
+    {
+        $totalFiles                  = count($files);
+        $totalFilesPlusCurrentBackup = $totalFiles + 1;
+
+        return $totalFiles > 0
+            && $totalFilesPlusCurrentBackup > $this->amount;
+    }
 }

tests/phpbu/Backup/Cleaner/QuantityTest.php

@@ -139,4 +139,31 @@ public function testCleanupDeleteNoFile()
 
         $cleaner->cleanup($targetStub, $collectorStub, $resultStub);
     }
+
+    /**
+     * Tests Capacity::cleanup
+     */
+    public function testCleanupDeleteFilesCountingCurrentBackup()
+    {
+        $fileList      = $this->getFileMockList(
+            array(
+                array('size' => 100, 'shouldBeDeleted' => true),
+            )
+        );
+        $resultStub    = $this->getMockBuilder('\\phpbu\\App\\Result')
+                              ->getMock();
+        $collectorStub = $this->getMockBuilder('\\phpbu\\App\\Backup\\Collector')
+                              ->disableOriginalConstructor()
+                              ->getMock();
+        $targetStub    = $this->getMockBuilder('\\phpbu\\App\\Backup\\Target')
+                              ->disableOriginalConstructor()
+                              ->getMock();
+
+        $collectorStub->method('getBackupFiles')->willReturn($fileList);
+
+        $cleaner = new Quantity();
+        $cleaner->setup(array('amount' => '1'));
+
+        $cleaner->cleanup($targetStub, $collectorStub, $resultStub);
+    }
 }