Add virtual properties and methods

Author: krlove

.gitignore

@@ -1,3 +1,4 @@
 .idea
 index.php
+test.php
 vendor

src/Model/ArgumentModel.php

@@ -44,9 +44,9 @@ public function __construct($name, $type = null, $default = null)
     public function toLines()
     {
         if ($this->type !== null) {
-            return $this->type . ' ' . $this->name;
+            return $this->type . ' $' . $this->name;
         } else {
-            return $this->name;
+            return '$' . $this->name;
         }
     }
 

src/Model/BaseMethodModel.php

@@ -0,0 +1,80 @@
+<?php
+
+namespace Krlove\Generator\Model;
+
+use Krlove\Generator\RenderableModel;
+
+/**
+ * Class BaseMethodModel
+ * @package Krlove\Generator\Model
+ */
+abstract class BaseMethodModel extends RenderableModel
+{
+    /**
+     * @var string
+     */
+    protected $name;
+
+    /**
+     * @var ArgumentModel[]
+     */
+    protected $arguments = [];
+
+    /**
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * @param string $name
+     *
+     * @return $this
+     */
+    public function setName($name)
+    {
+        $this->name = $name;
+
+        return $this;
+    }
+
+    /**
+     * @return ArgumentModel[]
+     */
+    public function getArguments()
+    {
+        return $this->arguments;
+    }
+
+    /**
+     * @param ArgumentModel $argument
+     *
+     * @return $this
+     */
+    public function addArgument(ArgumentModel $argument)
+    {
+        $this->arguments[] = $argument;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    protected function renderArguments()
+    {
+        $result = '';
+        if ($this->arguments) {
+            $arguments = [];
+            foreach ($this->arguments as $argument) {
+                $arguments[] = $argument->render();
+            }
+
+            $result .= implode(', ', $arguments);
+        }
+
+        return $result;
+    }
+}

src/Model/BasePropertyModel.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace Krlove\Generator\Model;
+
+use Krlove\Generator\RenderableModel;
+
+/**
+ * Class BaseProperty
+ * @package Krlove\Generator\Model
+ */
+abstract class BasePropertyModel extends RenderableModel
+{
+    /**
+     * @var string
+     */
+    protected $name;
+
+    /**
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * @param string $name
+     *
+     * @return $this
+     */
+    public function setName($name)
+    {
+        $this->name = $name;
+
+        return $this;
+    }
+}

src/Model/ClassModel.php

@@ -2,6 +2,7 @@
 
 namespace Krlove\Generator\Model;
 
+use Krlove\Generator\Exception\GeneratorException;
 use Krlove\Generator\Model\Traits\DocBlockTrait;
 use Krlove\Generator\RenderableModel;
 
@@ -39,12 +40,12 @@ class ClassModel extends RenderableModel
     protected $constants = [];
 
     /**
-     * @var PropertyModel[]
+     * @var BasePropertyModel[]
      */
     protected $properties = [];
 
     /**
-     * @var MethodModel[]
+     * @var BaseMethodModel[]
      */
     protected $methods = [];
 
@@ -61,6 +62,7 @@ public function toLines()
         if (count($this->uses) > 0) {
             $lines[] = $this->renderArrayLn($this->uses);
         }
+        $this->prepareDocBlock();
         if ($this->docBlock !== null) {
             $lines[] = $this->ln($this->docBlock->render());
         }
@@ -71,12 +73,8 @@ public function toLines()
         if (count($this->constants) > 0) {
             $lines[] = $this->renderArrayLn($this->constants, 4);
         }
-        if (count($this->properties) > 0) {
-            $lines[] = $this->renderArrayLn($this->properties, 4, str_repeat(PHP_EOL, 2));
-        }
-        if (count($this->methods) > 0) {
-            $lines[] = $this->renderArray($this->methods, 4, str_repeat(PHP_EOL, 2));
-        }
+        $this->processProperties($lines);
+        $this->processMethods($lines);
         $lines[] = $this->ln('}');
 
         return $lines;
@@ -183,42 +181,97 @@ public function addConstant(ConstantModel $constant)
     }
 
     /**
-     * @return PropertyModel[]
+     * @return BasePropertyModel[]
      */
     public function getProperties()
     {
         return $this->properties;
     }
 
     /**
-     * @param PropertyModel $property
+     * @param BasePropertyModel $property
      *
      * @return $this
      */
-    public function addProperty(PropertyModel $property)
+    public function addProperty(BasePropertyModel $property)
     {
         $this->properties[] = $property;
 
         return $this;
     }
 
     /**
-     * @return MethodModel[]
+     * @return BaseMethodModel[]
      */
     public function getMethods()
     {
         return $this->methods;
     }
 
     /**
-     * @param MethodModel
+     * @param BaseMethodModel
      *
      * @return $this
      */
-    public function addMethod(MethodModel $method)
+    public function addMethod(BaseMethodModel $method)
     {
         $this->methods[] = $method;
 
         return $this;
     }
+
+    /**
+     * Convert virtual properties and methods to DocBlock content
+     */
+    protected function prepareDocBlock()
+    {
+        $content = [];
+
+        foreach ($this->properties as $property) {
+            if ($property instanceof VirtualPropertyModel) {
+                $content[] = $property->toLines();
+            }
+        }
+
+        foreach ($this->methods as $method) {
+            if ($method instanceof VirtualMethodModel) {
+                $content[] = $method->toLines();
+            }
+        }
+
+        if ($content) {
+            if ($this->docBlock === null) {
+                $this->docBlock = new DocBlockModel();
+            }
+
+            $this->docBlock->addContent($content);
+        }
+    }
+
+    /**
+     * @param array $lines
+     */
+    protected function processProperties(&$lines)
+    {
+        $properties = array_filter($this->properties, function ($property) {
+            return !$property instanceof VirtualPropertyModel;
+        });
+        if (count($properties) > 0) {
+            $lines[] = $this->renderArrayLn($properties, 4, str_repeat(PHP_EOL, 2));
+        }
+    }
+
+    /**
+     * @param array $lines
+     * @throws GeneratorException
+     */
+    protected function processMethods(&$lines)
+    {
+        $methods = array_filter($this->methods, function ($method) {
+            return !$method instanceof VirtualMethodModel;
+        });
+        if (count($methods) > 0) {
+            $lines[] = $this->renderArray($methods, 4, str_repeat(PHP_EOL, 2));
+        }
+    }
 }

src/Model/ClassNameModel.php

@@ -71,18 +71,6 @@ public function toLines()
         return $lines;
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    protected function validate()
-    {
-        if ($this->final && $this->abstract) {
-            throw new ValidationException('Entity cannot be final and abstract at the same time');
-        }
-
-        return parent::validate();
-    }
-
     /**
      * @return string
      */
@@ -142,4 +130,16 @@ public function addImplements($implements)
 
         return $this;
     }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected function validate()
+    {
+        if ($this->final && $this->abstract) {
+            throw new ValidationException('Entity cannot be final and abstract at the same time');
+        }
+
+        return parent::validate();
+    }
 }

src/Model/DocBlockModel.php

@@ -54,13 +54,19 @@ public function getContent()
     }
 
     /**
-     * @param string $content
+     * @param array|string $content
      *
      * @return $this
      */
     public function addContent($content)
     {
-        $this->content[] = $content;
+        if (is_array($content)) {
+            foreach ($content as $item) {
+                $this->addContent($item);
+            }
+        } else {
+            $this->content[] = $content;
+        }
 
         return $this;
     }