Merge remote-tracking branch 'origin/8.x' into 8.x

taylorotwell · taylorotwell · commit 213b58db3736 · 2021-03-21T08:55:19.000-05:00
diff --git a/src/Illuminate/Filesystem/LockableFile.php b/src/Illuminate/Filesystem/LockableFile.php
@@ -2,6 +2,7 @@
 
 namespace Illuminate\Filesystem;
 
+use Exception;
 use Illuminate\Contracts\Filesystem\LockTimeoutException;
 
 class LockableFile
@@ -65,6 +66,10 @@ protected function ensureDirectoryExists($path)
     protected function createResource($path, $mode)
     {
         $this->handle = @fopen($path, $mode);
+
+        if (! $this->handle) {
+            throw new Exception('Unable to create lockable file: '.$path.'. Please ensure you have permission to create files in this location.');
+        }
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace Illuminate\Filesystem;`
`4`	`4`
	`5`	`+use Exception;`
`5`	`6`	`use Illuminate\Contracts\Filesystem\LockTimeoutException;`
`6`	`7`
`7`	`8`	`class LockableFile`
`@@ -65,6 +66,10 @@ protected function ensureDirectoryExists($path)`
`65`	`66`	`protected function createResource($path, $mode)`
`66`	`67`	`{`
`67`	`68`	`$this->handle = @fopen($path, $mode);`
	`69`	`+`
	`70`	`+ if (! $this->handle) {`
	`71`	`+ throw new Exception('Unable to create lockable file: '.$path.'. Please ensure you have permission to create files in this location.');`
	`72`	`+ }`
`68`	`73`	`}`
`69`	`74`
`70`	`75`	`/**`