Merge pull request #291 from lenybernard/feature/get-view-reference-w…

…ith-children Feature/get view reference with children
Victoire · Dec 2, 2015 · 0530ba8 · 0530ba8
2 parents d7ee7d3 + c2e88a1
commit 0530ba8
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 20 deletions.
diff --git a/Bundle/ViewReferenceBundle/Cache/Xml/ViewReferenceXmlCacheManager.php b/Bundle/ViewReferenceBundle/Cache/Xml/ViewReferenceXmlCacheManager.php
@@ -42,16 +42,17 @@ public function generateXml(array $nodes, $rootNode = null, $url = '')
                 $viewReference->getViewNamespace(), 'array'
             );
             foreach ($arrayTransformer->reverseTransform($viewReference) as $key => $value) {
-                $itemNode->addAttribute($key, $value);
+                if (!is_array($value)) {
+                    $itemNode->addAttribute($key, $value);
+                }
             }
 
             $_url = ltrim($url.'/'.$viewReference->getSlug(), '/');
             $itemNode->attributes()->url = $_url;
 
             //Build url thanks to hierarchy
             if (!empty($node['children'])) {
-                $childrenNode = $itemNode->addChild('children');
-                $this->generateXml($node['children'], $childrenNode, $_url);
+                $this->generateXml($node['children'], $itemNode, $_url);
             }
         }
 

diff --git a/Bundle/ViewReferenceBundle/Cache/Xml/ViewReferenceXmlCacheRepository.php b/Bundle/ViewReferenceBundle/Cache/Xml/ViewReferenceXmlCacheRepository.php
@@ -43,8 +43,8 @@ public function getReferenceByUrl($url, $locale)
         if ($url) {
             //add every hierarchy item in the xpath var
             $xpath .= sprintf(
-                '/children/viewReference[@slug="%s"]',
-                implode('"]/children/viewReference[@slug="', $urlParts)
+                '/viewReference[@slug="%s"]',
+                implode('"]/viewReference[@slug="', $urlParts)
             );
         }
 
@@ -67,11 +67,11 @@ public function getReferenceByUrl($url, $locale)
      *
      * @param $parameters
      *
-     * @return ViewReference|null
+     * @return ViewReference|\SimpleXMLElement|null
      */
-    public function getOneReferenceByParameters($parameters, $transform = true)
+    public function getOneReferenceByParameters($parameters, $transform = true, $keepChildren = false)
     {
-        $viewReferences = $this->getReferencesByParameters($parameters, $transform);
+        $viewReferences = $this->getReferencesByParameters($parameters, $transform, $keepChildren);
         if (count($viewReferences)) {
             return $viewReferences[0];
         }
@@ -80,24 +80,31 @@ public function getOneReferenceByParameters($parameters, $transform = true)
     /**
      * @param array $parameters
      *
-     * @return ViewReference[]
+     * @return ViewReference[]|\SimpleXMLElement[]
      */
-    public function getReferencesByParameters($parameters, $transform = true)
+    public function getReferencesByParameters($parameters, $transform = true, $keepChildren = false)
     {
         $viewsReferences = [];
-        $arguments = [];
 
+        /** @var \SimpleXmlElement[] $xmlReferences */
         if ($xmlReferences = $this->driver->readCache()->xpath(ViewReferenceHelper::buildXpath($parameters))) {
-            foreach ($xmlReferences as $xmlReference) {
+            foreach ($xmlReferences as $reference) {
                 if ($transform === true) {
-                    if (isset($xmlReference['entityId'])) {
-                        $viewRefTransformer = new XMLToBusinessPageReferenceTransformer();
-                    } else {
-                        $viewRefTransformer = new XMLToViewReferenceTransformer();
-                    }
-                    $viewReference = $viewRefTransformer->transform($xmlReference);
+                    $transformViewReferenceFn = function ($parentViewReference) use (&$transformViewReferenceFn, $keepChildren) {
+                        $transformer = ViewReferenceXmlCacheRepository::findTransformerFromXmlElement($parentViewReference);
+                        $reference = $transformer->transform($parentViewReference);
+                        if ($keepChildren) {
+                            foreach ($parentViewReference->children() as $child) {
+                                $reference->addChild($transformViewReferenceFn($child));
+                            }
+                        }
+
+                        return $reference;
+                    };
+
+                    $reference = $transformViewReferenceFn($reference);
                 }
-                $viewsReferences[] = $viewReference;
+                $viewsReferences[] = $reference;
             }
         }
 
@@ -129,7 +136,7 @@ public function getChoices(\SimpleXMLElement $node = null, $depth = 0)
             $node = $this->driver->readCache();
         }
 
-        foreach ($node->children() as $child) {
+        foreach ($node as $child) {
             $viewReferenceTransformer = self::findTransformerFromXmlElement($child);
             $viewReference = $viewReferenceTransformer->transform($child);
             if ($viewReference->getName() != '') {

diff --git a/Bundle/ViewReferenceBundle/ViewReference/ViewReference.php b/Bundle/ViewReferenceBundle/ViewReference/ViewReference.php
@@ -14,10 +14,12 @@ class ViewReference
     protected $url;
     protected $viewId;
     protected $viewNamespace;
+    protected $children;
 
     public function __construct($id = null)
     {
         $this->id = $id;
+        $this->children = [];
     }
 
     /**
@@ -133,4 +135,28 @@ public function setUrl($url)
     {
         $this->url = $url;
     }
+
+    /**
+     * @return ViewReference[]
+     */
+    public function getChildren()
+    {
+        return $this->children;
+    }
+
+    /**
+     * @param ViewReference[] $children
+     */
+    public function setChildren($children)
+    {
+        $this->children = $children;
+    }
+
+    /**
+     * @param ViewReference $child
+     */
+    public function addChild($child)
+    {
+        $this->children[] = $child;
+    }
 }