Merge branch 'hotfix/router-priority-list' of https://github.com/Soca…

…lNick/zf2
guilhermewop · Jul 25, 2012 · 0c1b41b · 0c1b41b
2 parents 394c94f + 5d0ca28
commit 0c1b41b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/library/Zend/Mvc/Router/PriorityList.php b/library/Zend/Mvc/Router/PriorityList.php
@@ -63,7 +63,7 @@ public function insert($name, RouteInterface $route, $priority)
 
         $this->routes[$name] = array(
             'route'    => $route,
-            'priority' => $priority,
+            'priority' => (int) $priority,
             'serial'   => $this->serial++,
         );
     }

diff --git a/tests/Zend/Mvc/Router/PriorityListTest.php b/tests/Zend/Mvc/Router/PriorityListTest.php
@@ -126,4 +126,19 @@ public function testLIFOWithPriority()
 
         $this->assertEquals(array('baz', 'bar', 'foo'), $orders);
     }
+
+    public function testPriorityWithNegativesAndNull()
+    {
+        $this->list->insert('foo', new TestAsset\DummyRoute(), null);
+        $this->list->insert('bar', new TestAsset\DummyRoute(), 1);
+        $this->list->insert('baz', new TestAsset\DummyRoute(), -1);
+
+        $order = array();
+
+        foreach ($this->list as $key => $value) {
+            $orders[] = $key;
+        }
+
+        $this->assertEquals(array('bar', 'foo', 'baz'), $orders);
+    }
 }