Merge branch 'release/1.1.0'

WsdlToPhp · Mar 29, 2016 · 837760a · 837760a
2 parents 9f5823e + 83bf24f
commit 837760a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # CHANGELOG
 
+## 1.1.0
+- issue #5 - No autocomplete because of return type on a new line after @return in annotation
+
 ## 1.0.1
 - issue #4 - Cyrillic alphabet is not handled well
 

diff --git a/src/Element/PhpAnnotation.php b/src/Element/PhpAnnotation.php
@@ -64,7 +64,7 @@ protected function getPhpContent()
         $content = array(
             $fullContent,
         );
-        if (strlen($fullContent) > $this->getMaxLength()) {
+        if ($this->getPhpName() === '' && strlen($fullContent) > $this->getMaxLength()) {
             $content = explode(self::BREAK_LINE_CHAR, wordwrap($fullContent, $this->getMaxLength(), self::BREAK_LINE_CHAR, true));
         }
         return array_map(function ($element) {

diff --git a/tests/Element/PhpAnnotationBlockTest.php b/tests/Element/PhpAnnotationBlockTest.php
@@ -48,10 +48,7 @@ public function testGetSeveralLinesWithNameToString()
         ));
 
         $this->assertSame("/**\n" .
-                          " * @description This sample annotation is on one line This sample annotation is on\n" .
-                          " * one line This sample annotation is on one line This sample annotation is on one\n" .
-                          " * line This sample annotation is on one line This sample annotation is on one line\n" .
-                          " * This sample annotation is on one line\n" .
+                          " * @description This sample annotation is on one line This sample annotation is on one line This sample annotation is on one line This sample annotation is on one line This sample annotation is on one line This sample annotation is on one line This sample annotation is on one line\n" .
                           " */", $annotationBlock->toString());
     }
 
@@ -96,10 +93,7 @@ public function testToStringSeveralLinesWithNameToString()
         ));
 
         $this->assertSame("/**\n" .
-                          " * @description This sample annotation is on one line This sample annotation is on\n" .
-                          " * one line This sample annotation is on one line This sample annotation is on one\n" .
-                          " * line This sample annotation is on one line This sample annotation is on one line\n" .
-                          " * This sample annotation is on one line\n" .
+                          " * @description This sample annotation is on one line This sample annotation is on one line This sample annotation is on one line This sample annotation is on one line This sample annotation is on one line This sample annotation is on one line This sample annotation is on one line\n" .
                           " */", $annotationBlock->toString());
     }
 

diff --git a/tests/Element/PhpAnnotationTest.php b/tests/Element/PhpAnnotationTest.php
@@ -35,15 +35,12 @@ public function testGetSeveralLinesWithNamePhpDeclaration()
     {
         $annotation = new PhpAnnotation('description', str_repeat('This sample annotation is on one line ', 7));
 
-        $this->assertSame(" * @description This sample annotation is on one line This sample annotation is on\n" .
-                          " * one line This sample annotation is on one line This sample annotation is on one\n" .
-                          " * line This sample annotation is on one line This sample annotation is on one line\n" .
-                          " * This sample annotation is on one line", $annotation->getPhpDeclaration());
+        $this->assertSame(" * @description This sample annotation is on one line This sample annotation is on one line This sample annotation is on one line This sample annotation is on one line This sample annotation is on one line This sample annotation is on one line This sample annotation is on one line", $annotation->getPhpDeclaration());
     }
 
     public function testGetSeveralLinesLargerWithNamePhpDeclaration()
     {
-        $annotation = new PhpAnnotation('description', str_repeat('This sample annotation is on one line ', 7), 300);
+        $annotation = new PhpAnnotation('description', str_repeat('This sample annotation is on one line ', 7));
 
         $this->assertSame(" * @description This sample annotation is on one line This sample annotation is on one line This sample annotation is on one line This sample annotation is on one line This sample annotation is on one line This sample annotation is on one line This sample annotation is on one line", $annotation->getPhpDeclaration());
     }