fix: Automatic detection of line endings (CR, CRLF, LF, etc.)

arawa · Dec 2, 2024 · 194de05 · 194de05
1 parent 5ccc15f
commit 194de05
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/lib/Files/FileUploader.php b/lib/Files/FileUploader.php
@@ -5,6 +5,8 @@
 class FileUploader implements FileInterface {
 	private $resource;
 
+    private string|false $lineEnding;
+
 	public function __construct(private string $path) {
 	}
 
@@ -13,6 +15,8 @@ public function __construct(private string $path) {
 	 * @throws \Exception
 	 */
 	public function open(?string $path = null) {
+        $this->lineEnding = ini_get("auto_detect_line_endings");
+        ini_set("auto_detect_line_endings", true);
 		$this->resource = fopen($this->path, "r");
 
 		if (!$this->resource) {
@@ -23,6 +27,7 @@ public function open(?string $path = null) {
 	}
 
 	public function close(): bool {
+        ini_set("auto_detect_line_endings", $this->lineEnding);
 		return fclose($this->resource);
 	}
 

diff --git a/lib/Files/NextcloudFile.php b/lib/Files/NextcloudFile.php
@@ -6,6 +6,8 @@
 
 class NextcloudFile implements FileInterface {
 	private $resource;
+
+    private string|false $lineEnding;
 
 	public function __construct(private Node $file) {
 	}
@@ -15,6 +17,8 @@ public function __construct(private Node $file) {
 	 * @throws \Exception
 	 */
 	public function open(?string $path = null) {
+        $this->lineEnding = ini_get("auto_detect_line_endings");
+        ini_set("auto_detect_line_endings", true);
 		$store = $this->file->getStorage();
 		$this->resource = $store->fopen($this->file->getInternalPath(), "r");
 
@@ -26,6 +30,7 @@ public function open(?string $path = null) {
 	}
 
 	public function close(): bool {
+        ini_set("auto_detect_line_endings", $this->lineEnding);
 		return fclose($this->resource);
 	}