Merge remote-tracking branch 'drupalorg/8.x-1.x' into 8.x-1.x

Niklan · Nov 12, 2021 · ea889bf · ea889bf
2 parents 41b584a + 7291e51
commit ea889bf
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 28 deletions.
diff --git a/composer.json b/composer.json
@@ -1,16 +1,19 @@
 {
-  "name": "drupal/yandex_yml",
-  "type": "drupal-module",
-  "description": "Yandex YML (Yandex Market Language) generator.",
-  "keywords": ["Drupal"],
-  "license": "GPL-2.0+",
-  "homepage": "https://www.drupal.org/project/yandex_yml",
-  "minimum-stability": "dev",
-  "support": {
-    "issues": "https://www.drupal.org/project/issues/yandex_yml",
-    "source": "http://cgit.drupalcode.org/yandex_yml"
-  },
-  "require": {
-    "php": ">=5.6"
-  }
+    "name": "drupal/yandex_yml",
+    "type": "drupal-module",
+    "description": "Yandex YML (Yandex Market Language) generator.",
+    "keywords": [
+        "Drupal"
+    ],
+    "license": "GPL-2.0+",
+    "homepage": "https://www.drupal.org/project/yandex_yml",
+    "minimum-stability": "dev",
+    "support": {
+        "issues": "https://www.drupal.org/project/issues/yandex_yml",
+        "source": "http://cgit.drupalcode.org/yandex_yml"
+    },
+    "require": {
+        "php": ">=5.6",
+        "drupal/core": "^8.7.7 || ^9"
+    }
 }
diff --git a/src/Xml/ElementInterface.php b/src/Xml/ElementInterface.php
@@ -58,7 +58,7 @@ public function getElementName();
   /**
    * Gets element value.
    *
-   * @return null|string
+   * @return mixed
    *   An element value.
    */
   public function getElementValue();

diff --git a/src/YandexYml/Currency/Currency.php b/src/YandexYml/Currency/Currency.php
@@ -17,7 +17,7 @@ final class Currency extends Element {
    *
    * @param string $id
    *   The currency ID.
-   * @param $rate
+   * @param string|int $rate
    *   The rate value.
    */
   public function __construct($id, $rate) {
@@ -32,14 +32,14 @@ public function __construct($id, $rate) {
    *
    * @param string $id
    *   The currency id.
-   *
    * @return \Drupal\yandex_yml\YandexYml\Currency\Currency
    *   The current currency.
-   * @example RUR, RUB, USD, EUR, UAH, KZT.
    *
+   * @example RUR, RUB, USD, EUR, UAH, KZT.
    */
   protected function setId($id) {
     $this->addElementAttribute(new Attribute('id', $id));
+    return $this;
   }
 
   /**
@@ -62,6 +62,7 @@ protected function setId($id) {
    */
   protected function setRate($rate) {
     $this->addElementAttribute(new Attribute('rate', $rate));
+    return $this;
   }
 
-}
+}
diff --git a/src/YandexYml/Offer/Offer.php b/src/YandexYml/Offer/Offer.php
@@ -23,13 +23,13 @@ abstract class Offer extends Element implements OfferInterface {
    *
    * @param int|string $id
    *   The offer internal ID
-   * @param $url
+   * @param string $url
    *   The offer URL.
-   * @param $price
+   * @param string $price
    *   The offer price.
-   * @param $currency_id
+   * @param string $currency_id
    *   The currency for price.
-   * @param $category_id
+   * @param string $category_id
    *   The category ID.
    * @param bool|null $price_from
    *   The price from or not.

diff --git a/src/YandexYml/Shop/Shop.php b/src/YandexYml/Shop/Shop.php
@@ -27,10 +27,6 @@ final class Shop extends Element {
    *   The full company name which owns the shop.
    * @param null|string $url
    *   The shop home page.
-   * @param null|string $platform
-   *   The platform name.
-   * @param null|string $version
-   *   The platform version.
    */
   public function __construct(
     $name,

diff --git a/yandex_yml.info.yml b/yandex_yml.info.yml
@@ -1,4 +1,4 @@
 name: Yandex YML
 type: module
 description: Yandex YML (Yandex Market Language) generator.
-core: 8.x
+core_version_requirement: ^8.7.7 || ^9