Merge pull request #36 from phpcr/session_export_improvements

2 new features for session export view

Author: dantleech

CHANGELOG.md

@@ -0,0 +1,4 @@
+# alpha2 / dev-master
+
+- Added `--pretty` option to `session:export:view` command to output formatted XML
+- Ask confirmation before overwriting file in `session:export:view`

features/phpcr_session_export_view.feature

@@ -28,14 +28,10 @@ Feature: Export the repository to an XML file
         Invalid path 'cms'
         """
 
-    Scenario: Export to an existing file
+    Scenario: Export to an existing file (should overwrite as --no-interaction is specified)
         Given the file "foobar.xml" exists
-        And I execute the "session:export:view /tests_general_base foobar.xml" command
-        Then the command should fail
-        And the output should contain:
-        """
-        File "foobar.xml" already exists.
-        """
+        And I execute the "session:export:view /tests_general_base foobar.xml --no-interaction" command
+        Then the command should not fail
 
     Scenario: Export non recursive
         Given I execute the "session:export:view /tests_general_base foobar.xml --no-recurse" command
@@ -51,3 +47,10 @@ Feature: Export the repository to an XML file
     Scenario: Export the document view
         Given I execute the "session:export:view / foobar.xml --document" command
         Then the command should not fail
+
+    Scenario: Export the document view in pretty way
+        Given I execute the "session:export:view / foobar.xml --pretty" command
+        Then the command should not fail
+        And the file "foobar.xml" should exist
+        And the xpath count "/sv:node" is "1" in file "foobar.xml"
+        And the xpath count "/sv:node/sv:node" is "1" in file "foobar.xml"

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

@@ -20,6 +20,7 @@ protected function configure()
         $this->addOption('no-recurse', null, InputOption::VALUE_NONE, 'Do not recurse');
         $this->addOption('skip-binary', null, InputOption::VALUE_NONE, 'Skip binary properties');
         $this->addOption('document', null, InputOption::VALUE_NONE, 'Export the document view');
+        $this->addOption('pretty', null, InputOption::VALUE_NONE, 'Export in human readable format');
         $this->setHelp(<<<HERE
 Serializes the node (and if <info>--no-recurse</info> is false, the whole subgraph) at
 <info>absPath</info> as an XML stream and outputs it to the supplied URI. The
@@ -58,12 +59,20 @@ public function execute(InputInterface $input, OutputInterface $output)
     {
         $session = $this->getHelper('phpcr')->getSession();
         $file = $input->getArgument('file');
+        $pretty = $input->getOption('pretty');
         $exportDocument = $input->getOption('document');
+        $dialog = $this->getHelper('dialog');
 
         if (file_exists($file)) {
-            throw new \InvalidArgumentException(sprintf(
-                'File "%s" already exists.', $file
-            ));
+            $confirmed = true;
+
+            if (false === $input->getOption('no-interaction')) {
+                $confirmed = $dialog->askConfirmation($output, 'File already exists, overwrite?');
+            }
+
+            if (false === $confirmed) {
+                return;
+            }
         }
 
         $stream = fopen($file, 'w');
@@ -87,5 +96,13 @@ public function execute(InputInterface $input, OutputInterface $output)
         }
 
         fclose($stream);
+
+        if ($pretty) {
+            $xml = new \DOMDocument(1.0);
+            $xml->load($file);
+            $xml->preserveWhitespace = true;
+            $xml->formatOutput = true;
+            $xml->save($file);
+        }
     }
 }