Development

Changeset 22808

You must first sign up to be able to contribute.

Changeset 22808

Show
Ignore:
Timestamp:
10/05/09 22:11:28 (4 years ago)
Author:
francois
Message:

[sfPropel14Plugin] Propel doesn t add includes since version 1.3

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • plugins/sfPropel14Plugin/trunk/config/skeleton/config/propel.ini

    r22807 r22808  
    4949propel.builder.objectmultiextend.class = plugins.sfPropelPlugin.lib.builder.SfMultiExtendObjectBuilder 
    5050 
    51 propel.builder.addIncludes  = false 
    5251propel.builder.addComments  = true 
    5352propel.builder.addBehaviors = true 

  • plugins/sfPropel14Plugin/trunk/lib/builder/SfExtensionObjectBuilder.php

    r12141 r22808  
    2929 
    3030    return $code; 
    31   } 
    32  
    33   protected function addIncludes(&$script) 
    34   { 
    35     if (!DataModelBuilder::getBuildProperty('builderAddIncludes')) 
    36     { 
    37       return; 
    38     } 
    39  
    40     parent::addIncludes($script); 
    4131  } 
    4232 

  • plugins/sfPropel14Plugin/trunk/lib/builder/SfExtensionPeerBuilder.php

    r12141 r22808  
    3030  } 
    3131 
    32   protected function addIncludes(&$script) 
    33   { 
    34     if (!DataModelBuilder::getBuildProperty('builderAddIncludes')) 
    35     { 
    36       return; 
    37     } 
    38  
    39     parent::addIncludes($script); 
    40   } 
    41  
    4232  /** 
    4333   * Adds class phpdoc comment and openning of class. 

  • plugins/sfPropel14Plugin/trunk/lib/builder/SfMultiExtendObjectBuilder.php

    r14770 r22808  
    3030  } 
    3131 
    32   protected function addIncludes(&$script) 
    33   { 
    34     if (!DataModelBuilder::getBuildProperty('builderAddIncludes')) 
    35     { 
    36       return; 
    37     } 
    38  
    39     parent::addIncludes($script); 
    40   } 
    41  
    4232  protected function addClassOpen(&$script) 
    4333  { 

  • plugins/sfPropel14Plugin/trunk/lib/builder/SfNestedSetBuilder.php

    r9564 r22808  
    2929    return $code; 
    3030  } 
    31  
    32   protected function addIncludes(&$script) 
    33   { 
    34     if (!DataModelBuilder::getBuildProperty('builderAddIncludes')) 
    35     { 
    36       return; 
    37     } 
    38  
    39     parent::addIncludes($script); 
    40   } 
    4131} 

  • plugins/sfPropel14Plugin/trunk/lib/builder/SfNestedSetPeerBuilder.php

    r9564 r22808  
    2929    return $code; 
    3030  } 
    31  
    32   protected function addIncludes(&$script) 
    33   { 
    34     if (!DataModelBuilder::getBuildProperty('builderAddIncludes')) 
    35     { 
    36       return; 
    37     } 
    38  
    39     parent::addIncludes($script); 
    40   } 
    4131} 

  • plugins/sfPropel14Plugin/trunk/lib/builder/SfObjectBuilder.php

    r21908 r22808  
    3434 
    3535    return $objectCode; 
    36   } 
    37  
    38   protected function addIncludes(&$script) 
    39   { 
    40     if (!DataModelBuilder::getBuildProperty('builderAddIncludes')) 
    41     { 
    42       return; 
    43     } 
    44  
    45     parent::addIncludes($script); 
    46  
    47     // include the i18n classes if needed 
    48     if ($this->getTable()->getAttribute('isI18N')) 
    49     { 
    50       $relatedTable = $this->getDatabase()->getTable($this->getTable()->getAttribute('i18nTable')); 
    51  
    52       $script .= ' 
    53 require_once \''.ClassTools::getFilePath($this->getStubObjectBuilder()->getPackage().'.', $relatedTable->getPhpName().'Peer').'\'; 
    54 require_once \''.ClassTools::getFilePath($this->getStubObjectBuilder()->getPackage().'.', $relatedTable->getPhpName()).'\'; 
    55 '; 
    56     } 
    5736  } 
    5837 

  • plugins/sfPropel14Plugin/trunk/lib/builder/SfPeerBuilder.php

    r22807 r22808  
    3838 
    3939    return $peerCode; 
    40   } 
    41  
    42   protected function addIncludes(&$script) 
    43   { 
    44     if (!DataModelBuilder::getBuildProperty('builderAddIncludes')) 
    45     { 
    46       return; 
    47     } 
    48  
    49     parent::addIncludes($script); 
    5040  } 
    5141