danog/file
1
0
Fork 0
mirror of https://github.com/danog/file.git synced 2024-11-30 04:19:39 +01:00
Code Issues Projects Releases Wiki Activity

Do not use the last error if it is null

Browse Source
This commit is contained in:
Daniil Gentili 2018-12-24 12:10:57 +01:00
parent 8cfe851cd2
commit 5a69fca406
1 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
lib/BlockingDriver.php
View File

@ -94,9 +94,12 @@ class BlockingDriver implements Driver
} }
if (($size = @\filesize($path)) === false) { if (($size = @\filesize($path)) === false) {
return new Failure(new FilesystemException( $message = 'Could not open the file.';
\error_get_last()["message"] if ($error = \error_get_last()) {
)); $message .= \sprintf(" Errno: %d; %s", $error["type"], $error["message"]);
}
return new Failure(new FilesystemException($message));
} }
\clearstatcache(true, $path); \clearstatcache(true, $path);
@ -328,15 +331,21 @@ class BlockingDriver implements Driver
public function chown(string $path, int $uid, int $gid): Promise public function chown(string $path, int $uid, int $gid): Promise
{ {
if ($uid !== -1 && !@\chown($path, $uid)) { if ($uid !== -1 && !@\chown($path, $uid)) {
return new Failure(new FilesystemException( $message = 'Could not open the file.';
\error_get_last()["message"] if ($error = \error_get_last()) {
)); $message .= \sprintf(" Errno: %d; %s", $error["type"], $error["message"]);
}
return new Failure(new FilesystemException($message));
} }
if ($gid !== -1 && !@\chgrp($path, $gid)) { if ($gid !== -1 && !@\chgrp($path, $gid)) {
return new Failure(new FilesystemException( $message = 'Could not open the file.';
\error_get_last()["message"] if ($error = \error_get_last()) {
)); $message .= \sprintf(" Errno: %d; %s", $error["type"], $error["message"]);
}
return new Failure(new FilesystemException($message));
} }
return new Success; return new Success;
@ -358,8 +367,14 @@ class BlockingDriver implements Driver
public function get(string $path): Promise public function get(string $path): Promise
{ {
$result = @\file_get_contents($path); $result = @\file_get_contents($path);
if ($result === false) {
$message = 'Could not open the file.';
if ($error = \error_get_last()) {
$message .= \sprintf(" Errno: %d; %s", $error["type"], $error["message"]);
}
}
return ($result === false) return ($result === false)
? new Failure(new FilesystemException(\error_get_last()["message"])) ? new Failure(new FilesystemException($message))
: new Success($result); : new Success($result);
} }
@ -369,8 +384,15 @@ class BlockingDriver implements Driver
public function put(string $path, string $contents): Promise public function put(string $path, string $contents): Promise
{ {
$result = @\file_put_contents($path, $contents); $result = @\file_put_contents($path, $contents);
if ($result === false) {
$message = 'Could not open the file.';
if ($error = \error_get_last()) {
$message .= \sprintf(" Errno: %d; %s", $error["type"], $error["message"]);
}
}
return ($result === false) return ($result === false)
? new Failure(new FilesystemException(\error_get_last()["message"])) ? new Failure(new FilesystemException($message))
: new Success($result); : new Success($result);
} }
} }