Also added support for params

Niklan · Feb 28, 2018 · 618588f · 618588f
1 parent 6a89360
commit 618588f
Show file tree

Hide file tree

Showing 4 changed files with 132 additions and 22 deletions.
diff --git a/src/YandexYml/Offer/YandexYmlOfferBase.php b/src/YandexYml/Offer/YandexYmlOfferBase.php
@@ -4,6 +4,7 @@
 
 use Drupal\Component\Utility\Unicode;
 use Drupal\yandex_yml\Annotation\YandexYmlAttribute;
+use Drupal\yandex_yml\Annotation\YandexYmlElement;
 use Drupal\yandex_yml\Annotation\YandexYmlElementWrapper;
 use Drupal\yandex_yml\Annotation\YandexYmlElementWrapperAttribute;
 use Drupal\yandex_yml\YandexYml\YandexYmlToArrayTrait;
@@ -217,17 +218,7 @@ abstract class YandexYmlOfferBase {
   protected $cpa;
 
   /**
-   * @TODO
-   * YandexYml(
-   *   elementName = "param",
-   *   type = "array_map",
-   *   parentElement = "offer",
-   *   array_map = {
-   *    "name": "property",
-   *    "value": "property",
-   *    "unit": "property"
-   *   }
-   * )
+   * @YandexYmlElement()
    *
    * @var array
    */
@@ -825,7 +816,14 @@ public function getCpa() {
    * @return YandexYmlOfferBase
    */
   public function setParam($name, $value, $unit = NULL) {
-    $this->param[] = ['name' => $name, 'value' => $value, 'unit' => $unit];
+    $param = \Drupal::service('yandex_yml.param')
+      ->setName($name)
+      ->setValue($value);
+
+    if ($unit) {
+      $param->setUnit($unit);
+    }
+    $this->param[] = $param;
     return $this;
   }
 
@@ -969,22 +967,22 @@ public function getGroupId() {
   }
 
   /**
-   * Set id's of recommended products separated by comma.
+   * Set id's of recommended products.
    *
-   * @param string $rec
+   * @param array $rec
    *
    * @return YandexYmlOfferBase
    */
-  public function setRec($rec) {
-    $this->rec = $rec;
+  public function setRec(array $rec) {
+    $this->rec = implode(',', $rec);
     return $this;
   }
 
   /**
    * @return array
    */
   public function getRec() {
-    return $this->rec;
+    return explode(',', $this->rec);
   }
 
 }
diff --git a/src/YandexYml/Param/YandexYmlParam.php b/src/YandexYml/Param/YandexYmlParam.php
@@ -0,0 +1,97 @@
+<?php
+
+namespace Drupal\yandex_yml\YandexYml\Param;
+
+use Drupal\yandex_yml\Annotation\YandexYmlElement;
+use Drupal\yandex_yml\Annotation\YandexYmlAttribute;
+use Drupal\yandex_yml\Annotation\YandexYmlValue;
+use Drupal\yandex_yml\YandexYml\YandexYmlToArrayTrait;
+
+/**
+ * Class YandexYmlParam
+ *
+ * Used as abstraction for YML element.
+ *
+ * @YandexYmlElement(
+ *   name = "param"
+ * )
+ *
+ * @package Drupal\yandex_yml\YandexYml\Param
+ */
+class YandexYmlParam {
+
+  use YandexYmlToArrayTrait;
+
+  /**
+   * @YandexYmlAttribute()
+   *
+   * @var string
+   */
+  private $name;
+
+  /**
+   * @YandexYmlAttribute()
+   *
+   * @var string
+   */
+  private $unit;
+
+  /**
+   * @YandexYmlValue()
+   *
+   * @var string
+   */
+  private $value;
+
+  /**
+   * @param string $name
+   *
+   * @return YandexYmlParam
+   */
+  public function setName($name) {
+    $this->name = $name;
+    return $this;
+  }
+
+  /**
+   * @return string
+   */
+  public function getName() {
+    return $this->name;
+  }
+
+  /**
+   * @param string $unit
+   *
+   * @return YandexYmlParam
+   */
+  public function setUnit($unit) {
+    $this->unit = $unit;
+    return $this;
+  }
+
+  /**
+   * @return string
+   */
+  public function getUnit() {
+    return $this->unit;
+  }
+
+  /**
+   * @param string $value
+   *
+   * @return YandexYmlParam
+   */
+  public function setValue($value) {
+    $this->value = $value;
+    return $this;
+  }
+
+  /**
+   * @return string
+   */
+  public function getValue() {
+    return $this->value;
+  }
+
+}
diff --git a/src/YandexYml/YandexYmlToArrayTrait.php b/src/YandexYml/YandexYmlToArrayTrait.php
@@ -74,6 +74,9 @@ private function parseAnnotations() {
       $child = $this->getElementWrappers();
       $element['child'] = $child;
 
+      $elements = $this->getElementsFromProperties();
+      $element['child'] = array_merge($element['child'], $elements);
+
       $result[] = $element;
     }
     else {
@@ -139,11 +142,19 @@ private function getElementsFromProperties() {
       $reflection = new \ReflectionProperty($this, $name);
       $property_annotation = $this->reader->getPropertyAnnotation($reflection, 'Drupal\yandex_yml\Annotation\YandexYmlElement');
       if ($property_annotation) {
-        $element_name = !empty($property_annotation->get()['name']) ? $property_annotation->get()['name'] : $name;
-        $elements[] = [
-          'name' => $element_name,
-          'value' => $value,
-        ];
+        if (is_array($value)) {
+          ksm($value);
+          foreach ($value as $value_element) {
+            $elements = array_merge($elements, $value_element->toArray());
+          }
+        }
+        else {
+          $element_name = !empty($property_annotation->get()['name']) ? $property_annotation->get()['name'] : $name;
+          $elements[] = [
+            'name' => $element_name,
+            'value' => $value,
+          ];
+        }
       }
     }
     return $elements;

diff --git a/yandex_yml.services.yml b/yandex_yml.services.yml
@@ -53,4 +53,8 @@ services:
   yandex_yml.shop:
     class: Drupal\yandex_yml\YandexYml\Shop\YandexYmlShop
     arguments: []
+    shared: false
+  yandex_yml.param:
+    class: Drupal\yandex_yml\YandexYml\Param\YandexYmlParam
+    arguments: []
     shared: false