Merge pull request #1565 from sjinks/issue-1529

Fix #1529
phalcon · Nov 18, 2013 · d43e90e · d43e90e
2 parents 9d4aede + 5bc0558
commit d43e90e
Show file tree

Hide file tree

Showing 27 changed files with 79 additions and 127 deletions.
diff --git a/ext/cli/console.c b/ext/cli/console.c
@@ -89,13 +89,8 @@ PHP_METHOD(Phalcon_CLI_Console, setDI){
 	zval *dependency_injector;
 
 	phalcon_fetch_params(0, 1, 0, &dependency_injector);
-
-	if (Z_TYPE_P(dependency_injector) != IS_OBJECT) {
-		PHALCON_THROW_EXCEPTION_STRW(phalcon_cli_console_exception_ce, "Dependency Injector is invalid");
-		return;
-	}
+	PHALCON_VERIFY_INTERFACE_EX(dependency_injector, phalcon_diinterface_ce, phalcon_cli_console_exception_ce, 0);
 	phalcon_update_property_this(this_ptr, SL("_dependencyInjector"), dependency_injector TSRMLS_CC);
-
 }
 
 /**

diff --git a/ext/cli/router.c b/ext/cli/router.c
@@ -103,9 +103,8 @@ PHP_METHOD(Phalcon_CLI_Router, setDI){
 	zval *dependency_injector;
 
 	phalcon_fetch_params(0, 1, 0, &dependency_injector);
-
+	PHALCON_VERIFY_INTERFACE_EX(dependency_injector, phalcon_diinterface_ce, phalcon_cli_router_exception_ce, 0);
 	phalcon_update_property_this(this_ptr, SL("_dependencyInjector"), dependency_injector TSRMLS_CC);
-
 }
 
 /**

diff --git a/ext/db/adapter.c b/ext/db/adapter.c
@@ -164,9 +164,8 @@ PHP_METHOD(Phalcon_Db_Adapter, setDialect){
 	zval *dialect;
 
 	phalcon_fetch_params(0, 1, 0, &dialect);
-
+	PHALCON_VERIFY_INTERFACE_EX(dialect, phalcon_db_dialectinterface_ce, phalcon_db_exception_ce, 0);
 	phalcon_update_property_this(this_ptr, SL("_dialect"), dialect TSRMLS_CC);
-
 }
 
 /**

diff --git a/ext/di/injectable.c b/ext/di/injectable.c
@@ -66,19 +66,16 @@ PHALCON_INIT_CLASS(Phalcon_DI_Injectable){
  * Sets the dependency injector
  *
  * @param Phalcon\DiInterface $dependencyInjector
+ * @throw Phalcon\Di\Exception if !($dependencyInjector instanceof Phalcon\DiInterface)
  */
 PHP_METHOD(Phalcon_DI_Injectable, setDI){
 
-	zval *dependency_injector;
+	zval **dependency_injector;
 
-	phalcon_fetch_params(0, 1, 0, &dependency_injector);
-
-	if (Z_TYPE_P(dependency_injector) != IS_OBJECT) {
-		PHALCON_THROW_EXCEPTION_STRW(phalcon_di_exception_ce, "Dependency Injector is invalid");
-		return;
-	}
-	phalcon_update_property_this(this_ptr, SL("_dependencyInjector"), dependency_injector TSRMLS_CC);
+	phalcon_fetch_params_ex(1, 0, &dependency_injector);
 
+	PHALCON_VERIFY_INTERFACE_EX(*dependency_injector, phalcon_diinterface_ce, phalcon_di_exception_ce, 0);
+	phalcon_update_property_this(this_ptr, SL("_dependencyInjector"), *dependency_injector TSRMLS_CC);
 }
 
 /**

diff --git a/ext/dispatcher.c b/ext/dispatcher.c
@@ -108,9 +108,8 @@ PHP_METHOD(Phalcon_Dispatcher, setDI){
 	zval *dependency_injector;
 
 	phalcon_fetch_params(0, 1, 0, &dependency_injector);
-
+	PHALCON_VERIFY_INTERFACE_EX(dependency_injector, phalcon_diinterface_ce, phalcon_exception_ce, 0);
 	phalcon_update_property_this(this_ptr, SL("_dependencyInjector"), dependency_injector TSRMLS_CC);
-
 }
 
 /**

diff --git a/ext/flash/session.c b/ext/flash/session.c
@@ -70,9 +70,8 @@ PHP_METHOD(Phalcon_Flash_Session, setDI){
 	zval *dependency_injector;
 
 	phalcon_fetch_params(0, 1, 0, &dependency_injector);
-
+	PHALCON_VERIFY_INTERFACE_EX(dependency_injector, phalcon_diinterface_ce, phalcon_session_exception_ce, 0);
 	phalcon_update_property_this(this_ptr, SL("_dependencyInjector"), dependency_injector TSRMLS_CC);
-
 }
 
 /**

diff --git a/ext/http/cookie.c b/ext/http/cookie.c
@@ -146,9 +146,8 @@ PHP_METHOD(Phalcon_Http_Cookie, setDI){
 	zval *dependency_injector;
 
 	phalcon_fetch_params(0, 1, 0, &dependency_injector);
-
+	PHALCON_VERIFY_INTERFACE_EX(dependency_injector, phalcon_diinterface_ce, phalcon_http_cookie_exception_ce, 0);
 	phalcon_update_property_this(this_ptr, SL("_dependencyInjector"), dependency_injector TSRMLS_CC);
-
 }
 
 /**

diff --git a/ext/http/request.c b/ext/http/request.c
@@ -96,9 +96,8 @@ PHP_METHOD(Phalcon_Http_Request, setDI){
 	zval *dependency_injector;
 
 	phalcon_fetch_params(0, 1, 0, &dependency_injector);
-
+	PHALCON_VERIFY_INTERFACE_EX(dependency_injector, phalcon_diinterface_ce, phalcon_http_request_exception_ce, 0);
 	phalcon_update_property_this(this_ptr, SL("_dependencyInjector"), dependency_injector TSRMLS_CC);
-
 }
 
 /**

diff --git a/ext/http/response.c b/ext/http/response.c
@@ -116,9 +116,8 @@ PHP_METHOD(Phalcon_Http_Response, setDI){
 	zval *dependency_injector;
 
 	phalcon_fetch_params(0, 1, 0, &dependency_injector);
-
+	PHALCON_VERIFY_INTERFACE_EX(dependency_injector, phalcon_diinterface_ce, phalcon_http_response_exception_ce, 0);
 	phalcon_update_property_this(this_ptr, SL("_dependencyInjector"), dependency_injector TSRMLS_CC);
-
 }
 
 /**

diff --git a/ext/http/response/cookies.c b/ext/http/response/cookies.c
@@ -75,9 +75,8 @@ PHP_METHOD(Phalcon_Http_Response_Cookies, setDI){
 	zval *dependency_injector;
 
 	phalcon_fetch_params(0, 1, 0, &dependency_injector);
-
+	PHALCON_VERIFY_INTERFACE_EX(dependency_injector, phalcon_diinterface_ce, phalcon_http_response_exception_ce, 0);
 	phalcon_update_property_this(this_ptr, SL("_dependencyInjector"), dependency_injector TSRMLS_CC);
-
 }
 
 /**

diff --git a/ext/mvc/collection.c b/ext/mvc/collection.c
@@ -213,9 +213,8 @@ PHP_METHOD(Phalcon_Mvc_Collection, setDI){
 	zval *dependency_injector;
 
 	phalcon_fetch_params(0, 1, 0, &dependency_injector);
-
+	PHALCON_VERIFY_INTERFACE_EX(dependency_injector, phalcon_diinterface_ce, phalcon_mvc_collection_exception_ce, 0);
 	phalcon_update_property_this(this_ptr, SL("_dependencyInjector"), dependency_injector TSRMLS_CC);
-
 }
 
 /**

diff --git a/ext/mvc/collection/manager.c b/ext/mvc/collection/manager.c
@@ -91,13 +91,8 @@ PHP_METHOD(Phalcon_Mvc_Collection_Manager, setDI){
 	zval *dependency_injector;
 
 	phalcon_fetch_params(0, 1, 0, &dependency_injector);
-
-	if (Z_TYPE_P(dependency_injector) != IS_OBJECT) {
-		PHALCON_THROW_EXCEPTION_STRW(phalcon_mvc_model_exception_ce, "The dependency injector is invalid");
-		return;
-	}
+	PHALCON_VERIFY_INTERFACE_EX(dependency_injector, phalcon_diinterface_ce, phalcon_mvc_model_exception_ce, 0);
 	phalcon_update_property_this(this_ptr, SL("_dependencyInjector"), dependency_injector TSRMLS_CC);
-
 }
 
 /**

diff --git a/ext/mvc/micro.c b/ext/mvc/micro.c
@@ -118,11 +118,7 @@ PHP_METHOD(Phalcon_Mvc_Micro, setDI){
 	PHALCON_MM_GROW();
 
 	phalcon_fetch_params(1, 1, 0, &dependency_injector);
-
-	if (Z_TYPE_P(dependency_injector) != IS_OBJECT) {
-		PHALCON_THROW_EXCEPTION_STR(phalcon_mvc_application_exception_ce, "The dependency injector must be an object");
-		return;
-	}
+	PHALCON_VERIFY_INTERFACE_EX(dependency_injector, phalcon_diinterface_ce, phalcon_mvc_micro_exception_ce, 1);
 
 	/** 
 	 * We automatically set ourselves as application service

diff --git a/ext/mvc/model.c b/ext/mvc/model.c
@@ -245,9 +245,8 @@ PHP_METHOD(Phalcon_Mvc_Model, setDI){
 	zval *dependency_injector;
 
 	phalcon_fetch_params(0, 1, 0, &dependency_injector);
-
+	PHALCON_VERIFY_INTERFACE_EX(dependency_injector, phalcon_diinterface_ce, phalcon_mvc_model_exception_ce, 0);
 	phalcon_update_property_this(this_ptr, SL("_dependencyInjector"), dependency_injector TSRMLS_CC);
-
 }
 
 /**

diff --git a/ext/mvc/model/criteria.c b/ext/mvc/model/criteria.c
@@ -87,13 +87,8 @@ PHP_METHOD(Phalcon_Mvc_Model_Criteria, setDI){
 	zval *dependency_injector;
 
 	phalcon_fetch_params(0, 1, 0, &dependency_injector);
-
-	if (Z_TYPE_P(dependency_injector) != IS_OBJECT) {
-		PHALCON_THROW_EXCEPTION_STRW(phalcon_mvc_model_exception_ce, "Dependency Injector is invalid");
-		return;
-	}
+	PHALCON_VERIFY_INTERFACE_EX(dependency_injector, phalcon_diinterface_ce, phalcon_mvc_model_exception_ce, 0);
 	phalcon_update_property_array_string(this_ptr, SL("_params"), SS("di"), dependency_injector TSRMLS_CC);
-
 }
 
 /**

diff --git a/ext/mvc/model/manager.c b/ext/mvc/model/manager.c
@@ -110,13 +110,8 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, setDI){
 	zval *dependency_injector;
 
 	phalcon_fetch_params(0, 1, 0, &dependency_injector);
-
-	if (Z_TYPE_P(dependency_injector) != IS_OBJECT) {
-		PHALCON_THROW_EXCEPTION_STRW(phalcon_mvc_model_exception_ce, "The dependency injector is invalid");
-		return;
-	}
+	PHALCON_VERIFY_INTERFACE_EX(dependency_injector, phalcon_diinterface_ce, phalcon_mvc_model_exception_ce, 0);
 	phalcon_update_property_this(this_ptr, SL("_dependencyInjector"), dependency_injector TSRMLS_CC);
-
 }
 
 /**

diff --git a/ext/mvc/model/metadata.c b/ext/mvc/model/metadata.c
@@ -255,13 +255,8 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, setDI){
 	zval *dependency_injector;
 
 	phalcon_fetch_params(0, 1, 0, &dependency_injector);
-
-	if (Z_TYPE_P(dependency_injector) != IS_OBJECT) {
-		PHALCON_THROW_EXCEPTION_STRW(phalcon_mvc_model_exception_ce, "The dependency injector is invalid");
-		return;
-	}
+	PHALCON_VERIFY_INTERFACE_EX(dependency_injector, phalcon_diinterface_ce, phalcon_mvc_model_exception_ce, 0);
 	phalcon_update_property_this(this_ptr, SL("_dependencyInjector"), dependency_injector TSRMLS_CC);
-
 }
 
 /**