Merge pull request #14 from fpietka/analysis-XpK5V8

Applied fixes from StyleCI

Author: fpietka

library/Nestedset/Model.php

@@ -35,7 +35,7 @@
  * Powered by Nextcode, 2009
  */
 
-class NestedSet_Model
+class Nestedset_Model
 {
  /**
  * In MySQL and PostgreSQL, 'left' and 'right' are reserved words
@@ -167,8 +167,7 @@ public function add($name, $reference = null, $position = 'into')
  {
  if (is_null($reference)) {
  (new NestedSet_Model_Builder)->append($this, $name);
- }
- else {
+ } else {
  $reference = (int) $reference;
 
  (new NestedSet_Model_Builder)->addInto($this, $name, $reference);
@@ -203,8 +202,7 @@ public function delete($id, $recursive = true)
 
  if ($recursive) {
  (new NestedSet_Model_Builder)->deleteRecursive($this, $result);
- }
- else {
+ } else {
  (new NestedSet_Model_Builder)->deleteNonRecursive($this, $result);
  }
 

library/Nestedset/Model/Builder.php

@@ -1,6 +1,6 @@
 <?php
 
-class NestedSet_Model_Builder
+class Nestedset_Model_Builder
 {
  /**
  * Add an element to the end of the tree.
@@ -23,8 +23,7 @@ public function append(NestedSet_Model $nestedset, $name)
 
  if (false === $result) {
  $result = 0;
- }
- else {
+ } else {
  $result = $result['max'];
  }
 
@@ -43,8 +42,7 @@ public function append(NestedSet_Model $nestedset, $name)
 
  $db->insert($nestedset->getTableName(), $values);
  $db->commit();
- }
- catch (Exception $e) {
+ } catch (Exception $e) {
  $db->rollBack();
  throw $e;
  }
@@ -110,8 +108,7 @@ public function addInto(NestedSet_Model $nestedset, $name, $reference)
 
  $db->insert($nestedset->getTableName(), $values);
  $db->commit();
- }
- catch (Exception $e) {
+ } catch (Exception $e) {
  $db->rollBack();
  throw $e;
  }
@@ -192,8 +189,7 @@ public function moveInto(NestedSet_Model $nestedset, array $element, array $refe
  ");
 
  $db->commit();
- }
- catch (Exception $e) {
+ } catch (Exception $e) {
  $db->rollBack();
  throw $e;
  }
@@ -238,8 +234,7 @@ public function deleteRecursive(NestedSet_Model $nestedset, array $tree)
  ");
 
  $db->commit();
- }
- catch (Exception $e) {
+ } catch (Exception $e) {
  $db->rollBack();
  throw $e;
  }
@@ -299,8 +294,7 @@ public function deleteNonRecursive(NestedSet_Model $nestedset, array $tree)
  ");
 
  $db->commit();
- }
- catch (Exception $e) {
+ } catch (Exception $e) {
  $db->rollBack();
  throw $e;
  }

library/Nestedset/Model/Output.php

@@ -1,6 +1,6 @@
 <?php
 
-class NestedSet_Model_Output
+class Nestedset_Model_Output
 {
  /**
  * Convert a tree array (with depth) into a hierarchical array.
@@ -36,8 +36,7 @@ public function toArray(array $nodes)
 
  $result[$i] = $node;
  $stack[] =& $result[$i];
- }
- else {
+ } else {
  // Add node to parent
  $i = count($stack[$stackLevel - 1]['children']);
 
@@ -80,13 +79,11 @@ public function toXml(array $nodes)
  // Handle root
  $root->appendChild($element);
  $currentChildren[0] = $children;
- }
- elseif ($node['depth'] > $depth) {
+ } elseif ($node['depth'] > $depth) {
  // is a new sub level
  $currentChildren[$depth]->appendChild($element);
  $currentChildren[$node['depth']] = $children;
- }
- elseif ($node['depth'] == $depth || $node['depth'] < $depth) {
+ } elseif ($node['depth'] == $depth || $node['depth'] < $depth) {
  // is at the same level
  $currentChildren[$node['depth'] - 1]->appendChild($element);
  }
@@ -146,11 +143,9 @@ protected function _toHtmlList(array $nodes)
  foreach ($nodes as $node) {
  if ($depth < $node['depth']) {
  $result .= "<ul>";
- }
- elseif ($depth == $node['depth'] && $depth > $nodes[0]['depth']) {
+ } elseif ($depth == $node['depth'] && $depth > $nodes[0]['depth']) {
  $result .= "</li>";
- }
- elseif ($depth > $node['depth']) {
+ } elseif ($depth > $node['depth']) {
  for ($i = 0; $i < ($depth - $node['depth']); $i++) {
  $result .= "</li></ul>";
  }

library/Nestedset/Model/Reader.php

@@ -1,6 +1,6 @@
 <?php
 
-class NestedSet_Model_Reader
+class Nestedset_Model_Reader
 {
  /**
  * Get all elements from nested set
@@ -37,23 +37,20 @@ public function getAll(NestedSet_Model $nestedset, $depth = null, $mode = 'inclu
 
  if ($mode == 'exclude') {
  $mode = '=';
- }
- else {
+ } else {
  $mode = '!=';
  }
 
  $query .= "HAVING COUNT(parent.{$nestedset->getStructureName()}) - 1 $mode $depth";
- }
- else {
+ } else {
  foreach ($depth as &$one) {
  $one = (int) $one;
  }
  $depth = implode(', ', $depth);
 
  if ($mode == 'exclude') {
  $mode = 'NOT IN';
- }
- else {
+ } else {
  $mode = 'IN';
  }
 

tests/unit/library/Nestedset/ModelTest.php

@@ -13,7 +13,7 @@
 require_once 'Zend/Db/Table.php';
 require_once 'Zend/Db/Adapter/Abstract.php';
 
-class NestedSet_ModelTest extends PHPUnit_Framework_TestCase
+class Nestedset_ModelTest extends PHPUnit_Framework_TestCase
 {
  public function setUp()
  {
@@ -30,8 +30,7 @@ public function setUp()
 
  public function afterTestMethod($method)
  {
- switch ($method)
- {
+ switch ($method) {
  case 'testAddASimpleElement':
  case 'testDeleteElement':
  case 'testDeleteRecursiveElement':