Fixing double pointer in Router::getDefaults, fixing build [ci skip]

alexbusu · Aug 15, 2013 · 2a49c4f · 2a49c4f
1 parent 1d739ef
commit 2a49c4f
Show file tree

Hide file tree

Showing 14 changed files with 12 additions and 52 deletions.
diff --git a/build/32bits/phalcon.c b/build/32bits/phalcon.c
@@ -188,6 +188,7 @@ PHP includes the Zend Engine, freely available at
 #include "ext/standard/url.h"
 #include "ext/spl/spl_heap.h"
 #include "ext/spl/spl_exceptions.h"
+#include "ext/spl/spl_directory.h"
 #include "ext/date/php_date.h"
 
 #ifdef PHALCON_USE_PHP_PCRE
@@ -83673,8 +83674,9 @@ static PHP_METHOD(Phalcon_Mvc_Router, setDefaults){
 }
 
 static PHP_METHOD(Phalcon_Mvc_Router, getDefaults){
+
 	zval *namespace_name, *module_name;
-	zval *controller_name, *action_name, **params;
+	zval *controller_name, *action_name, *params;
 
 	namespace_name = phalcon_fetch_nproperty_this(this_ptr, SL("_defaultNamespace"), PH_NOISY_CC);
 	module_name = phalcon_fetch_nproperty_this(this_ptr, SL("_defaultModule"), PH_NOISY_CC);

diff --git a/build/32bits/phalcon.h b/build/32bits/phalcon.h
@@ -5136,8 +5136,6 @@ PHALCON_INIT_FUNCS(phalcon_translate_adapter_method_entry){
 #ifndef PHALCON_CACHE_FRONTEND_DATA_H
 #define PHALCON_CACHE_FRONTEND_DATA_H
 
-#include "cache/frontendinterface.h"
-
 zend_class_entry *phalcon_cache_frontend_data_ce;
 
 PHALCON_INIT_CLASS(Phalcon_Cache_Frontend_Data);
@@ -6250,8 +6248,6 @@ PHALCON_INIT_FUNCS(phalcon_cache_backend_libmemcached_method_entry){
 #ifndef PHALCON_CACHE_FRONTEND_JSON_H
 #define PHALCON_CACHE_FRONTEND_JSON_H
 
-#include "cache/frontendinterface.h"
-
 zend_class_entry *phalcon_cache_frontend_json_ce;
 
 PHALCON_INIT_CLASS(Phalcon_Cache_Frontend_Json);
@@ -6271,8 +6267,6 @@ PHALCON_INIT_FUNCS(phalcon_cache_frontend_json_method_entry){
 #ifndef PHALCON_CACHE_FRONTEND_OUTPUT_H
 #define PHALCON_CACHE_FRONTEND_OUTPUT_H
 
-#include "cache/frontendinterface.h"
-
 zend_class_entry *phalcon_cache_frontend_output_ce;
 
 PHALCON_INIT_CLASS(Phalcon_Cache_Frontend_Output);
@@ -6308,8 +6302,6 @@ PHALCON_INIT_FUNCS(phalcon_cache_frontend_output_method_entry){
 #ifndef PHALCON_CACHE_FRONTEND_NONE_H
 #define PHALCON_CACHE_FRONTEND_NONE_H
 
-#include "cache/frontendinterface.h"
-
 zend_class_entry *phalcon_cache_frontend_none_ce;
 
 PHALCON_INIT_CLASS(Phalcon_Cache_Frontend_None);
@@ -6331,8 +6323,6 @@ PHALCON_INIT_FUNCS(phalcon_cache_frontend_none_method_entry){
 #ifndef PHALCON_CACHE_FRONTEND_BASE64_H
 #define PHALCON_CACHE_FRONTEND_BASE64_H
 
-#include "cache/frontendinterface.h"
-
 zend_class_entry *phalcon_cache_frontend_base64_ce;
 
 PHALCON_INIT_CLASS(Phalcon_Cache_Frontend_Base64);
@@ -6352,8 +6342,6 @@ PHALCON_INIT_FUNCS(phalcon_cache_frontend_base64_method_entry){
 #ifndef PHALCON_CACHE_FRONTEND_IGBINARY_H
 #define PHALCON_CACHE_FRONTEND_IGBINARY_H
 
-#include "cache/frontendinterface.h"
-
 zend_class_entry *phalcon_cache_frontend_igbinary_ce;
 
 PHALCON_INIT_CLASS(Phalcon_Cache_Frontend_Igbinary);

diff --git a/build/64bits/phalcon.c b/build/64bits/phalcon.c
@@ -188,6 +188,7 @@ PHP includes the Zend Engine, freely available at
 #include "ext/standard/url.h"
 #include "ext/spl/spl_heap.h"
 #include "ext/spl/spl_exceptions.h"
+#include "ext/spl/spl_directory.h"
 #include "ext/date/php_date.h"
 
 #ifdef PHALCON_USE_PHP_PCRE
@@ -83673,8 +83674,9 @@ static PHP_METHOD(Phalcon_Mvc_Router, setDefaults){
 }
 
 static PHP_METHOD(Phalcon_Mvc_Router, getDefaults){
+
 	zval *namespace_name, *module_name;
-	zval *controller_name, *action_name, **params;
+	zval *controller_name, *action_name, *params;
 
 	namespace_name = phalcon_fetch_nproperty_this(this_ptr, SL("_defaultNamespace"), PH_NOISY_CC);
 	module_name = phalcon_fetch_nproperty_this(this_ptr, SL("_defaultModule"), PH_NOISY_CC);

diff --git a/build/64bits/phalcon.h b/build/64bits/phalcon.h
@@ -5136,8 +5136,6 @@ PHALCON_INIT_FUNCS(phalcon_translate_adapter_method_entry){
 #ifndef PHALCON_CACHE_FRONTEND_DATA_H
 #define PHALCON_CACHE_FRONTEND_DATA_H
 
-#include "cache/frontendinterface.h"
-
 zend_class_entry *phalcon_cache_frontend_data_ce;
 
 PHALCON_INIT_CLASS(Phalcon_Cache_Frontend_Data);
@@ -6250,8 +6248,6 @@ PHALCON_INIT_FUNCS(phalcon_cache_backend_libmemcached_method_entry){
 #ifndef PHALCON_CACHE_FRONTEND_JSON_H
 #define PHALCON_CACHE_FRONTEND_JSON_H
 
-#include "cache/frontendinterface.h"
-
 zend_class_entry *phalcon_cache_frontend_json_ce;
 
 PHALCON_INIT_CLASS(Phalcon_Cache_Frontend_Json);
@@ -6271,8 +6267,6 @@ PHALCON_INIT_FUNCS(phalcon_cache_frontend_json_method_entry){
 #ifndef PHALCON_CACHE_FRONTEND_OUTPUT_H
 #define PHALCON_CACHE_FRONTEND_OUTPUT_H
 
-#include "cache/frontendinterface.h"
-
 zend_class_entry *phalcon_cache_frontend_output_ce;
 
 PHALCON_INIT_CLASS(Phalcon_Cache_Frontend_Output);
@@ -6308,8 +6302,6 @@ PHALCON_INIT_FUNCS(phalcon_cache_frontend_output_method_entry){
 #ifndef PHALCON_CACHE_FRONTEND_NONE_H
 #define PHALCON_CACHE_FRONTEND_NONE_H
 
-#include "cache/frontendinterface.h"
-
 zend_class_entry *phalcon_cache_frontend_none_ce;
 
 PHALCON_INIT_CLASS(Phalcon_Cache_Frontend_None);
@@ -6331,8 +6323,6 @@ PHALCON_INIT_FUNCS(phalcon_cache_frontend_none_method_entry){
 #ifndef PHALCON_CACHE_FRONTEND_BASE64_H
 #define PHALCON_CACHE_FRONTEND_BASE64_H
 
-#include "cache/frontendinterface.h"
-
 zend_class_entry *phalcon_cache_frontend_base64_ce;
 
 PHALCON_INIT_CLASS(Phalcon_Cache_Frontend_Base64);
@@ -6352,8 +6342,6 @@ PHALCON_INIT_FUNCS(phalcon_cache_frontend_base64_method_entry){
 #ifndef PHALCON_CACHE_FRONTEND_IGBINARY_H
 #define PHALCON_CACHE_FRONTEND_IGBINARY_H
 
-#include "cache/frontendinterface.h"
-
 zend_class_entry *phalcon_cache_frontend_igbinary_ce;
 
 PHALCON_INIT_CLASS(Phalcon_Cache_Frontend_Igbinary);

diff --git a/build/safe/phalcon.c b/build/safe/phalcon.c
@@ -188,6 +188,7 @@ PHP includes the Zend Engine, freely available at
 #include "ext/standard/url.h"
 #include "ext/spl/spl_heap.h"
 #include "ext/spl/spl_exceptions.h"
+#include "ext/spl/spl_directory.h"
 #include "ext/date/php_date.h"
 
 #ifdef PHALCON_USE_PHP_PCRE
@@ -83673,8 +83674,9 @@ static PHP_METHOD(Phalcon_Mvc_Router, setDefaults){
 }
 
 static PHP_METHOD(Phalcon_Mvc_Router, getDefaults){
+
 	zval *namespace_name, *module_name;
-	zval *controller_name, *action_name, **params;
+	zval *controller_name, *action_name, *params;
 
 	namespace_name = phalcon_fetch_nproperty_this(this_ptr, SL("_defaultNamespace"), PH_NOISY_CC);
 	module_name = phalcon_fetch_nproperty_this(this_ptr, SL("_defaultModule"), PH_NOISY_CC);

diff --git a/build/safe/phalcon.h b/build/safe/phalcon.h
@@ -5136,8 +5136,6 @@ PHALCON_INIT_FUNCS(phalcon_translate_adapter_method_entry){
 #ifndef PHALCON_CACHE_FRONTEND_DATA_H
 #define PHALCON_CACHE_FRONTEND_DATA_H
 
-#include "cache/frontendinterface.h"
-
 zend_class_entry *phalcon_cache_frontend_data_ce;
 
 PHALCON_INIT_CLASS(Phalcon_Cache_Frontend_Data);
@@ -6250,8 +6248,6 @@ PHALCON_INIT_FUNCS(phalcon_cache_backend_libmemcached_method_entry){
 #ifndef PHALCON_CACHE_FRONTEND_JSON_H
 #define PHALCON_CACHE_FRONTEND_JSON_H
 
-#include "cache/frontendinterface.h"
-
 zend_class_entry *phalcon_cache_frontend_json_ce;
 
 PHALCON_INIT_CLASS(Phalcon_Cache_Frontend_Json);
@@ -6271,8 +6267,6 @@ PHALCON_INIT_FUNCS(phalcon_cache_frontend_json_method_entry){
 #ifndef PHALCON_CACHE_FRONTEND_OUTPUT_H
 #define PHALCON_CACHE_FRONTEND_OUTPUT_H
 
-#include "cache/frontendinterface.h"
-
 zend_class_entry *phalcon_cache_frontend_output_ce;
 
 PHALCON_INIT_CLASS(Phalcon_Cache_Frontend_Output);
@@ -6308,8 +6302,6 @@ PHALCON_INIT_FUNCS(phalcon_cache_frontend_output_method_entry){
 #ifndef PHALCON_CACHE_FRONTEND_NONE_H
 #define PHALCON_CACHE_FRONTEND_NONE_H
 
-#include "cache/frontendinterface.h"
-
 zend_class_entry *phalcon_cache_frontend_none_ce;
 
 PHALCON_INIT_CLASS(Phalcon_Cache_Frontend_None);
@@ -6331,8 +6323,6 @@ PHALCON_INIT_FUNCS(phalcon_cache_frontend_none_method_entry){
 #ifndef PHALCON_CACHE_FRONTEND_BASE64_H
 #define PHALCON_CACHE_FRONTEND_BASE64_H
 
-#include "cache/frontendinterface.h"
-
 zend_class_entry *phalcon_cache_frontend_base64_ce;
 
 PHALCON_INIT_CLASS(Phalcon_Cache_Frontend_Base64);
@@ -6352,8 +6342,6 @@ PHALCON_INIT_FUNCS(phalcon_cache_frontend_base64_method_entry){
 #ifndef PHALCON_CACHE_FRONTEND_IGBINARY_H
 #define PHALCON_CACHE_FRONTEND_IGBINARY_H
 
-#include "cache/frontendinterface.h"
-
 zend_class_entry *phalcon_cache_frontend_igbinary_ce;
 
 PHALCON_INIT_CLASS(Phalcon_Cache_Frontend_Igbinary);

diff --git a/ext/cache/frontend/base64.h b/ext/cache/frontend/base64.h
@@ -20,8 +20,6 @@
 #ifndef PHALCON_CACHE_FRONTEND_BASE64_H
 #define PHALCON_CACHE_FRONTEND_BASE64_H
 
-#include "cache/frontendinterface.h"
-
 extern zend_class_entry *phalcon_cache_frontend_base64_ce;
 
 PHALCON_INIT_CLASS(Phalcon_Cache_Frontend_Base64);

diff --git a/ext/cache/frontend/data.h b/ext/cache/frontend/data.h
@@ -20,8 +20,6 @@
 #ifndef PHALCON_CACHE_FRONTEND_DATA_H
 #define PHALCON_CACHE_FRONTEND_DATA_H
 
-#include "cache/frontendinterface.h"
-
 extern zend_class_entry *phalcon_cache_frontend_data_ce;
 
 PHALCON_INIT_CLASS(Phalcon_Cache_Frontend_Data);

diff --git a/ext/cache/frontend/igbinary.h b/ext/cache/frontend/igbinary.h
@@ -21,8 +21,6 @@
 #ifndef PHALCON_CACHE_FRONTEND_IGBINARY_H
 #define PHALCON_CACHE_FRONTEND_IGBINARY_H
 
-#include "cache/frontendinterface.h"
-
 extern zend_class_entry *phalcon_cache_frontend_igbinary_ce;
 
 PHALCON_INIT_CLASS(Phalcon_Cache_Frontend_Igbinary);

diff --git a/ext/cache/frontend/json.h b/ext/cache/frontend/json.h
@@ -20,8 +20,6 @@
 #ifndef PHALCON_CACHE_FRONTEND_JSON_H
 #define PHALCON_CACHE_FRONTEND_JSON_H
 
-#include "cache/frontendinterface.h"
-
 extern zend_class_entry *phalcon_cache_frontend_json_ce;
 
 PHALCON_INIT_CLASS(Phalcon_Cache_Frontend_Json);

diff --git a/ext/cache/frontend/none.h b/ext/cache/frontend/none.h
@@ -20,8 +20,6 @@
 #ifndef PHALCON_CACHE_FRONTEND_NONE_H
 #define PHALCON_CACHE_FRONTEND_NONE_H
 
-#include "cache/frontendinterface.h"
-
 extern zend_class_entry *phalcon_cache_frontend_none_ce;
 
 PHALCON_INIT_CLASS(Phalcon_Cache_Frontend_None);

diff --git a/ext/cache/frontend/output.h b/ext/cache/frontend/output.h
@@ -20,8 +20,6 @@
 #ifndef PHALCON_CACHE_FRONTEND_OUTPUT_H
 #define PHALCON_CACHE_FRONTEND_OUTPUT_H
 
-#include "cache/frontendinterface.h"
-
 extern zend_class_entry *phalcon_cache_frontend_output_ce;
 
 PHALCON_INIT_CLASS(Phalcon_Cache_Frontend_Output);

diff --git a/ext/mvc/router.c b/ext/mvc/router.c
@@ -473,8 +473,9 @@ PHP_METHOD(Phalcon_Mvc_Router, setDefaults){
  * @return array
  */
 PHP_METHOD(Phalcon_Mvc_Router, getDefaults){
+
 	zval *namespace_name, *module_name;
-	zval *controller_name, *action_name, **params;
+	zval *controller_name, *action_name, *params;
 
 	namespace_name = phalcon_fetch_nproperty_this(this_ptr, SL("_defaultNamespace"), PH_NOISY_CC);
 	module_name = phalcon_fetch_nproperty_this(this_ptr, SL("_defaultModule"), PH_NOISY_CC);

diff --git a/scripts/gen-build.php b/scripts/gen-build.php
@@ -148,6 +148,7 @@ public function generate($path, $destination='build/', $calculateHashKeys=false,
 #include "ext/standard/url.h"
 #include "ext/spl/spl_heap.h"
 #include "ext/spl/spl_exceptions.h"
+#include "ext/spl/spl_directory.h"
 #include "ext/date/php_date.h"
 
 #ifdef PHALCON_USE_PHP_PCRE