Changeset 11850
- Timestamp:
- 09/29/08 17:43:13 (5 years ago)
- Files:
-
- branches/1.0/data/tasks/sfPakePropel.php (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/1.0/data/tasks/sfPakePropel.php
r8288 r11850 54 54 function _propel_convert_yml_schema($check_schema = true, $prefix = '') 55 55 { 56 $finder = pakeFinder::type('file')->ignore_version_control()->name('*schema.yml') ;56 $finder = pakeFinder::type('file')->ignore_version_control()->name('*schema.yml')->prune('doctrine'); 57 57 $dirs = array('config'); 58 58 if ($pluginDirs = glob(sfConfig::get('sf_root_dir').'/plugins/*/config')) … … 92 92 function _propel_convert_xml_schema($check_schema = true, $prefix = '') 93 93 { 94 $finder = pakeFinder::type('file')->ignore_version_control()->name('*schema.xml') ;94 $finder = pakeFinder::type('file')->ignore_version_control()->name('*schema.xml')->prune('doctrine'); 95 95 96 96 $schemas = array_merge($finder->in('config'), $finder->in(glob(sfConfig::get('sf_root_dir').'/plugins/*/config'))); … … 124 124 function _propel_copy_xml_schema_from_plugins($prefix = '') 125 125 { 126 $schemas = pakeFinder::type('file')->ignore_version_control()->name('*schema.xml')-> in(glob(sfConfig::get('sf_root_dir').'/plugins/*/config'));126 $schemas = pakeFinder::type('file')->ignore_version_control()->name('*schema.xml')->prune('doctrine')->in(glob(sfConfig::get('sf_root_dir').'/plugins/*/config')); 127 127 128 128 foreach ($schemas as $schema) … … 351 351 function _call_phing($task, $task_name, $check_schema = true) 352 352 { 353 $schemas = pakeFinder::type('file')->ignore_version_control()->name('*schema.xml')-> relative()->follow_link()->in('config');353 $schemas = pakeFinder::type('file')->ignore_version_control()->name('*schema.xml')->prune('doctrine')->relative()->follow_link()->in('config'); 354 354 if ($check_schema && !$schemas) 355 355 {