[5.7] Fix filesystem locking hangs in PackageManifest::build() (#25898)

src/Illuminate/Filesystem/Filesystem.php

@@ -122,6 +122,32 @@ public function put($path, $contents, $lock = false)
         return file_put_contents($path, $contents, $lock ? LOCK_EX : 0);
     }
 
+    /**
+     * Write the contents of a file, replacing it atomically if it already exists.
+     *
+     * This will replace the target file permissions. It also resolves symlinks to replace the symlink's target file.
+     *
+     * @param  string  $path
+     * @param  string  $content
+     * @return void
+     */
+    public function replace($path, $content)
+    {
+        // If the path already exists and is a symlink, make sure we get the real path...
+        clearstatcache(true, $path);
+
+        $path = realpath($path) ?: $path;
+
+        $tempPath = tempnam(dirname($path), basename($path));
+
+        // Fix permissions of tempPath because `tempnam()` creates it with permissions set to 0600.
+        chmod($tempPath, 0777 - umask());
+
+        file_put_contents($tempPath, $content);
+
+        rename($tempPath, $path);
+    }
+
     /**
      * Prepend to a file.
      *

src/Illuminate/Foundation/PackageManifest.php

@@ -97,7 +97,7 @@ protected function getManifest()
             $this->build();
         }
 
-        $this->files->get($this->manifestPath, true);
+        $this->files->get($this->manifestPath);
 
         return $this->manifest = file_exists($this->manifestPath) ?
             $this->files->getRequire($this->manifestPath) : [];
@@ -168,9 +168,8 @@ protected function write(array $manifest)
             throw new Exception('The '.dirname($this->manifestPath).' directory must be present and writable.');
         }
 
-        $this->files->put(
-            $this->manifestPath, '<?php return '.var_export($manifest, true).';',
-            true
+        $this->files->replace(
+            $this->manifestPath, '<?php return '.var_export($manifest, true).';'
         );
     }
 }

tests/Filesystem/FilesystemTest.php

@@ -42,6 +42,45 @@ public function testPutStoresFiles()
         $this->assertStringEqualsFile($this->tempDir.'/file.txt', 'Hello World');
     }
 
+    public function testReplaceStoresFiles()
+    {
+        $tempFile = "{$this->tempDir}/file.txt";
+        $symlinkDir = "{$this->tempDir}/symlink_dir";
+        $symlink = "{$symlinkDir}/symlink.txt";
+
+        mkdir($symlinkDir);
+        symlink($tempFile, $symlink);
+
+        // Prevent changes to symlink_dir
+        chmod($symlinkDir, 0555);
+
+        // Test with a weird non-standard umask.
+        $umask = 0131;
+        $originalUmask = umask($umask);
+
+        $filesystem = new Filesystem;
+
+        // Test replacing non-existent file.
+        $filesystem->replace($tempFile, 'Hello World');
+        $this->assertStringEqualsFile($tempFile, 'Hello World');
+        $this->assertEquals($umask, 0777 - $this->getFilePermissions($tempFile));
+
+        // Test replacing existing file.
+        $filesystem->replace($tempFile, 'Something Else');
+        $this->assertStringEqualsFile($tempFile, 'Something Else');
+        $this->assertEquals($umask, 0777 - $this->getFilePermissions($tempFile));
+
+        // Test replacing symlinked file.
+        $filesystem->replace($symlink, 'Yet Something Else Again');
+        $this->assertStringEqualsFile($tempFile, 'Yet Something Else Again');
+        $this->assertEquals($umask, 0777 - $this->getFilePermissions($tempFile));
+
+        umask($originalUmask);
+
+        // Reset changes to symlink_dir
+        chmod($symlinkDir, 0777 - $originalUmask);
+    }
+
     public function testSetChmod()
     {
         file_put_contents($this->tempDir.'/file.txt', 'Hello World');
@@ -496,4 +535,16 @@ public function testHash()
         $filesystem = new Filesystem;
         $this->assertEquals('acbd18db4cc2f85cedef654fccc4a4d8', $filesystem->hash($this->tempDir.'/foo.txt'));
     }
+
+    /**
+     * @param string $file
+     * @return int
+     */
+    private function getFilePermissions($file)
+    {
+        $filePerms = fileperms($file);
+        $filePerms = substr(sprintf('%o', $filePerms), -3);
+
+        return (int) base_convert($filePerms, 8, 10);
+    }
 }