Development

Changeset 7840

You must first sign up to be able to contribute.

Changeset 7840

Show
Ignore:
Timestamp:
03/12/08 21:48:55 (6 months ago)
Author:
fabien
Message:

updated symfony 1.1 project in tools/performance

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • tools/performance/1.1/symfony

    r6834 r7840  
    1111 
    1212chdir(dirname(__FILE__)); 
    13 include('config/config.php'); 
    14 include($sf_symfony_data_dir.'/bin/symfony.php'); 
     13require_once(dirname(__FILE__).'/lib/ProjectConfiguration.class.php'); 
     14$configuration = new ProjectConfiguration(); 
     15include($configuration->getSymfonyLibDir().'/command/cli.php'); 

  • tools/performance/1.1/test/bootstrap/functional.php

    r6834 r7840  
    1919} 
    2020 
    21 // define symfony constant 
    22 define('SF_ROOT_DIR',    realpath(dirname(__FILE__).'/../..')); 
    23 define('SF_APP',         $app); 
    24 define('SF_ENVIRONMENT', 'test'); 
    25 define('SF_DEBUG',       true); 
     21$class = $app.'Configuration'; 
     22require_once(dirname(__FILE__).'/../../lib/'.$class.'.class.php'); 
    2623 
    27 // initialize symfony 
    28 require_once(SF_ROOT_DIR.DIRECTORY_SEPARATOR.'apps'.DIRECTORY_SEPARATOR.SF_APP.DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'config.php'); 
     24$configuration = new $class('test', true); 
     25sfContext::createInstance($configuration); 
    2926 
    3027// remove all cache 

  • tools/performance/1.1/test/bootstrap/unit.php

    r6834 r7840  
    1010 
    1111$_test_dir = realpath(dirname(__FILE__).'/..'); 
    12 define('SF_ROOT_DIR', realpath($_test_dir.'/..')); 
    1312 
    14 // symfony directories 
    15 include(SF_ROOT_DIR.DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'config.php'); 
    16  
    17 require_once($sf_symfony_lib_dir.'/vendor/lime/lime.php'); 
     13require_once(dirname(__FILE__).'/../../lib/ProjectConfiguration.class.php'); 
     14$configuration = new ProjectConfiguration(realpath($_test_dir.'/..')); 
     15include($configuration->getSymfonyLibDir().'/vendor/lime/lime.php'); 

  • tools/performance/1.1/web/frontend_dev.php

    r6834 r7840  
    11<?php 
    22 
    3 define('SF_ROOT_DIR',    realpath(dirname(__FILE__).'/..')); 
    4 define('SF_APP',         'frontend'); 
    5 define('SF_ENVIRONMENT', 'dev'); 
    6 define('SF_DEBUG',       true); 
     3require_once(dirname(__FILE__).'/../lib/frontendConfiguration.class.php'); 
    74 
    8 require_once(SF_ROOT_DIR.DIRECTORY_SEPARATOR.'apps'.DIRECTORY_SEPARATOR.SF_APP.DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'config.php'); 
    9  
    10 sfContext::getInstance()->getController()->dispatch(); 
     5$configuration = new frontendConfiguration('dev', true); 
     6sfContext::createInstance($configuration)->dispatch(); 

  • tools/performance/1.1/web/index.php

    r6834 r7840  
    11<?php 
    22 
    3 define('SF_ROOT_DIR',    realpath(dirname(__FILE__).'/..')); 
    4 define('SF_APP',         'frontend'); 
    5 define('SF_ENVIRONMENT', 'prod'); 
    6 define('SF_DEBUG',       false); 
     3require_once(dirname(__FILE__).'/../lib/frontendConfiguration.class.php'); 
    74 
    8 require_once(SF_ROOT_DIR.DIRECTORY_SEPARATOR.'apps'.DIRECTORY_SEPARATOR.SF_APP.DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'config.php'); 
    9  
    10 sfContext::getInstance()->getController()->dispatch(); 
     5$configuration = new frontendConfiguration('prod', false); 
     6sfContext::createInstance($configuration)->dispatch();