Use FILEINFO_MIME_TYPE

ext/http/request/file.c

@@ -203,7 +203,7 @@ PHP_METHOD(Phalcon_Http_Request_File, getRealType){
 	}
 
 	PHALCON_INIT_VAR(constant);
-	if (!zend_get_constant(SL("FILEINFO_MIME"), constant TSRMLS_CC)) {
+	if (!zend_get_constant(SL("FILEINFO_MIME_TYPE"), constant TSRMLS_CC)) {
 		RETURN_MM_NULL();
 	}
 
@@ -221,27 +221,7 @@ PHP_METHOD(Phalcon_Http_Request_File, getRealType){
 	phalcon_call_func_p2(mime, "finfo_file", finfo, temp_file);
 	phalcon_call_func_p1_noret("finfo_close", finfo);
 
-	if (Z_TYPE_P(mime) != IS_STRING) {
-		RETURN_MM_NULL();
-	}
-
-	PHALCON_INIT_VAR(pattern);
-	ZVAL_STRING(pattern, "#^([a-z\\-]+\\/[a-z0-9\\-\\.\\+]+)(;\\s.+)?$#", 1);
-
-	PHALCON_INIT_VAR(matches);
-	PHALCON_INIT_VAR(ret);
-	phalcon_preg_match(ret, &ret, pattern, mime, matches TSRMLS_CC);
-
-	if (zend_is_true(ret) && phalcon_array_isset_long(matches, 1)) {
-		PHALCON_OBS_NVAR(ret);
-		phalcon_array_fetch_long(&ret, matches, 1, PH_NOISY);
-
-		phalcon_update_property_this(this_ptr, SL("_real_type"), ret TSRMLS_CC);
-
-		RETURN_CTOR(ret);
-	}
-
-	RETURN_MM_NULL();
+	RETURN_CTOR(ret);
 }
 
 /**

ext/mvc/collection.c

@@ -2109,3 +2109,56 @@ PHP_METHOD(Phalcon_Mvc_Collection, unserialize){
 	return;
 }
 
+/**
+ * Runs JavaScript code on the database server.
+ *
+ * <code>
+ *
+ * $ret = Robots::execute("function() { return 'Hello, world!';}");
+ * echo $ret['retval'], "\n";
+ *
+ * </code>
+ *
+ * @param mixed $code
+ * @param array $args
+ * @return array
+ */
+PHP_METHOD(Phalcon_Mvc_Collection, execute){
+
+	zval *parameters = NULL, *class_name, *collection, *connection;
+	zval *unique;
+	zend_class_entry *ce0;
+
+	PHALCON_MM_GROW();
+
+	phalcon_fetch_params(1, 0, 1, &parameters);
+
+	if (!parameters) {
+		parameters = PHALCON_GLOBAL(z_null);
+	}
+
+	if (Z_TYPE_P(parameters) != IS_NULL) {
+		if (Z_TYPE_P(parameters) != IS_ARRAY) { 
+			PHALCON_THROW_EXCEPTION_STR(phalcon_mvc_collection_exception_ce, "Invalid parameters for findFirst");
+			return;
+		}
+	}
+
+	PHALCON_INIT_VAR(class_name);
+	phalcon_get_called_class(class_name  TSRMLS_CC);
+	ce0 = phalcon_fetch_class(class_name TSRMLS_CC);
+
+	PHALCON_INIT_VAR(collection);
+	object_init_ex(collection, ce0);
+	if (phalcon_has_constructor(collection TSRMLS_CC)) {
+		phalcon_call_method_noret(collection, "__construct");
+	}
+
+	PHALCON_INIT_VAR(connection);
+	phalcon_call_method(connection, collection, "getconnection");
+
+	unique = PHALCON_GLOBAL(z_true);
+	phalcon_call_self_p4(return_value, this_ptr, "_getresultset", parameters, collection, connection, unique);
+	RETURN_MM();
+}
+

ext/mvc/collection.h

@@ -63,6 +63,7 @@ PHP_METHOD(Phalcon_Mvc_Collection, delete);
 PHP_METHOD(Phalcon_Mvc_Collection, toArray);
 PHP_METHOD(Phalcon_Mvc_Collection, serialize);
 PHP_METHOD(Phalcon_Mvc_Collection, unserialize);
+PHP_METHOD(Phalcon_Mvc_Collection, execute);
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_collection___construct, 0, 0, 0)
 	ZEND_ARG_INFO(0, dependencyInjector)
@@ -137,6 +138,11 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_collection_unserialize, 0, 0, 1)
 	ZEND_ARG_INFO(0, data)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_collection_execute, 0, 0, 1)
+	ZEND_ARG_INFO(0, code)
+	ZEND_ARG_INFO(0, args)
+ZEND_END_ARG_INFO()
+
 PHALCON_INIT_FUNCS(phalcon_mvc_collection_method_entry){
 	PHP_ME(Phalcon_Mvc_Collection, __construct, arginfo_phalcon_mvc_collection___construct, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL|ZEND_ACC_CTOR) 
 	PHP_ME(Phalcon_Mvc_Collection, setId, arginfo_phalcon_mvc_collection_setid, ZEND_ACC_PUBLIC) 
@@ -179,6 +185,7 @@ PHALCON_INIT_FUNCS(phalcon_mvc_collection_method_entry){
 	PHP_ME(Phalcon_Mvc_Collection, toArray, NULL, ZEND_ACC_PUBLIC) 
 	PHP_ME(Phalcon_Mvc_Collection, serialize, NULL, ZEND_ACC_PUBLIC) 
 	PHP_ME(Phalcon_Mvc_Collection, unserialize, arginfo_phalcon_mvc_collection_unserialize, ZEND_ACC_PUBLIC) 
+	PHP_ME(Phalcon_Mvc_Collection, execute, arginfo_phalcon_mvc_collection_execute, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC) 
 	PHP_FE_END
 };