Merge pull request #128 from phpcr/various

Various

Author: dantleech

CHANGELOG.md

@@ -11,9 +11,11 @@ dev-master
 
 ### Bug fixes
 
+- [capability] Commands not being disabled based on capability
 - [config] Do not override CLI options with profile options
 - [node:remove] Cannot `node:remove` by UUID
 - [node:edit] Serialization of single value references doesn't work
+- [file:import] Irregular files are accepted
 
 ### Enhancements
 

features/all/phpcr_file_import.feature

@@ -27,6 +27,10 @@ Feature: Import an external file as to a node
         And I execute the "file:import . phpcr.png" command
         Then the command should fail
 
+    Scenario: Import non-regular file onto existing file, force not specified
+        Given I execute the "file:import foo ." command
+        Then the command should fail
+
     Scenario: Import a file onto existing file, force specified
         Given I execute the "file:import . phpcr.png" command
         And I execute the "file:import . phpcr.png --force" command

features/all/phpcr_query_update.feature

@@ -140,3 +140,16 @@ Feature: Execute a a raw UPDATE query in JCR_SQL2
         And the node at "/cms/articles/article1" should have the mixin "mix:mimeType"
         Then the node at "/cms/articles/article1" should have the mixin "mix:lockable"
 
+    Scenario Outline: Execute an invalid query
+        Given I execute the "<query>" command
+        Then the command should fail
+        And I should see the following:
+        """
+        InvalidQueryException
+        """
+        Examples:
+            | query |
+            | UPDATE foo FOR fi |
+            | UPDATE [nt:unstructured] mixin_foo('bar') |
+            | UPDATE [nt:unstructured] APPLY mixin_foo('bar') |
+            | UPDATE [nt:unstructured] mixin_foo'bar') |

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

@@ -5,6 +5,8 @@
 use PHPCR\Shell\DependencyInjection\Container;
 use PHPCR\Shell\Console\Helper\PhpcrHelper;
 use PHPCR\Shell\PhpcrShell;
+use PHPCR\SessionInterface;
+use PHPCR\Shell\Phpcr\PhpcrSession;
 
 /**
  * Subclass of the full ShellApplication for running as an EmbeddedApplication

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

@@ -21,6 +21,7 @@
 use PHPCR\Shell\Console\Command\Phpcr\PhpcrShellCommand;
 use PHPCR\Shell\Config\Profile;
 use PHPCR\Shell\PhpcrShell;
+use PHPCR\Shell\Console\Command\Phpcr\BasePhpcrCommand;
 
 /**
  * Main application for PHPCRSH
@@ -44,6 +45,11 @@ class ShellApplication extends Application
      */
     protected $debug = false;
 
+    /**
+     * @var boolean
+     */
+    protected $initialized = false;
+
     /**
      * Constructor - name and version inherited from SessionApplication
      *
@@ -55,7 +61,6 @@ public function __construct($container)
         $this->dispatcher = $container->get('event.dispatcher') ? : new EventDispatcher();
         $this->setDispatcher($this->dispatcher);
         $this->container = $container;
-        $this->init();
     }
 
     /**
@@ -74,12 +79,17 @@ public function setShowUnsupported($boolean)
      */
     public function init()
     {
+        if (true === $this->initialized) {
+            return;
+        }
+
         $this->registerPhpcrCommands();
         $this->registerPhpcrStandaloneCommands();
         $this->registerShellCommands();
 
         $event = new ApplicationInitEvent($this);
         $this->dispatcher->dispatch(PhpcrShellEvents::APPLICATION_INIT, $event);
+        $this->initialized = true;
     }
 
     /**
@@ -218,6 +228,8 @@ private function configureFormatter(OutputFormatter $formatter)
      */
     public function doRun(InputInterface $input, OutputInterface $output)
     {
+        $this->init();
+
         // configure the formatter for the output
         $this->configureFormatter($output->getFormatter());
 
@@ -272,7 +284,7 @@ public function add(Command $command)
             $command->setContainer($this->container);
         }
 
-        if ($command instanceof PhpcrShellCommand) {
+        if ($command instanceof BasePhpcrCommand) {
             if ($this->showUnsupported || $command->isSupported()) {
                 parent::add($command);
             }

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

@@ -70,6 +70,13 @@ public function execute(InputInterface $input, OutputInterface $output)
             ));
         }
 
+        if (!is_file($filePath)) {
+            throw new \InvalidArgumentException(sprintf(
+                'File "%s" is not a regular file.',
+                $filePath
+            ));
+        }
+
         try {
             // first assume the user specified the path to the parent node
             $parentNode = $this->session->getNode($path);

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

@@ -6,6 +6,7 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Input\InputArgument;
+use PHPCR\RepositoryInterface;
 
 class VersionCheckinCommand extends BasePhpcrCommand
 {
@@ -42,7 +43,9 @@ protected function configure()
 If checkin succeeds, the change to the <comment>jcr:isCheckedOut</comment> property is
 dispatched immediately.
 HERE
-        );
+    );
+
+        $this->requiresDescriptor(RepositoryInterface::OPTION_VERSIONING_SUPPORTED, true);
     }
 
     public function execute(InputInterface $input, OutputInterface $output)

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

@@ -6,6 +6,7 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Input\InputArgument;
+use PHPCR\RepositoryInterface;
 
 class VersionCheckoutCommand extends BasePhpcrCommand
 {
@@ -31,6 +32,7 @@ protected function configure()
 If this node is already checked-out, this method has no effect.
 HERE
         );
+        $this->requiresDescriptor(RepositoryInterface::OPTION_VERSIONING_SUPPORTED, true);
     }
 
     public function execute(InputInterface $input, OutputInterface $output)

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

@@ -6,6 +6,7 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Input\InputArgument;
+use PHPCR\RepositoryInterface;
 
 class VersionCheckpointCommand extends BasePhpcrCommand
 {
@@ -21,6 +22,7 @@ protected function configure()
 If this node is already checked-in, this method is equivalent to <info>version:checkout</info>.
 HERE
         );
+        $this->requiresDescriptor(RepositoryInterface::OPTION_VERSIONING_SUPPORTED, true);
     }
 
     public function execute(InputInterface $input, OutputInterface $output)

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

@@ -6,6 +6,7 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Input\InputArgument;
+use PHPCR\RepositoryInterface;
 
 class VersionHistoryCommand extends BasePhpcrCommand
 {
@@ -18,6 +19,7 @@ protected function configure()
 Lists the version history of the node given at <info>path</info>.
 HERE
         );
+        $this->requiresDescriptor(RepositoryInterface::OPTION_VERSIONING_SUPPORTED, true);
     }
 
     public function execute(InputInterface $input, OutputInterface $output)