Merge pull request #2332 from baryshev/patch-1

Fix #1608 about Phalcon\Mvc\Router\Annotations
phalcon · Apr 16, 2014 · 90a8c6d · 90a8c6d
2 parents 8366b30 + 412db0d
commit 90a8c6d
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 2 deletions.
diff --git a/ext/mvc/router/annotations.c b/ext/mvc/router/annotations.c
@@ -544,7 +544,11 @@ PHP_METHOD(Phalcon_Mvc_Router_Annotations, processActionAnnotation){
 				PHALCON_INIT_VAR(uri);
 				PHALCON_CONCAT_VV(uri, route_prefix, value);
 			} else {
-				PHALCON_CPY_WRT(uri, route_prefix);
+				if (Z_TYPE_P(route_prefix) != IS_NULL) {
+					PHALCON_CPY_WRT(uri, route_prefix);
+				} else {
+					PHALCON_CPY_WRT(uri, value);
+				}
 			}
 		} else {
 			PHALCON_INIT_NVAR(uri);

diff --git a/unit-tests/RouterMvcAnnotationsTest.php b/unit-tests/RouterMvcAnnotationsTest.php
@@ -87,6 +87,19 @@ public function saveAction()
 
 }
 
+class MainController
+{
+
+	/**
+	 * @Get("/")
+	 */
+	public function indexAction()
+	{
+
+	}
+
+}
+
 class RouterMvcAnnotationsTest extends PHPUnit_Framework_TestCase
 {
 	public function _getDI()
@@ -105,10 +118,11 @@ public function testRouterFullResources()
 
 		$router->addResource('Robots');
 		$router->addResource('Products');
+		$router->addResource('Main');
 
 		$router->handle();
 
-		$this->assertEquals(count($router->getRoutes()), 7);
+		$this->assertEquals(count($router->getRoutes()), 8);
 
 		$route = $router->getRouteByName('save-robot');
 		$this->assertTrue(is_object($route));
@@ -175,6 +189,13 @@ public function testRouterFullResources()
 				'action' => 'deleteRobot',
 				'params' => array('id' => '100')
 			),
+			array(
+				'uri' => '/',
+				'method' => 'GET',
+				'controller' => 'Main',
+				'action' => 'index',
+				'params' => array()
+			),
 		);
 
 		foreach ($routes as $route) {