Merge pull request #238 from barryvdh/patch-3

Always delete tmp file
thephpleague · Apr 3, 2019 · 5f884d7 · 5f884d7
2 parents 37fe775 + 5385fdc
commit 5f884d7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,7 +7,6 @@ env:
   - COMPOSER_OPTS="--prefer-lowest"
 
 php:
-  - 5.4
   - 5.5
   - 5.6
   - 7.0

diff --git a/composer.json b/composer.json
@@ -23,7 +23,7 @@
     "require": {
         "intervention/image": "^2.4",
         "league/flysystem": "^1.0",
-        "php": "^5.4 | ^7.0",
+        "php": "^5.5 | ^7.0",
         "psr/http-message": "^1.0"
     },
     "require-dev": {

diff --git a/src/Server.php b/src/Server.php
@@ -537,10 +537,10 @@ public function makeImage($path, array $params)
             // This edge case occurs when the target already exists
             // because it's currently be written to disk in another
             // request. It's best to just fail silently.
+        } finally {
+            unlink($tmp);
         }
 
-        unlink($tmp);
-
         return $cachedPath;
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,6 @@ env: @@
       - COMPOSER_OPTS="--prefer-lowest"
     php:
-      - 5.4
       - 5.5
       - 5.6
       - 7.0
@@ Expand Down @@