fix include node

arhframe · Mar 20, 2015 · f176322 · f176322
1 parent 9084430
commit f176322
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/src/Arhframe/Yamlarh/YamlarhNode/IncludeYamlarhNode.php b/src/Arhframe/Yamlarh/YamlarhNode/IncludeYamlarhNode.php
@@ -47,7 +47,7 @@ private function searchForInclude(&$arrayYaml = null)
                 $currentFile = new File($this->yamlarh->getFilename());
                 $includeFile = new File($includeFile);
                 if (!$includeFile->isFile()) {
-                    $includeFile->setFolder($currentFile->getFolder());
+                    $includeFile->setFolder($currentFile->getFolder() . $includeFile->getFolder());
                 }
                 $yamlArh = new Yamlarh($includeFile->absolute());
                 $includeYaml = array_merge($yamlArh->parse(), $arrayYaml, $includeYaml);

diff --git a/tests/Arhframe/Yamlarh/resource/include/file1.xml b/tests/Arhframe/Yamlarh/resource/include/file1.xml
@@ -4,6 +4,6 @@
         <var1>var</var1>
     </arhframe>
     <test>
-        <yar-include>file2.json</yar-include>
+        <yar-include>folderinclude/file2.json</yar-include>
     </test>
 </yamlarh>
diff --git a/...frame/Yamlarh/resource/include/file2.json → ...resource/include/folderinclude/file2.json b/...frame/Yamlarh/resource/include/file2.json → ...resource/include/folderinclude/file2.json