Fixed rebase

Author: dantleech

composer.json

@@ -10,7 +10,7 @@
         "symfony/serializer": "~2.3",
         "symfony/yaml": "~2.3",
         "symfony/dependency-injection": "~2.3",
-        "dantleech/glob": "~0.1"
+        "dantleech/glob-finder": "~0.1"
     },
     "minimum-stability": "dev",
     "require-dev": {

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

@@ -62,7 +62,7 @@ public function execute(InputInterface $input, OutputInterface $output)
             $nodes = array($session->getNodeByPathOrIdentifier($path));
             $filter = null;
         } catch (\Exception $e) {
-            $parentPath = $this->getHelper('path')->getParentPath($path);
+            $parentPath = $this->get('helper.path')->getParentPath($path);
 
             $filter = substr($path, strlen($parentPath));
 

src/PHPCR/Shell/Phpcr/PhpcrSession.php

@@ -6,6 +6,7 @@
 use PHPCR\CredentialsInterface;
 use PHPCR\Util\UUIDHelper;
 use PHPCR\PathNotFoundException;
+use DTL\Glob\Finder\PhpcrTraversalFinder;
 
 /**
  * Custom session wrapper for PHPCR Shell
@@ -18,10 +19,12 @@ class PhpcrSession implements SessionInterface
 {
     protected $session;
     protected $cwd = '/';
+    protected $finder;
 
-    public function __construct(SessionInterface $session)
+    public function __construct(SessionInterface $session, $finder = null)
     {
         $this->session = $session;
+        $this->finder = $finder ? : new PhpcrTraversalFinder($session);
     }
 
     /**