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

Merge pull request #275 from RobinvdVleuten/1.4

Browse source 
Correct prefix when PSR-4 bundle
This commit is contained in:
Toni Uebernickel 2014-08-19 08:44:35 +02:00
parent 89e91ad5d4 8d9067ec87
commit ba23a366ff
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Command/AbstractCommand.php
View file

@ -77,7 +77,13 @@ abstract class AbstractCommand extends ContainerAwareCommand
protected function getPackagePrefix(Bundle $bundle, $baseDirectory = '')
{
$parts = explode(DIRECTORY_SEPARATOR, realpath($bundle->getPath()));
$length = count(explode('\\', $bundle->getNamespace())) * (-1);
$segments = explode('\\', $bundle->getNamespace());
$length = count($parts);
$partsDiff = array_diff($segments, $parts);
if (empty($partsDiff)) {
$length = count(explode('\\', $bundle->getNamespace())) * (-1);
}
$prefix = implode(DIRECTORY_SEPARATOR, array_slice($parts, 0, $length));
$prefix = ltrim(str_replace($baseDirectory, '', $prefix), DIRECTORY_SEPARATOR);
@ -95,7 +101,7 @@ abstract class AbstractCommand extends ContainerAwareCommand
protected function initialize(InputInterface $input, OutputInterface $output)
{
parent::initialize($input, $output);
if ($input->getOption('verbose')) {
$this->additionalPhingArgs[] = 'verbose';
}