Updated way of accessing to fields

omnilight · omnilight · commit be20e938ad24 · 2015-06-24T13:11:38.000+03:00
diff --git a/AttributeFinder.php b/AttributeFinder.php
@@ -0,0 +1,31 @@
+<?php
+namespace omnilight\datetime;
+use yii\base\Model;
+use yii\base\InvalidParamException;
+
+
+/**
+ * Trait AttributeFinder
+ */
+trait AttributeFinder
+{
+    /**
+     * @param Model $model
+     * @param $attribute
+     * @return DateTimeAttribute
+     */
+    protected static function findAttribute(Model $model, $attribute)
+    {
+        foreach ($model->behaviors as $behavior) {
+            if (!($behavior instanceof DateTimeBehavior)) {
+                continue;
+            }
+
+            if ($behavior->hasAttribute($attribute)) {
+                return $behavior->getAttribute($attribute);
+            }
+        }
+
+        throw new InvalidParamException('Model '.get_class($model).' does not have attribute '.$attribute);
+    }
+}
diff --git a/DatePickerConfig.php b/DatePickerConfig.php
@@ -2,6 +2,8 @@
 
 namespace omnilight\datetime;
 
+use yii\base\InvalidParamException;
+use yii\base\Model;
 use yii\helpers\ArrayHelper;
 use yii\helpers\FormatConverter;
 
@@ -11,14 +13,19 @@
  */
 class DatePickerConfig
 {
+    use AttributeFinder;
+
     /**
-     * @param DateTimeAttribute $attribute
+     * @param Model $model
+     * @param $attribute
      * @param array $options
      * @param string $datePickerClass
      * @return array
      */
-    public static function get(DateTimeAttribute $attribute, $options = [], $datePickerClass = 'yii\jui\DatePicker')
+    public static function get(Model $model, $attribute, $options = [], $datePickerClass = 'yii\jui\DatePicker')
     {
+        $attribute = self::findAttribute($model, $attribute);
+
         $format = DateTimeBehavior::normalizeIcuFormat($attribute->targetFormat, $attribute->behavior->formatter);
         switch ($datePickerClass) {
             case 'yii\jui\DatePicker':
diff --git a/DateTimeAttribute.php b/DateTimeAttribute.php
@@ -11,7 +11,7 @@
  * Class DateTimeAttribute
  * @property string $value
  */
-class DateTimeAttribute extends Object implements Arrayable
+class DateTimeAttribute extends Object
 {
     /**
      * @var DateTimeBehavior
@@ -79,45 +79,4 @@ public function setValue($value)
         $value = date_create_from_format($phpFormat, $value);
         $this->behavior->owner->{$this->originalAttribute} = $this->behavior->formatter->format($value, $this->originalFormat);
     }
-
-    /**
-     * @inheritdoc
-     */
-    public function fields()
-    {
-        return [];
-    }
-
-    /**
-     * Returns the list of additional fields that can be returned by [[toArray()]] in addition to those listed in [[fields()]].
-     *
-     * This method is similar to [[fields()]] except that the list of fields declared
-     * by this method are not returned by default by [[toArray()]]. Only when a field in the list
-     * is explicitly requested, will it be included in the result of [[toArray()]].
-     *
-     * @return array the list of expandable field names or field definitions. Please refer
-     * to [[fields()]] on the format of the return value.
-     * @see toArray()
-     * @see fields()
-     */
-    public function extraFields()
-    {
-        return [];
-    }
-
-    /**
-     * Converts the object into an array.
-     *
-     * @param array $fields the fields that the output array should contain. Fields not specified
-     * in [[fields()]] will be ignored. If this parameter is empty, all fields as specified in [[fields()]] will be returned.
-     * @param array $expand the additional fields that the output array should contain.
-     * Fields not specified in [[extraFields()]] will be ignored. If this parameter is empty, no extra fields
-     * will be returned.
-     * @param boolean $recursive whether to recursively return array representation of embedded objects.
-     * @return array the array representation of the object
-     */
-    public function toArray(array $fields = [], array $expand = [], $recursive = true)
-    {
-        return $this->getValue();
-    }
 }
diff --git a/DateTimeBehavior.php b/DateTimeBehavior.php
@@ -73,32 +73,6 @@ public function init()
         $this->prepareAttributes();
     }
 
-    public function events()
-    {
-        $events = [];
-        if ($this->performValidation) {
-            $events[BaseActiveRecord::EVENT_BEFORE_VALIDATE] = 'onBeforeValidate';
-        }
-        return $events;
-    }
-
-    /**
-     * Performs validation for all the attributes
-     * @param Event $event
-     */
-    public function onBeforeValidate($event)
-    {
-        foreach ($this->attributeValues as $targetAttribute => $value) {
-            if ($value instanceof DateTimeAttribute) {
-                $validator = \Yii::createObject([
-                    'class' => DateValidator::className(),
-                    'format' => self::normalizeIcuFormat($value->targetFormat, $this->formatter)[1],
-                ]);
-                $validator->validateAttribute($this->owner, $targetAttribute);
-            }
-        }
-    }
-
     protected function prepareAttributes()
     {
         foreach ($this->attributes as $key => $value) {
@@ -132,61 +106,30 @@ protected function processTemplate($originalAttribute)
         ]);
     }
 
-    public function canGetProperty($name, $checkVars = true)
-    {
-        if ($this->hasAttributeValue($name))
-            return true;
-        else
-            return parent::canGetProperty($name, $checkVars);
-    }
-
-    protected function hasAttributeValue($name)
-    {
-        return isset($this->attributeValues[$name]);
-    }
-
-    public function canSetProperty($name, $checkVars = true)
-    {
-        if ($this->hasAttributeValue($name))
-            return true;
-        else
-            return parent::canSetProperty($name, $checkVars);
-    }
-
-    public function __get($name)
-    {
-        if ($this->hasAttributeValue($name))
-            return $this->getAttributeValue($name);
-        return parent::__get($name);
-    }
-
-    public function __set($name, $value)
-    {
-        if ($this->hasAttributeValue($name)) {
-            $this->setAttributeValue($name, $value);
-            return;
-        }
-        parent::__set($name, $value);
-    }
-
-    protected function getAttributeValue($name)
+    public function events()
     {
-        if (is_array($this->attributeValues[$name])) {
-            $this->attributeValues[$name] = \Yii::createObject($this->attributeValues[$name]);
+        $events = [];
+        if ($this->performValidation) {
+            $events[BaseActiveRecord::EVENT_BEFORE_VALIDATE] = 'onBeforeValidate';
         }
-        return $this->attributeValues[$name];
+        return $events;
     }
 
-    protected function setAttributeValue($name, $value)
+    /**
+     * Performs validation for all the attributes
+     * @param Event $event
+     */
+    public function onBeforeValidate($event)
     {
-        if (is_array($this->attributeValues[$name])) {
-            $this->attributeValues[$name] = \Yii::createObject($this->attributeValues[$name]);
+        foreach ($this->attributeValues as $targetAttribute => $value) {
+            if ($value instanceof DateTimeAttribute) {
+                $validator = \Yii::createObject([
+                    'class' => DateValidator::className(),
+                    'format' => self::normalizeIcuFormat($value->targetFormat, $this->formatter)[1],
+                ]);
+                $validator->validateAttribute($this->owner, $targetAttribute);
+            }
         }
-
-        if ($value instanceof DateTimeAttribute)
-            $this->attributeValues[$name] = $value;
-        else
-            $this->attributeValues[$name]->value = $value;
     }
 
     /**
@@ -213,4 +156,54 @@ public static function normalizeIcuFormat($format, $formatter)
         }
         return $format;
     }
+
+    public function canGetProperty($name, $checkVars = true)
+    {
+        if ($this->hasAttribute($name)) {
+            return true;
+        }
+
+        return parent::canGetProperty($name, $checkVars);
+    }
+
+    public function hasAttribute($name)
+    {
+        return isset($this->attributeValues[$name]);
+    }
+
+    public function canSetProperty($name, $checkVars = true)
+    {
+        if ($this->hasAttribute($name)) {
+            return true;
+        }
+
+        return parent::canSetProperty($name, $checkVars);
+    }
+
+    public function __get($name)
+    {
+        if ($this->hasAttribute($name)) {
+            return $this->getAttribute($name)->getValue();
+        }
+
+        return parent::__get($name);
+    }
+
+    public function __set($name, $value)
+    {
+        if ($this->hasAttribute($name)) {
+            $this->getAttribute($name)->setValue($value);
+            return;
+        }
+
+        parent::__set($name, $value);
+    }
+
+    public function getAttribute($name)
+    {
+        if (is_array($this->attributeValues[$name])) {
+            $this->attributeValues[$name] = \Yii::createObject($this->attributeValues[$name]);
+        }
+        return $this->attributeValues[$name];
+    }
 } 
diff --git a/README.md b/README.md
@@ -75,7 +75,7 @@ class Post extends ActiveRecord
 Now in your view with the form:
 ```php
 // $model has instance of Post
-<?= $form->field($model, 'posted_at_local')->widget(\yii\jui\DatePicker::className(), \omnilight\datetime\DatePickerConfig::get($model->posted_at_local)) ?>
+<?= $form->field($model, 'posted_at_local')->widget(\yii\jui\DatePicker::className(), \omnilight\datetime\DatePickerConfig::get($model, 'posted_at_local')) ?>
 // DatePickerConfig is used to properly configure widget. Currently it only supports DatePicker from the Jui extension
 ```
 
