Add modifier traits

Author: Andrew Mischenko

src/Model/ClassModel.php

@@ -5,6 +5,10 @@
 use Krlove\Generator\Model\Traits\DocBlockTrait;
 use Krlove\Generator\RenderableModel;
 
+/**
+ * Class ClassModel
+ * @package Krlove\Generator\Model
+ */
 class ClassModel extends RenderableModel
 {
     use DocBlockTrait;

src/Model/ClassNameModel.php

@@ -3,6 +3,8 @@
 namespace Krlove\Generator\Model;
 
 use Krlove\Generator\Exception\ValidationException;
+use Krlove\Generator\Model\Traits\AbstractModifierTrait;
+use Krlove\Generator\Model\Traits\FinalModifierTrait;
 use Krlove\Generator\RenderableModel;
 
 /**
@@ -11,21 +13,14 @@
  */
 class ClassNameModel extends RenderableModel
 {
+    use AbstractModifierTrait;
+    use FinalModifierTrait;
+
     /**
      * @var string
      */
     protected $name;
 
-    /**
-     * @var boolean
-     */
-    protected $final;
-
-    /**
-     * @var boolean
-     */
-    protected $abstract;
-
     /**
      * @var string
      */
@@ -147,42 +142,4 @@ public function addImplements($implements)
 
         return $this;
     }
-
-    /**
-     * @return boolean
-     */
-    public function isFinal()
-    {
-        return $this->final;
-    }
-
-    /**
-     * @param boolean $final
-     * @return $this
-     */
-    public function setFinal($final = true)
-    {
-        $this->final = boolval($final);
-
-        return $this;
-    }
-
-    /**
-     * @return boolean
-     */
-    public function isAbstract()
-    {
-        return $this->abstract;
-    }
-
-    /**
-     * @param boolean $abstract
-     * @return $this
-     */
-    public function setAbstract($abstract = true)
-    {
-        $this->abstract = boolval($abstract);
-
-        return $this;
-    }
 }

src/Model/MethodModel.php

@@ -3,8 +3,11 @@
 namespace Krlove\Generator\Model;
 
 use Krlove\Generator\Exception\ValidationException;
+use Krlove\Generator\Model\Traits\AbstractModifierTrait;
 use Krlove\Generator\Model\Traits\AccessModifierTrait;
 use Krlove\Generator\Model\Traits\DocBlockTrait;
+use Krlove\Generator\Model\Traits\FinalModifierTrait;
+use Krlove\Generator\Model\Traits\StaticModifierTrait;
 use Krlove\Generator\RenderableModel;
 
 /**
@@ -14,29 +17,17 @@
  */
 class MethodModel extends RenderableModel
 {
+    use AbstractModifierTrait;
     use AccessModifierTrait;
     use DocBlockTrait;
+    use FinalModifierTrait;
+    use StaticModifierTrait;
 
     /**
      * @var string
      */
     protected $name;
 
-    /**
-     * @var boolean
-     */
-    protected $static;
-
-    /**
-     * @var boolean
-     */
-    protected $final;
-
-    /**
-     * @var boolean;
-     */
-    protected $abstract;
-
     /**
      * @var ArgumentModel[]
      */
@@ -159,63 +150,6 @@ public function addArgument(ArgumentModel $argument)
         return $this;
     }
 
-    /**
-     * @return boolean
-     */
-    public function isStatic()
-    {
-        return $this->static;
-    }
-
-    /**
-     * @param boolean $static
-     * @return $this
-     */
-    public function setStatic($static = true)
-    {
-        $this->static = boolval($static);
-
-        return $this;
-    }
-
-    /**
-     * @return boolean
-     */
-    public function isFinal()
-    {
-        return $this->final;
-    }
-
-    /**
-     * @param boolean $final
-     * @return $this
-     */
-    public function setFinal($final = true)
-    {
-        $this->final = boolval($final);
-
-        return $this;
-    }
-
-    /**
-     * @return boolean
-     */
-    public function isAbstract()
-    {
-        return $this->abstract;
-    }
-
-    /**
-     * @param boolean $abstract
-     * @return $this
-     */
-    public function setAbstract($abstract = true)
-    {
-        $this->abstract = boolval($abstract);
-
-        return $this;
-    }
-
     /**
      * @return string
      */

src/Model/PropertyModel.php

@@ -4,6 +4,7 @@
 
 use Krlove\Generator\Model\Traits\AccessModifierTrait;
 use Krlove\Generator\Model\Traits\DocBlockTrait;
+use Krlove\Generator\Model\Traits\StaticModifierTrait;
 use Krlove\Generator\Model\Traits\ValueTrait;
 use Krlove\Generator\RenderableModel;
 
@@ -16,18 +17,14 @@ class PropertyModel extends RenderableModel
 {
     use AccessModifierTrait;
     use DocBlockTrait;
+    use StaticModifierTrait;
     use ValueTrait;
 
     /**
      * @var string
      */
     protected $name;
 
-    /**
-     * @var boolean
-     */
-    protected $static;
-
     /**
      * PropertyModel constructor.
      * @param string $name
@@ -88,23 +85,4 @@ public function setName($name)
 
         return $this;
     }
-
-    /**
-     * @return boolean
-     */
-    public function isStatic()
-    {
-        return $this->static;
-    }
-
-    /**
-     * @param boolean $static
-     * @return $this
-     */
-    public function setStatic($static)
-    {
-        $this->static = boolval($static);
-
-        return $this;
-    }
 }

src/Model/Traits/AbstractModifierTrait.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace Krlove\Generator\Model\Traits;
+
+/**
+ * Trait AbstractModifierTrait
+ * @package Krlove\Generator\Model\Traits
+ */
+trait AbstractModifierTrait
+{
+    /**
+     * @var boolean;
+     */
+    protected $abstract;
+
+    /**
+     * @return boolean
+     */
+    public function isAbstract()
+    {
+        return $this->abstract;
+    }
+
+    /**
+     * @param boolean $abstract
+     * @return $this
+     */
+    public function setAbstract($abstract = true)
+    {
+        $this->abstract = boolval($abstract);
+
+        return $this;
+    }
+}

src/Model/Traits/AccessModifierTrait.php

@@ -3,7 +3,7 @@
 namespace Krlove\Generator\Model\Traits;
 
 /**
- * Class AccessModifierTrait
+ * Trait AccessModifierTrait
  * @package Krlove\Generator\Model\Traits
  */
 trait AccessModifierTrait

src/Model/Traits/DocBlockTrait.php

@@ -5,7 +5,7 @@
 use Krlove\Generator\Model\DocBlockModel;
 
 /**
- * Class DocBlockTrait
+ * Trait DocBlockTrait
  * @package Krlove\Generator\Model\Traits
  */
 trait DocBlockTrait

src/Model/Traits/FinalModifierTrait.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace Krlove\Generator\Model\Traits;
+
+/**
+ * Trait FinalModifierTrait
+ * @package Krlove\Generator\Model\Traits
+ */
+trait FinalModifierTrait
+{
+    /**
+     * @var boolean
+     */
+    protected $final;
+
+    /**
+     * @return boolean
+     */
+    public function isFinal()
+    {
+        return $this->final;
+    }
+
+    /**
+     * @param boolean $final
+     * @return $this
+     */
+    public function setFinal($final = true)
+    {
+        $this->final = boolval($final);
+
+        return $this;
+    }
+}

src/Model/Traits/StaticModifierTrait.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace Krlove\Generator\Model\Traits;
+
+/**
+ * Trait StaticMidifierTrait
+ * @package Krlove\Generator\Model\Traits
+ */
+trait StaticModifierTrait
+{
+    /**
+     * @var boolean
+     */
+    protected $static;
+
+    /**
+     * @return boolean
+     */
+    public function isStatic()
+    {
+        return $this->static;
+    }
+
+    /**
+     * @param boolean $static
+     * @return $this
+     */
+    public function setStatic($static = true)
+    {
+        $this->static = boolval($static);
+
+        return $this;
+    }
+}

src/Model/Traits/ValueTrait.php

@@ -3,7 +3,7 @@
 namespace Krlove\Generator\Model\Traits;
 
 /**
- * Class PHPValueTrait
+ * Trait PHPValueTrait
  * @package Krlove\Generator\Model\Traits
  */
 trait ValueTrait