Normalize line endings to generate consistent line endings on Windows

Author: jorrit

src/SchemaGenerator/CodeGenerator/CodeFile/ClassFile.php

@@ -125,7 +125,7 @@ protected function generateFileContents(): string
         if (!empty($properties)) $properties = PHP_EOL . $properties;
         $methods = $this->generateMethods();
 
-        return sprintf(
+        $contents = sprintf(
             static::FILE_FORMAT,
             $namespace,
             $imports,
@@ -135,6 +135,7 @@ protected function generateFileContents(): string
             $properties,
             $methods
         );
+        return $this->normalizeLineEndings($contents);
     }
 
     /**

src/SchemaGenerator/CodeGenerator/CodeFile/TraitFile.php

@@ -104,7 +104,11 @@ public function addProperty(string $name, $value = null)
     public function addMethod(string $methodString, bool $isDeprecated = false, ?string $deprecationReason = null)
     {
         if (!empty($methodString)) {
-            $this->methods[] = $this->prependDeprecationComment($methodString, $isDeprecated, $deprecationReason);
+            $methodString = $this->prependDeprecationComment($methodString, $isDeprecated, $deprecationReason);
+
+            // Normalize line endings here to make replacements in generateMethods() work.
+            $methodString = $this->normalizeLineEndings($methodString);
+            $this->methods[] = $methodString;
         }
     }
 
@@ -126,7 +130,8 @@ protected function generateFileContents(): string
         if (!empty($properties)) $properties = PHP_EOL . $properties;
         $methods = $this->generateMethods();
 
-        return sprintf(static::FILE_FORMAT, $namespace, $imports, $className, $properties, $methods);
+        $contents = sprintf(static::FILE_FORMAT, $namespace, $imports, $className, $properties, $methods);
+        return $this->normalizeLineEndings($contents);
     }
 
     /**
@@ -224,4 +229,14 @@ protected function prependDeprecationComment(string $code, bool $isDeprecated, ?
 
         return $code;
     }
+
+    protected function normalizeLineEndings(string $code)
+    {
+        $code = str_replace("\r", '', $code);
+        if (PHP_EOL !== "\n") {
+            $code = str_replace("\n", PHP_EOL, $code);
+        }
+
+        return $code;
+    }
 }