Merge pull request #28 from GnaritasInc/pathfix

Insure "path" is an array.
frictionlessdata · Aug 30, 2017 · c045648 · c045648
2 parents 017fa91 + 62ce08f
commit c045648
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/Validators/DatapackageValidator.php b/src/Validators/DatapackageValidator.php
@@ -29,11 +29,15 @@ protected function getDescriptorForValidation()
             foreach ($descriptor->resources as &$resource) {
                 if (is_object($resource)) {
                     $resource = clone $resource;
-                    if (isset($resource->path) && is_array($resource->path)) {
-                        foreach ($resource->path as &$url) {
-                            if (is_string($url)) {
-                                $url = 'file://'.$url;
+                    if (isset($resource->path)) {
+                        if (is_array($resource->path)) {
+                            foreach ($resource->path as &$url) {
+                                if (is_string($url)) {
+                                    $url = 'file://'.$url;
+                                }
                             }
+                        } elseif (is_string($resource->path)) {
+                            $resource->path .= 'file://'.$resource->path;
                         }
                     }
                 }

diff --git a/src/Validators/ResourceValidator.php b/src/Validators/ResourceValidator.php
@@ -44,7 +44,9 @@ protected function getResourceClass()
     protected function validateKeys()
     {
         $resourceClass = $this->getResourceClass();
-        foreach ($this->descriptor->path as $dataSource) {
+        // DS: path can be a string or an array
+        $sources = is_array($this->descriptor->path) ? $this->descriptor->path : array($this->descriptor->path);
+        foreach ($sources as $dataSource) {
             foreach ($resourceClass::validateDataSource($dataSource, $this->basePath) as $error) {
                 $this->errors[] = $error;
             }