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

Forward global functions to Filesystem

Browse Source
This commit is contained in:
Niklas Keller 2020-10-21 21:04:38 +02:00
parent 701e1c974e
commit 3983198322
8 changed files with 18 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Driver.php
View File

@ -104,7 +104,7 @@ interface Driver
*
* @return Promise<void>
*/
public function createDirectories(string $path, int $mode = 0777): Promise;
public function createDirectoryRecursively(string $path, int $mode = 0777): Promise;
/**
* Delete a directory.

2
src/Driver/BlockingDriver.php
View File

@ -193,7 +193,7 @@ final class BlockingDriver implements Driver
}
}
public function createDirectories(string $path, int $mode = 0777): Promise
public function createDirectoryRecursively(string $path, int $mode = 0777): Promise
{
try {
\set_error_handler(static function ($type, $message) use ($path) {

2
src/Driver/EioDriver.php
View File

@ -144,7 +144,7 @@ final class EioDriver implements Driver
return $deferred->promise();
}
public function createDirectories(string $path, int $mode = 0777): Promise
public function createDirectoryRecursively(string $path, int $mode = 0777): Promise
{
$deferred = new Deferred;
$this->poll->listen($deferred->promise());

2
src/Driver/ParallelDriver.php
View File

@ -90,7 +90,7 @@ final class ParallelDriver implements Driver
return new Coroutine($this->runFileTask(new Internal\FileTask("createDirectory", [$path, $mode])));
}
public function createDirectories(string $path, int $mode = 0777): Promise
public function createDirectoryRecursively(string $path, int $mode = 0777): Promise
{
return new Coroutine($this->runFileTask(new Internal\FileTask("createDirectories", [$path, $mode])));
}

2
src/Driver/UvDriver.php
View File

@ -209,7 +209,7 @@ final class UvDriver implements Driver
return $deferred->promise();
}
public function createDirectories(string $path, int $mode = 0777): Promise
public function createDirectoryRecursively(string $path, int $mode = 0777): Promise
{
$deferred = new Deferred;
$this->poll->listen($deferred->promise());

4
src/Filesystem.php
View File

@ -313,9 +313,9 @@ final class Filesystem
*
* @return Promise<void>
*/
public function createDirectories(string $path, int $mode = 0777): Promise
public function createDirectoryRecursively(string $path, int $mode = 0777): Promise
{
return $this->driver->createDirectories($path, $mode);
return $this->driver->createDirectoryRecursively($path, $mode);
}
/**

77
src/functions.php
View File

@ -118,11 +118,7 @@ function getLinkStatus(string $path): Promise
*/
function exists(string $path): Promise
{
return call(static function () use ($path) {
$result = yield getStatus($path);
return $result !== null;
});
return filesystem()->exists($path);
}
/**
@ -138,18 +134,7 @@ function exists(string $path): Promise
*/
function getSize(string $path): Promise
{
return call(static function () use ($path) {
$result = yield getStatus($path);
if ($result === null) {
throw new FilesystemException("Failed to read file size for '{$path}'");
}
if ($result['mode'] & 0100000) {
return $result["size"];
}
throw new FilesystemException("Failed to read file size for '{$path}'; specified path is not a regular file");
});
return filesystem()->getSize($path);
}
/**
@ -161,14 +146,7 @@ function getSize(string $path): Promise
*/
function isDirectory(string $path): Promise
{
return call(static function () use ($path) {
$result = yield getStatus($path);
if ($result === null) {
return false;
}
return (bool) ($result['mode'] & 0040000);
});
return filesystem()->isDirectory($path);
}
/**
@ -180,14 +158,7 @@ function isDirectory(string $path): Promise
*/
function isFile(string $path): Promise
{
return call(static function () use ($path) {
$result = yield getStatus($path);
if ($result === null) {
return false;
}
return (bool) ($result['mode'] & 0100000);
});
return filesystem()->isFile($path);
}
/**
@ -202,14 +173,7 @@ function isFile(string $path): Promise
*/
function isSymlink(string $path): Promise
{
return call(function () use ($path) {
$result = yield $this->getLinkStatus($path);
if ($result === null) {
return false;
}
return ($result['mode'] & 0120000) === 0120000;
});
return filesystem()->isSymlink($path);
}
/**
@ -222,14 +186,7 @@ function isSymlink(string $path): Promise
*/
function getModificationTime(string $path): Promise
{
return call(static function () use ($path) {
$result = yield getStatus($path);
if ($result === null) {
throw new FilesystemException("Failed to read file modification time for '{$path}'");
}
return $result["mtime"];
});
return filesystem()->getModificationTime($path);
}
/**
@ -242,14 +199,7 @@ function getModificationTime(string $path): Promise
*/
function getAccessTime(string $path): Promise
{
return call(static function () use ($path) {
$result = yield getStatus($path);
if ($result === null) {
throw new FilesystemException("Failed to read file access time for '{$path}'");
}
return $result["atime"];
});
return filesystem()->getAccessTime($path);
}
/**
@ -262,14 +212,7 @@ function getAccessTime(string $path): Promise
*/
function getCreationTime(string $path): Promise
{
return call(static function () use ($path) {
$result = yield getStatus($path);
if ($result === null) {
throw new FilesystemException("Failed to read file creation time for '{$path}'");
}
return $result["ctime"];
});
return filesystem()->getCreationTime($path);
}
/**
@ -363,9 +306,9 @@ function createDirectory(string $path, int $mode = 0777): Promise
*
* @return Promise<void>
*/
function createDirectories(string $path, int $mode = 0777): Promise
function createDirectoryRecursively(string $path, int $mode = 0777): Promise
{
return filesystem()->createDirectories($path, $mode);
return filesystem()->createDirectoryRecursively($path, $mode);
}
/**

2
test/DriverTest.php
View File

@ -344,7 +344,7 @@ abstract class DriverTest extends FilesystemTest
// test for 0, because previous array_filter made that not work
$dir = "{$fixtureDir}/newdir/with/recursive/creation/0/1/2";
$this->assertNull(yield $this->driver->createDirectories($dir, 0764));
$this->assertNull(yield $this->driver->createDirectoryRecursively($dir, 0764));
$stat = yield $this->driver->getStatus($dir);
$this->assertSame('0744', $this->getPermissionsFromStatus($stat));
}