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

Added a better way to use a bundle argument in commands

Browse source 
Added bundle argument to propel:model:build command
This commit is contained in:
William DURAND 2012-04-20 02:20:54 +02:00
commit a30747ed09
6 changed files with 39 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Command/FixturesLoadCommand.php
View file

@ -47,12 +47,6 @@ class FixturesLoadCommand extends AbstractPropelCommand
*/
private $filesystem = null;
/**
* Bundle the fixtures are being loaded from
* @var Symfony\Component\HttpKernel\Bundle\BundleInterface
*/
private $bundle;
/**
* @see Command
*/
@ -128,12 +122,7 @@ EOT
$this->filesystem = new Filesystem();
if ('@' === substr($input->getArgument('bundle'), 0, 1)) {
$this->bundle = $this
->getContainer()
->get('kernel')
->getBundle(substr($input->getArgument('bundle'), 1));
if (null !== $this->bundle) {
$this->absoluteFixturesPath = $this->getFixturesPath($this->bundle);
} else {
$this->absoluteFixturesPath = realpath($this->getApplication()->getKernel()->getRootDir() . '/../' . $input->getOption('dir'));
@ -293,7 +282,7 @@ EOT
if (true === $ret) {
$this->writeSection($output, array(
'', 'All SQL statements have been executed.'
'', 'All SQL statements have been inserted.'
), 'fg=green;bg=black');
} else {
$this->writeTaskError($output, 'insert-sql', false);
@ -325,7 +314,6 @@ EOT
}
$finalFixtureFiles = array();
foreach ($files as $file) {
$fixtureFilePath = str_replace($this->getFixturesPath($this->bundle) . DIRECTORY_SEPARATOR, '', $file->getRealPath());
$logicalName = sprintf('@%s/Resources/fixtures/%s', $this->bundle->getName(), $fixtureFilePath);
@ -342,6 +330,6 @@ EOT
*/
protected function getFixturesPath(BundleInterface $bundle)
{
return $bundle->getPath().DIRECTORY_SEPARATOR.'Resources'.DIRECTORY_SEPARATOR.'fixtures';
return $bundle->getPath() . DIRECTORY_SEPARATOR . 'Resources' . DIRECTORY_SEPARATOR . 'fixtures';
}
}