Updated

Author: dantleech

README.md

@@ -58,7 +58,7 @@ PHPCR > select * from nt:unstructured;
 
 ## Changing the CWD
 
-The PHPCR shell (will) allows you to navigate the PHPCR document hierarchy like a file system
+The PHPCR shell allows you to navigate the PHPCR document hierarchy like a file system
 
 ````bash
 PHPCR > ls

src/PHPCR/Shell/Console/Application/ShellApplication.php

@@ -100,7 +100,6 @@ public function doRun(InputInterface $input, OutputInterface $output)
         $name = $this->getCommandName($input);
 
         if (!$name) {
-            $name = 'help';
             $input = new ArrayInput(array('command' => 'pwd'));
         }
 

src/PHPCR/Shell/PhpcrSession.php

@@ -52,7 +52,11 @@ public function getAbsPath($path)
         if (substr($path, 0, 1) == '/') {
             $absPath = $path;
         } else {
-            $absPath = $this->getCwd() . '/' . $path;
+            if ($this->cwd == '/') {
+                $absPath = sprintf('/%s', $path);
+            } else {
+                $absPath = sprintf('%s/%s', $this->getCwd(), $path);
+            }
         }
 
         return $absPath;
@@ -161,7 +165,7 @@ public function propertyExists($path)
 
     public function move($srcAbsPath, $destAbsPath)
     {
-        return $this->session->move($srcAbsPath, $destAbsPath);
+        return $this->session->move($this->getAbsPath($srcAbsPath), $this->getAbsPath($destAbsPath));
     }
 
     public function removeItem($path)
@@ -201,7 +205,7 @@ public function hasCapability($methodName, $target, array $arguments)
 
     public function importXML($parentAbsPath, $uri, $uuidBehavior)
     {
-        return $this->session->importXML($parentAbsPath, $uri, $uuidBehavior);
+        return $this->session->importXML($this->getAbsPath($parentAbsPath), $uri, $uuidBehavior);
     }
 
     public function exportSystemView($path, $stream, $skipBinary, $noRecurse)