Add docblocks, improve constructors

Author: krlove

src/Model/ArgumentModel.php

@@ -28,10 +28,14 @@ class ArgumentModel implements RenderableInterface
     /**
      * ArgumentModel constructor.
      * @param string $name
+     * @param string|null $type
+     * @param mixed|null $default
      */
-    public function __construct($name)
+    public function __construct($name, $type = null, $default = null)
     {
-        $this->setName($name);
+        $this->setName($name)
+            ->setType($type)
+            ->setDefault($default);
     }
 
     /**

src/Model/ClassModel.php

@@ -7,10 +7,13 @@
 use Krlove\Generator\Collection\RenderableCollection;
 use Krlove\Generator\Line;
 use Krlove\Generator\Line\EmptyLine;
+use Krlove\Generator\Model\Traits\DocBlockTrait;
 use Krlove\Generator\RenderableInterface;
 
 class ClassModel implements RenderableInterface
 {
+    use DocBlockTrait;
+
     /**
      * @var ClassNameModel
      */
@@ -74,6 +77,10 @@ public function render()
             $output[] = $this->uses->render();
             $output[] = new EmptyLine(2);
         }
+        if ($this->docBlock !== null) {
+            $output[] = $this->docBlock->render();
+            $output[] = new EmptyLine();
+        }
         $output[] = $this->name->render();
         $output[] = new EmptyLine();
         if (!$this->traits->isEmpty()) {

src/Model/ClassNameModel.php

@@ -30,32 +30,32 @@ class ClassNameModel implements RenderableInterface
     /**
      * PHPClassName constructor.
      * @param string $name
-     * @param string $extends
+     * @param string|null $extends
      */
-    public function __construct($name, $extends)
+    public function __construct($name, $extends = null)
     {
-        $this->setName($name);
-        $this->setExtends($extends);
+        $this->setName($name)
+            ->setExtends($extends);
     }
 
     /**
      * {@inheritDoc}
      */
     public function render()
     {
-        $lines = new LineCollection();
+        $output = new LineCollection();
         $name = sprintf('class %s', $this->name);
         if ($this->extends !== null) {
             $name .= sprintf(' extends %s', $this->extends);
         }
-        if ($this->implements !== null) {
+        if (count($this->implements) > 0) {
             $name .= sprintf(' implements %s', implode(', ', $this->implements));
         }
 
-        $lines[] = new Line($name);
-        $lines[] = new Line('{');
+        $output[] = new Line($name);
+        $output[] = new Line('{');
 
-        return $lines;
+        return $output;
     }
 
     /**

src/Model/DocBlockModel.php

@@ -0,0 +1,68 @@
+<?php
+
+namespace Krlove\Generator\Model;
+
+use Krlove\Generator\Collection\LineCollection;
+use Krlove\Generator\RenderableInterface;
+
+/**
+ * Class DocBlockModel
+ * @package Krlove\Generator\Model
+ */
+class DocBlockModel implements RenderableInterface
+{
+    /**
+     * @var array
+     */
+    protected $content = [];
+
+    /**
+     * DocBlockModel constructor.
+     */
+    public function __construct()
+    {
+        $args = func_get_args();
+        foreach ($args as $arg) {
+            $this->addContent($arg);
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function render()
+    {
+        $output = new LineCollection();
+        $output[] = '/**';
+        if ($this->content) {
+            foreach ($this->content as $item) {
+                $output[] = sprintf(' * %s', $item);
+            }
+        } else {
+            $output[] = ' *';
+        }
+        $output[] = ' */';
+
+        return $output;
+    }
+
+    /**
+     * @return array
+     */
+    public function getContent()
+    {
+        return $this->content;
+    }
+
+    /**
+     * @param string $content
+     *
+     * @return $this
+     */
+    public function addContent($content)
+    {
+        $this->content[] = $content;
+
+        return $this;
+    }
+}

src/Model/MethodModel.php

@@ -5,6 +5,7 @@
 use Krlove\Generator\Collection\LineCollection;
 use Krlove\Generator\Collection\RenderableCollection;
 use Krlove\Generator\Line\Line;
+use Krlove\Generator\Model\Traits\DocBlockTrait;
 use Krlove\Generator\Model\Traits\ModifierTrait;
 use Krlove\Generator\RenderableInterface;
 
@@ -16,6 +17,7 @@
 class MethodModel implements RenderableInterface
 {
     use ModifierTrait;
+    use DocBlockTrait;
 
     /**
      * @var string
@@ -33,12 +35,14 @@ class MethodModel implements RenderableInterface
     protected $body;
 
     /**
-     * PHPClassMethod constructor.
+     * MethodModel constructor.
      * @param string $name
+     * @param string $modifier
      */
-    public function __construct($name)
+    public function __construct($name, $modifier = 'public')
     {
-        $this->setName($name);
+        $this->setName($name)
+            ->setModifier($modifier);
 
         $this->arguments = new RenderableCollection();
     }
@@ -49,18 +53,21 @@ public function __construct($name)
     public function render()
     {
         $lines = new LineCollection();
-        $output = sprintf('%s function %s(', $this->modifier, $this->name);
+        if ($this->docBlock !== null) {
+            $lines[] = $this->docBlock->render();
+        }
+        $function = sprintf('%s function %s(', $this->modifier, $this->name);
         if ($this->arguments) {
             $arguments = [];
             foreach ($this->arguments as $argument) {
                 $arguments[] = $argument->render();
             }
 
-            $output .= implode(', ', $arguments);
+            $function .= implode(', ', $arguments);
         }
-        $output .= ')';
+        $function .= ')';
 
-        $lines[] = new Line($output);
+        $lines[] = new Line($function);
         $lines[] = new Line('{');
         if ($this->body) {
             $lines[] = new Line($this->body); // todo make body renderable

src/Model/PropertyModel.php

@@ -2,50 +2,62 @@
 
 namespace Krlove\Generator\Model;
 
-use Krlove\Generator\Line\Line;
+use Krlove\Generator\Collection\LineCollection;
+use Krlove\Generator\Model\Traits\DocBlockTrait;
 use Krlove\Generator\Model\Traits\ModifierTrait;
 use Krlove\Generator\Model\Traits\ValueTrait;
 use Krlove\Generator\RenderableInterface;
 
 /**
  * TODO: add support for static and virtual properties
+ * TODO: add abstract and final modifiers
  * Class PHPClassProperty
  * @package Krlove\Generator\Model
  */
 class PropertyModel implements RenderableInterface
 {
     use ValueTrait;
     use ModifierTrait;
+    use DocBlockTrait;
 
     /**
      * @var string
      */
     protected $name;
 
     /**
-     * PHPClassProperty constructor.
+     * PropertyModel constructor.
      * @param string $name
+     * @param string $modifier
+     * @param mixed|null $value
      */
-    public function __construct($name)
+    public function __construct($name, $modifier = 'public', $value = null)
     {
-        $this->setName($name);
+        $this->setName($name)
+            ->setModifier($modifier)
+            ->setValue($value);
     }
 
     /**
      * {@inheritDoc}
      */
     public function render()
     {
-        $output = sprintf('%s $%s', $this->modifier, $this->name);
+        $lines = new LineCollection();
+        if ($this->docBlock !== null) {
+            $lines[] = $this->docBlock->render();
+        }
+        $property = sprintf('%s $%s', $this->modifier, $this->name);
         if ($this->value !== null) {
             $value = $this->renderValue();
             if ($value !== null) {
-                $output .= sprintf(' = %s', $this->renderValue());
+                $property .= sprintf(' = %s', $this->renderValue());
             }
         }
-        $output .= ';';
+        $property .= ';';
+        $lines[] = $property;
 
-        return new Line($output);
+        return $lines;
     }
 
     /**

src/Model/Traits/DocBlockTrait.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace Krlove\Generator\Model\Traits;
+
+use Krlove\Generator\Model\DocBlockModel;
+
+/**
+ * Class DocBlockTrait
+ * @package Krlove\Generator\Model\Traits
+ */
+trait DocBlockTrait
+{
+    /**
+     * @var DocBlockModel
+     */
+    protected $docBlock;
+
+    /**
+     * @return DocBlockModel
+     */
+    public function getDocBlock()
+    {
+        return $this->docBlock;
+    }
+
+    /**
+     * @param DocBlockModel $docBlock
+     *
+     * @return $this
+     */
+    public function setDocBlock($docBlock)
+    {
+        $this->docBlock = $docBlock;
+
+        return $this;
+    }
+}