From d3b27dcb1a3f347d15ef68c0d182ea466a1bb9bb Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Sat, 27 Aug 2011 13:36:18 +0200 Subject: [PATCH] DDC-1344 - Fix path displaying to not use realpath()ed variables --- .../ORM/Tools/Console/Command/ConvertMappingCommand.php | 2 +- .../ORM/Tools/Console/Command/GenerateEntitiesCommand.php | 2 +- .../ORM/Tools/Console/Command/GenerateProxiesCommand.php | 2 +- .../ORM/Tools/Console/Command/GenerateRepositoriesCommand.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/Doctrine/ORM/Tools/Console/Command/ConvertMappingCommand.php b/lib/Doctrine/ORM/Tools/Console/Command/ConvertMappingCommand.php index 9a7903127..03af43ac4 100644 --- a/lib/Doctrine/ORM/Tools/Console/Command/ConvertMappingCommand.php +++ b/lib/Doctrine/ORM/Tools/Console/Command/ConvertMappingCommand.php @@ -137,7 +137,7 @@ EOT if ( ! file_exists($destPath)) { throw new \InvalidArgumentException( - sprintf("Mapping destination directory '%s' does not exist.", $destPath) + sprintf("Mapping destination directory '%s' does not exist.", $input->getArgument('dest-path')) ); } else if ( ! is_writable($destPath)) { throw new \InvalidArgumentException( diff --git a/lib/Doctrine/ORM/Tools/Console/Command/GenerateEntitiesCommand.php b/lib/Doctrine/ORM/Tools/Console/Command/GenerateEntitiesCommand.php index 198db0d6c..0c65712cb 100644 --- a/lib/Doctrine/ORM/Tools/Console/Command/GenerateEntitiesCommand.php +++ b/lib/Doctrine/ORM/Tools/Console/Command/GenerateEntitiesCommand.php @@ -123,7 +123,7 @@ EOT if ( ! file_exists($destPath)) { throw new \InvalidArgumentException( - sprintf("Entities destination directory '%s' does not exist.", $destPath) + sprintf("Entities destination directory '%s' does not exist.", $input->getArgument('dest-path')) ); } else if ( ! is_writable($destPath)) { throw new \InvalidArgumentException( diff --git a/lib/Doctrine/ORM/Tools/Console/Command/GenerateProxiesCommand.php b/lib/Doctrine/ORM/Tools/Console/Command/GenerateProxiesCommand.php index 987628956..cd7578b27 100644 --- a/lib/Doctrine/ORM/Tools/Console/Command/GenerateProxiesCommand.php +++ b/lib/Doctrine/ORM/Tools/Console/Command/GenerateProxiesCommand.php @@ -87,7 +87,7 @@ EOT if ( ! file_exists($destPath)) { throw new \InvalidArgumentException( - sprintf("Proxies destination directory '%s' does not exist.", $destPath) + sprintf("Proxies destination directory '%s' does not exist.", $em->getConfiguration()->getProxyDir()) ); } else if ( ! is_writable($destPath)) { throw new \InvalidArgumentException( diff --git a/lib/Doctrine/ORM/Tools/Console/Command/GenerateRepositoriesCommand.php b/lib/Doctrine/ORM/Tools/Console/Command/GenerateRepositoriesCommand.php index 30d36eb44..2a92493e8 100644 --- a/lib/Doctrine/ORM/Tools/Console/Command/GenerateRepositoriesCommand.php +++ b/lib/Doctrine/ORM/Tools/Console/Command/GenerateRepositoriesCommand.php @@ -79,7 +79,7 @@ EOT if ( ! file_exists($destPath)) { throw new \InvalidArgumentException( - sprintf("Entities destination directory '%s' does not exist.", $destPath) + sprintf("Entities destination directory '%s' does not exist.", $input->getArgument('dest-path')) ); } else if ( ! is_writable($destPath)) { throw new \InvalidArgumentException(