diff --git a/Command/AbstractCommand.php b/Command/AbstractCommand.php index b9d8a308..c7b78fef 100644 --- a/Command/AbstractCommand.php +++ b/Command/AbstractCommand.php @@ -345,7 +345,7 @@ protected function getPackageFromBundle(Bundle $bundle, $namespace) $namespaceDiff = substr($namespace, strlen($baseNamespace) + 1); $bundlePath = realpath($bundle->getPath()) . '/' . str_replace('\\', '/', $namespaceDiff); - $appPath = realpath($this->getKernel()->getProjectDir() . '/..'); + $appPath = realpath($this->getKernel()->getProjectDir()); $path = static::getRelativePath($bundlePath, $appPath); diff --git a/Command/FixturesDumpCommand.php b/Command/FixturesDumpCommand.php index 89970fbf..0259c5c0 100644 --- a/Command/FixturesDumpCommand.php +++ b/Command/FixturesDumpCommand.php @@ -58,10 +58,10 @@ protected function configure() protected function execute(InputInterface $input, OutputInterface $output) { $fixtureDir = $input->getOption('dir') ?: $this->defaultFixturesDir; - $path = realpath($this->getKernel()->getProjectDir() . '/../') . '/' . $fixtureDir; + $path = realpath($this->getKernel()->getProjectDir() . '/') . '/' . $fixtureDir; if (!file_exists($path)) { - $output->writeln("The $path folder does not exists."); + $output->writeln("The $path folder does not exist."); if ($this->askConfirmation($input, $output, "Do you want me to create it for you ? [Yes]")) { $fs = new Filesystem(); $fs->mkdir($path); diff --git a/Command/FixturesLoadCommand.php b/Command/FixturesLoadCommand.php index e9ae4416..f787b190 100644 --- a/Command/FixturesLoadCommand.php +++ b/Command/FixturesLoadCommand.php @@ -119,7 +119,7 @@ protected function execute(InputInterface $input, OutputInterface $output) if (null !== $this->bundle) { $this->absoluteFixturesPath = $this->getFixturesPath($this->bundle); } else { - $this->absoluteFixturesPath = realpath($this->getKernel()->getProjectDir() . '/../' . $input->getOption('dir')); + $this->absoluteFixturesPath = realpath($this->getKernel()->getProjectDir() . '/' . $input->getOption('dir')); } if (!$this->absoluteFixturesPath && !file_exists($this->absoluteFixturesPath)) { diff --git a/Command/FormGenerateCommand.php b/Command/FormGenerateCommand.php index 18c97005..ef38dfea 100644 --- a/Command/FormGenerateCommand.php +++ b/Command/FormGenerateCommand.php @@ -155,7 +155,7 @@ protected function writeFormType(BundleInterface $bundle, Table $table, \SplFile */ protected function getRelativeFileName(\SplFileInfo $file) { - return substr(str_replace(realpath($this->getContainer()->getParameter('kernel.project_dir') . '/../'), '', $file), 1); + return substr(str_replace(realpath($this->getContainer()->getParameter('kernel.project_dir') . '/'), '', $file), 1); } /** diff --git a/Command/ModelBuildCommand.php b/Command/ModelBuildCommand.php index 592f0b25..77a089f7 100644 --- a/Command/ModelBuildCommand.php +++ b/Command/ModelBuildCommand.php @@ -52,7 +52,7 @@ protected function createSubCommandInstance() */ protected function getSubCommandArguments(InputInterface $input) { - $outputDirDefault = $this->getApplication()->getKernel()->getProjectDir().'/../'; + $outputDirDefault = $this->getApplication()->getKernel()->getProjectDir().'/'; $outputDir = $this->input->getOption('output-dir') ?: $outputDirDefault; $result = [ diff --git a/Tests/TestCase.php b/Tests/TestCase.php index e3611296..3106fe26 100644 --- a/Tests/TestCase.php +++ b/Tests/TestCase.php @@ -24,7 +24,7 @@ public function getContainer() { $container = new ContainerBuilder(new ParameterBag(array( 'kernel.debug' => false, - 'kernel.project_dir' => __DIR__ . '/../', + 'kernel.project_dir' => __DIR__ . '/', ))); $container->setParameter('propel.configuration', array());