RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2024-12-14 07:06:04 +03:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jonathan.Wage 2007-11-08 23:49:01 +00:00
parent 5bb4493864
commit 84fb1ecdc4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Doctrine/Import/Schema.php
View File

@ -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
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));
} }
} }
} }