Commit 84fb1ecd authored by Jonathan.Wage's avatar Jonathan.Wage

Fix array_merge so that schemas that are loaded after are merged in to the...

Fix array_merge so that schemas that are loaded after are merged in to the existing array of schemas.
parent 5bb44938
...@@ -103,7 +103,7 @@ class Doctrine_Import_Schema ...@@ -103,7 +103,7 @@ class Doctrine_Import_Schema
foreach ((array) $schema AS $s) { foreach ((array) $schema AS $s) {
if (is_file($s)) { if (is_file($s)) {
$array = array_merge($this->parseSchema($s, $format), $array); $array = array_merge($array, $this->parseSchema($s, $format));
} else if (is_dir($s)) { } else if (is_dir($s)) {
$it = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($s), $it = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($s),
RecursiveIteratorIterator::LEAVES_ONLY); RecursiveIteratorIterator::LEAVES_ONLY);
...@@ -111,7 +111,7 @@ class Doctrine_Import_Schema ...@@ -111,7 +111,7 @@ class Doctrine_Import_Schema
foreach ($it as $file) { foreach ($it as $file) {
$e = explode('.', $file->getFileName()); $e = explode('.', $file->getFileName());
if (end($e) === $format) { if (end($e) === $format) {
$array = array_merge($this->parseSchema($file->getPathName(), $format), $array); $array = array_merge($array, $this->parseSchema($file->getPathName(), $format));
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment