Development

Changeset 15380

You must first sign up to be able to contribute.

Changeset 15380

Show
Ignore:
Timestamp:
02/10/09 06:15:45 (4 years ago)
Author:
Stephen.Ostrow
Message:
  • Making it so unit tests will run
  • Updating the relationship handling for onDelete for Country and User
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • plugins/sfDoctrineUserPlugin/branches/1.2/CHANGELOG

    r15358 r15380  
     1Version 1.2.1 
     2-------------- 
     3 * [15380]: 
     4  * Making it so unit tests will run 
     5  * Updating the relationship handling for onDelete for Country and User 
     6 
     7 
    18Version 1.2.0 
    29-------------- 

  • plugins/sfDoctrineUserPlugin/branches/1.2/config/doctrine/0000_configuration.yml

    r15357 r15380  
    5959      class: sfUserCountry 
    6060      local: country_id 
     61      onDelete: CASCADE 

  • plugins/sfDoctrineUserPlugin/branches/1.2/config/doctrine/1001_user_phone.yml

    r15357 r15380  
    1818      class: sfUserUser 
    1919      local: user_id 
     20      onDelete: CASCADE 
    2021    PhoneType: 
    2122      class: sfUserPhoneType 

  • plugins/sfDoctrineUserPlugin/branches/1.2/config/doctrine/1002_user_address.yml

    r15357 r15380  
    2828      foreignAlias: Addresses 
    2929      local: user_id 
     30      onDelete: CASCADE 
    3031    AddressType: 
    3132      class: sfUserAddressType 

  • plugins/sfDoctrineUserPlugin/branches/1.2/config/doctrine/1003_user_email.yml

    r15357 r15380  
    1616      foreign: id 
    1717      foreignAlias: EmailAddresses 
     18      onDelete: CASCADE 

  • plugins/sfDoctrineUserPlugin/branches/1.2/config/doctrine/1004_user_im.yml

    r15357 r15380  
    1515      foreignAlias: ImAccounts 
    1616      local: user_id 
     17      onDelete: CASCADE 
    1718    ImAccountType: 
    1819      class: sfUserImAccountType 

  • plugins/sfDoctrineUserPlugin/branches/1.2/config/doctrine/1005_user_billing.yml

    r15357 r15380  
    7979      foreignAlias: Billings 
    8080      local: user_id 
     81      onDelete: CASCADE 
    8182    CreditCardType: 
    8283      class: sfUserCreditCardType 

  • plugins/sfDoctrineUserPlugin/branches/1.2/package.xml.tmpl

    r15357 r15380  
    2121  </stability> 
    2222  <license uri="http://www.symfony-project.org/license">MIT license</license> 
    23   <notes>-</notes> 
     23  <notes>Blah Blah Blah</notes> 
    2424  <contents> 
    2525    ##CONTENTS## 

  • plugins/sfDoctrineUserPlugin/branches/1.2/test/bootstrap/Doctrine.php

    r15357 r15380  
    33include(dirname(__FILE__).'/unit.php'); 
    44 
    5 //$configuration = ProjectConfiguration::getApplicationConfiguration('frontend', 'test', true); 
    65new sfDatabaseManager($configuration); 
    76$con = Doctrine_Manager::getInstance()->getCurrentConnection(); 
    8 Doctrine::loadData($plugin_configuration->getRootDir().'/test/fixtures/project/data/fixtures', false); 
     7Doctrine::loadData($configuration->getRootDir().'/test/fixtures/project/data/fixtures', false); 

  • plugins/sfDoctrineUserPlugin/branches/1.2/test/bootstrap/unit.php

    r15357 r15380  
    66} 
    77 
     8if (!isset($app)) 
     9{ 
     10  $app = 'frontend'; 
     11} 
     12 
    813require_once $_SERVER['SYMFONY'].'/autoload/sfCoreAutoload.class.php'; 
    914sfCoreAutoload::register(); 
    1015 
    11 $configuration = new sfProjectConfiguration(dirname(__FILE__).'/../fixtures/project'); 
     16function sfDoctrineUserPlugin_cleanup() 
     17{ 
     18  sfToolkit::clearDirectory(dirname(__FILE__).'/../fixtures/project/cache'); 
     19  sfToolkit::clearDirectory(dirname(__FILE__).'/../fixtures/project/log'); 
     20} 
     21sfDoctrineUserPlugin_cleanup(); 
     22//register_shutdown_function('sfDoctrineUserPlugin_cleanup'); 
     23 
     24require_once dirname(__FILE__).'/../fixtures/project/config/ProjectConfiguration.class.php'; 
     25$configuration = ProjectConfiguration::getApplicationConfiguration($app, 'test', isset($debug) ? $debug : true); 
    1226require_once $configuration->getSymfonyLibDir().'/vendor/lime/lime.php'; 
    13  
    14 function sfDoctrineUserPlugin_autoload_again($class) 
    15 { 
    16   $autoload = sfSimpleAutoload::getInstance(); 
    17   $autoload->reload(); 
    18   return $autoload->autoload($class); 
    19 } 
    20 spl_autoload_register('sfDoctrineUserPlugin_autoload_again'); 
    21  
    22 require_once dirname(__FILE__).'/../../config/sfDoctrineUserPluginConfiguration.class.php'; 
    23 $plugin_configuration = new sfDoctrineUserPluginConfiguration($configuration, dirname(__FILE__).'/../..'); 
     27sfContext::createInstance($configuration); 

  • plugins/sfDoctrineUserPlugin/branches/1.2/test/fixtures/project/config/ProjectConfiguration.class.php

    r15357 r15380  
    1515    $this->setPlugins(array('sfDoctrineUserPlugin', 'sfDoctrinePlugin')); 
    1616    $this->setPluginPath('sfDoctrineUserPlugin', dirname(__FILE__).'/../../../..'); 
    17     $this->setPluginPath('sfDoctrinePlugin', dirname(__FILE__).'/../../../..'); 
     17    $this->setPluginPath('sfDoctrinePlugin', $this->getSymfonyLibDir().'/plugins/sfDoctrinePlugin'); 
    1818  } 
    1919} 

  • plugins/sfDoctrineUserPlugin/branches/1.2/test/fixtures/project/config/databases.yml

    r15357 r15380  
    11dev: 
    2   propel: 
    3     param: 
    4       classname:  DebugPDO 
    5  
     2  connection1: 
     3    class: sfDoctrineDatabase 
    64test: 
    7   propel: 
    8     param: 
    9       classname:  DebugPDO 
     5  connection1: 
     6    class: sfDoctrineDatabase 
    107 
    118all: 
    12   propel: 
    13     class:        sfPropelDatabase 
     9  connection1: 
     10    class: sfDoctrineDatabase 
    1411    param: 
    15       classname:  PropelPDO 
    16       dsn:        mysql:dbname=##PROJECT_NAME##;host=localhost 
    17       username:   root 
    18       password:    
    19       encoding:   utf8 
    20       persistent: true 
    21       pooling:    true 
     12      dsn: 'mysql:dbname=sf_doctrune_user_plugin_test;host=localhost' 
     13      username: root 
     14      password: null 

  • plugins/sfDoctrineUserPlugin/branches/1.2/test/unit/model/sfUserAddressTest.php

    r15357 r15380  
    2424   * Begin Tests 
    2525   */ 
     26 
     27  $user[0] = new sfUserUser(); 
     28  $user[0]->set('first_name', 'FirstName'); 
     29  $user[0]->save(); 
     30