Development

Changeset 6645

You must first sign up to be able to contribute.

Changeset 6645

Show
Ignore:
Timestamp:
12/20/07 20:46:07 (8 months ago)
Author:
fabien
Message:

removed propel inline includes for better performance (closes #2376)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/1.1/lib/plugins/sfPropelPlugin/lib/propel/builder/SfObjectBuilder.php

    r5840 r6645  
    2121  public function build() 
    2222  { 
     23    $objectCode = parent::build(); 
    2324    if (!DataModelBuilder::getBuildProperty('builderAddComments')) 
    2425    { 
    25       return sfToolkit::stripComments(parent::build()); 
    26     } 
    27      
    28     return parent::build(); 
     26      $objectCode = sfToolkit::stripComments($objectCode); 
     27    } 
     28    if (!DataModelBuilder::getBuildProperty('builderAddIncludes')) 
     29    {  
     30       //remove all inline includes: object classes include the peers 
     31      $objectCode = preg_replace("/include_once\s*.*Base.*Peer\.php.*\s*/", "", $objectCode); 
     32    } 
     33    return $objectCode; 
    2934  } 
    3035 

  • branches/1.1/lib/plugins/sfPropelPlugin/lib/propel/builder/SfPeerBuilder.php

    r6073 r6645  
    2121  public function build() 
    2222  { 
     23    $peerCode = parent::build(); 
    2324    if (!DataModelBuilder::getBuildProperty('builderAddComments')) 
    2425    { 
    25       return sfToolkit::stripComments(parent::build()); 
    26     } 
    27  
    28     return parent::build(); 
     26      $peerCode =  sfToolkit::stripComments($peerCode); 
     27    } 
     28    if (!DataModelBuilder::getBuildProperty('builderAddIncludes')) 
     29    { 
     30      //remove all inline includes: peer class include inline the mapbuilder classes 
     31      $peerCode = preg_replace("/(include|require)_once\s*.*MapBuilder\.php.*\s*/", "", $peerCode); 
     32    } 
     33    return $peerCode; 
    2934  } 
    3035