Fix PHPUnit error on Windows

Author: Carlgo11

src/com/carlgo11/tempfiles/datastorage/FileStorage.php

@@ -61,8 +61,7 @@ public function saveEntry(EncryptedFile $file, string $password) {
 		$newFile = fopen($conf['file-path'] . $file, "w");
 
 		// Get expiry date if file already exists
-		if ($this->entryExists($file)) $expiry = $this->getExpiry($file);
-		else $expiry = (new DateTime('+1 day'))->getTimestamp();
+		if (($expiry = $this->getExpiry($file)) === NULL) $expiry = (new DateTime('+1 day'))->getTimestamp();
 
 		$content = [
 			'expiry' => $expiry,
@@ -85,11 +84,12 @@ public function saveEntry(EncryptedFile $file, string $password) {
 	 * @since 2.5
 	 */
 	private function getExpiry(string $id) {
+		if (!$this->entryExists($id)) return NULL;
 		global $conf;
-		if (!$this->entryExists($id)) return NULL; // NOTE: Will always return NULL when run inside WSL
 
 		$file = file_get_contents($conf['file-path'] . $id);
 		$data = json_decode($file, TRUE);
+		if ($data === NULL) return NULL;
 		return $data['expiry'];
 	}
 

tests/com/carlgo11/tempfiles/datastorage/DataStorageTest.php

@@ -15,7 +15,7 @@ public function testSaveFile() {
 			$file->setContent(random_bytes(2.097 * 10 ^ 6)); // Generate random 2MB content
 			$file->setMetaData(['size' => 2048, 'name' => 'test.jpg', 'type' => 'image/jpeg']);
 			$file->setDeletionPassword(Misc::generatePassword(12, 32));
-
+			print("Saving file...");
 			$this->assertTrue(DataStorage::saveFile($file, $password));
 			sleep(1);
 			print("Fetching file...");