php-gettext#282 Added support for different line breaks

jonasraoni · Jul 22, 2022 · ef12806 · ef12806
1 parent faeef90
commit ef12806
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/Loader/StrictPoLoader.php b/src/Loader/StrictPoLoader.php
@@ -143,7 +143,7 @@ private function readNumber(): string
      */
     private function readCommentString(): string
     {
-        for ($data = ''; ($this->getChar() ?? "\n") !== "\n"; $data .= $this->nextChar());
+        for ($data = ''; ($char = $this->getChar() ?? "\n") !== "\n" && $char !== "\r"; $data .= $this->nextChar());
         return $data;
     }
 
@@ -177,13 +177,13 @@ private function readQuotedString(): string
             for (; ($char = $this->getChar() ?? '"') !== '"'; $data .= $char) {
                 $this->nextChar();
                 if ($char === '\\') {
-                    if (($alias = $aliases[$this->nextChar()] ?? null) === null) {
+                    // Ensures the next char is a valid escape character
+                    if (($char = $aliases[$this->nextChar()] ?? null) === null) {
                         throw new Exception("Invalid quoted character at byte {$this->position}");
                     }
-                    $char = $alias;
                     continue;
                 }
-                if ($char === "\n") {
+                if ($char === "\n" || $char === "\r") {
                     throw new Exception("New line character must be encoded at byte {$this->position}");
                 }
             }