Switch to trait based implementation of Attributable

Author: ircmaxell

lib/PHPCfg/Op/Attributes/Attributable.php

@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of PHP-CFG, a Control flow graph implementation for PHP
+ *
+ * @copyright 2015 Anthony Ferrara. All rights reserved
+ * @license MIT See LICENSE at the root of the project for more info
+ */
+
+namespace PHPCfg\Op\Attributes;
+
+use PHPCfg\Op;
+use PhpCfg\Operand;
+
+trait Attributable
+{
+    private array $attrGroups = [];
+
+    public function setAttributeGroups(array $attrGroups)
+    {
+        $this->attrGroups = $attrGroups;
+    }
+
+    public function getAttributeGroups(): array
+    {
+        return $this->attrGroups;
+    }
+
+}

lib/PHPCfg/Op/Expr/Param.php

@@ -13,20 +13,21 @@
 
 use PHPCfg\Block;
 use PHPCfg\Op;
+use PHPCfg\Op\Attributes\Attributable;
 use PHPCfg\Op\AttributableOp;
 use PHPCfg\Op\Expr;
 use PhpCfg\Operand;
 
 class Param extends Expr implements AttributableOp
 {
+    use Attributable;
+
     public Operand $name;
 
     public bool $byRef;
 
     public bool $variadic;
 
-    public array $attrGroups;
-
     public ?Operand $defaultVar = null;
 
     public ?Block $defaultBlock = null;
@@ -52,7 +53,7 @@ public function __construct(
         $this->declaredType = $type;
         $this->byRef = $byRef;
         $this->variadic = $variadic;
-        $this->attrGroups = $attrGroups;
+        $this->setAttributeGroups($attrGroups);
         if (!is_null($defaultVar)) {
             $this->defaultVar = $this->addReadRef($defaultVar);
         }
@@ -73,9 +74,4 @@ public function getSubBlocks(): array
     {
         return ['defaultBlock' => $this->defaultBlock];
     }
-
-    public function getAttributeGroups(): array
-    {
-        return $this->attrGroups;
-    }
 }

lib/PHPCfg/Op/Stmt/ClassMethod.php

@@ -12,10 +12,9 @@
 namespace PHPCfg\Op\Stmt;
 
 use PHPCfg\Func;
-use PHPCfg\Op\AttributableOp;
 use PhpParser\Modifiers;
 
-class ClassMethod extends Function_ implements AttributableOp
+class ClassMethod extends Function_
 {
     public int $visibility;
 
@@ -25,8 +24,6 @@ class ClassMethod extends Function_ implements AttributableOp
 
     public bool $abstract;
 
-    public array $attrGroups;
-
     public function __construct(Func $func, int $visiblity, bool $static, bool $final, bool $abstract, array $attrGroups, array $attributes = [])
     {
         parent::__construct($func, $attrGroups, $attributes);
@@ -65,9 +62,4 @@ public function isStatic(): bool
     {
         return $this->static;
     }
-
-    public function getAttributeGroups(): array
-    {
-        return $this->attrGroups;
-    }
 }

lib/PHPCfg/Op/Stmt/Class_.php

@@ -12,31 +12,27 @@
 namespace PHPCfg\Op\Stmt;
 
 use PHPCfg\Block;
+use PHPCfg\Op\Attributes\Attributable;
 use PHPCfg\Op\AttributableOp;
 use PHPCfg\Op;
 
 class Class_ extends ClassLike implements AttributableOp
 {
+    use Attributable;
+
     public int $flags;
 
     public ?Op\Type $extends;
 
     public array $implements;
 
-    public array $attrGroups;
-
     public function __construct(Op\Type\Literal $name, int $flags, ?Op\Type $extends, array $implements, Block $stmts, array $attrGroups, array $attributes = [])
     {
         parent::__construct($name, $stmts, $attributes);
         $this->flags = $flags;
         $this->extends = $extends;
         $this->implements = $implements;
-        $this->attrGroups = $attrGroups;
-    }
-
-    public function getAttributeGroups(): array
-    {
-        return $this->attrGroups;
+        $this->setAttributeGroups($attrGroups);
     }
 
     public function getTypeNames(): array

lib/PHPCfg/Op/Stmt/Function_.php

@@ -14,24 +14,20 @@
 use PHPCfg\Func;
 use PHPCfg\Op\CallableOp;
 use PHPCfg\Op\AttributableOp;
+use PHPCfg\Op\Attributes\Attributable;
 use PHPCfg\Op\Stmt;
 
 class Function_ extends Stmt implements CallableOp, AttributableOp
 {
-    public Func $func;
+    use Attributable;
 
-    public array $attrGroups;
+    public Func $func;
 
     public function __construct(Func $func, array $attrGroups, array $attributes = [])
     {
         parent::__construct($attributes);
         $this->func = $func;
-        $this->attrGroups = $attrGroups;
-    }
-
-    public function getAttributeGroups(): array
-    {
-        return $this->attrGroups;
+        $this->setAttributeGroups($attrGroups);
     }
 
     public function getFunc(): Func

lib/PHPCfg/Op/Stmt/Property.php

@@ -14,12 +14,15 @@
 use PHPCfg\Block;
 use PHPCfg\Op\Stmt;
 use PHPCfg\Op;
+use PHPCfg\Op\Attributes\Attributable;
 use PHPCfg\Op\AttributableOp;
 use PHPCfg\Operand;
 use PhpParser\Modifiers;
 
 class Property extends Stmt implements AttributableOp
 {
+    use Attributable;
+
     public Operand $name;
 
     public int $visibility;
@@ -28,8 +31,6 @@ class Property extends Stmt implements AttributableOp
 
     public bool $readonly;
 
-    public array $attrGroups;
-
     public ?Operand $defaultVar = null;
 
     public ?Block $defaultBlock = null;
@@ -43,7 +44,7 @@ public function __construct(Operand $name, int $visiblity, bool $static, bool $r
         $this->visibility = $visiblity;
         $this->static = $static;
         $this->readonly = $readonly;
-        $this->attrGroups = $attrGroups;
+        $this->setAttributeGroups($attrGroups);
         $this->declaredType = $declaredType;
         if (!is_null($defaultVar)) {
             $this->defaultVar = $this->addReadRef($defaultVar);
@@ -90,9 +91,4 @@ public function getSubBlocks(): array
     {
         return ['defaultBlock' => $this->defaultBlock];
     }
-
-    public function getAttributeGroups(): array
-    {
-        return $this->attrGroups;
-    }
 }

lib/PHPCfg/Printer.php

@@ -122,7 +122,7 @@ protected function renderOp(Op $op)
         $result .= $this->renderAttributes($op->getAttributes());
 
         if ($op instanceof Op\AttributableOp) {
-            $result .= $this->renderAttrGroups($op->attrGroups);
+            $result .= $this->renderAttrGroups($op);
         }
 
         if ($op instanceof  Op\Stmt\Property || $op instanceof Op\Stmt\ClassMethod) {
@@ -401,11 +401,11 @@ public function renderAttributes(array $attributes): string
         return $result;
     }
 
-    public function renderAttrGroups(array $attrGroups): string
+    public function renderAttrGroups(Op\AttributableOp $op): string
     {
         $result = '';
 
-        foreach ($attrGroups as $indexGroup => $attrGroup) {
+        foreach ($op->getAttributeGroups() as $indexGroup => $attrGroup) {
             $result .= "\n    attrGroup[$indexGroup]: ";
             $result .= $this->indent($this->renderAttributes($attrGroup->getAttributes()));
             foreach ($attrGroup->attrs as $indexAttr => $attr) {