Development

Changeset 7255

You must first sign up to be able to contribute.

Changeset 7255

Show
Ignore:
Timestamp:
02/01/08 02:12:24 (10 months ago)
Author:
dwhittle
Message:

dwhittle: merge changes to branch

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/dwhittle/1.1/data/config/autoload.yml

    r5386 r7255  
    11autoload: 
    2   # symfony core 
    3   symfony: 
    4     name:           symfony 
    5     path:           %SF_SYMFONY_LIB_DIR% 
    6     recursive:      on 
    7     exclude:        [vendor, plugins] 
    82 
    93  # plugins 

  • branches/dwhittle/1.1/lib/autoload/sfCoreAutoload.class.php

    r7247 r7255  
    150150  'sfConfig' => 'config', 
    151151  'sfConfigCache' => 'config', 
     152  'sfConfigDimension' => 'config', 
    152153  'sfConfigHandler' => 'config', 
    153154  'sfDatabaseConfigHandler' => 'config', 
    …… 
    201202  'sfFilter' => 'filter', 
    202203  'sfFilterChain' => 'filter', 
    203   'sfRenderingFilter' => 'filter', 
    204204  'sfForm' => 'form', 
    205205  'sfFormField' => 'form', 
    …… 
    243243  'sfNoLogger' => 'log', 
    244244  'sfWebDebugLogger' => 'log', 
     245  'sfCommentOptimizer' => 'optimizer', 
     246  'sfConditionOptimizer' => 'optimizer', 
     247  'sfConstantOptimizer' => 'optimizer', 
     248  'sfOptimizer' => 'optimizer', 
     249  'sfWhitespaceOptimizer' => 'optimizer', 
    245250  'sfPearDownloader' => 'plugin', 
    246251  'sfPearEnvironment' => 'plugin', 
    …… 
    275280  'sfStorage' => 'storage', 
    276281  'sfCacheClearTask' => 'task/cache', 
     282  'sfCacheGenerateTask' => 'task/cache', 
     283  'sfCacheOptimizeTask' => 'task/cache', 
    277284  'sfConfigureAuthorTask' => 'task/configure', 
    278285  'sfConfigureDatabaseTask' => 'task/configure', 
    …… 
    310317  'sfLoggerUpgrade' => 'task/project/upgrade1.1', 
    311318  'sfPropelUpgrade' => 'task/project/upgrade1.1', 
     319  'sfRenderingFilterUpgrade' => 'task/project/upgrade1.1', 
    312320  'sfSingletonUpgrade' => 'task/project/upgrade1.1', 
    313321  'sfUpgrade' => 'task/project/upgrade1.1', 
    …… 
    323331  'sfSecurityUser' => 'user', 
    324332  'sfUser' => 'user', 
     333  'CartesianIterator' => 'util', 
    325334  'sfBrowser' => 'util', 
    326335  'sfCallable' => 'util', 

  • branches/dwhittle/1.1/lib/command/sfSymfonyCommandApplication.class.php

    r6412 r7255  
    1919class sfSymfonyCommandApplication extends sfCommandApplication 
    2020{ 
    21   protected 
    22     $autoloader = null; 
    23  
    2421  /** 
    2522   * Configures the current symfony command application. 
    …… 
    4037    } 
    4138 
    42     require_once($this->options['symfony_lib_dir'].'/util/sfCore.class.php'); 
    43     require_once($this->options['symfony_lib_dir'].'/config/sfConfig.class.php'); 
    44     require_once($this->options['symfony_lib_dir'].'/util/sfSimpleAutoload.class.php'); 
     39    // initialize symfony core autoloading 
     40    require_once($this->options['symfony_lib_dir'].'/autoload/sfCoreAutoload.class.php'); 
     41    sfCoreAutoload::getInstance()->register(); 
    4542 
    4643    // application 
    …… 
    8481 
    8582  /** 
    86    * Returns the autoloader object. 
    87    * 
    88    * @param object The autoloader object 
    89    */ 
    90   public function getAutoloader() 
    91   { 
    92     return $this->autoloader; 
    93   } 
    94  
    95   /** 
    9683   * Initializes the environment variables and include path. 
    9784   * 
    …… 
    132119    else 
    133120    { 
    134       require_once(sfConfig::get('sf_symfony_lib_dir').'/util/sfToolkit.class.php'); 
    135121      $cache = sfToolkit::getTmpDir().DIRECTORY_SEPARATOR.sprintf('sf_autoload_cmd_%s.data', md5(__FILE__)); 
    136122    } 
    …… 
    138124    $this->autoloader = sfSimpleAutoload::getInstance($cache); 
    139125    $this->autoloader->register(); 
    140  
    141     require_once(sfConfig::get('sf_symfony_lib_dir').'/util/sfFinder.class.php'); 
    142     $finder = sfFinder::type('file')->ignore_version_control()->prune('test')->prune('vendor')->name('*.php'); 
    143     $this->autoloader->addFiles($finder->in(sfConfig::get('sf_symfony_lib_dir'))); 
    144126    $this->autoloader->addDirectory(sfConfig::get('sf_root_dir').'/plugins'); 
    145127  } 

  • branches/dwhittle/1.1/lib/plugins/sfCompat10Plugin/test/bootstrap/unit.php

    r5386 r7255  
    1515sfConfig::set('sf_symfony_data_dir', realpath($_test_dir.'/../data')); 
    1616 
    17 require_once(dirname(__FILE__).'/../../../../util/sfSimpleAutoload.class.php'); 
     17require_once(dirname(__FILE__).'/../../../../autoload/sfSimpleAutoload.class.php'); 
    1818require_once(dirname(__FILE__).'/../../../../util/sfToolkit.class.php'); 
    1919$autoload = sfSimpleAutoload::getInstance(sfToolkit::getTmpDir().DIRECTORY_SEPARATOR.sprintf('sf_autoload_unit_%s.data', md5(__FILE__))); 

  • branches/dwhittle/1.1/lib/plugins/sfPropelPlugin/lib/task/sfPropelBaseTask.class.php

    r7198 r7255  
    3333    if (!self::$done) 
    3434    { 
     35      $libDir = dirname(__FILE__).DIRECTORY_SEPARATOR.'..'; 
     36 
    3537      $autoloader = sfSimpleAutoload::getInstance(); 
    36       $autoloader->addDirectory(dirname(__FILE__).DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'vendor'.DIRECTORY_SEPARATOR.'creole'); 
    37       $autoloader->addDirectory(dirname(__FILE__).DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'vendor'.DIRECTORY_SEPARATOR.'propel'); 
     38      $autoloader->addDirectory($libDir.DIRECTORY_SEPARATOR.'vendor'.DIRECTORY_SEPARATOR.'creole'); 
     39      $autoloader->addDirectory($libDir.DIRECTORY_SEPARATOR.'vendor'.DIRECTORY_SEPARATOR.'propel'); 
     40      $autoloader->addDirectory($libDir.DIRECTORY_SEPARATOR.'creole'); 
     41      $autoloader->addDirectory($libDir.DIRECTORY_SEPARATOR.'propel'); 
     42      $autoloader->addDirectory($libDir.DIRECTORY_SEPARATOR.'task'); 
    3843      $autoloader->addDirectory(sfConfig::get('sf_root_dir').DIRECTORY_SEPARATOR.'lib'.DIRECTORY_SEPARATOR.'model'); 
    3944      $autoloader->addDirectory(sfConfig::get('sf_root_dir').DIRECTORY_SEPARATOR.'lib'.DIRECTORY_SEPARATOR.'form'); 
     45      $autoloader->register(); 
    4046 
    4147      self::$done = true; 

  • branches/dwhittle/1.1/lib/plugins/sfPropelPlugin/lib/task/sfPropelBuildAllLoadTask.class.php

    r6707 r7255  
    88 * file that was distributed with this source code. 
    99 */ 
     10 
     11require_once(dirname(__FILE__).'/sfPropelBaseTask.class.php'); 
    1012 
    1113/** 

  • branches/dwhittle/1.1/lib/plugins/sfPropelPlugin/lib/task/sfPropelBuildAllTask.class.php

    r6707 r7255  
    88 * file that was distributed with this source code. 
    99 */ 
     10 
     11require_once(dirname(__FILE__).'/sfPropelBaseTask.class.php'); 
    1012 
    1113/** 

  • branches/dwhittle/1.1/lib/plugins/sfPropelPlugin/lib/task/sfPropelBuildDbTask.class.php

    r6707 r7255  
    88 * file that was distributed with this source code. 
    99 */ 
     10 
     11require_once(dirname(__FILE__).'/sfPropelBaseTask.class.php'); 
    1012 
    1113/** 

  • branches/dwhittle/1.1/lib/plugins/sfPropelPlugin/lib/task/sfPropelBuildFormsTask.class.php

    r6707 r7255  
    88 * file that was distributed with this source code. 
    99 */ 
     10 
     11require_once(dirname(__FILE__).'/sfPropelBaseTask.class.php'); 
    1012 
    1113/** 

  • branches/dwhittle/1.1/lib/plugins/sfPropelPlugin/lib/task/sfPropelBuildModelTask.class.php

    r6707 r7255  
    88 * file that was distributed with this source code. 
    99 */ 
     10 
     11require_once(dirname(__FILE__).'/sfPropelBaseTask.class.php'); 
    1012 
    1113/** 

  • branches/dwhittle/1.1/lib/plugins/sfPropelPlugin/lib/task/sfPropelBuildSchemaTask.class.php

    r6707 r7255  
    88 * file that was distributed with this source code. 
    99 */ 
     10 
     11require_once(dirname(__FILE__).'/sfPropelBaseTask.class.php'); 
    1012 
    1113/** 

  • branches/dwhittle/1.1/lib/plugins/sfPropelPlugin/lib/task/sfPropelBuildSqlTask.class.php

    r6707 r7255  
    88 * file that was distributed with this source code. 
    99 */ 
     10 
     11require_once(dirname(__FILE__).'/sfPropelBaseTask.class.php'); 
    1012 
    1113/** 

  • branches/dwhittle/1.1/lib/plugins/sfPropelPlugin/lib/task/sfPropelDataDumpTask.class.php

    r6707 r7255  
    88 * file that was distributed with this source code. 
    99 */ 
     10 
     11require_once(dirname(__FILE__).'/sfPropelBaseTask.class.php'); 
    1012 
    1113/** 

  • branches/dwhittle/1.1/lib/plugins/sfPropelPlugin/lib/task/sfPropelDataLoadTask.class.php

    r6707 r7255  
    88 * file that was distributed with this source code. 
    99 */ 
     10 
     11require_once(dirname(__FILE__).'/sfPropelBaseTask.class.php'); 
    1012 
    1113/** 

  • branches/dwhittle/1.1/lib/plugins/sfPropelPlugin/lib/task/sfPropelGenerateCrudTask.class.php

    r6884 r7255  
    88 * file that was distributed with this source code. 
    99 */ 
     10 
     11require_once(dirname(__FILE__).'/sfPropelBaseTask.class.php'); 
    1012 
    1113/** 

  • branches/dwhittle/1.1/lib/plugins/sfPropelPlugin/lib/task/sfPropelInitAdminTask.class.php

    r6707 r7255  
    88 * file that was distributed with this source code. 
    99 */ 
     10 
     11require_once(dirname(__FILE__).'/sfPropelBaseTask.class.php'); 
    1012 
    1113/** 

  • branches/dwhittle/1.1/lib/plugins/sfPropelPlugin/lib/task/sfPropelInsertSqlTask.class.php

    r6707 r7255  
    88 * file that was distributed with this source code. 
    99 */ 
     10 
     11require_once(dirname(__FILE__).'/sfPropelBaseTask.class.php'); 
    1012 
    1113/** 

  • branches/dwhittle/1.1/lib/plugins/sfPropelPlugin/lib/task/sfPropelSchemaToXmlTask.class.php

    r6707 r7255  
    88 * file that was distributed with this source code. 
    99 */ 
     10 
     11require_once(dirname(__FILE__).'/sfPropelBaseTask.class.php'); 
    1012 
    1113/** 

  • branches/dwhittle/1.1/lib/plugins/sfPropelPlugin/lib/task/sfPropelSchemaToYmlTask.class.php

    r6707 r7255  
    88 * file that was distributed with this source code. 
    99 */ 
     10 
     11require_once(dirname(__FILE__).'/sfPropelBaseTask.class.php'); 
    1012 
    1113/** 

  • branches/dwhittle/1.1/lib/task/generator/sfGenerateAppTask.class.php

    r6932 r7255  
    88 * file that was distributed with this source code. 
    99 */ 
     10 
     11require_once(dirname(__FILE__).'/sfGeneratorBaseTask.class.php'); 
    1012 
    1113/** 

  • branches/dwhittle/1.1/lib/task/generator/sfGenerateControllerTask.class.php

    r6932 r7255  
    88 * file that was distributed with this source code. 
    99 */ 
     10 
     11require_once(dirname(__FILE__).'/sfGeneratorBaseTask.class.php'); 
    1012 
    1113/** 

  • branches/dwhittle/1.1/lib/task/generator/sfGenerateModuleTask.class.php

    r6932 r7255  
    88 * file that was distributed with this source code. 
    99 */ 
     10 
     11require_once(dirname(__FILE__).'/sfGeneratorBaseTask.class.php'); 
    1012 
    1113/** 

  • branches/dwhittle/1.1/lib/task/generator/sfGenerateProjectTask.class.php

    r6932 r7255  
    88 * file that was distributed with this source code. 
    99 */ 
     10 
     11require_once(dirname(__FILE__).'/sfGeneratorBaseTask.class.php'); 
    1012 
    1113/** 

  • branches/dwhittle/1.1/lib/task/plugin/sfPluginAddChannelTask.class.php

    r6932 r7255  
    88 * file that was distributed with this source code. 
    99 */ 
     10 
     11require_once(dirname(__FILE__).'/sfPluginBaseTask.class.php'); 
    1012 
    1113/** 

  • branches/dwhittle/1.1/lib/task/plugin/sfPluginInstallTask.class.php

    r6932 r7255  
    88 * file that was distributed with this source code. 
    99 */ 
     10 
     11require_once(dirname(__FILE__).'/sfPluginBaseTask.class.php'); 
    1012 
    1113/** 

  • branches/dwhittle/1.1/lib/task/plugin/sfPluginListTask.class.php

    r6932 r7255  
    88 * file that was distributed with this source code. 
    99 */ 
     10 
     11require_once(dirname(__FILE__).'/sfPluginBaseTask.class.php'); 
    1012 
    1113/** 

  • branches/dwhittle/1.1/lib/task/plugin/sfPluginUninstallTask.class.php

    r6932 r7255  
    88 * file that was distributed with this source code. 
    99 */ 
     10 
     11require_once(dirname(__FILE__).'/sfPluginBaseTask.class.php'); 
    1012 
    1113/** 

  • branches/dwhittle/1.1/lib/task/plugin/sfPluginUpgradeTask.class.php

    r6932 r7255  
    88 * file that was distributed with this source code. 
    99 */ 
     10 
     11require_once(dirname(__FILE__).'/sfPluginBaseTask.class.php'); 
    1012 
    1113/** 

  • branches/dwhittle/1.1/lib/util/sfCore.class.php

    r7075 r7255  
    126126  static public function initConfiguration($sf_symfony_lib_dir, $sf_symfony_data_dir, $test = false, $sf_dimension = null) 
    127127  { 
    128     // YAML support 
    129     require_once($sf_symfony_lib_dir.DIRECTORY_SEPARATOR.'util'.DIRECTORY_SEPARATOR.'sfYaml.class.php'); 
    130  
    131     // APC cache support 
    132     require_once($sf_symfony_lib_dir.DIRECTORY_SEPARATOR.'cache'.DIRECTORY_SEPARATOR.'sfCache.class.php'); 
    133     require_once($sf_symfony_lib_dir.DIRECTORY_SEPARATOR.'cache'.DIRECTORY_SEPARATOR.'sfAPCCache.class.php'); 
    134  
    135     // config support 
    136     require_once($sf_symfony_lib_dir.DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'sfConfig.class.php'); 
    137     require_once($sf_symfony_lib_dir.DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'sfConfigCache.class.php'); 
    138     require_once($sf_symfony_lib_dir.DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'sfConfigHandler.class.php'); 
    139     require_once($sf_symfony_lib_dir.DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'sfYamlConfigHandler.class.php'); 
    140     require_once($sf_symfony_lib_dir.DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'sfAutoloadConfigHandler.class.php'); 
    141     require_once($sf_symfony_lib_dir.DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'sfRootConfigHandler.class.php'); 
    142     require_once($sf_symfony_lib_dir.DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'sfLoader.class.php'); 
    143  
    144     // exceptions 
    145     require_once($sf_symfony_lib_dir.DIRECTORY_SEPARATOR.'exception'.DIRECTORY_SEPARATOR.'sfException.class.php'); 
    146     require_once($sf_symfony_lib_dir.DIRECTORY_SEPARATOR.'exception'.DIRECTORY_SEPARATOR.'sfConfigurationException.class.php'); 
    147     require_once($sf_symfony_lib_dir.DIRECTORY_SEPARATOR.'exception'.DIRECTORY_SEPARATOR.'sfCacheException.class.php'); 
    148     require_once($sf_symfony_lib_dir.DIRECTORY_SEPARATOR.'exception'.DIRECTORY_SEPARATOR.'sfParseException.class.php'); 
    149  
    150     // utils 
    151     require_once($sf_symfony_lib_dir.DIRECTORY_SEPARATOR.'util'.DIRECTORY_SEPARATOR.'sfParameterHolder.class.php'); 
    152     require_once($sf_symfony_lib_dir.DIRECTORY_SEPARATOR.'util'.DIRECTORY_SEPARATOR.'sfToolkit.class.php'); 
    153  
    154     // autoloading 
    155     require_once($sf_symfony_lib_dir.DIRECTORY_SEPARATOR.'util'.DIRECTORY_SEPARATOR.'sfAutoload.class.php'); 
     128    require_once($sf_symfony_lib_dir.'/autoload/sfCoreAutoload.class.php'); 
     129    sfCoreAutoload::getInstance()->register(); 
    156130 
    157131    // in debug mode, load timer classes and start global timer 
    158132    if (SF_DEBUG) 
    159133    { 
    160       require_once($sf_symfony_lib_dir.DIRECTORY_SEPARATOR.'debug'.DIRECTORY_SEPARATOR.'sfTimerManager.class.php'); 
    161       require_once($sf_symfony_lib_dir.DIRECTORY_SEPARATOR.'debug'.DIRECTORY_SEPARATOR.'sfTimer.class.php'); 
    162134      sfConfig::set('sf_timer_start', microtime(true)); 
    163135    } 

  • branches/dwhittle/1.1/test/bin/prove.php

    r7195 r7255  
    2626 
    2727$h = new lime_symfony(new lime_output_color()); 
     28 
    2829$h->base_dir = realpath(dirname(__FILE__).'/..'); 
    29  
    30 require_once(dirname(__FILE__).'/../../lib/util/sfSimpleAutoload.class.php'); 
     30require_once(dirname(__FILE__).'/../../lib/autoload/sfSimpleAutoload.class.php'); 
    3131require_once(dirname(__FILE__).'/../../lib/util/sfToolkit.class.php'); 
    32  
    3332$autoload = sfSimpleAutoload::getInstance(sfToolkit::getTmpDir().DIRECTORY_SEPARATOR.sprintf('sf_autoload_unit_%s.data', md5(__FILE__))); 
    3433$autoload->removeCache(); 
     34 
     35// update sfCoreAutoload 
     36require_once(dirname(__FILE__).'/../../lib/autoload/sfCoreAutoload.class.php'); 
     37sfCoreAutoload::make(); 
    3538 
    3639// cache autoload files 

  • branches/dwhittle/1.1/test/bootstrap/unit.php

    r6871 r7255  
    2323sfConfig::set('sf_symfony_data_dir', realpath($_test_dir.'/../data')); 
    2424 
    25 require_once(dirname(__FILE__).'/../../lib/util/sfSimpleAutoload.class.php'); 
     25require_once(dirname(__FILE__).'/../../lib/autoload/sfSimpleAutoload.class.php'); 
    2626require_once(dirname(__FILE__).'/../../lib/util/sfToolkit.class.php'); 
    2727$autoload = sfSimpleAutoload::getInstance(sfToolkit::getTmpDir().DIRECTORY_SEPARATOR.sprintf('sf_autoload_unit_%s.data', md5(__FILE__)));