From 15bf4d70e00a7c911c670b97764bcb429bef3c9c Mon Sep 17 00:00:00 2001 From: "Jonathan.Wage" Date: Thu, 15 Nov 2007 19:43:49 +0000 Subject: [PATCH] Fixed issue with specifying directory as schema --- lib/Doctrine/Import/Schema.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/Doctrine/Import/Schema.php b/lib/Doctrine/Import/Schema.php index 58e4451ed..b7c47b01b 100644 --- a/lib/Doctrine/Import/Schema.php +++ b/lib/Doctrine/Import/Schema.php @@ -102,7 +102,7 @@ class Doctrine_Import_Schema $array = array(); foreach ((array) $schema AS $s) { - if (is_file($s) || is_string($s)) { + if (is_file($s)) { $array = array_merge($array, $this->parseSchema($s, $format)); } else if (is_dir($s)) { $it = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($s), @@ -114,6 +114,8 @@ class Doctrine_Import_Schema $array = array_merge($array, $this->parseSchema($file->getPathName(), $format)); } } + } else { + $array = array_merge($array, $this->parseSchema($s, $format)); } }