Development

Changeset 7503

You must first sign up to be able to contribute.

Changeset 7503

Show
Ignore:
Timestamp:
02/16/08 08:00:05 (9 months ago)
Author:
dwhittle
Message:

dwhittle: fixed propel:build-forms + tests (moved BaseFormPropel? to lib/form/base) - closes #2940

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/dwhittle/1.1/lib/plugins/sfPropelPlugin/data/generator/sfPropelForm/default/template/sfPropelFormGeneratedTemplate.php

    r7157 r7503  
    11[?php 
     2 
     3require_once(dirname(__FILE__).DIRECTORY_SEPARATOR.'BaseFormPropel.class.php'); 
    24 
    35/** 

  • branches/dwhittle/1.1/lib/plugins/sfPropelPlugin/lib/propel/addon/sfPropelAutoload.php

    r6707 r7503  
    2020require_once('propel/Propel.php'); 
    2121 
    22 sfPropel::initialize(sfContext::getInstance()->getEventDispatcher()); 
     22sfPropel::initialize(sfContext::hasInstance() ? sfContext::getInstance()->getEventDispatcher() : new sfEventDispatcher()); 

  • branches/dwhittle/1.1/lib/plugins/sfPropelPlugin/lib/propel/generator/sfPropelFormGenerator.class.php

    r7157 r7503  
    5757 
    5858    // create the project base class for all forms 
    59     $file = sfConfig::get('sf_lib_dir').'/form/BaseFormPropel.class.php'; 
     59    $file = sfConfig::get('sf_lib_dir').DIRECTORY_SEPARATOR.'form'.DIRECTORY_SEPARATOR.'base'.DIRECTORY_SEPARATOR.'BaseFormPropel.class.php'; 
    6060    if (!file_exists($file)) 
    6161    { 
    62       if (!is_dir(sfConfig::get('sf_lib_dir').'/form')) 
    63       { 
    64         mkdir(sfConfig::get('sf_lib_dir').'/form', 0777, true); 
     62      if (!is_dir(sfConfig::get('sf_lib_dir').DIRECTORY_SEPARATOR.'form')) 
     63      { 
     64        mkdir(sfConfig::get('sf_lib_dir').DIRECTORY_SEPARATOR.'form', 0777, true); 
     65        mkdir(sfConfig::get('sf_lib_dir').DIRECTORY_SEPARATOR.'form'.DIRECTORY_SEPARATOR.'base', 0777, true); 
    6566      } 
    6667 
    …… 
    137138   * This method does not returns foreign keys that are also primary keys. 
    138139   * 
    139    * @return array An array composed of:  
     140   * @return array An array composed of: 
    140141   *                 * The foreign table PHP name 
    141142   *                 * The foreign key PHP name 

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

    r7477 r7503  
    4242      $autoloader->addDirectory($libDir.DIRECTORY_SEPARATOR.'task'); 
    4343 
    44       $autoloader->setClassPath('Propel', $libDir.'/propel/addon/sfPropelAutoload.php'); 
     44      $autoloader->setClassPath('Propel', $libDir.DIRECTORY_SEPARATOR.'propel'.DIRECTORY_SEPARATOR.'addon'.DIRECTORY_SEPARATOR.'sfPropelAutoload.php'); 
    4545 
    4646      $autoloader->addDirectory(sfConfig::get('sf_model_lib_dir')); 

  • branches/dwhittle/1.1/test/other/fixtures/propel/databases.yml

    r6707 r7503  
    33    class:      sfPropelDatabase 
    44    param: 
    5       dsn:      sqlite:/tmp/database.sqlite 
     5      dsn:      sqlite:%SF_DATA_DIR%/database.sqlite 

  • branches/dwhittle/1.1/test/other/fixtures/propel/propel.ini

    r6707 r7503  
    22propel.project             = project 
    33propel.database            = sqlite 
    4 propel.database.createUrl  = sqlite:/tmp/database.sqlite 
    5 propel.database.url        = sqlite:/tmp/database.sqlite 
     4propel.database.createUrl  = sqlite:%SF_DATA_DIR%/database.sqlite 
     5propel.database.url        = sqlite:%SF_DATA_DIR%/database.sqlite 
    66 
    77propel.addGenericAccessors = true 
    …… 
    1313; directories 
    1414propel.home                    = . 
    15 propel.output.dir              = /tmp 
     15propel.output.dir              = %SF_ROOT_DIR% 
    1616propel.schema.dir              = ${propel.output.dir}/config 
    1717propel.conf.dir                = ${propel.output.dir}/config 

  • branches/dwhittle/1.1/test/other/tasksTest.php

    r7349 r7503  
    77define('DS', DIRECTORY_SEPARATOR); 
    88 
    9 class symfony_cmd 
     9class sf_test_project 
    1010{ 
    1111  public $php_cli = null; 
    …… 
    1818    $this->t = $t; 
    1919 
    20     $this->tmp_dir = sfToolkit::getTmpDir().DIRECTORY_SEPARATOR.'symfony_cmd'; 
     20    $this->tmp_dir = sfToolkit::getTmpDir().DS.'sf_test_project'; 
    2121 
    2222    if (is_dir($this->tmp_dir)) 
    …… 
    5050  { 
    5151    ob_start(); 
    52     passthru(sprintf('%s -d html_errors=off -d open_basedir= -q "%s" %s 2>&1', $this->php_cli, dirname(__FILE__).'/../../data/bin/symfony', $cmd), $return); 
     52    passthru(sprintf('%s "%s" %s 2>&1', $this->php_cli, dirname(__FILE__).'/../../data/bin/symfony', $cmd), $return); 
    5353    $content = ob_get_clean(); 
    5454    $this->t->cmp_ok($return, '<=', 0, sprintf('"symfony %s" returns ok', $cmd)); 
    …… 
    6464 
    6565$t = new lime_test(32, new lime_output_color()); 
    66 $c = new symfony_cmd(); 
     66$c = new sf_test_project(); 
    6767$c->initialize($t); 
    6868 
    …… 
    8181copy(dirname(__FILE__).'/fixtures/propel/propel.ini', $c->tmp_dir.DS.'config'.DS.'propel.ini'); 
    8282 
     83// update propel configuration paths 
     84file_put_contents($c->tmp_dir.DS.'config'.DS.'propel.ini', str_replace('%SF_ROOT_DIR%', $c->tmp_dir, str_replace('%SF_DATA_DIR%', $c->tmp_dir.'/data', file_get_contents($c->tmp_dir.DS.'config'.DS.'propel.ini')))); 
     85 
    8386// propel:* 
    8487$content = $c->execute_command('propel:build-sql'); 
    …… 
    8992 
    9093$content = $c->execute_command('propel:build-form'); 
    91 $t->ok(file_exists($c->tmp_dir.DS.'lib'.DS.'form'.DS.'BaseFormPropel.class.php'), '"propel:build-form" creates form classes under "lib/form" directory'); 
     94$t->ok(file_exists($c->tmp_dir.DS.'lib'.DS.'form'.DS.'base'.DS.'BaseFormPropel.class.php'), '"propel:build-form" creates form classes under "lib/form" directory'); 
    9295 
    9396$c->execute_command('propel:insert-sql'); 
    94 $file = dirname(__FILE__).DS.'..'.DS.'..'.DS.'lib'.DS.'plugins'.DS.'sfPropelPlugin'.DS.'lib'.DS.'vendor'.DS.'propel-generator'.DS.'database.sqlite'; touch($file); 
    95 $t->ok(file_exists($file), '"propel:insert-sql" creates tables in the database'); 
    96 rename($file, $c->tmp_dir.'/data/database.sqlite'); 
     97$t->ok(file_exists($c->tmp_dir.DS.'data'.DS.'database.sqlite'), '"propel:insert-sql" creates tables in the database'); 
    9798 
    9899$content = $c->execute_command('propel:generate-crud --generate-in-cache frontend articleInitCrud Article');