make annotation splitting more clever using wordwrap in order to keep

words complete and remove useless spaces at line starting and ending

Author: mikaelcom

Element/PhpAnnotation.php

@@ -65,7 +65,7 @@ protected function getPhpContent()
             $fullContent,
         );
         if (strlen($fullContent) > $this->getMaxLength()) {
-            $content = str_split($fullContent, $this->getMaxLength());
+            $content = explode(self::BREAK_LINE_CHAR, wordwrap($fullContent, $this->getMaxLength(), self::BREAK_LINE_CHAR, true));
         }
         return array_map(function ($element) {
             return sprintf(' %s', $element);

Tests/Component/PhpClassTest.php

@@ -21,7 +21,7 @@ public function testSimpleToString()
             ->addAnnotationBlock(new PhpAnnotationElement('var', 'int'))
             ->addProperty('bar', 1)
             ->addAnnotationBlock(array(
-                '- documentation: The ID of the contact that performed the action, if available.-May be blank for anonymous activity.',
+                '- documentation: The ID of the contact that performed the action, if available. May be blank for anonymous activity.',
                 new PhpAnnotationElement('var', 'bool'),
             ))
             ->addPropertyElement(new PhpPropertyElement('sample', true))

Tests/Element/PhpAnnotationBlockTest.php

@@ -35,9 +35,9 @@ public function testGetSeveralLinesToString()
 
         $this->assertSame("/**\n" .
                           " * This sample annotation is on one line This sample annotation is on one line This\n" .
-                          " *  sample annotation is on one line This sample annotation is on one line This sam\n" .
-                          " * ple annotation is on one line This sample annotation is on one line This sample \n" .
-                          " * annotation is on one line\n" .
+                          " * sample annotation is on one line This sample annotation is on one line This\n" .
+                          " * sample annotation is on one line This sample annotation is on one line This\n" .
+                          " * sample annotation is on one line\n" .
                           " */", $annotationBlock->toString());
     }
 
@@ -48,10 +48,10 @@ 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" .
+                          " * @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" .
+                          " * This sample annotation is on one line\n" .
                           " */", $annotationBlock->toString());
     }
 
@@ -96,10 +96,10 @@ 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" .
+                          " * @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" .
+                          " * This sample annotation is on one line\n" .
                           " */", $annotationBlock->toString());
     }
 

Tests/Element/PhpAnnotationTest.php

@@ -26,19 +26,19 @@ public function testGetSeveralLinesPhpDeclaration()
         $annotation = new PhpAnnotation(PhpAnnotation::NO_NAME, str_repeat('This sample annotation is on one line ', 7));
 
         $this->assertSame(" * This sample annotation is on one line This sample annotation is on one line This\n" .
-                          " *  sample annotation is on one line This sample annotation is on one line This sam\n" .
-                          " * ple annotation is on one line This sample annotation is on one line This sample \n" .
-                          " * annotation is on one line", $annotation->getPhpDeclaration());
+                          " * sample annotation is on one line This sample annotation is on one line This\n" .
+                          " * sample annotation is on one line This sample annotation is on one line This\n" .
+                          " * sample annotation is on one line", $annotation->getPhpDeclaration());
     }
 
     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" .
+        $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 sample annotation is on one line", $annotation->getPhpDeclaration());
     }
 
     public function testGetSeveralLinesLargerWithNamePhpDeclaration()

Tests/resources/PhpClassTest_SimpleToString.php

@@ -13,7 +13,7 @@ abstract class Foo extends stdClass
      */
     public $bar = 1;
     /**
-     * - documentation: The ID of the contact that performed the action, if available.-
+     * - documentation: The ID of the contact that performed the action, if available.
      * May be blank for anonymous activity.
      * @var bool
      */