Development

Changeset 7989

You must first sign up to be able to contribute.

Changeset 7989

Show
Ignore:
Timestamp:
03/19/08 21:05:40 (7 months ago)
Author:
dwhittle
Message:

dwhittle: merged changes to branch (sf/propel)

+ removed old dimensions test files

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/dwhittle/1.0/lib/filter/sfCacheFilter.class.php

    r7772 r7989  
    119119    { 
    120120      // set some headers that deals with cache 
    121       $lifetime = $this->cacheManager->getClientLifeTime($uri, 'page'); 
    122       $this->response->setHttpHeader('Last-Modified', $this->response->getDate(time()), false); 
    123       $this->response->setHttpHeader('Expires', $this->response->getDate(time() + $lifetime), false); 
    124       $this->response->addCacheControlHttpHeader('max-age', $lifetime); 
     121      if ($lifetime = $this->cacheManager->getClientLifeTime($uri, 'page')) 
     122      { 
     123        $this->response->setHttpHeader('Last-Modified', $this->response->getDate(time()), false); 
     124        $this->response->setHttpHeader('Expires', $this->response->getDate(time() + $lifetime), false); 
     125        $this->response->addCacheControlHttpHeader('max-age', $lifetime); 
     126      } 
    125127 
    126128      // set Vary headers 

  • branches/dwhittle/1.0/lib/util/sfToolkit.class.php

    r7797 r7989  
    177177  public static function stripComments($source) 
    178178  { 
    179     if (!sfConfig::get('sf_strip_comments', true)) 
    180     { 
    181       return $source; 
    182     } 
    183  
    184     // tokenizer available? 
    185     if (!function_exists('token_get_all')) 
    186     { 
    187       $source = sfToolkit::pregtr($source, array('#/\*((?!\*/)[\d\D\s])*\*/#' => '',   // remove /* ... */ 
    188                                                  '#^\s*//.*$#m'               => '')); // remove // ... 
    189  
     179    if (!sfConfig::get('sf_strip_comments', true) || !function_exists('token_get_all')) 
     180    { 
    190181      return $source; 
    191182    } 

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

    r6598 r7989  
    170170      'withLayout'     => isset($options['withLayout']) ? $options['withLayout'] : false, 
    171171      'lifeTime'       => $options['lifeTime'], 
    172       'clientLifeTime' => isset($options['clientLifeTime']) && $options['clientLifeTime'] ? $options['clientLifeTime'] : $options['lifeTime'], 
     172      'clientLifeTime' => isset($options['clientLifeTime']) ? $options['clientLifeTime'] : $options['lifeTime'], 
    173173      'contextual'     => isset($options['contextual']) ? $options['contextual'] : false, 
    174174      'vary'           => isset($options['vary']) ? $options['vary'] : array(), 

  • branches/dwhittle/1.1/UPGRADE

    r7918 r7989  
    3030        [php] 
    3131        chdir(dirname(__FILE__)); 
    32         require_once(dirname(__FILE__).'/lib/ProjectConfiguration.class.php'); 
     32        require_once(dirname(__FILE__).'/config/ProjectConfiguration.class.php'); 
    3333        $configuration = new ProjectConfiguration(); 
    3434        include($configuration->getSymfonyLibDir().'/command/cli.php'); 
    …… 
    3838        $ cp /path/to/symfony/lib/task/generator/skeleton/project/symfony symfony 
    3939 
    40   * Create a `lib/ProjectConfiguration.class.php` file with the following content: 
     40  * Create a `config/ProjectConfiguration.class.php` file with the following content: 
    4141 
    4242        [php] 
    …… 
    5959    You can also copy the skeleton file from the symfony project skeleton directly: 
    6060 
    61         $ cp /path/to/symfony/lib/task/generator/skeleton/project/lib/ProjectConfiguration.class.php lib/ProjectConfiguration.class.php 
     61        $ cp /path/to/symfony/lib/task/generator/skeleton/project/config/ProjectConfiguration.class.php config/ProjectConfiguration.class.php 
    6262 
    6363  * Launch the `project:upgrade1.1` task from your project directory 
    …… 
    426426 
    427427    [php] 
    428     $databaseManager = new sfDatabaseManager(); 
     428    $configuration = ProjectConfiguration::getApplicationConfiguration($application, $env, true); 
     429    $databaseManager = new sfDatabaseManager($configuration); 
    429430    $databaseManager->loadConfiguration(); 
    430431 
    …… 
    583584---------- 
    584585 
    585 The `sfViewCacheManager::removePattern()` and `sfToolkit::clearGlob()` don't work anymore for removing several cache parts at once. But the `sfViewCacheManager::remove()` now accepts internal URIs with wildcards. So you can replace: 
     586The `sfViewCacheManager::removePattern()` and `sfToolkit::clearGlob()` don't work anymore 
     587for removing several cache parts at once. But the `sfViewCacheManager::remove()` now 
     588accepts internal URIs with wildcards. So you can replace: 
    586589 
    587590    $cacheManager->removePattern('*/all/user/show/id/*'); 
    …… 
    599602    $cacheManager->remove('@sf_cache_partial?module=user&action=_my_partial&sf_cache_key=*'); 
    600603 
    601 And the biggets benefit is that it allows you to clear 'glob' URIs in *any* cache factory, noy only the `sfFileCache`. 
     604And the biggets benefit is that it allows you to clear 'glob' URIs in *any* cache 
     605factory, not only the `sfFileCache`. 
     606 
     607NOTE to early adopters 
     608---------------------- 
     609 
     610If you have upgraded your project and have a `lib/Projectconfiguratioun.class.php` file, 
     611then you need to upgrade your project manually before being able to launch the 
     612`project:upgrade1.1` task. 
     613 
     614Here is how: 
     615 
     616  * Move `lib/ProjectConfiguration.class.php` to `config/ProjectConfiguration.class.php` 
     617 
     618  * Change the path to symfony in `config/ProjectConfiguration.class.php` if needed. 
     619 
     620  * Move all your application configuration classes (`lib/$APP_NAME$Configuration.class.php`) 
     621    to their respective `apps/$APP_NAME$/config/` directory. 
     622 
     623  * Remove the `require_once dirname(__FILE__).'/ProjectConfiguration.class.php';` in all 
     624    the application configuration classes. 
     625 
     626  * Change the location of `ProjectConfiguration.class.php` in the main `symfony` script to `config/` 
     627 
     628  * Change your front controllers so they look like this: 
     629 
     630      {{{ 
     631        <?php 
     632 
     633        require_once(dirname(__FILE__).'/../config/ProjectConfiguration.class.php'); 
     634 
     635        $configuration = ProjectConfiguration::getApplicationConfiguration('frontend', 'dev', true); 
     636        sfContext::createInstance($configuration)->dispatch(); 
     637      }}} 
     638 
     639You can now launch the `project:upgrade1.1` script to finish the upgrade. 

  • branches/dwhittle/1.1/lib/config/sfApplicationConfiguration.class.php

    r7853 r7989  
    7676 
    7777  /** 
    78    * Returns a sfApplicationConfiguration configuration for a given application. 
    79    * 
    80    * @param string  An application name 
    81    * @param string  The environment name 
    82    * @param Boolean true to enable debug mode 
    83    * @param string  The project root directory 
    84    * 
    85    * @return sfApplicationConfiguration A sfApplicationConfiguration instance 
    86    */ 
    87   static public function getForApplication($application, $environment, $debug, $rootDir = null) 
    88   { 
    89     $class = $application.'Configuration'; 
    90  
    91     return new $class($environment, $debug, $rootDir); 
    92   } 
    93  
    94   /** 
    9578   * @see sfProjectConfiguration 
    9679   */ 

  • branches/dwhittle/1.1/lib/config/sfProjectConfiguration.class.php

    r7697 r7989  
    3333    sfProjectConfiguration::$active = $this; 
    3434 
    35     if (is_null($rootDir)) 
    36     { 
    37       $r = new ReflectionObject($this); 
    38  
    39       $this->rootDir = realpath(dirname($r->getFileName()).'/..'); 
    40     } 
    41     else 
    42     { 
    43       $this->rootDir = realpath($rootDir); 
    44     } 
     35    $this->rootDir = is_null($rootDir) ? self::guessRootDir() : realpath($rootDir); 
    4536 
    4637    $this->symfonyLibDir = realpath(dirname(__FILE__).'/..'); 
    …… 
    262253    return sfProjectConfiguration::$active; 
    263254  } 
     255 
     256  static public function guessRootDir() 
     257  { 
     258    $r = new ReflectionClass('ProjectConfiguration'); 
     259 
     260    return realpath(dirname($r->getFileName()).'/..'); 
     261  } 
     262 
     263  /** 
     264   * Returns a sfApplicationConfiguration configuration for a given application. 
     265   * 
     266   * @param string  An application name 
     267   * @param string  The environment name 
     268   * @param Boolean true to enable debug mode 
     269   * @param string  The project root directory 
     270   * 
     271   * @return sfApplicationConfiguration A sfApplicationConfiguration instance 
     272   */ 
     273  static public function getApplicationConfiguration($application, $environment, $debug, $rootDir = null) 
     274  { 
     275    $class = $application.'Configuration'; 
     276 
     277    if (is_null(sfProjectConfiguration::$active)) 
     278    { 
     279      // force initialization of sf_apps_dir config setting 
     280      new ProjectConfiguration(); 
     281    } 
     282 
     283    require_once sfConfig::get('sf_apps_dir').'/'.$application.'/config/'.$class.'.class.php'; 
     284 
     285    if (is_null($rootDir)) 
     286    { 
     287      $rootDir = self::guessRootDir(); 
     288    } 
     289 
     290    return new $class($environment, $debug, $rootDir); 
     291  } 
    264292} 

  • branches/dwhittle/1.1/lib/controller/sfWebController.class.php

    r7918 r7989  
    113113  public function convertUrlStringToParameters($url) 
    114114  { 
     115    $givenUrl = $url; 
     116 
    115117    $params       = array(); 
    116118    $query_string = ''; 
    …… 
    146148      $route_name = substr($url, 1); 
    147149    } 
     150    else if (false !== strpos($url, '/')) 
     151    { 
     152      list($params['module'], $params['action']) = explode('/', $url); 
     153    } 
    148154    else 
    149155    { 
    150       list($params['module'], $params['action']) = explode('/', $url); 
     156      throw new InvalidArgumentException(sprintf('An internal URI must contain a module and an action (module/action) ("%s" given).', $givenUrl)); 
    151157    } 
    152158 

  • branches/dwhittle/1.1/lib/debug/sfDebug.class.php

    r7879 r7989  
    106106   * @return array The request parameter holders 
    107107   */ 
    108   public static function requestAsArray($request) 
     108  public static function requestAsArray(sfRequest $request) 
    109109  { 
    110110    if (!$request) 
    …… 
    126126   * @return array The response parameters 
    127127   */ 
    128   public static function responseAsArray($response) 
     128  public static function responseAsArray(sfResponse $response) 
    129129  { 
    130130    if (!$response) 
    …… 
    145145 
    146146  /** 
     147   * Returns user parameters as an array. 
     148   * 
     149   * @param sfUser A sfUser instance 
     150   * 
     151   * @return array The user parameters 
     152   */ 
     153  public static function userAsArray(sfUser $user) 
     154  { 
     155    if (!$user) 
     156    { 
     157      return array(); 
     158    } 
     159 
     160    return array( 
     161      'options'         => $user->getOptions(), 
     162      'attributeHolder' => self::flattenParameterHolder($user->getAttributeHolder()), 
     163      'culture'         => $user->getCulture(), 
     164    ); 
     165  } 
     166 
     167  /** 
    147168   * Returns a parameter holder as an array. 
    148169   * 

  • branches/dwhittle/1.1/lib/debug/sfWebDebug.class.php

    r7918 r7989  
    312312      'xdebug'        => (sfConfig::get('sf_xdebug', true) && extension_loaded('xdebug'))   ? 'on' : 'off', 
    313313      'syck'          => extension_loaded('syck')                                           ? 'on' : 'off', 
     314      'tokenizer'    => function_exists('token_get_all')                                    ? 'on' : 'off', 
    314315      'apc'           => extension_loaded('apc') && ini_get('apc.enabled')                  ? 'on' : 'off', 
    315316      'memcache'      => extension_loaded('memcache')                                       ? 'on' : 'off', 
    …… 
    333334    $result .= $this->formatArrayAsHtml('request',  sfDebug::requestAsArray($context->getRequest())); 
    334335    $result .= $this->formatArrayAsHtml('response', sfDebug::responseAsArray($context->getResponse())); 
     336    $result .= $this->formatArrayAsHtml('user',     sfDebug::userAsArray($context->getUser())); 
    335337    $result .= $this->formatArrayAsHtml('settings', sfDebug::settingsAsArray()); 
    336338    $result .= $this->formatArrayAsHtml('globals',  sfDebug::globalsAsArray()); 
    …… 
    354356    $content = ' 
    355357    <h2>'.$id.' <a href="#" onclick="sfWebDebugToggle(\'sfWebDebug'.$id.'\'); return false;">'.image_tag(sfConfig::get('sf_web_debug_web_dir').'/images/toggle.gif').'</a></h2> 
    356     <div id="sfWebDebug'.$id.'" style="display: none"><pre>'.htmlspecialchars(@sfYaml::dump($values), ENT_QUOTES, sfConfig::get('sf_charset')).'</pre></div> 
     358    <div id="sfWebDebug'.$id.'" style="display: none"><pre>'.htmlspecialchars(sfYaml::dump($values), ENT_QUOTES, sfConfig::get('sf_charset')).'</pre></div> 
    357359    '; 
    358360 

  • branches/dwhittle/1.1/lib/filter/sfCacheFilter.class.php

    r7772 r7989  
    112112    { 
    113113      // set some headers that deals with cache 
    114       $lifetime = $this->cacheManager->getClientLifeTime($uri, 'page'); 
    115       $this->response->setHttpHeader('Last-Modified', $this->response->getDate(time()), false); 
    116       $this->response->setHttpHeader('Expires', $this->response->getDate(time() + $lifetime), false); 
    117       $this->response->addCacheControlHttpHeader('max-age', $lifetime); 
     114      if ($lifetime = $this->cacheManager->getClientLifeTime($uri, 'page')) 
     115      { 
     116        $this->response->setHttpHeader('Last-Modified', $this->response->getDate(time()), false); 
     117        $this->response->setHttpHeader('Expires', $this->response->getDate(time() + $lifetime), false); 
     118        $this->response->addCacheControlHttpHeader('max-age', $lifetime); 
     119      } 
    118120 
    119121      // set Vary headers 

  • branches/dwhittle/1.1/lib/i18n/sfI18N.class.php

    r7942 r7989  
    4141   * Initializes this class. 
    4242   * 
     43   * Available options: 
     44   * 
     45   *  * culture:             The culture 
     46   *  * source:              The i18n source (XLIFF by default) 
     47   *  * debug:               Whether to enable debug or not (false by default) 
     48   *  * database:            The database name (default by default) 
     49   *  * untranslated_prefix: The prefix to use when a message is not translated 
     50   *  * untranslated_suffix: The suffix to use when a message is not translated 
     51   * 
    4352   * @param sfApplicationConfiguration A sfApplicationConfiguration instance 
    4453   * @param sfCache                    A sfCache instance 

  • branches/dwhittle/1.1/lib/i18n/sfMessageSource_File.class.php

    r6812 r7989  
    3333  /** 
    3434   * Separator between culture name and source. 
    35    * @var string  
     35   * @var string 
    3636   */ 
    3737  protected $dataSeparator = '.'; 
    …… 
    8686   * 
    8787   * @param string catalogue name 
    88    * @return array list of all variants for this catalogue.  
     88   * @return array list of all variants for this catalogue. 
    8989   */ 
    9090  public function getCatalogueList($catalogue) 
    …… 
    117117   * 
    118118   * @param string a particular catalogue. 
    119    * @return array a list of catalogues.  
     119   * @return array a list of catalogues. 
    120120   * @see getCatalogueList() 
    121121   */ 
    …… 
    143143   * E.g. array('messages', 'en_AU') 
    144144   * 
    145    * @return array list of catalogues  
     145   * @return array list of catalogues 
    146146   * @see getCatalogues() 
    147147   */ 
    …… 
    156156   * E.g. array('messages', 'en_AU') 
    157157   * 
    158    * @return array list of catalogues  
     158   * @return array list of catalogues 
    159159   */ 
    160160  protected function getCatalogues($dir = null, $variant = null) 
    161161  { 
    162     $dir = $dir ? $dir : $this->source; 
     162    $dir = $dir ? $dir : $this->getSource($variant); 
    163163    $files = scandir($dir); 
    164164 

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

    r7730 r7989  
    1414} 
    1515 
    16 $class = $app.'Configuration'; 
    17 require $root_dir.'/lib/'.$class.'.class.php'; 
    18 $configuration = new $class('test', isset($debug) ? $debug : true, $root_dir); 
     16 
     17require_once $root_dir.'/config/ProjectConfiguration.class.php'; 
     18$configuration = ProjectConfiguration::getApplicationConfiguration($app, 'test', isset($debug) ? $debug : true); 
     19 
    1920sfContext::createInstance($configuration); 
    2021 

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

    r7618 r7989  
    1919} 
    2020 
    21 $class = $app.'Configuration'; 
    22 require_once(dirname(__FILE__).'/../../lib/'.$class.'.class.php'); 
    23  
    24 $configuration = new $class('test', true); 
     21require_once dirname(__FILE__).'/../../config/ProjectConfiguration.class.php'; 
     22$configuration = ProjectConfiguration::getApplicationConfiguration($app, 'test', isset($debug) ? $debug : true); 
    2523sfContext::createInstance($configuration); 
    2624 

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

    r7618 r7989  
    1111$_test_dir = realpath(dirname(__FILE__).'/..'); 
    1212 
    13 require_once(dirname(__FILE__).'/../../lib/ProjectConfiguration.class.php'); 
     13require_once(dirname(__FILE__).'/../../config/ProjectConfiguration.class.php'); 
    1414$configuration = new ProjectConfiguration(realpath($_test_dir.'/..')); 
    1515include($configuration->getSymfonyLibDir().'/vendor/lime/lime.php'); 

  • branches/dwhittle/1.1/lib/plugins/sfCompat10Plugin/test/functional/fixtures/web/frontend_dev.php

    r7618 r7989  
    11<?php 
    22 
    3 require_once(dirname(__FILE__).'/../lib/frontendConfiguration.class.php'); 
     3require_once(dirname(__FILE__).'/../config/ProjectConfiguration.class.php'); 
    44 
    5 $configuration = new frontendConfiguration('dev', true); 
     5$configuration = ProjectConfiguration::getApplicationConfiguration('frontend', 'dev', true); 
    66sfContext::createInstance($configuration)->dispatch(); 

  • branches/dwhittle/1.1/lib/plugins/sfCompat10Plugin/test/functional/fixtures/web/index.php

    r7618 r7989  
    11<?php 
    22 
    3 require_once(dirname(__FILE__).'/../lib/frontendConfiguration.class.php'); 
     3require_once(dirname(__FILE__).'/../config/ProjectConfiguration.class.php'); 
    44 
    5 $configuration = new frontendConfiguration('prod', false); 
     5$configuration = ProjectConfiguration::getApplicationConfiguration('frontend', 'prod', false); 
    66sfContext::createInstance($configuration)->dispatch(); 

  • branches/dwhittle/1.1/lib/plugins/sfPropelPlugin/lib/propel/validator/sfPropelUniqueValidator.class.php

    r6707 r7989  
    3030 * @version    SVN: $Id$ 
    3131 */ 
    32 class sfPropelUniqueValidator extends sfValidatorBase 
     32class sfPropelUniqueValidator extends sfValidator 
    3333{ 
    3434  public function execute(&$value, &$error) 

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

    r7680 r7989  
    6161  { 
    6262    // load Propel configuration before Phing 
    63     $configuration = sfApplicationConfiguration::getForApplication($arguments['application'], $options['env'], true); 
     63    $configuration = ProjectConfiguration::getApplicationConfiguration($arguments['application'], $options['env'], true); 
    6464    $databaseManager = new sfDatabaseManager($configuration); 
    6565 

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

    r7918 r7989  
    6969  protected function execute($arguments = array(), $options = array()) 
    7070  { 
    71     $configuration = sfApplicationConfiguration::getForApplication($arguments['application'], $options['env'], true); 
     71    $configuration = ProjectConfiguration::getApplicationConfiguration($arguments['application'], $options['env'], true); 
    7272 
    7373    $databaseManager = new sfDatabaseManager($configuration); 

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

    r7618 r7989  
    8484    } 
    8585 
    86     $configuration = sfApplicationConfiguration::getForApplication($arguments['application'], $options['env'], true); 
     86    $configuration = ProjectConfiguration::getApplicationConfiguration($arguments['application'], $options['env'], true); 
    8787 
    8888    $databaseManager = new sfDatabaseManager($configuration); 

  • branches/dwhittle/1.1/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/php5/PHP5ObjectBuilder.php

    r7955 r7989  
    22 
    33/* 
    4  *  $Id: PHP5ObjectBuilder.php 1005 2008-03-18 15:10:29Z hans $ 
     4 *  $Id: PHP5ObjectBuilder.php 1006 2008-03-19 15:30:19Z hans $ 
    55 * 
    66 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
    …… 
    21732173          $colFK = $tblFK->getColumn($colFKName); 
    21742174          if ($colFK === null) { 
    2175             $e = new Exception("Column $colFKName not found in " . $tblFK->getName()); 
    2176             print $e; 
    2177             throw $e; 
     2175            throw new EngineException("Column $colFKName not found in " . $tblFK->getName()); 
    21782176          } 
     2177          $clo = strtolower($column->getName()); 
    21792178          $script .= " 
    2180         \$criteria->add(".$fkPeerBuilder->getColumnConstant($colFK).", \$this->get".$column->getPhpName()."()); 
     2179        \$criteria->add(".$fkPeerBuilder->getColumnConstant($colFK).", \$this->$clo); 
    21812180"; 
    21822181        } // end foreach ($fk->getForeignColumns() 
    …… 
    21952194          $colFKName = $flMap[$columnName]; 
    21962195          $colFK = $tblFK->getColumn($colFKName); 
     2196          $clo = strtolower($column->getName()); 
    21972197          $script .= " 
    2198       \$criteria->add(".$fkPeerBuilder->getColumnConstant($colFK).", \$this->get".$column->getPhpName()."()); 
     2198      \$criteria->add(".$fkPeerBuilder->getColumnConstant($colFK).", \$this->$clo); 
    21992199"; 
    22002200        } /* end foreach ($fk->getForeignColumns() */ 
    …… 
    25882588"; 
    25892589    $script .= " 
    2590     if (\$this->$varName === null && !\$this->isNew()) { 
    2591 "; 
     2590    if (\$this->$varName === null && !\$this->isNew()) {"; 
    25922591 
    25932592    $lfmap = $refFK->getLocalForeignMapping(); 
    …… 
    26052604    foreach ($tblFK->getPrimaryKey() as $col) { 
    26062605      $localColumn = $table->getColumn($lfmap[$col->getName()]); 
    2607       $params[] = "\$this->get".$localColumn->getPhpName()."()"; 
     2606      $clo = strtolower($localColumn->getName()); 
     2607      $params[] = "\$this->$clo"; 
    26082608    } 
    26092609 
    26102610    $script .= " 
    26112611      \$this->$varName = ".$joinedTableObjectBuilder->getPeerClassname()."::retrieveByPK(".implode(", ", $params).", \$con); 
    2612     } // if (\$this->$varName === null) 
     2612    } 
    26132613 
    26142614    return \$this->$varName; 

  • branches/dwhittle/1.1/lib/plugins/sfPropelPlugin/test/bootstrap/functional.php

    r7721 r7989  
    2020} 
    2121 
    22 $class = $app.'Configuration'; 
    23 require $root_dir.'/lib/'.$class.'.class.php'; 
    24 $configuration = new $class('test', isset($debug) ? $debug : true); 
     22require_once $root_dir.'/config/ProjectConfiguration.class.php'; 
     23$configuration = ProjectConfiguration::getApplicationConfiguration($app, 'test', isset($debug) ? $debug : true); 
    2524sfContext::createInstance($configuration); 
    2625 

  • branches/dwhittle/1.1/lib/plugins/sfPropelPlugin/test/functional/crud/crudBrowser.class.php

    r7699 r7989  
    2525    $task->run(array('crud', 'article', 'Article'), $options); 
    26