Merge branch 'hotfix/46'

Close #46
Fixes #45
Fixes #39

Author: weierophinney

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 3.0.2 - TBD
+## 3.0.2 - 2016-04-20
 
 ### Added
 
@@ -24,6 +24,9 @@ All notable changes to this project will be documented in this file, in reverse
     zend-code are compatible across versions.
   - PHP now excludes the 7.0.5 release, as it has known issues in its tokenizer
     implementation that make the zend-code token scanner unusable.
+- [#46](https://github.com/zendframework/zend-code/pull/46) updates all
+  generators to use `\n` for line endings in generated code, vs `PHP_EOL`,
+  ensuring cross-platform consistency.
 
 ## 3.0.1 - 2016-01-26
 

phpcs.xml.dist

@@ -14,6 +14,13 @@
             <property name="ignoreBlankLines" value="false"/>
         </properties>
     </rule>
+    <rule ref="Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen">
+        <severity>0</severity>
+    </rule>
+    <rule ref="Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose">
+      <severity>0</severity>
+     </rule>
+
 
     <!-- Paths to check -->
     <file>src</file>

src/Generator/MethodGenerator.php

@@ -93,7 +93,7 @@ protected static function clearBodyIndention($body)
             return $body;
         }
 
-        $lines = explode(PHP_EOL, $body);
+        $lines = explode("\n", $body);
 
         $indention = str_replace(trim($lines[1]), '', $lines[1]);
 
@@ -103,7 +103,7 @@ protected static function clearBodyIndention($body)
             }
         }
 
-        $body = implode(PHP_EOL, $lines);
+        $body = implode("\n", $lines);
 
         return $body;
     }

src/Reflection/DocBlock/Tag/AuthorTag.php

@@ -69,6 +69,6 @@ public function getAuthorEmail()
 
     public function __toString()
     {
-        return 'DocBlock Tag [ * @' . $this->getName() . ' ]' . PHP_EOL;
+        return 'DocBlock Tag [ * @' . $this->getName() . ' ]' . "\n";
     }
 }

src/Reflection/DocBlock/Tag/GenericTag.php

@@ -95,7 +95,7 @@ public function returnValue($position)
      */
     public function __toString()
     {
-        return 'DocBlock Tag [ * @' . $this->name . ' ]' . PHP_EOL;
+        return 'DocBlock Tag [ * @' . $this->name . ' ]' . "\n";
     }
 
     /**

src/Reflection/DocBlock/Tag/LicenseTag.php

@@ -69,6 +69,6 @@ public function getLicenseName()
 
     public function __toString()
     {
-        return 'DocBlock Tag [ * @' . $this->getName() . ' ]' . PHP_EOL;
+        return 'DocBlock Tag [ * @' . $this->getName() . ' ]' . "\n";
     }
 }

src/Reflection/DocBlock/Tag/MethodTag.php

@@ -117,6 +117,6 @@ public function isStatic()
 
     public function __toString()
     {
-        return 'DocBlock Tag [ * @' . $this->getName() . ' ]' . PHP_EOL;
+        return 'DocBlock Tag [ * @' . $this->getName() . ' ]' . "\n";
     }
 }

src/Reflection/DocBlock/Tag/PropertyTag.php

@@ -95,6 +95,6 @@ public function getDescription()
 
     public function __toString()
     {
-        return 'DocBlock Tag [ * @' . $this->getName() . ' ]' . PHP_EOL;
+        return 'DocBlock Tag [ * @' . $this->getName() . ' ]' . "\n";
     }
 }

src/Reflection/DocBlockReflection.php

@@ -271,15 +271,15 @@ protected function reflect()
      */
     public function toString()
     {
-        $str = "DocBlock [ /* DocBlock */ ] {" . PHP_EOL . PHP_EOL;
-        $str .= "  - Tags [" . count($this->tags) . "] {" . PHP_EOL;
+        $str = "DocBlock [ /* DocBlock */ ] {" . "\n" . "\n";
+        $str .= "  - Tags [" . count($this->tags) . "] {" . "\n";
 
         foreach ($this->tags as $tag) {
             $str .= "    " . $tag;
         }
 
-        $str .= "  }" . PHP_EOL;
-        $str .= "}" . PHP_EOL;
+        $str .= "  }" . "\n";
+        $str .= "}" . "\n";
 
         return $str;
     }

test/Generator/TestAsset/TestClassWithManyProperties.php

@@ -36,7 +36,7 @@ class TestClassWithManyProperties
         array(
             'bar',
             'baz',
-            //PHP_EOL
+            "\n"
         )
     );