Skip to content

Check for invalid node values on delete #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 8, 2017
Merged

Check for invalid node values on delete #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/Storage/DbalNestedSet.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,9 @@ public function getTree() {
* {@inheritdoc}
*/
public function deleteNode(Node $node) {
if ($node->getLeft() < 1 || $node->getRight() < 1) {
throw new \InvalidArgumentException("Left and right values must be > 0");
}
$left = $node->getLeft();
$right = $node->getRight();
$width = $right - $left + 1;
Expand Down
10 changes: 10 additions & 0 deletions tests/Functional/DbalNestedSetTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,16 @@ public function testDeleteNode() {
$tree = $this->nestedSet->getTree();
}

/**
* Tests deleting a node with missing values.
*
* @expectedException \InvalidArgumentException
Copy link
Member

@larowlan larowlan Feb 8, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good, although ->setExpectedException is preferred over @ExpectedException see https://thephp.cc/news/2016/02/questioning-phpunit-best-practices

Copy link
Member Author

@kimpepper kimpepper Feb 8, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Followed up on #10

*/
public function testDeleteNodeInvalid() {
$node = new Node(1, 1);
$this->nestedSet->deleteNode($node);
}

/**
* Tests deleting a node and its sub-tree.
*/
Expand Down