fix: add fallbacks for realpath() so VFS is supported

kenjis · kenjis · commit a2309e6c8b15 · 2021-10-18T20:56:48.000+09:00
diff --git a/system/Publisher/Publisher.php b/system/Publisher/Publisher.php
@@ -229,7 +229,8 @@ final public function getScratch(): string
         if ($this->scratch === null) {
             $this->scratch = rtrim(sys_get_temp_dir(), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . bin2hex(random_bytes(6)) . DIRECTORY_SEPARATOR;
             mkdir($this->scratch, 0700);
-            $this->scratch = realpath($this->scratch) . DIRECTORY_SEPARATOR;
+            $this->scratch = realpath($this->scratch) ? realpath($this->scratch) . DIRECTORY_SEPARATOR
+                : $this->scratch . DIRECTORY_SEPARATOR;
         }
 
         return $this->scratch;
diff --git a/tests/system/Publisher/PublisherSupportTest.php b/tests/system/Publisher/PublisherSupportTest.php
@@ -144,7 +144,7 @@ public function testWipe()
     {
         $directory = rtrim(sys_get_temp_dir(), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . bin2hex(random_bytes(6));
         mkdir($directory, 0700);
-        $directory = realpath($directory);
+        $directory = realpath($directory) ?: $directory;
         $this->assertDirectoryExists($directory);
         config('Publisher')->restrictions[$directory] = ''; // Allow the directory
 

Original file line number	Diff line number	Diff line change
`@@ -229,7 +229,8 @@ final public function getScratch(): string`
`229`	`229`	`if ($this->scratch === null) {`
`230`	`230`	`$this->scratch = rtrim(sys_get_temp_dir(), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . bin2hex(random_bytes(6)) . DIRECTORY_SEPARATOR;`
`231`	`231`	`mkdir($this->scratch, 0700);`
`232`		`- $this->scratch = realpath($this->scratch) . DIRECTORY_SEPARATOR;`
	`232`	`+ $this->scratch = realpath($this->scratch) ? realpath($this->scratch) . DIRECTORY_SEPARATOR`
	`233`	`+ : $this->scratch . DIRECTORY_SEPARATOR;`
`233`	`234`	`}`
`234`	`235`
`235`	`236`	`return $this->scratch;`
Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ public function testWipe()`
`144`	`144`	`{`
`145`	`145`	`$directory = rtrim(sys_get_temp_dir(), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . bin2hex(random_bytes(6));`
`146`	`146`	`mkdir($directory, 0700);`
`147`		`- $directory = realpath($directory);`
	`147`	`+ $directory = realpath($directory) ?: $directory;`
`148`	`148`	`$this->assertDirectoryExists($directory);`
`149`	`149`	`config('Publisher')->restrictions[$directory] = ''; // Allow the directory`
`150`	`150`