From 809bf00aa93a1c492928e0c8c96538837c44db24 Mon Sep 17 00:00:00 2001
From: Hugo Sales <hugo@hsal.es>
Date: Sun, 8 Aug 2021 01:05:45 +0000
Subject: [PATCH] [TemporaryFile][TESTS] Throw on attempt to write to null
 resource and fix tests

---
 src/Util/TemporaryFile.php       | 20 +++++++++++++++++---
 tests/Util/TemporaryFileTest.php |  8 ++++++++
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/src/Util/TemporaryFile.php b/src/Util/TemporaryFile.php
index 795163a46d..d840c75466 100644
--- a/src/Util/TemporaryFile.php
+++ b/src/Util/TemporaryFile.php
@@ -61,8 +61,10 @@ class TemporaryFile extends \SplFileInfo
             }
         }
         if ($this->resource === false) {
+            // @codeCoverageIgnoreStart
             $this->cleanup();
             throw new TemporaryFileException('Could not open file: ' . $filepath);
+            // @codeCoverageIgnoreEnd
         }
 
         parent::__construct($filepath);
@@ -81,14 +83,18 @@ class TemporaryFile extends \SplFileInfo
      *
      * @param string $data The string that is to be written.
      *
-     * @return null|false|int the number of bytes written, false on error, null on null resource/stream
+     * @throws ServerException when the resource is null
+     *
+     * @return false|int the number of bytes written, false on error
      */
-    public function write(string $data): int | false | null
+    public function write(string $data): int | false
     {
         if (!is_null($this->resource)) {
             return fwrite($this->resource, $data);
         } else {
-            return null;
+            // @codeCoverageIgnoreStart
+            throw new TemporaryFileException(_m('Temporary file attempted to write to a null resource'));
+            // @codeCoverageIgnoreEnd
         }
     }
 
@@ -152,10 +158,14 @@ class TemporaryFile extends \SplFileInfo
     {
         if (!is_dir($directory)) {
             if (false === @mkdir($directory, $dirmode, true) && !is_dir($directory)) {
+                // @codeCoverageIgnoreStart
                 throw new TemporaryFileException(sprintf('Unable to create the "%s" directory.', $directory));
+                // @codeCoverageIgnoreEnd
             }
         } elseif (!is_writable($directory)) {
+            // @codeCoverageIgnoreStart
             throw new TemporaryFileException(sprintf('Unable to write in the "%s" directory.', $directory));
+            // @codeCoverageIgnoreEnd
         }
 
         $destpath = rtrim($directory, '/\\') . DIRECTORY_SEPARATOR . $this->getName($filename);
@@ -200,7 +210,9 @@ class TemporaryFile extends \SplFileInfo
         if (!$renamed || !$chmoded) {
             if (!$existed && file_exists($destpath)) {
                 // If the file wasn't there, clean it up in case of a later failure
+                // @codeCoverageIgnoreStart
                 unlink($destpath);
+                // @codeCoverageIgnoreEnd
             }
             throw new TemporaryFileException(sprintf('Could not move the file "%s" to "%s" (%s).', $this->getPathname(), $destpath, strip_tags($error)));
         }
@@ -220,9 +232,11 @@ class TemporaryFile extends \SplFileInfo
      */
     public function getMimeType()
     {
+        // @codeCoverageIgnoreStart
         if (!class_exists(MimeTypes::class)) {
             throw new \LogicException('You cannot guess the mime type as the Mime component is not installed. Try running "composer require symfony/mime".');
         }
+        // @codeCoverageIgnoreEnd
 
         return MimeTypes::getDefault()->guessMimeType($this->getPathname());
     }
diff --git a/tests/Util/TemporaryFileTest.php b/tests/Util/TemporaryFileTest.php
index 4054b78cfc..55318fea11 100644
--- a/tests/Util/TemporaryFileTest.php
+++ b/tests/Util/TemporaryFileTest.php
@@ -45,4 +45,12 @@ class TemporaryFileTest extends WebTestCase
         static::assertThrows(TemporaryFileException::class, fn () => $temp->commit($filepath));
         static::assertThrows(TemporaryFileException::class, fn () => $temp->commit('/root/cannot_write_here'));
     }
+
+    public function testCreateDirectory()
+    {
+        $temp = new TemporaryFile();
+        @unlink('/tmp/social-test-folder/test');
+        $temp->move('/tmp/social-test-folder/', 'test');
+        static::assertTrue(file_exists('/tmp/social-test-folder/test'));
+    }
 }