mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-10-16 03:51:37 +00:00
Code Issues Projects Releases Wiki Activity

Start using webmozart/pathutil for joining paths (#4287)

Browse Source
This commit is contained in:
Dylan T
2021-06-29 19:40:43 +01:00
committed by GitHub
parent aee7b03c1d
commit 32d7b1e6af
31 changed files with 252 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/utils/Filesystem.php
View File

@@ -23,6 +23,7 @@ declare(strict_types=1);
namespace pocketmine\utils;
use Webmozart\PathUtil\Path;
use function copy;
use function dirname;
use function fclose;
@@ -79,10 +80,11 @@ final class Filesystem{
if($objects === false) throw new AssumptionFailedError("scandir() shouldn't return false when is_dir() returns true");
foreach($objects as $object){
if($object !== "." and $object !== ".."){
if(is_dir($dir . "/" . $object)){
self::recursiveUnlink($dir . "/" . $object);
$fullObject = Path::join($dir, $object);
if(is_dir($fullObject)){
self::recursiveUnlink($fullObject);
}else{
unlink($dir . "/" . $object);
unlink($fullObject);
}
}
}
@@ -128,7 +130,7 @@ final class Filesystem{
if($object === "." || $object === ".."){
continue;
}
self::recursiveCopyInternal($origin . "/" . $object, $destination . "/" . $object);
self::recursiveCopyInternal(Path::join($origin, $object), Path::join($destination, $object));
}
}else{
$dirName = dirname($destination);