Infinit recursion fix

Author: michalsanger

Quadtree/QuadtreeAbstract.php

@@ -31,6 +31,9 @@ abstract class QuadtreeAbstract
 
     /** @var Quadtree */
     private $se;
+    
+    /** @var boolean */
+    private $overlappingInserted = FALSE;
 
     /**
      * @param \Quadtree\ICollisionDetector $detector
@@ -89,6 +92,12 @@ public function collideWithItems(Insertable $item)
      */
     private function insertItem(Insertable $item)
     {
+        if ($this->overlappingInserted || $item->getBounds()->contains($this->bounds)) {
+            $this->items[] = $item;
+            $this->overlappingInserted = true;
+            return TRUE;
+        }
+
         if ($this->nw === NULL && count($this->items) < $this->capacity) {
             $this->items[] = $item;
             return TRUE;

tests/QuadtreeOverlaping/BlackHoleQuadtree.php

@@ -0,0 +1,10 @@
+<?php
+
+class BlackHoleQuadtree extends \Quadtree\QuadtreeAbstract
+{
+    public function __construct(\Quadtree\Geometry\Bounds $bounds, $leafCapacity)
+    {
+        $detector = new \DummyCollisionDetector();
+        parent::__construct($detector, $bounds, $leafCapacity);
+    }
+}

tests/QuadtreeOverlaping/DummyCollistionDetector.php

@@ -0,0 +1,15 @@
+<?php
+
+class DummyCollisionDetector implements \Quadtree\ICollisionDetector
+{
+    public function collide(array $insertedItems, \Quadtree\Insertable $item)
+    {
+        return FALSE;
+    }
+
+    public function intersects(\Quadtree\Geometry\Bounds $bounds, \Quadtree\Insertable $item)
+    {
+        return $bounds->intersects($item->getBounds());
+    }
+}
+    

tests/QuadtreeOverlaping/Overlapping.phpt

@@ -0,0 +1,18 @@
+<?php
+
+require __DIR__ . '/../bootstrap.php';
+require './DummyCollistionDetector.php';
+require './BlackHoleQuadtree.php';
+
+use Tester\Assert;
+use Quadtree\Quadtree;
+use Quadtree\Geometry\Bounds;
+
+$qt = new BlackHoleQuadtree(new Bounds(100, 100), 2);
+Assert::true($qt->insert(new Bounds(100, 100)));
+Assert::true($qt->insert(new Bounds(100, 100)));
+Assert::true($qt->insert(new Bounds(100, 100)));
+
+Assert::true($qt->insert(new Bounds(10, 10)));
+Assert::true($qt->insert(new Bounds(10, 10)));
+Assert::true($qt->insert(new Bounds(10, 10)));