deblan/propel-bundle
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch '2.0'

Browse source
This commit is contained in:
William DURAND 2011-12-05 22:23:19 +01:00
parent 600808b2a1 667ca20b80
commit b61cff3d19
2 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Command/AbstractPropelCommand.php
View file

@ -483,7 +483,7 @@ EOT;
private function transformToLogicalName(\SplFileInfo $schema, BundleInterface $bundle)
{
$schemaPath = str_replace($bundle->getPath().'/Resources/config/', '', $schema->getPathname());
$schemaPath = str_replace($bundle->getPath(). DIRECTORY_SEPARATOR . 'Resources' . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR, '', $schema->getRealPath());
return sprintf('@%s/Resources/config/%s', $bundle->getName(), $schemaPath);
}

3
DataFixtures/Loader/AbstractDataLoader.php
View file

@ -206,9 +206,6 @@ abstract class AbstractDataLoader extends AbstractDataHandler implements DataLoa
// save the object for future reference
if (method_exists($obj, 'getPrimaryKey')) {
$class_default = constant(constant($class.'::PEER').'::CLASS_DEFAULT');
if ('/' !== substr($class_default, 0, 1)) {
$class_default = '/' . $class_default;
}
$this->object_references[Propel::importClass($class_default).'_'.$key] = $obj;
}
}