File import: Do not accept irregular files

Author: dantleech

CHANGELOG.md

@@ -15,6 +15,7 @@ dev-master
 - [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

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

@@ -45,6 +45,11 @@ class ShellApplication extends Application
      */
     protected $debug = false;
 
+    /**
+     * @var boolean
+     */
+    protected $initialized = false;
+
     /**
      * Constructor - name and version inherited from SessionApplication
      *
@@ -56,7 +61,6 @@ public function __construct($container)
         $this->dispatcher = $container->get('event.dispatcher') ? : new EventDispatcher();
         $this->setDispatcher($this->dispatcher);
         $this->container = $container;
-        $this->init();
     }
 
     /**
@@ -75,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;
     }
 
     /**
@@ -219,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());
 

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/PhpcrSession.php

@@ -21,7 +21,7 @@ protected function createTester()
         $container = new Container(PhpcrShell::MODE_EMBEDDED_SHELL);
         $container->get('phpcr.session_manager')->setSession(new PhpcrSession($session));
         $application = $container->get('application');
-
+        $application->setShowUnsupported(true);
         $tester = new ApplicationTester($application);
 
         return $tester;