Development

Changeset 8315

You must first sign up to be able to contribute.

Changeset 8315

Show
Ignore:
Timestamp:
04/05/08 02:43:40 (8 months ago)
Author:
dwhittle
Message:

dwhittle: merged changed to branch

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/dwhittle/1.0/data/bin/symfony.php

    r6598 r8315  
    44 * This file is part of the symfony package. 
    55 * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com> 
    6  *  
     6 * 
    77 * For the full copyright and license information, please view the LICENSE 
    88 * file that was distributed with this source code. 
    …… 
    163163  if ($dirs = glob($globDir)) 
    164164  { 
    165     $tasks = pakeFinder::type('file')->name($name)->in($dirs); 
     165    $tasks = pakeFinder::type('file')->ignore_version_control()->name($name)->in($dirs); 
    166166    foreach ($tasks as $task) 
    167167    { 

  • branches/dwhittle/1.0/data/tasks/sfPakeGenerator.php

    r6598 r8315  
    44 * This file is part of the symfony package. 
    55 * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com> 
    6  *  
     6 * 
    77 * For the full copyright and license information, please view the LICENSE 
    88 * file that was distributed with this source code. 
    …… 
    4949  pake_mirror($finder, sfConfig::get('sf_symfony_data_dir').'/skeleton/project', $sf_root_dir); 
    5050 
    51   $finder = pakeFinder::type('file')->name('properties.ini', 'apache.conf', 'propel.ini'); 
     51  $finder = pakeFinder::type('file')->ignore_version_control()->name('properties.ini', 'apache.conf', 'propel.ini'); 
    5252  pake_replace_tokens($finder, $sf_root_dir, '##', '##', array('PROJECT_NAME' => $project_name)); 
    5353 
    54   $finder = pakeFinder::type('file')->name('propel.ini'); 
     54  $finder = pakeFinder::type('file')->ignore_version_control()->name('propel.ini'); 
    5555  pake_replace_tokens($finder, $sf_root_dir, '##', '##', array('PROJECT_DIR' => $sf_root_dir)); 
    5656 
    …… 
    9494 
    9595  // set no_script_name value in settings.yml for production environment 
    96   $finder = pakeFinder::type('file')->name('settings.yml'); 
     96  $finder = pakeFinder::type('file')->ignore_version_control()->name('settings.yml'); 
    9797  pake_replace_tokens($finder, $app_dir.'/'.sfConfig::get('sf_app_config_dir_name'), '##', '##', array('NO_SCRIPT_NAME' => ($first_app ? 'on' : 'off'))); 
    9898 
    …… 
    100100  pake_copy(sfConfig::get('sf_symfony_data_dir').'/skeleton/app/web/index_dev.php', sfConfig::get('sf_web_dir').'/'.$app.'_dev.php'); 
    101101 
    102   $finder = pakeFinder::type('file')->name($index_name.'.php', $app.'_dev.php'); 
     102  $finder = pakeFinder::type('file')->ignore_version_control()->name($index_name.'.php', $app.'_dev.php'); 
    103103  pake_replace_tokens($finder, sfConfig::get('sf_web_dir'), '##', '##', array('APP_NAME' => $app)); 
    104104 
    …… 
    162162 
    163163  // customize php and yml files 
    164   $finder = pakeFinder::type('file')->name('*.php', '*.yml'); 
     164  $finder = pakeFinder::type('file')->ignore_version_control()->name('*.php', '*.yml'); 
    165165  pake_replace_tokens($finder, $module_dir, '##', '##', $constants); 
    166166} 

  • branches/dwhittle/1.0/data/tasks/sfPakeMisc.php

    r6598 r8315  
    44 * This file is part of the symfony package. 
    55 * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com> 
    6  *  
     6 * 
    77 * For the full copyright and license information, please view the LICENSE 
    88 * file that was distributed with this source code. 
    …… 
    297297 
    298298  $lockFile = $app.'_'.$env.'.clilock'; 
    299   $locks = pakeFinder::type('file')->prune('.svn')->discard('.svn')->maxdepth(0)->name($lockFile)->relative()->in('./'); 
     299  $locks = pakeFinder::type('file')->ignore_version_control()->prune('.svn')->discard('.svn')->maxdepth(0)->name($lockFile)->relative()->in('./'); 
    300300 
    301301  if (file_exists(sfConfig::get('sf_root_dir').'/'.$lockFile)) 
    302302  { 
    303303    pake_remove($lockFile, ''); 
    304     run_clear_cache($task, array());  
     304    run_clear_cache($task, array()); 
    305305    pake_echo_action('enable', "$app [$env] has been ENABLED"); 
    306306 

  • branches/dwhittle/1.0/data/tasks/sfPakePlugins.php

    r8007 r8315  
    44 * This file is part of the symfony package. 
    55 * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com> 
    6  *  
     6 * 
    77 * For the full copyright and license information, please view the LICENSE 
    88 * file that was distributed with this source code. 
    …… 
    218218    ), 
    219219    '_lastmodified' => array( 
    220       'ETag' => "113845-297-dc93f000",  
     220      'ETag' => "113845-297-dc93f000", 
    221221      'Last-Modified' => date('r'), 
    222222    ), 
    …… 
    277277    else 
    278278    { 
    279       pake_remove(pakeFinder::type('any'), $target_dir); 
     279      pake_remove(pakeFinder::type('any')->ignore_version_control(), $target_dir); 
    280280      pake_remove($target_dir, ''); 
    281281    } 
    …… 
    295295 
    296296  if ($source == $target) 
    297   {  
     297  { 
    298298    return '.'; 
    299299  } 

  • branches/dwhittle/1.0/data/tasks/sfPakePropel.php

    r7772 r8315  
    44 * This file is part of the symfony package. 
    55 * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com> 
    6  *  
     6 * 
    77 * For the full copyright and license information, please view the LICENSE 
    88 * file that was distributed with this source code. 
    …… 
    5454function _propel_convert_yml_schema($check_schema = true, $prefix = '') 
    5555{ 
    56   $finder = pakeFinder::type('file')->name('*schema.yml'); 
     56  $finder = pakeFinder::type('file')->ignore_version_control()->name('*schema.yml'); 
    5757  $dirs = array('config'); 
    5858  if ($pluginDirs = glob(sfConfig::get('sf_root_dir').'/plugins/*/config')) 
    …… 
    8585 
    8686    $file = str_replace(basename($schema), $localprefix.$xml_file_name,  $schema); 
    87     pake_echo_action('schema', 'putting '.$file);     
     87    pake_echo_action('schema', 'putting '.$file); 
    8888    file_put_contents($file, $db_schema->asXML()); 
    8989  } 
    …… 
    9292function _propel_convert_xml_schema($check_schema = true, $prefix = '') 
    9393{ 
    94   $finder = pakeFinder::type('file')->name('*schema.xml'); 
     94  $finder = pakeFinder::type('file')->ignore_version_control()->name('*schema.xml'); 
    9595 
    9696  $schemas = array_merge($finder->in('config'), $finder->in(glob(sfConfig::get('sf_root_dir').'/plugins/*/config'))); 
    …… 
    115115    // save converted xml files in original directories 
    116116    $yml_file_name = str_replace('.xml', '.yml', basename($schema)); 
    117      
     117 
    118118    $file = str_replace(basename($schema), $prefix.$yml_file_name,  $schema); 
    119     pake_echo_action('schema', 'putting '.$file);     
     119    pake_echo_action('schema', 'putting '.$file); 
    120120    file_put_contents($file, $db_schema->asYAML()); 
    121121  } 
    …… 
    124124function _propel_copy_xml_schema_from_plugins($prefix = '') 
    125125{ 
    126   $schemas = pakeFinder::type('file')->name('*schema.xml')->in(glob(sfConfig::get('sf_root_dir').'/plugins/*/config')); 
     126  $schemas = pakeFinder::type('file')->ignore_version_control()->name('*schema.xml')->in(glob(sfConfig::get('sf_root_dir').'/plugins/*/config')); 
    127127 
    128128  foreach ($schemas as $schema) 
    …… 
    168168  _propel_copy_xml_schema_from_plugins('generated-'); 
    169169  _call_phing($task, 'om'); 
    170   $finder = pakeFinder::type('file')->name('generated-*schema.xml'); 
     170  $finder = pakeFinder::type('file')->ignore_version_control()->name('generated-*schema.xml'); 
    171171  pake_remove($finder, array('config', 'plugins')); 
    172172} 
    …… 
    177177  _propel_copy_xml_schema_from_plugins('generated-'); 
    178178  _call_phing($task, 'sql'); 
    179   $finder = pakeFinder::type('file')->name('generated-*schema.xml'); 
     179  $finder = pakeFinder::type('file')->ignore_version_control()->name('generated-*schema.xml'); 
    180180  pake_remove($finder, 'config'); 
    181181} 
    …… 
    191191  _propel_copy_xml_schema_from_plugins('generated-'); 
    192192  _call_phing($task, 'insert-sql'); 
    193   $finder = pakeFinder::type('file')->name('generated-*schema.xml'); 
     193  $finder = pakeFinder::type('file')->ignore_version_control()->name('generated-*schema.xml'); 
    194194  pake_remove($finder, 'config'); 
    195195} 
    …… 
    210210  { 
    211211    _propel_convert_xml_schema(false, ''); 
    212     $finder = pakeFinder::type('file')->name('schema.xml'); 
     212    $finder = pakeFinder::type('file')->ignore_version_control()->name('schema.xml'); 
    213213    pake_remove($finder, 'config'); 
    214214  } 
    …… 
    324324      $pluginDirs = array(); 
    325325    } 
    326     $fixtures_dirs = pakeFinder::type('dir')->name('fixtures')->in(array_merge($pluginDirs, array(sfConfig::get('sf_data_dir')))); 
     326    $fixtures_dirs = pakeFinder::type('dir')->ignore_version_control()->name('fixtures')->in(array_merge($pluginDirs, array(sfConfig::get('sf_data_dir')))); 
    327327  } 
    328328  else 
    …… 
    351351function _call_phing($task, $task_name, $check_schema = true) 
    352352{ 
    353   $schemas = pakeFinder::type('file')->name('*schema.xml')->relative()->follow_link()->in('config'); 
     353  $schemas = pakeFinder::type('file')->ignore_version_control()->name('*schema.xml')->relative()->follow_link()->in('config'); 
    354354  if ($check_schema && !$schemas) 
    355355  { 

  • branches/dwhittle/1.0/data/tasks/sfPakePropelAdminGenerator.php

    r6598 r8315  
    44 * This file is part of the symfony package. 
    55 * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com> 
    6  *  
     6 * 
    77 * For the full copyright and license information, please view the LICENSE 
    88 * file that was distributed with this source code. 
    …… 
    4444    'MODEL_CLASS'  => $model_class, 
    4545    'AUTHOR_NAME'  => $author_name, 
    46     'THEME'        => $theme,  
     46    'THEME'        => $theme, 
    4747  ); 
    4848 
    …… 
    6262 
    6363  // customize php and yml files 
    64   $finder = pakeFinder::type('file')->name('*.php', '*.yml'); 
     64  $finder = pakeFinder::type('file')->ignore_version_control()->name('*.php', '*.yml'); 
    6565  pake_replace_tokens($finder, $moduleDir, '##', '##', $constants); 
    6666} 

  • branches/dwhittle/1.0/data/tasks/sfPakePropelCrudGenerator.php

    r6598 r8315  
    44 * This file is part of the symfony package. 
    55 * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com> 
    6  *  
     6 * 
    77 * For the full copyright and license information, please view the LICENSE 
    88 * file that was distributed with this source code. 
    …… 
    6262 
    6363  // customize php and yml files 
    64   $finder = pakeFinder::type('file')->name('*.php', '*.yml'); 
     64  $finder = pakeFinder::type('file')->ignore_version_control()->name('*.php', '*.yml'); 
    6565  pake_replace_tokens($finder, $moduleDir, '##', '##', $constants); 
    6666} 
    …… 
    9696 
    9797  // copy our generated module 
    98   $finder = pakeFinder::type('any'); 
     98  $finder = pakeFinder::type('any')->ignore_version_control(); 
    9999  pake_mirror($finder, $tmp_dir.'/auto'.ucfirst($module), $moduleDir); 
    100100 
    …… 
    120120 
    121121  // customize php and yml files 
    122   $finder = pakeFinder::type('file')->name('*.php', '*.yml'); 
     122  $finder = pakeFinder::type('file')->ignore_version_control()->name('*.php', '*.yml'); 
    123123  pake_replace_tokens($finder, $moduleDir, '##', '##', $constants); 
    124124 
    …… 
    126126  pake_copy(sfConfig::get('sf_symfony_data_dir').'/skeleton/module/test/actionsTest.php', $sf_root_dir.'/test/functional/'.$app.'/'.$module.'ActionsTest.php'); 
    127127 
    128   // customize test file 
     128  // customize test files 
    129129  pake_replace_tokens($module.'ActionsTest.php', $sf_root_dir.'/test/functional/'.$app, '##', '##', $constants); 
    130130 
    131131  // delete temp files 
    132   $finder = pakeFinder::type('any'); 
     132  $finder = pakeFinder::type('any')->ignore_version_control(); 
    133133  pake_remove($finder, $tmp_dir); 
    134134} 

  • branches/dwhittle/1.0/data/tasks/sfPakeSymfony.php

    r6664 r8315  
    44 * This file is part of the symfony package. 
    55 * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com> 
    6  *  
     6 * 
    77 * For the full copyright and license information, please view the LICENSE 
    88 * file that was distributed with this source code. 
    …… 
    7272  _change_symfony_dirs('\''.$dirs[0].'\'', '\''.$dirs[1].'\''); 
    7373 
    74   $finder = pakeFinder::type('any'); 
     74  $finder = pakeFinder::type('any')->ignore_version_control(); 
    7575  pake_remove($finder, sfConfig::get('sf_lib_dir').'/symfony'); 
    7676  pake_remove(sfConfig::get('sf_lib_dir').'/symfony', ''); 

  • branches/dwhittle/1.0/data/tasks/sfPakeUpgrade.php

    r6598 r8315  
    44 * This file is part of the symfony package. 
    55 * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com> 
    6  *  
     6 * 
    77 * For the full copyright and license information, please view the LICENSE 
    88 * file that was distributed with this source code. 
    …… 
    6060 
    6161  // find all applications for this project 
    62   $apps = pakeFinder::type('directory')->name(sfConfig::get('sf_app_module_dir_name'))->mindepth(1)->maxdepth(1)->relative()->in(sfConfig::get('sf_apps_dir_name')); 
     62  $apps = pakeFinder::type('directory')->ignore_version_control()->name(sfConfig::get('sf_app_module_dir_name'))->mindepth(1)->maxdepth(1)->relative()->in(sfConfig::get('sf_apps_dir_name')); 
    6363 
    6464  // install symfony CLI 
    …… 
    9898    { 
    9999      // template dirs 
    100       $template_dirs   = pakeFinder::type('directory')->name('templates')->mindepth(1)->maxdepth(1)->in($dir); 
     100      $template_dirs   = pakeFinder::type('directory')->ignore_version_control()->name('templates')->mindepth(1)->maxdepth(1)->in($dir); 
    101101      $template_dirs[] = $app_dir.'/'.sfConfig::get('sf_app_template_dir_name'); 
    102102 
    …… 
    110110 
    111111      // actions dirs 
    112       $action_dirs = pakeFinder::type('directory')->name('actions')->mindepth(1)->maxdepth(1)->in($dir); 
     112      $action_dirs = pakeFinder::type('directory')->ignore_version_control()->name('actions')->mindepth(1)->maxdepth(1)->in($dir); 
    113113 
    114114      _upgrade_1_0_deprecated_for_actions($action_dirs); 
    …… 
    137137{ 
    138138  $dirs = array(sfConfig::get('sf_lib_dir_name'), sfConfig::get('sf_apps_dir_name')); 
    139   $finder = pakeFinder::type('file')->name('*.php'); 
     139  $finder = pakeFinder::type('file')->ignore_version_control()->name('*.php'); 
    140140 
    141141  $seen = false; 
    …… 
    165165  pake_echo_action('upgrade 1.0', 'upgrading sf/ path configuration'); 
    166166 
    167   $php_files = pakeFinder::type('file')->name('*.php')->in($app_dir); 
     167  $php_files = pakeFinder::type('file')->ignore_version_control()->name('*.php')->in($app_dir); 
    168168  foreach ($php_files as $php_file) 
    169169  { 
    …… 
    227227  { 
    228228    list($dir, $config_file) = array(dirname($config_file), basename($config_file)); 
    229     $files = pakeFinder::type('file')->name($config_file)->in(sfConfig::get('sf_root_dir').DIRECTORY_SEPARATOR.$dir); 
     229    $files = pakeFinder::type('file')->ignore_version_control()->name($config_file)->in(sfConfig::get('sf_root_dir').DIRECTORY_SEPARATOR.$dir); 
    230230    foreach ($files as $file) 
    231231    { 
    …… 
    261261  pake_echo_action('upgrade 1.0', 'upgrading view configuration'); 
    262262 
    263   $yml_files = pakeFinder::type('file')->name('*.yml')->in($app_dir); 
     263  $yml_files = pakeFinder::type('file')->ignore_version_control()->name('*.yml')->in($app_dir); 
    264264  foreach ($yml_files as $yml_file) 
    265265  { 
    …… 
    302302  pake_echo_action('upgrade 1.0', 'upgrading cache configuration'); 
    303303 
    304   $yml_files = pakeFinder::type('files')->name('cache.yml')->in($app_dir); 
     304  $yml_files = pakeFinder::type('files')->ignore_version_control()->name('cache.yml')->in($app_dir); 
    305305 
    306306  $seen = false; 
    …… 
    339339  pake_echo_action('upgrade 1.0', 'upgrading deprecated helpers in generator.yml'); 
    340340 
    341   $yml_files = pakeFinder::type('files')->name('generator.yml')->in($app_dir); 
     341  $yml_files = pakeFinder::type('files')->ignore_version_control()->name('generator.yml')->in($app_dir); 
    342342 
    343343  $seen = array(); 
    …… 
    377377  pake_echo_action('upgrade 1.0', 'upgrading deprecated methods in actions'); 
    378378 
    379   $php_files = pakeFinder::type('file')->name('*.php')->in($action_dirs); 
     379  $php_files = pakeFinder::type('file')->ignore_version_control()->name('*.php')->in($action_dirs); 
    380380  foreach ($php_files as $php_file) 
    381381  { 
    …… 
    424424  $regex = '/('.implode('|', $helpers).')/'; 
    425425 
    426   $php_files = pakeFinder::type('file')->name('*.php')->in($template_dirs); 
     426  $php_files = pakeFinder::type('file')->ignore_version_control()->name('*.php')->in($template_dirs); 
    427427  $seen = false; 
    428428  foreach ($php_files as $php_file) 
    …… 
    457457  pake_echo_action('upgrade 1.0', 'upgrading deprecated helpers'); 
    458458 
    459   $php_files = pakeFinder::type('file')->name('*.php')->in($template_dirs); 
     459  $php_files = pakeFinder::type('file')->ignore_version_control()->name('*.php')->in($template_dirs); 
    460460  $seen = array(); 
    461461  $deprecated_str = array( 
    …… 
    518518  // upgrade module filters.yml 
    519519  $seen = false; 
    520   $yml_files = pakeFinder::type('file')->name('filters.yml')->in($app_dir.DIRECTORY_SEPARATOR.'modules'); 
     520  $yml_files = pakeFinder::type('file')->ignore_version_control()->name('filters.yml')->in($app_dir.DIRECTORY_SEPARATOR.'modules'); 
    521521  foreach ($yml_files as $yml_file) 
    522522  { 
    …… 
    618618 
    619619  $seen = false; 
    620   $php_files = pakeFinder::type('file')->name('*.php')->in(sfConfig::get('sf_lib_dir').'/model'); 
     620  $php_files = pakeFinder::type('file')->ignore_version_control()->name('*.php')->in(sfConfig::get('sf_lib_dir').'/model'); 
    621621  foreach ($php_files as $php_file) 
    622622  { 
    …… 
    651651 
    652652  $seen = false; 
    653   $xml_files = pakeFinder::type('file')->name('*schema.xml')->in(sfConfig::get('sf_config_dir')); 
     653  $xml_files = pakeFinder::type('file')->ignore_version_control()->name('*schema.xml')->in(sfConfig::get('sf_config_dir')); 
    654654  foreach ($xml_files as $xml_file) 
    655655  { 

  • branches/dwhittle/1.0/lib/addon/propel/generator/sfPropelCrudGenerator.class.php

    r6598 r8315  
    6767  { 
    6868    // we must load all map builder classes to be able to deal with foreign keys (cf. editSuccess.php template) 
    69     $classes = sfFinder::type('file')->name('*MapBuilder.php')->in(sfLoader::getModelDirs()); 
     69    $classes = sfFinder::type('file')->ignore_version_control()->name('*MapBuilder.php')->in(sfLoader::getModelDirs()); 
    7070    foreach ($classes as $class) 
    7171    { 

  • branches/dwhittle/1.0/lib/addon/propel/sfPropelData.class.php

    r6598 r8315  
    267267    { 
    268268      // load all map builder classes 
    269       $files = sfFinder::type('file')->name('*MapBuilder.php')->in(sfLoader::getModelDirs()); 
     269      $files = sfFinder::type('file')->ignore_version_control()->name('*MapBuilder.php')->in(sfLoader::getModelDirs()); 
    270270      foreach ($files as $file) 
    271271      { 
    …… 
    456456    return $classes; 
    457457  } 
    458    
     458 
    459459  protected function fixOrderingOfForeignKeyDataInSameTable($resultsSets, $tableName, $column, $in = null) 
    460460  { 

  • branches/dwhittle/1.0/lib/addon/propel/sfPropelManyToMany.class.php

    r6598 r8315  
    5252 
    5353    // we must load all map builder classes 
    54     $classes = sfFinder::type('file')->name('*MapBuilder.php')->in(sfLoader::getModelDirs()); 
     54    $classes = sfFinder::type('file')->ignore_version_control()->name('*MapBuilder.php')->in(sfLoader::getModelDirs()); 
    5555    foreach ($classes as $class) 
    5656    { 

  • branches/dwhittle/1.0/lib/addon/sfData.class.php

    r6598 r8315  
    109109    else if (is_dir($directory_or_file)) 
    110110    { 
    111       $fixture_files = sfFinder::type('file')->name('*.yml')->in($directory_or_file); 
     111      $fixture_files = sfFinder::type('file')->ignore_version_control()->name('*.yml')->in($directory_or_file); 
    112112    } 
    113113    else 

  • branches/dwhittle/1.0/lib/cache/sfFileCache.class.php

    r6598 r8315  
    44 * This file is part of the symfony package. 
    55 * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com> 
    6  *  
     6 * 
    77 * For the full copyright and license information, please view the LICENSE 
    88 * file that was distributed with this source code. 
    …… 
    7272  */ 
    7373  protected $automaticCleaningFactor = 500; 
    74    
     74 
    7575 /** 
    7676  * Nested directory level 
    …… 
    9191  public function __construct($cacheDir = null) 
    9292  { 
    93     $this->setCacheDir($cacheDir); 
     93    if (!is_null($cacheDir)) 
     94    { 
     95      $this->setCacheDir($cacheDir); 
     96    } 
    9497  } 
    9598 
    …… 
    275278    return false; 
    276279  } 
    277    
     280 
    278281 /** 
    279282  * Saves some data in a cache file. 
    …… 
    484487        $hashControl = @fread($fp, 32); 
    485488        $length = $length - 32; 
    486       }  
     489      } 
    487490      $data = ($length) ? @fread($fp, $length) : ''; 
    488491      set_magic_quotes_runtime($mqr); 
    …… 
    570573    throw new sfCacheException('Unable to write cache file "'.$path.$file.'"'); 
    571574  } 
    572    
     575 
    573576 /** 
    574577  * Writes the given data in the cache file and controls it just after to avoid corrupted cache entries. 
    …… 
    587590    return ($dataRead == $data); 
    588591  } 
    589    
     592 
    590593 /** 
    591594  * Makes a control key with the string containing datas. 

  • branches/dwhittle/1.0/lib/generator/sfCrudGenerator.class.php

    r6598 r8315  
    8787 
    8888    $this->setTheme($theme); 
    89     $templateFiles = sfFinder::type('file')->name('*.php')->relative()->in($themeDir.'/templates'); 
    90     $configFiles = sfFinder::type('file')->name('*.yml')->relative()->in($themeDir.'/config'); 
     89    $templateFiles = sfFinder::type('file')->ignore_version_control()->name('*.php')->relative()->in($themeDir.'/templates'); 
     90    $configFiles = sfFinder::type('file')->ignore_version_control()->name('*.yml')->relative()->in($themeDir.'/config'); 
    9191 
    9292    $this->generatePhpFiles($this->generatedModuleName, $templateFiles, $configFiles); 
    …… 
    314314  { 
    315315    $type = $column->getCreoleType(); 
    316      
     316 
    317317    $columnGetter = $this->getColumnGetter($column, true); 
    318318 

  • branches/dwhittle/1.0/lib/view/sfMailView.class.php

    r6598 r8315  
    8282    $all_template_dir  = dirname($template); 
    8383    $all_template_regex = preg_replace('/\\.php$/', '\..+\.php', basename($template)); 
    84     $all_templates = sfFinder::type('file')->name('/^'.$all_template_regex.'$/')->in($all_template_dir); 
     84    $all_templates = sfFinder::type('file')->ignore_version_control()->name('/^'.$all_template_regex.'$/')->in($all_template_dir); 
    8585    $all_retvals = array(); 
    8686    foreach ($all_templates as $templateFile) 

  • branches/dwhittle/1.0/test/bin/coverage.php

    r6598 r8315  
    44 * This file is part of the symfony package. 
    55 * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com> 
    6  *  
     6 * 
    77 * For the full copyright and license information, please view the LICENSE 
    88 * file that was distributed with this source code. 
    …… 
    2727$c->base_dir = realpath(dirname(__FILE__).'/../../lib'); 
    2828 
    29 $finder = pakeFinder::type('file')->name('*.php')->prune('vendor'); 
     29$finder = pakeFinder::type('file')->ignore_version_control()->name('*.php')->prune('vendor'); 
    3030$c->register($finder->in($c->base_dir)); 
    3131$c->run(); 

  • branches/dwhittle/1.0/test/unit/cache/sfFileCacheTest.php

    r6598 r8315  
    44 * This file is part of the symfony package. 
    55 * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com> 
    6  *  
     6 * 
    77 * For the full copyright and license information, please view the LICENSE 
    88 * file that was distributed with this source code. 
    …… 
    1212require_once(dirname(__FILE__).'/sfCacheDriverTests.class.php'); 
    1313 
    14 $t = new lime_test(18, new lime_output_color()); 
     14$t = new lime_test(36, new lime_output_color()); 
    1515 
    1616// setup 
    …… 
    2424 
    2525// teardown 
     26 
    2627sfToolkit::clearDirectory($temp); 
    2728rmdir($temp); 
     29 
     30$temp = tempnam('/tmp/cachedir', 'tmp'); 
     31unlink($temp); 
     32mkdir($temp); 
     33 
     34