From 19488ed23dbb80d24258df289b2225055de66c6e Mon Sep 17 00:00:00 2001
From: dantleech <dan.t.leech@gmail.com>
Date: Sun, 7 Sep 2014 07:50:47 +0200
Subject: [PATCH 1/2] Updated version

---
 CHANGELOG.md                                               | 4 ++--
 src/PHPCR/Shell/Console/Application/SessionApplication.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 98c90125..1650657e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,8 @@
 Changelog
 =========
 
-dev-master
-----------
+alpha-5
+-------
 
 ### Features
 
diff --git a/src/PHPCR/Shell/Console/Application/SessionApplication.php b/src/PHPCR/Shell/Console/Application/SessionApplication.php
index d43d6098..e517e735 100644
--- a/src/PHPCR/Shell/Console/Application/SessionApplication.php
+++ b/src/PHPCR/Shell/Console/Application/SessionApplication.php
@@ -16,7 +16,7 @@
 class SessionApplication extends BaseApplication
 {
     const APP_NAME = 'PHPCRSH';
-    const APP_VERSION = '1.0.0-alpha4';
+    const APP_VERSION = '1.0.0-alpha5';
 
     protected $shellApplication;
 

From 20da502aaf01721a320f196f8c6df25b8c4d037f Mon Sep 17 00:00:00 2001
From: dantleech <dan.t.leech@gmail.com>
Date: Sun, 7 Sep 2014 07:49:15 +0200
Subject: [PATCH 2/2] bugfix: Node mixin remove does not accept path

---
 CHANGELOG.md                                               | 7 +++++++
 features/phpcr_node_mixin_remove.feature                   | 2 +-
 .../Shell/Console/Command/Phpcr/NodeMixinRemoveCommand.php | 4 +++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1650657e..6546f535 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,13 @@
 Changelog
 =========
 
+dev-master
+----------
+
+### Bug fixes
+
+- [node] Mixin remove command does not accept a path
+
 alpha-5
 -------
 
diff --git a/features/phpcr_node_mixin_remove.feature b/features/phpcr_node_mixin_remove.feature
index 39e2526d..b55b32d6 100644
--- a/features/phpcr_node_mixin_remove.feature
+++ b/features/phpcr_node_mixin_remove.feature
@@ -10,7 +10,7 @@ Feature: Remove mixin to the current node
 
     Scenario: Remove a mixin to the current node
         Given the current node is "/tests_general_base"
-        And I execute the "node:mixin:remove mix:versionable --no-ansi" command
+        And I execute the "node:mixin:remove . mix:versionable --no-ansi" command
         And I save the session
         Then the command should not fail
         And the node at "/tests_general_base" should not have the mixin "mix:versionable"
diff --git a/src/PHPCR/Shell/Console/Command/Phpcr/NodeMixinRemoveCommand.php b/src/PHPCR/Shell/Console/Command/Phpcr/NodeMixinRemoveCommand.php
index 9209a817..4eee4a19 100644
--- a/src/PHPCR/Shell/Console/Command/Phpcr/NodeMixinRemoveCommand.php
+++ b/src/PHPCR/Shell/Console/Command/Phpcr/NodeMixinRemoveCommand.php
@@ -13,6 +13,7 @@ protected function configure()
     {
         $this->setName('node:mixin:remove');
         $this->setDescription('Remove the named mixin to the current node');
+        $this->addArgument('path', InputArgument::REQUIRED, 'Path of node');
         $this->addArgument('mixinName', InputArgument::REQUIRED, 'The name of the mixin node type to be removeed');
         $this->setHelp(<<<HERE
 Removes the specified mixin node type from this node and removes
@@ -28,7 +29,8 @@ public function execute(InputInterface $input, OutputInterface $output)
     {
         $session = $this->getHelper('phpcr')->getSession();
         $mixinName = $input->getArgument('mixinName');
-        $currentNode = $session->getCurrentNode();
+        $path = $input->getArgument('path');
+        $currentNode = $session->getNodeByPathOrIdentifier($path);
         $currentNode->removeMixin($mixinName);
     }
 }