From 0f78f2b8755363c9c3c8725e6a9f9dfeacac1500 Mon Sep 17 00:00:00 2001
From: Romain Pouclet <me@palleas.com>
Date: Fri, 6 Apr 2012 12:04:43 +0200
Subject: [PATCH] Avoid duplicating fixtures path

---
 Command/FixturesLoadCommand.php | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/Command/FixturesLoadCommand.php b/Command/FixturesLoadCommand.php
index 768cd62..fed0b29 100644
--- a/Command/FixturesLoadCommand.php
+++ b/Command/FixturesLoadCommand.php
@@ -16,6 +16,7 @@ use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Finder\Finder;
+use Symfony\Component\HttpKernel\Bundle\BundleInterface;
 
 use Propel\PropelBundle\Command\AbstractPropelCommand;
 use Propel\PropelBundle\DataFixtures\Loader\YamlDataLoader;
@@ -128,7 +129,7 @@ EOT
                 ->getContainer()
                 ->get('kernel')
                 ->getBundle(substr($input->getArgument('bundle'), 1));
-            $this->absoluteFixturesPath = $this->bundle->getPath() . DIRECTORY_SEPARATOR . 'Resources' . DIRECTORY_SEPARATOR . 'fixtures';
+            $this->absoluteFixturesPath = $this->getFixturesPath($this->bundle);
         } else {
             $this->absoluteFixturesPath = realpath($this->getApplication()->getKernel()->getRootDir() . '/../' . $input->getOption('dir'));
         }
@@ -321,11 +322,21 @@ EOT
         $finalFixtureFiles = array();
 
         foreach ($files as $file) {
-            $fixtureFilePath = str_replace($this->bundle->getPath(). DIRECTORY_SEPARATOR . 'Resources' . DIRECTORY_SEPARATOR . 'fixtures' . DIRECTORY_SEPARATOR, '', $file->getRealPath());
+            $fixtureFilePath = str_replace($this->getFixturesPath($this->bundle) . DIRECTORY_SEPARATOR, '', $file->getRealPath());
             $logicalName = sprintf('@%s/Resources/fixtures/%s', $this->bundle->getName(), $fixtureFilePath);
             $finalFixtureFiles[] = new \SplFileInfo($this->getFileLocator()->locate($logicalName));
         }
 
         return new \ArrayIterator($finalFixtureFiles);
     }
+
+    /**
+     * Returns the path the command will look into to find fixture files
+     *
+     * @return String
+     */
+    protected function getFixturesPath(BundleInterface $bundle)
+    {
+        return $bundle->getPath().DIRECTORY_SEPARATOR.'Resources'.DIRECTORY_SEPARATOR.'fixtures';
+    }   
 }