Made Version commands CNP sensative

dantleech · dantleech · commit ab95f2787695 · 2014-04-06T16:46:14.000+02:00
diff --git a/src/PHPCR/Shell/Console/Command/Phpcr/VersionCheckinCommand.php b/src/PHPCR/Shell/Console/Command/Phpcr/VersionCheckinCommand.php
@@ -13,9 +13,9 @@ protected function configure()
     {
         $this->setName('version:checkin');
         $this->setDescription('Checkin (commit) a node version');
-        $this->addArgument('absPath', null, InputArgument::REQUIRED, 'Absolute path to node');
+        $this->addArgument('path', null, InputArgument::REQUIRED, 'Absolute path to node');
         $this->setHelp(<<<HERE
-Creates for the versionable node at <info>absPath</info> a new version with a system
+Creates for the versionable node at <info>path</info> a new version with a system
 generated version name and returns that version (which will be the new
 base version of this node). Sets the <comment>jcr:checkedOut</comment> property to false
 thus putting the node into the checked-in state. This means that the node
@@ -49,15 +49,15 @@ public function execute(InputInterface $input, OutputInterface $output)
     {
         $session = $this->getHelper('phpcr')->getSession();
         $nodeHelper = $this->getHelper('node');
-        $absPath = $input->getArgument('absPath');
+        $path = $session->getAbsPath($input->getArgument('path'));
         $workspace = $session->getWorkspace();
 
         $versionManager = $workspace->getVersionManager();
 
-        $node = $session->getNode($absPath);
+        $node = $session->getNode($path);
         $nodeHelper->assertNodeIsVersionable($node);
 
-        $version = $versionManager->checkin($absPath);
+        $version = $versionManager->checkin($path);
 
         $output->writeln('Version: ' . $version->getName());
     }
diff --git a/src/PHPCR/Shell/Console/Command/Phpcr/VersionCheckoutCommand.php b/src/PHPCR/Shell/Console/Command/Phpcr/VersionCheckoutCommand.php
@@ -13,9 +13,9 @@ protected function configure()
     {
         $this->setName('version:checkout');
         $this->setDescription('Checkout a node version and enable changes to be made');
-        $this->addArgument('absPath', null, InputArgument::REQUIRED, 'Absolute path to node');
+        $this->addArgument('path', null, InputArgument::REQUIRED, 'Absolute path to node');
         $this->setHelp(<<<HERE
-Sets the versionable node at <info>absPath</info> to checked-out status by setting
+Sets the versionable node at <info>path</info> to checked-out status by setting
 its jcr:isCheckedOut property to true. Under full versioning it also sets
 the jcr:predecessors property to be a reference to the current base
 version (the same value as held in <comment>jcr:baseVersion</comment>).
@@ -37,7 +37,7 @@ public function execute(InputInterface $input, OutputInterface $output)
     {
         $session = $this->getHelper('phpcr')->getSession();
         $nodeHelper = $this->getHelper('node');
-        $absPath = $input->getArgument('absPath');
+        $absPath = $session->getAbsPath($input->getArgument('path'));
         $workspace = $session->getWorkspace();
 
         $node = $session->getNode($absPath);
diff --git a/src/PHPCR/Shell/Console/Command/Phpcr/VersionCheckpointCommand.php b/src/PHPCR/Shell/Console/Command/Phpcr/VersionCheckpointCommand.php
@@ -13,10 +13,10 @@ protected function configure()
     {
         $this->setName('version:checkpoint');
         $this->setDescription('Checkin and then checkout a node');
-        $this->addArgument('absPath', null, InputArgument::REQUIRED, 'Absolute path to node');
+        $this->addArgument('path', null, InputArgument::REQUIRED, 'Path to node');
         $this->setHelp(<<<HERE
 Performs a <info>version:checkin</info> followed by a <info>version:checkout</info> on the versionable node at
-<info>absPath</info>
+<info>path</info>
 
 If this node is already checked-in, this method is equivalent to <info>version:checkout</info>.
 HERE
@@ -27,13 +27,13 @@ public function execute(InputInterface $input, OutputInterface $output)
     {
         $session = $this->getHelper('phpcr')->getSession();
         $nodeHelper = $this->getHelper('node');
-        $absPath = $input->getArgument('absPath');
+        $path = $session->getAbsPath($input->getArgument('path'));
         $workspace = $session->getWorkspace();
 
-        $node = $session->getNode($absPath);
+        $node = $session->getNode($path);
         $nodeHelper->assertNodeIsVersionable($node);
         $versionManager = $workspace->getVersionManager();
-        $version = $versionManager->checkpoint($absPath);
+        $version = $versionManager->checkpoint($path);
 
         $output->writeln('Version: ' . $version->getName());
     }
diff --git a/src/PHPCR/Shell/Console/Command/Phpcr/VersionHistoryCommand.php b/src/PHPCR/Shell/Console/Command/Phpcr/VersionHistoryCommand.php
@@ -13,9 +13,9 @@ protected function configure()
     {
         $this->setName('version:history');
         $this->setDescription('Show version history of node at given absolute path');
-        $this->addArgument('absPath', null, InputArgument::REQUIRED, 'Absolute path to node');
+        $this->addArgument('path', null, InputArgument::REQUIRED, 'Absolute path to node');
         $this->setHelp(<<<HERE
-Lists the version history of the node given at <info>absPath</info>.
+Lists the version history of the node given at <info>path</info>.
 HERE
         );
     }
@@ -26,13 +26,13 @@ public function execute(InputInterface $input, OutputInterface $output)
         $nodeHelper = $this->getHelper('node');
         $table = clone $this->getHelper('table');
 
-        $absPath = $input->getArgument('absPath');
+        $path = $session->getAbsPath($input->getArgument('path'));
         $workspace = $session->getWorkspace();
 
-        $node = $session->getNode($absPath);
+        $node = $session->getNode($path);
         $nodeHelper->assertNodeIsVersionable($node);
         $versionManager = $workspace->getVersionManager();
-        $history = $versionManager->getVersionHistory($absPath);
+        $history = $versionManager->getVersionHistory($path);
 
         $versions = $history->getAllVersions();
 
diff --git a/src/PHPCR/Shell/Console/Command/Phpcr/VersionRemoveCommand.php b/src/PHPCR/Shell/Console/Command/Phpcr/VersionRemoveCommand.php
@@ -13,7 +13,7 @@ protected function configure()
     {
         $this->setName('version:remove');
         $this->setDescription('Remove a node version');
-        $this->addArgument('absPath', null, InputArgument::REQUIRED, 'Absolute path to node');
+        $this->addArgument('path', null, InputArgument::REQUIRED, 'Path to node');
         $this->addArgument('versionName', null, InputArgument::REQUIRED, 'Name of version to remove');
         $this->setHelp(<<<HERE
 Removes the named version from this version history and automatically
@@ -37,13 +37,14 @@ protected function configure()
 
     public function execute(InputInterface $input, OutputInterface $output)
     {
-        $absPath = $input->getArgument('absPath');
-        $versionName = $input->getArgument('versionName');
         $session = $this->getHelper('phpcr')->getSession();
+
+        $versionName = $input->getArgument('versionName');
+        $path = $session->getAbsPath($input->getArgument('path'));
         $workspace = $session->getWorkspace();
         $versionManager = $workspace->getVersionManager();
 
-        $history = $versionManager->getVersionHistory($absPath);
+        $history = $versionManager->getVersionHistory($path);
         $history->removeVersion($versionName);
     }
 }
diff --git a/src/PHPCR/Shell/Console/Command/Phpcr/VersionRestoreCommand.php b/src/PHPCR/Shell/Console/Command/Phpcr/VersionRestoreCommand.php
@@ -14,26 +14,26 @@ protected function configure()
     {
         $this->setName('version:restore');
         $this->setDescription('Restore a node version');
-        $this->addArgument('absPath', null, InputArgument::REQUIRED, 'Absolute path to node');
+        $this->addArgument('path', null, InputArgument::REQUIRED, 'Path to node');
         $this->addArgument('versionName', null, InputArgument::REQUIRED, 'Name of version to retore');
         $this->addOption('remove-existing', null, InputOption::VALUE_NONE, 'Flag that governs what happens in case of identifier collision');
         $this->setHelp(<<<HERE
 Attempt to restore an old version of a node.
 
-<em>If <info>absPath</info> is given and <info>versionName</info> is a version name:</em>
- Restores the node at <info>absPath</info> to the state defined by the version with
+<em>If <info>path</info> is given and <info>versionName</info> is a version name:</em>
+ Restores the node at <info>path</info> to the state defined by the version with
  the specified version name (<info>versionName</info>).
- This method will work regardless of whether the node at absPath is
+ This method will work regardless of whether the node at path is
  checked-in or not.
 
 
-<em>If <info>absPath</info> is given and <info>versionName</info> is a VersionInterface instance:
+<em>If <info>path</info> is given and <info>versionName</info> is a VersionInterface instance:
 </em>
- Restores the specified version to <info>absPath</info>. There must be no existing
- node at <info>absPath</info>. If one exists, a VersionException is thrown.
- There must be a parent node to the location at <info>absPath</info>, otherwise a
+ Restores the specified version to <info>path</info>. There must be no existing
+ node at <info>path</info>. If one exists, a VersionException is thrown.
+ There must be a parent node to the location at <info>path</info>, otherwise a
  PathNotFoundException is thrown.
- If the would-be parent of the location <info>absPath</info> is actually a property,
+ If the would-be parent of the location <info>path</info> is actually a property,
  or if a node type restriction would be violated, then a
  ConstraintViolationException is thrown.
 
@@ -71,7 +71,7 @@ protected function configure()
 subgraphs that has the same identifier as one of the nodes that would be
 introduced by the restore operation into one of these subgraphs.
 Else, an identifier collision occurs when a node exists outside the
-subgraph rooted at absPath with the same identifier as a node that would
+subgraph rooted at path with the same identifier as a node that would
 be introduced by the restore operation into the affected subgraph.
 The result in such a case is governed by the removeExisting flag. If
 <info>removeExisting</info> is true, then the incoming node takes precedence, and the
@@ -93,12 +93,13 @@ protected function configure()
 
     public function execute(InputInterface $input, OutputInterface $output)
     {
-        $absPath = $input->getArgument('absPath');
+        $session = $this->getHelper('phpcr')->getSession();
+
+        $path = $session->getAbsPath($input->getArgument('path'));
         $versionName = $input->getArgument('versionName');
         $removeExisting = $input->getOption('remove-existing');
-        $session = $this->getHelper('phpcr')->getSession();
         $workspace = $session->getWorkspace();
         $versionManager = $workspace->getVersionManager();
-        $versionManager->restore($removeExisting, $versionName, $absPath);
+        $versionManager->restore($removeExisting, $versionName, $path);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ protected function configure()`
`13`	`13`	`{`
`14`	`14`	`$this->setName('version:remove');`
`15`	`15`	`$this->setDescription('Remove a node version');`
`16`		`- $this->addArgument('absPath', null, InputArgument::REQUIRED, 'Absolute path to node');`
	`16`	`+ $this->addArgument('path', null, InputArgument::REQUIRED, 'Path to node');`
`17`	`17`	`$this->addArgument('versionName', null, InputArgument::REQUIRED, 'Name of version to remove');`
`18`	`18`	`$this->setHelp(<<<HERE`
`19`	`19`	`Removes the named version from this version history and automatically`
`@@ -37,13 +37,14 @@ protected function configure()`
`37`	`37`
`38`	`38`	`public function execute(InputInterface $input, OutputInterface $output)`
`39`	`39`	`{`
`40`		`- $absPath = $input->getArgument('absPath');`
`41`		`- $versionName = $input->getArgument('versionName');`
`42`	`40`	`$session = $this->getHelper('phpcr')->getSession();`
	`41`	`+`
	`42`	`+ $versionName = $input->getArgument('versionName');`
	`43`	`+ $path = $session->getAbsPath($input->getArgument('path'));`
`43`	`44`	`$workspace = $session->getWorkspace();`
`44`	`45`	`$versionManager = $workspace->getVersionManager();`
`45`	`46`
`46`		`- $history = $versionManager->getVersionHistory($absPath);`
	`47`	`+ $history = $versionManager->getVersionHistory($path);`
`47`	`48`	`$history->removeVersion($versionName);`
`48`	`49`	`}`
`49`	`50`	`}`