Merge branch '1.2.0' of https://github.com/phalcon/cphalcon into 1.2.0

Conflicts: ext/forms/element.c
phalcon · May 27, 2013 · c8ae2ca · c8ae2ca
2 parents 8197480 + 31785fd
commit c8ae2ca
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/ext/forms/element.c b/ext/forms/element.c
@@ -425,12 +425,15 @@ PHP_METHOD(Phalcon_Forms_Element, getAttributes){
 
 	PHALCON_OBS_VAR(attributes);
 	phalcon_read_property_this(&attributes, this_ptr, SL("_attributes"), PH_NOISY_CC);
-	if (Z_TYPE_P(attributes) != IS_ARRAY) { 
+
+	if (Z_TYPE_P(attributes) != IS_ARRAY) {
+
 		PHALCON_INIT_VAR(empty_array);
 		array_init(empty_array);
+
 		RETURN_CTOR(empty_array);
 	}
-	
+
 	RETURN_CCTOR(attributes);
 }
 

diff --git a/unit-tests/FormsTest.php b/unit-tests/FormsTest.php
@@ -73,7 +73,7 @@ public function testFormElementEmpty()
 		$element = new Text("name");
 
 		$this->assertEquals($element->getLabel(), null);
-		$this->assertEquals($element->getAttributes(), null);
+		$this->assertEquals($element->getAttributes(), array());
 	}
 
 	public function testFormElement()

diff --git a/unit-tests/ModelsRelationsTest.php b/unit-tests/ModelsRelationsTest.php
@@ -286,4 +286,4 @@ public function _executeTestsRenamed($di)
 
 	}
 
-}
+}
diff --git a/unit-tests/RouterMvcTest.php b/unit-tests/RouterMvcTest.php
@@ -194,6 +194,8 @@ public function testRouter()
 
 		$router->add("/posts/delete/{id}", "Posts::delete");
 
+		$router->add("/show/{id:video([0-9]+)}/{title:[a-z\-]+}", "Videos::show");
+
 		foreach ($tests as $n => $test) {
 			$this->_runTest($router, $test);
 		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -286,4 +286,4 @@ public function _executeTestsRenamed($di)

		}

		}
		}