query argument now mandastory for query command

Author: dantleech

CHANGELOG.md

@@ -18,6 +18,7 @@ dev-master
 - [node:remove] Cannot `node:remove` by UUID
 - [node:edit] Serialization of single value references doesn't work
 - [file:import] Irregular files are accepted
+- [query] Possible to try and execute query without a query
 
 ### Enhancements
 

composer.json

@@ -36,6 +36,9 @@
             "email": "daniel@dantleech.com"
         }
     ],
+    "conflict": {
+        "doctrine/phpcr-bundle": "<=1.2.1"
+    },
     "autoload": {
         "psr-0": {"": "src"}
     },

features/all/phpcr_query.feature

@@ -29,3 +29,7 @@ Feature: Execute a query
     Scenario: Execute query with language
         Given I execute the "query '/jcr:root/nodes' --language=xpath" command
         Then the command should not fail
+
+    Scenario: Execute query with no query
+        Given I execute the "query --language=xpath" command
+        Then the command should fail

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

@@ -15,14 +15,15 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Input\InputArgument;
 
 class QueryCommand extends BasePhpcrCommand
 {
     protected function configure()
     {
         $this->setName('query');
         $this->setDescription('Execute a SELECT query (advanced)');
-        $this->addArgument('query');
+        $this->addArgument('query', InputArgument::REQUIRED, 'Query to execute');
         $this->addOption('language', 'l', InputOption::VALUE_OPTIONAL, 'The query language (e.g. jcr-sql2', 'JCR-SQL2');
         $this->addOption('limit', null, InputOption::VALUE_OPTIONAL, 'The query limit', 0);
         $this->addOption('offset', null, InputOption::VALUE_OPTIONAL, 'The query offset', 0);

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

@@ -85,6 +85,7 @@ public function execute(InputInterface $input, OutputInterface $output)
         $updates = $res->offsetGet(1);
         $applies = $res->offsetGet(3);
 
+
         $start = microtime(true);
         $result = $query->execute();
         $rows = 0;