Fixes

lireincore · Mar 22, 2017 · ce17295 · ce17295
1 parent 1dfdb76
commit ce17295
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 51 deletions.
diff --git a/README.md b/README.md
@@ -6,12 +6,12 @@
 
 ## About
 
-[YML (Yandex Market Language)](https://yandex.ru/support/partnermarket/yml/about-yml.xml) streaming parser with validation for PHP.
+[YML (Yandex Market Language)](https://yandex.ru/support/partnermarket/yml/about-yml.xml) streaming parser with validation.
 Based on XMLReader. Suitable for large files.
 
 ## Install
 
-Add the `lireincore/ymlparser` package to your `require` section in the `composer.json` file
+Add the `"lireincore/ymlparser": "^3.2"` package to your `require` section in the `composer.json` file
 
 or
 

diff --git a/composer.json b/composer.json
@@ -1,19 +1,27 @@
 {
     "name": "lireincore/ymlparser",
     "description": "YML (Yandex Market Language) parser",
-    "version": "3.2.0",
+    "version": "3.2.1",
     "type": "library",
     "keywords": ["yml", "parser", "yandex", "market"],
     "homepage": "https://github.com/lireincore/ymlparser",
     "license": "MIT",
+    "support": {
+        "issues": "https://github.com/lireincore/imgcache/issues",
+        "source": "https://github.com/lireincore/imgcache"
+    },
     "authors": [
         {
-            "name": "LireinCore",
+            "name": "lirein",
             "email": "[email protected]"
         }
     ],
     "require": {
-        "php": ">=5.5"
+        "php": ">=5.5",
+        "ext-xmlreader": "*"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "~5.0"
     },
     "autoload": {
         "psr-4": {

diff --git a/src/Offer/AExtOffer.php b/src/Offer/AExtOffer.php
@@ -108,8 +108,9 @@ public function getErrors()
                 $errors = array_merge($errors, $deliveryOption->getErrors());
             }
         }
-        if ($this->age)
+        if ($this->age) {
             $errors = array_merge($errors, $this->age->getErrors());
+        }
 
         return $errors;
     }
@@ -124,11 +125,11 @@ public function setAttribute(array $attrNode)
             foreach ($attrNode['nodes'] as $subNode) {
                 $this->addDeliveryOption((new DeliveryOption())->setAttributes($subNode['attributes']));
             }
-        }
-        elseif ($attrNode['name'] == 'age') {
+        } elseif ($attrNode['name'] == 'age') {
             $this->setAge((new Age())->setAttributes($attrNode['attributes'] + ['value' => $attrNode['value']]));
+        } else {
+            parent::setAttribute($attrNode);
         }
-        else parent::setAttribute($attrNode);
 
         return $this;
     }

diff --git a/src/Offer/AOffer.php b/src/Offer/AOffer.php
@@ -255,17 +255,13 @@ public function setAttribute(array $attrNode)
             foreach ($attrNode['nodes'] as $subNode) {
                 $this->addOutlet((new Outlet())->setAttributes($subNode['attributes']));
             }
-        }
-        elseif ($attrNode['name'] == 'picture') {
+        } elseif ($attrNode['name'] == 'picture') {
             $this->addPicture($attrNode['value']);
-        }
-        elseif ($attrNode['name'] == 'barcode') {
+        } elseif ($attrNode['name'] == 'barcode') {
             $this->addBarcode($attrNode['value']);
-        }
-        elseif ($attrNode['name'] == 'param') {
+        } elseif ($attrNode['name'] == 'param') {
             $this->addParam((new Param())->setAttributes($attrNode['attributes'] + ['value' => $attrNode['value']]));
-        }
-        else {
+        } else {
             if (!is_null($attrNode['value'])) $this->setField($attrNode['name'], $attrNode['value']);
             if (!empty($attrNode['attributes'])) {
                 foreach ($attrNode['attributes'] as $name => $value) {

diff --git a/src/Offer/TourOffer.php b/src/Offer/TourOffer.php
@@ -126,8 +126,7 @@ public function setAttribute(array $attrNode)
     {
         if ($attrNode['name'] == 'dataTour') {
             $this->addDataTour($attrNode['value']);
-        }
-        else {
+        } else {
             parent::setAttribute($attrNode);
         }
 

diff --git a/src/Shop.php b/src/Shop.php
@@ -189,18 +189,15 @@ public function setAttribute(array $attrNode)
             foreach ($attrNode['nodes'] as $subNode) {
                 $this->addCurrency((new Currency())->setAttributes($subNode['attributes']));
             }
-        }
-        elseif ($attrNode['name'] == 'categories') {
+        } elseif ($attrNode['name'] == 'categories') {
             foreach ($attrNode['nodes'] as $subNode) {
                 $this->addCategory((new Category())->setAttributes($subNode['attributes'] + ['name' => $subNode['value']]));
             }
-        }
-        elseif ($attrNode['name'] == 'delivery-options') {
+        } elseif ($attrNode['name'] == 'delivery-options') {
             foreach ($attrNode['nodes'] as $subNode) {
                 $this->addDeliveryOption((new DeliveryOption())->setAttributes($subNode['attributes']));
             }
-        }
-        else {
+        } else {
             if (!is_null($attrNode['value'])) $this->setField($attrNode['name'], $attrNode['value']);
             if (!empty($attrNode['attributes'])) {
                 foreach ($attrNode['attributes'] as $name => $value) {

diff --git a/src/TYML.php b/src/TYML.php
@@ -29,19 +29,16 @@ protected function toArray()
         foreach ($this as $key => $value) {
             if (is_object($value) && method_exists($value, 'getData')) {
                 $array[$key] = $value->getData();
-            }
-            elseif (is_array($value)) {
+            } elseif (is_array($value)) {
                 if (!empty($value)) {
                     $array[$key] = $this->getArray($value);
                 }
-            }
-            else {
+            } else {
                 $getter = 'get' . $key;
                 if (method_exists($this, $getter)) {
                     $getValue = $this->$getter();
                     if ($getValue !== null) $array[$key] = $getValue;
-                }
-                elseif ($value !== null) {
+                } elseif ($value !== null) {
                     $array[$key] = $value;
                 }
             }
@@ -61,17 +58,14 @@ protected function getArray($value)
         foreach ($value as $subkey => $subvalue) {
             if (is_object($subvalue) && method_exists($subvalue, 'getData')) {
                 $subarray[$subkey] = $subvalue->getData();
-            }
-            elseif (is_array($subvalue)) {
+            } elseif (is_array($subvalue)) {
                 $subarray[$subkey] = $this->getArray($subvalue);
-            }
-            else {
+            } else {
                 $getter = 'get' . $subkey;
                 if (method_exists($this, $getter)) {
                     $getValue = $this->$getter();
                     if ($getValue !== null) $subarray[$subkey] = $getValue;
-                }
-                elseif ($subvalue !== null) {
+                } elseif ($subvalue !== null) {
                     $subarray[$subkey] = $subvalue;
                 }
             }

diff --git a/src/YML.php b/src/YML.php
@@ -58,13 +58,17 @@ public function __construct()
 
     /**
      * @param string $uri
-     * @param string|null $schema
+     * @param string|bool $schema
      * @throws \Exception
      */
-    public function parse($uri, $schema = __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'yml.xsd')
+    public function parse($uri, $schema = true)
     {
         $this->uri = $uri;
-        $this->schema = $schema;
+        if ($schema === true) {
+            $this->schema = __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'yml.xsd';
+        } elseif (is_string($schema)) {
+            $this->schema = $schema;
+        }
 
         $this->open();
 
@@ -113,8 +117,7 @@ public function getOffers()
                 while ($this->read()) {
                     if ($this->path == 'yml_catalog/shop/offers/offer') {
                         yield $this->parseOffer();
-                    }
-                    elseif ($this->path == 'yml_catalog/shop') {
+                    } elseif ($this->path == 'yml_catalog/shop') {
                         break;
                     }
                 }
@@ -137,11 +140,9 @@ protected function parseShop()
         while ($this->read()) {
             if ($this->path == 'yml_catalog/shop/offers') {
                 $shop->setOffersCount($this->parseOffersCount());
-            }
-            elseif ($xml->nodeType == \XMLReader::ELEMENT) {
+            } elseif ($xml->nodeType == \XMLReader::ELEMENT) {
                 $nodes[] = $this->parseNode('yml_catalog/shop');
-            }
-            elseif ($this->path == 'yml_catalog') {
+            } elseif ($this->path == 'yml_catalog') {
                 break;
             }
         }
@@ -182,11 +183,9 @@ protected function parseNode($basePath)
             while ($this->read()) {
                 if ($xml->nodeType == \XMLReader::ELEMENT) {
                     $nodes[] = $this->parseNode($path);
-                }
-                elseif (($xml->nodeType == \XMLReader::TEXT || $xml->nodeType == \XMLReader::CDATA) && $xml->hasValue) {
+                } elseif (($xml->nodeType == \XMLReader::TEXT || $xml->nodeType == \XMLReader::CDATA) && $xml->hasValue) {
                     $value .= $xml->value;
-                }
-                elseif ($this->path == $basePath) {
+                } elseif ($this->path == $basePath) {
                     break;
                 }
             }
@@ -246,7 +245,7 @@ protected function open()
         }
 
         if (!empty($this->schema)) {
-            $schema = (string)$this->schema;
+            $schema = $this->schema;
             if (!$this->XMLReader->setSchema($schema)) {
                 throw new \Exception("Failed to open XML Schema file '{$schema}'");
             }