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

Fixed issue with specifying directory as schema

Browse Source
This commit is contained in:
Jonathan.Wage 2007-11-15 19:43:49 +00:00
parent caa3f47666
commit 15bf4d70e0
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -102,7 +102,7 @@ class Doctrine_Import_Schema
$array = array(); $array = array();
foreach ((array) $schema AS $s) { foreach ((array) $schema AS $s) {
if (is_file($s) || is_string($s)) { if (is_file($s)) {
$array = array_merge($array, $this->parseSchema($s, $format)); $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),
@ -114,6 +114,8 @@ class Doctrine_Import_Schema
$array = array_merge($array, $this->parseSchema($file->getPathName(), $format)); $array = array_merge($array, $this->parseSchema($file->getPathName(), $format));
} }
} }
} else {
$array = array_merge($array, $this->parseSchema($s, $format));
} }
} }