tree are nodes are array: simplify

Author: fpietka

library/Nestedset/Model.php

@@ -275,37 +275,37 @@ public function getAll($depth = null, $mode = 'include', $order = 'ASC')
  /**
  * Convert a tree array (with depth) into a hierarchical array.
  *
- * @param $tree|array Array with depth value.
+ * @param $nodes|array Array with depth value.
  *
  * @return array
  */
- public function toArray($tree = null)
+ public function toArray(array $nodes = array())
  {
- return (new NestedSet_Model_Output)->toArray($this, $tree);
+ return (new NestedSet_Model_Output)->toArray($this, $nodes);
  }
 
  /**
  * Convert a tree array (with depth) into a hierarchical XML string.
  *
- * @param $tree|array Array with depth value.
+ * @param $nodes|array Array with depth value.
  *
  * @return string
  */
- public function toXml($tree = null)
+ public function toXml(array $nodes = array())
  {
- return (new NestedSet_Model_Output)->toXml($this, $tree);
+ return (new NestedSet_Model_Output)->toXml($this, $nodes);
  }
 
  /**
  * Return nested set as JSON
  *
- * @params $tree|array Original 'flat' nested tree
+ * @params $nodes|array Original 'flat' nested tree
  *
  * @return string
  */
- public function toJson($tree = null)
+ public function toJson(array $nodes = array())
  {
- return (new NestedSet_Model_Output)->toJson($this, $tree);
+ return (new NestedSet_Model_Output)->toJson($this, $nodes);
  }
 
  /**
@@ -316,9 +316,9 @@ public function toJson($tree = null)
  *
  * @return string
  */
- public function toHtml($tree = null, $method = 'list')
+ public function toHtml(array $nodes = array(), $method = 'list')
  {
- return (new NestedSet_Model_Output)->toHtml($this, $tree, $method);
+ return (new NestedSet_Model_Output)->toHtml($this, $nodes, $method);
  }
 
  /**

library/Nestedset/Model/Output.php

@@ -6,18 +6,15 @@ class NestedSet_Model_Output
  * Convert a tree array (with depth) into a hierarchical array.
  *
  * @param $model|NestedSet_Model Nested set model
- * @param $tree|array Array with depth value.
+ * @param $nodes|array Array with depth value.
  *
  * @return array
  */
- public function toArray(NestedSet_Model $nestedset, $tree = null)
+ public function toArray(NestedSet_Model $nestedset, array $nodes = array())
  {
- if (empty($tree) || !is_array($tree)) {
+ if (empty($nodes)) {
  $nodes = $nestedset->getAll();
  }
- else {
- $nodes = $tree;
- }
 
  $result = array();
  $stackLevel = 0;
@@ -64,18 +61,15 @@ public function toArray(NestedSet_Model $nestedset, $tree = null)
  * Convert a tree array (with depth) into a hierarchical XML string.
  *
  * @param $model|NestedSet_Model Nested set model
- * @param $tree|array Array with depth value.
+ * @param $nodes|array Array with depth value.
  *
  * @return string
  */
- public function toXml(NestedSet_Model $nestedset, $tree = null)
+ public function toXml(NestedSet_Model $nestedset, array $nodes = array())
  {
- if (empty($tree) || !is_array($tree)) {
+ if (empty($nodes)) {
  $nodes = $nestedset->getAll();
  }
- else {
- $nodes = $tree;
- }
 
  $xml = new DomDocument('1.0');
  $xml->preserveWhiteSpace = false;
@@ -119,13 +113,13 @@ public function toXml(NestedSet_Model $nestedset, $tree = null)
  /**
  * Return nested set as JSON
  *
- * @params $tree|array Original 'flat' nested tree
+ * @params $nodes|array Original 'flat' nested tree
  *
  * @return string
  */
- public function toJson(NestedSet_Model $nestedset, $tree = null)
+ public function toJson(NestedSet_Model $nestedset, array $nodes = array())
  {
- $nestedArray = $this->toArray($nestedset, $tree);
+ $nestedArray = $this->toArray($nestedset, $nodes);
  $result = json_encode($nestedArray);
 
  return $result;
@@ -141,14 +135,11 @@ public function toJson(NestedSet_Model $nestedset, $tree = null)
  *
  * @return string
  */
- public function toHtml(NestedSet_Model $nestedset, $tree = null, $method = 'list')
+ public function toHtml(NestedSet_Model $nestedset, array $nodes = array(), $method = 'list')
  {
- if (empty($tree) || !is_array($tree)) {
+ if (empty($nodes)) {
  $nodes = $nestedset->getAll();
  }
- else {
- $nodes = $tree;
- }
 
  switch ($method) {
  case 'list':