More cleaning up

Author: dantleech

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

@@ -26,6 +26,7 @@
 use PHPCR\Shell\Event\ApplicationInitEvent;
 use PHPCR\Shell\Event\PhpcrShellEvents;
 use PHPCR\Shell\Subscriber;
+use PHPCR\Shell\Console\Command\Phpcr\PhpcrShellCommand;
 
 /**
  * Main application for PHPCRSH
@@ -142,7 +143,6 @@ private function registerCommands()
         $this->add(new CommandPhpcr\SessionRefreshCommand());
         $this->add(new CommandPhpcr\SessionSaveCommand());
         $this->add(new CommandPhpcr\QuerySelectCommand());
-        $this->add(new CommandPhpcr\QueryCommand());
         $this->add(new CommandPhpcr\RetentionHoldAddCommand());
         $this->add(new CommandPhpcr\RetentionHoldListCommand());
         $this->add(new CommandPhpcr\RetentionHoldRemoveCommand());

src/PHPCR/Shell/Console/Command/Phpcr/AccessControlPrivilegeListCommand.php

@@ -2,18 +2,19 @@
 
 namespace PHPCR\Shell\Console\Command\Phpcr;
 
-use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
+
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;
+use PHPCR\RepositoryInterface;
 
-class AccessControlPrivilegeListCommand extends Command
+class AccessControlPrivilegeListCommand extends PhpcrShellCommand
 {
     protected function configure()
     {
         $this->setName('access-control:privilege:list');
-        $this->setDescription('List the privileges of the repository or a specific node NOT IMPLEMENTED');
+        $this->setDescription('List the privileges of the repository or a specific node');
         $this->addArgument('absPath', InputArgument::OPTIONAL, 'Absolute path for node, optional.');
         $this->addOption('supported', null, InputOption::VALUE_NONE, 'List privileges supported by repository rather than current session.');
         $this->setHelp(<<<HERE
@@ -43,7 +44,9 @@ protected function configure()
 list the privileges held by the current session, but rather the privileges
 supported by the repository.
 HERE
-        );
+    );
+
+        $this->requiresDescriptor(RepositoryInterface::OPTION_ACCESS_CONTROL_SUPPORTED, true);
     }
 
     public function execute(InputInterface $input, OutputInterface $output)

src/PHPCR/Shell/Console/Command/Phpcr/LockInfoCommand.php

@@ -13,7 +13,7 @@ class LockInfoCommand extends PhpcrShellCommand
     protected function configure()
     {
         $this->setName('lock:info');
-        $this->setDescription('Create a node at the current path');
+        $this->setDescription('Show details of the lock that applies to the specified node path');
         $this->addArgument('path', InputArgument::REQUIRED, 'Path of locked node');
         $this->setHelp(<<<HERE
 Shows the details of the lock that applies to the node at the specified

src/PHPCR/Shell/Console/Command/Phpcr/NodeCloneCommand.php

@@ -13,7 +13,7 @@ class NodeCloneCommand extends Command
     protected function configure()
     {
         $this->setName('node:clone');
-        $this->setDescription('Copy a node from one workspace to another');
+        $this->setDescription('Clone a node');
         $this->addArgument('srcPath', InputArgument::REQUIRED, 'Path to source node');
         $this->addArgument('destPath', InputArgument::REQUIRED, 'Path to destination node');
         $this->addArgument('srcWorkspace', InputArgument::OPTIONAL, 'If specified, copy from this workspace');

src/PHPCR/Shell/Console/Command/Phpcr/NodeDefinitionCommand.php

@@ -2,23 +2,24 @@
 
 namespace PHPCR\Shell\Console\Command\Phpcr;
 
-use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Input\InputArgument;
 use PHPCR\Util\CND\Writer\CndWriter;
 
-class NodeDefinitionCommand extends Command
+class NodeDefinitionCommand extends PhpcrShellCommand
 {
     protected function configure()
     {
         $this->setName('node:definition');
-        $this->setDescription('Show the CND Definition of current node NOT IMPLEMENTED');
+        $this->setDescription('Show the CND Definition of current node');
         $this->addArgument('path', InputArgument::REQUIRED, 'Path of node');
         $this->setHelp(<<<HERE
 Show the CND definition of the primary type of the current node.
 HERE
         );
+
+        $this->dequiresDescriptor('jackalope.not_implemented.node.definition');
     }
 
     public function execute(InputInterface $input, OutputInterface $output)

src/PHPCR/Shell/Console/Command/Phpcr/NodeLifecycleFollowCommand.php

@@ -13,7 +13,7 @@ class NodeLifecycleFollowCommand extends PhpcrShellCommand
     protected function configure()
     {
         $this->setName('node:lifecycle:follow');
-        $this->setDescription('Causes the lifecycle state of this node to undergo the specified transition. NOT IMPLEMENTED');
+        $this->setDescription('Causes the lifecycle state of this node to undergo the specified transition.');
         $this->addArgument('path', InputArgument::REQUIRED, 'Path of node');
         $this->addArgument('transition', InputArgument::REQUIRED, 'A state transition');
         $this->setHelp(<<<HERE

src/PHPCR/Shell/Console/Command/Phpcr/NodeLifecycleListCommand.php

@@ -13,7 +13,7 @@ class NodeLifecycleListCommand extends PhpcrShellCommand
     protected function configure()
     {
         $this->setName('node:lifecycle:list');
-        $this->setDescription('Returns the list of valid state transitions for this node. NOT IMPLEMENTED');
+        $this->setDescription('Returns the list of valid state transitions for this node.');
         $this->addArgument('path', InputArgument::REQUIRED, 'Path of node');
         $this->setHelp(<<<HERE
 Returns the list of valid state transitions for this node.

src/PHPCR/Shell/Console/Command/Phpcr/NodeTypeUnregisterCommand.php

@@ -2,12 +2,11 @@
 
 namespace PHPCR\Shell\Console\Command\Phpcr;
 
-use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Input\InputArgument;
 
-class NodeTypeUnregisterCommand extends Command
+class NodeTypeUnregisterCommand extends PhpcrShellCommand
 {
     protected function configure()
     {
@@ -18,6 +17,8 @@ protected function configure()
 Unregisters the specified node type
 HERE
         );
+
+        $this->dequiresDescriptor('jackalope.not_implemented.node_type.unregister');
     }
 
     public function execute(InputInterface $input, OutputInterface $output)

src/PHPCR/Shell/Console/Command/Phpcr/QueryCommand.php

@@ -11,10 +11,14 @@ class QuerySelectCommand extends Command
     protected function configure()
     {
         $this->setName('select');
-        $this->setDescription('Execute an SQL query UNSTABLE');
+        $this->setDescription('Execute an JCR-SQL2 query');
         $this->addArgument('query');
         $this->setHelp(<<<EOT
-This is an unstable feature, see notes for the <info>query</info> command.
+Execute a JCR-SQL2 query. Unlike other commands you can enter a query literally:
+
+     SELECT * FROM [nt:unstructured];
+
+This command only executes JCR-SQL2 queries at the moment.
 EOT
         );
     }

src/PHPCR/Shell/Console/Command/Phpcr/QuerySelectCommand.php

@@ -8,12 +8,12 @@
 use Symfony\Component\Console\Input\InputArgument;
 use PHPCR\SimpleCredentials;
 
-class SessionImpersonateCommand extends Command
+class SessionImpersonateCommand extends PhpcrShellCommand
 {
     protected function configure()
     {
         $this->setName('session:impersonate');
-        $this->setDescription('Impersonate the given user NOT SUPPORTED');
+        $this->setDescription('Impersonate the given user');
         $this->addArgument('username', InputArgument::REQUIRED, 'Username of user to impersonate');
         $this->setHelp(<<<HERE
 Note: This command is not implemented by any of the transports currently.
@@ -35,6 +35,8 @@ protected function configure()
 Session.
 HERE
         );
+
+        $this->dequiresDescriptor('jackalope.not_implemented.session.impersonate');
     }
 
     public function execute(InputInterface $input, OutputInterface $output)

src/PHPCR/Shell/Console/Command/Phpcr/SessionImpersonateCommand.php

@@ -21,7 +21,7 @@ class SessionImportXMLCommand extends Command
     protected function configure()
     {
         $this->setName('session:import-xml');
-        $this->setDescription('Export the system view');
+        $this->setDescription('Import content from an XML file');
         $this->addArgument('parentAbsPath', InputArgument::REQUIRED, 'Path of node to export');
         $this->addArgument('file', InputArgument::REQUIRED, 'File to export to');
         $this->addOption('uuid-behavior', null, InputOption::VALUE_REQUIRED, 'UUID behavior', 'create-new');

src/PHPCR/Shell/Console/Command/Phpcr/SessionImportXMLCommand.php

@@ -12,7 +12,7 @@ class WorkspaceDeleteCommand extends Command
     protected function configure()
     {
         $this->setName('workspace:delete');
-        $this->setDescription('Delete a new workspace');
+        $this->setDescription('Delete a workspace');
         $this->addArgument('name', InputArgument::REQUIRED, 'Name of new workspace');
         $this->addArgument('srcWorkspace', InputArgument::OPTIONAL, 'If specified, clone from this workspace');
         $this->setHelp(<<<HERE

src/PHPCR/Shell/Console/Command/Phpcr/WorkspaceDeleteCommand.php

@@ -12,7 +12,7 @@ class WorkspaceNamespaceUnregisterCommand extends Command
     protected function configure()
     {
         $this->setName('workspace:namespace:unregister');
-        $this->setDescription('Sets a one-to-one mapping between prefix and uri in the global namespace');
+        $this->setDescription('Unregister a namespace');
         $this->addArgument('uri', null, InputArgument::REQUIRED, 'The URI to be removed');
         $this->setHelp(<<<HERE
 Removes the specified namespace URI from namespace registry.