Merge pull request #11 from keboola/odin-destructor

remove destructor
keboola · Feb 18, 2019 · 7a1703e · 7a1703e
2 parents fb9043c + 36fd92a
commit 7a1703e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -11,4 +11,9 @@ $temp = new Temp('prefix');
 // Creates a file with unique name suffixed by 'suffix'
 $tempFile = $temp->createTmpFile('suffix');
 echo 'Files are stored in: ' . $temp->getTmpFolder();
+$temp->remove();
 ```
+
+## Migration from version 1.0
+The temp folder is no longer deleted automatically in the destructor. It needs to 
+be removed explicitly by calling the `remove()` method.
diff --git a/src/Keboola/Temp/Temp.php b/src/Keboola/Temp/Temp.php
@@ -123,19 +123,13 @@ public function setId($id)
     /**
      * Delete all files created by syrup component run
      */
-    public function __destruct()
+    public function remove()
     {
-        try {
-            foreach ($this->files as $file) {
-                if (file_exists($file['file']) && is_file($file['file'])) {
-                    $this->filesystem->remove($file['file']->getPathname());
-                }
+        foreach ($this->files as $file) {
+            if (file_exists($file['file']) && is_file($file['file'])) {
+                $this->filesystem->remove($file['file']->getPathname());
             }
-            $this->filesystem->remove($this->getTmpPath());
-        } catch (\Exception $e) {
-            // Graceful destructor, does not throw any errors.
-            // Fixes issues when deleting files on a server that is just shutting down.
-            // https://github.com/keboola/docker-bundle/issues/215
         }
+        $this->filesystem->remove($this->getTmpPath());
     }
 }
diff --git a/tests/Keboola/Temp/TempTest.php b/tests/Keboola/Temp/TempTest.php
@@ -32,7 +32,7 @@ public function testCreateFile()
     public function testCreateFileNested()
     {
         $temp = new Temp();
-        $file = $temp->createFile('dir/file');
+        $temp->createFile('dir/file');
 
         self::assertFileExists($temp->getTmpFolder() . '/dir/file');
     }
@@ -54,22 +54,22 @@ public function testSetTmpFolder()
         $expectedTmpDir = sys_get_temp_dir() . "/test/aabb";
         $this->assertEquals($expectedTmpDir, $temp->getTmpFolder());
 
-        $file = $temp->createFile('file');
+        $temp->createFile('file');
         self::assertFileExists(sys_get_temp_dir() . "/test/aabb/file");
     }
 
     public function testCleanup()
     {
         $temp = new Temp();
-        $file = $temp->createFile('file');
-        $deeperFile = $temp->createFile('dir/file2');
+        $temp->createFile('file');
+        $temp->createFile('dir/file2');
 
         $dir = $temp->getTmpFolder();
 
         self::assertFileExists($dir . '/file');
         self::assertFileExists($dir . '/dir/file2');
 
-        unset($temp);
+        $temp->remove();
         self::assertFileNotExists($dir);
     }
 
@@ -83,7 +83,7 @@ public function testCleanupForeignFile()
         touch($dir . '/file');
         self::assertFileExists($dir . '/file');
 
-        unset($temp);
+        $temp->remove();
         self::assertFileNotExists($dir);
     }
 }