Updated aliases

Author: dantleech

src/PHPCR/Shell/PhpcrSession.php

@@ -118,15 +118,17 @@ public function getAbsPath($path)
      */
     public function getAbsTargetPath($srcPath, $targetPath)
     {
+        $targetPath = $this->getAbsPath($targetPath);
+
         try {
-            $this->getNode($this->getAbsPath($targetPath));
+            $this->getNode($targetPath);
         } catch (PathNotFoundException $e) {
             return $targetPath;
         }
 
         $basename = basename($this->getAbsPath($srcPath));
 
-        return sprintf('%s/%s', $targetPath, $basename);
+        return $this->getAbsPath(sprintf('%s/%s', $targetPath, $basename));
     }
 
     public function getAbsPaths($paths)

src/PHPCR/Shell/Resources/config.dist/alias.yml

@@ -1,5 +1,5 @@
 # Shell shortcuts
-alist: shell:alias:list
+lsa: shell:alias:list
 creload: shell:config:reload
 cinit: shell:config:init
 
@@ -22,16 +22,16 @@ cat: node:property:show {arg1}
 touch: node:property:set {arg1} {arg2} {arg3}
 
 # Node type commands
-mixins: node-type:list "^mix:"
-ntlist: node-type:list
+lsmix: node-type:list "^mix:"
+lsnt: node-type:list {arg1}
 ntedit: node-type:edit {arg1}
 ntshow: node-type:show {arg1}
 
 # Workspace commands
 wslist: workspace:list
 
 # Namespsce commands
-nslist: workspace:namespace:list
+lsns: workspace:namespace:list {arg1}
 nsset: workspace:namespace:register
 
 # Editor commands
@@ -42,12 +42,11 @@ nano: node:property:edit {arg1} {arg2}
 man: help {arg1}
 
 # Version commands
-checkin: version:checkin {arg1}
-checkout: version:checkout {arg1}
-checkpoint: version:checkpoint {arg1}
-checkpoint: version:checkpoint {arg1}
-vhlist: version:history {arg1}
+ci: version:checkin {arg1}
+co: version:checkout {arg1}
+cp: version:checkpoint {arg1}
+vhist: version:history {arg1}
 
 # Session commands
 save: session:save
-reload: session:reload
+refresh: session:refresh

tests/PHPCR/Shell/PhpcrSessionTest.php

@@ -3,6 +3,7 @@
 namespace PHPCR\Shell;
 
 use PHPCR\SessionInterface;
+use PHPCR\PathNotFoundException;
 
 class PhpcrSessionTest extends \Phpunit_Framework_TestCase
 {
@@ -73,6 +74,9 @@ public function testMv($cwd, $relSrc, $relTar, $expSrc, $expTar)
         $this->phpcr->expects($this->once())
             ->method('move')
             ->with($expSrc, $expTar);
+        $this->phpcr->expects($this->once())
+            ->method('getNode')
+            ->will($this->throwException(new PathNotFoundException));
         $this->session->setCwd($cwd);
         $this->session->move($relSrc, $relTar);
     }