change EnumTrait

mdmsoft · Feb 4, 2016 · c2f674c · c2f674c
1 parent 92ada64
commit c2f674c
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 32 deletions.
diff --git a/EnumTrait.php b/EnumTrait.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace mdm\converter;
+
 use ReflectionClass;
 
 /**
@@ -15,7 +16,7 @@ trait EnumTrait
      * @var array
      */
     private static $_constants = [];
-    
+
     /**
      * Get all constant name
      * @param string $prefix
@@ -48,37 +49,19 @@ public static function constants($prefix = '')
         return self::$_constants[$className][$prefix];
     }
 
-    /**
-     *
-     * @param string $name
-     * @return type
-     */
-    public function __get($name)
+    protected function getLogical($attribute, $prefix)
     {
-        if (isset($this->enumAttributes, $this->enumAttributes[$name])) {
-            list($attr, $prefix) = $this->enumAttributes[$name];
-            $enums = static::enums($prefix);
-            return isset($enums[$this->$attr]) ? $enums[$this->$attr] : null;
-        } else {
-            return parent::__get($name);
-        }
+        $enums = static::enums($prefix);
+        return isset($enums[$this->$attribute]) ? $enums[$this->$attribute] : null;
     }
 
-    /**
-     *
-     * @param string $name
-     * @param mixed $value
-     */
-    public function __set($name, $value)
+    protected function setLogical($attribute, $prefix, $value)
     {
-        if (isset($this->enumAttributes, $this->enumAttributes[$name])) {
-            list($attr, $prefix) = $this->enumAttributes[$name];
-            $constant = static::constants($prefix);
-            if (isset($constant[strtoupper($value)])) {
-                $this->$attr = $constant[strtoupper($value)];
-            }
-        } else {
-            parent::__set($name, $value);
+        $constant = static::constants($prefix);
+        if (isset($constant[strtoupper($value)])) {
+            $this->$attribute = $constant[strtoupper($value)];
+        } elseif ($value === null) {
+            $this->$attribute = null;
         }
     }
 }
diff --git a/README.md b/README.md
@@ -139,13 +139,20 @@ Use to get list of constant
 class Post extends ActiveRecord
 {
     use \mdm\converter\EnumTrait;
-
-    protected $enumAttributes = [
-        'nmStatus' => ['status', 'STATUS_'],
-    ];
+
     const STATUS_DRAFT = 1;
     const STATUS_PUBLISHED = 2;
     const STATUS_DELETED = 3;
+
+    public function getNmStatus()
+    {
+        return $this->getLogical('status', 'STATUS_');
+    }
+
+    public function setNmStatus($value)
+    {
+        return $this->setLogical('status', 'STATUS_', $value);
+    }
 
 }