Take into account base path

symfony-cmf · Jun 2, 2016 · 05be4f2 · 05be4f2
1 parent c12c5cf
commit 05be4f2
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/Repository/AbstractPhpcrRepository.php b/Repository/AbstractPhpcrRepository.php
@@ -18,6 +18,7 @@
 use Webmozart\PathUtil\Path;
 use Puli\Repository\AbstractRepository;
 use Symfony\Cmf\Component\Resource\Repository\Api\EditableRepository;
+use DTL\Glob\GlobHelper;
 
 /**
  * Abstract repository for both PHPCR and PHPCR-ODM repositories.
@@ -38,13 +39,19 @@ abstract class AbstractPhpcrRepository extends AbstractRepository implements Res
      */
     private $finder;
 
+    /**
+     * @var GlobHelper
+     */
+    private $globHelper;
+
     /**
      * @param string $basePath
      */
     public function __construct(FinderInterface $finder, $basePath = null)
     {
         $this->finder = $finder;
         $this->basePath = $basePath;
+        $this->globHelper = new GlobHelper();
     }
 
     /**
@@ -108,6 +115,8 @@ public function move($query, $targetPath, $language = 'glob')
             return 0;
         }
 
+        $targetPath = $this->resolvePath($targetPath);
+
         try {
             // delegate moving to the implementation
             $this->moveNodes($nodes, $query, $targetPath);
@@ -172,6 +181,11 @@ protected function unresolvePath($path)
         return $path;
     }
 
+    protected function isGlobbed($string)
+    {
+        return $this->globHelper->isGlobbed($string);
+    }
+
     /**
      * Build a collection of PHPCR resources.
      *

diff --git a/Repository/PhpcrOdmRepository.php b/Repository/PhpcrOdmRepository.php
@@ -33,7 +33,6 @@ public function __construct(ManagerRegistry $managerRegistry, $basePath = null,
         $finder = $finder ?: new PhpcrOdmTraversalFinder($managerRegistry);
         parent::__construct($finder, $basePath);
         $this->managerRegistry = $managerRegistry;
-        $this->globHelper = new GlobHelper();
     }
 
     /**
@@ -139,15 +138,15 @@ protected function removeNodes(array $documents)
     /**
      * {@inheritdoc}
      */
-    protected function moveNodes(array $nodes, $sourceQuery, $targetPath)
+    protected function moveNodes(array $documents, $sourceQuery, $targetPath)
     {
-        $this->doMoveNodes($nodes, $sourceQuery, $targetPath);
+        $this->doMoveNodes($documents, $sourceQuery, $targetPath);
         $this->getManager()->flush();
     }
 
     private function doMoveNodes(array $documents, $sourceQuery, $targetPath)
     {
-        if (false === $this->globHelper->isGlobbed($sourceQuery)) {
+        if (false === $this->isGlobbed($sourceQuery)) {
             return $this->getManager()->move(current($documents), $targetPath);
         }
 

diff --git a/Repository/PhpcrRepository.php b/Repository/PhpcrRepository.php
@@ -146,7 +146,7 @@ protected function moveNodes(array $nodes, $sourceQuery, $targetPath)
 
     private function doMoveNodes(array $nodes, $sourceQuery, $targetPath)
     {
-        if (count($nodes) === 1 && current($nodes)->getPath() === $sourceQuery) {
+        if (false === $this->isGlobbed($sourceQuery)) {
             return $this->session->move(current($nodes)->getPath(), $targetPath);
         }