Merge pull request #439 from jmontoyaa/patch-2

realpath return false when using the script in a phar file.
doctrine · Dec 6, 2013 · f3f6b7d · f3f6b7d
2 parents 8b28a9a + e4cbc27
commit f3f6b7d
Showing 1 changed file with 14 additions and 8 deletions.
diff --git a/lib/Doctrine/DBAL/Tools/Console/Command/ImportCommand.php b/lib/Doctrine/DBAL/Tools/Console/Command/ImportCommand.php
@@ -65,20 +65,26 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         if (($fileNames = $input->getArgument('file')) !== null)  {
             foreach ((array) $fileNames as $fileName) {
-                $fileName = realpath($fileName);
-
-                if ( ! file_exists($fileName)) {
+
+                $filePath = realpath($fileName);
+
+                // Phar compatibility.
+                if (false === $filePath) {
+                    $filePath = $fileName;
+                }
+
+                if ( ! file_exists($filePath)) {
                     throw new \InvalidArgumentException(
-                        sprintf("SQL file '<info>%s</info>' does not exist.", $fileName)
+                        sprintf("SQL file '<info>%s</info>' does not exist.", $filePath)
                     );
-                } else if ( ! is_readable($fileName)) {
+                } else if ( ! is_readable($filePath)) {
                     throw new \InvalidArgumentException(
-                        sprintf("SQL file '<info>%s</info>' does not have read permissions.", $fileName)
+                        sprintf("SQL file '<info>%s</info>' does not have read permissions.", $filePath)
                     );
                 }
 
-                $output->write(sprintf("Processing file '<info>%s</info>'... ", $fileName));
-                $sql = file_get_contents($fileName);
+                $output->write(sprintf("Processing file '<info>%s</info>'... ", $filePath));
+                $sql = file_get_contents($filePath);
 
                 if ($conn instanceof \Doctrine\DBAL\Driver\PDOConnection) {
                     // PDO Drivers