Merge pull request #10 from phalcon/1.3.0

1.3.0
phalcon · Aug 7, 2013 · 96ef695 · 96ef695
2 parents 510d781 + d39cfb9
commit 96ef695
Show file tree

Hide file tree

Showing 171 changed files with 220,868 additions and 219,685 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,10 +16,10 @@ before_install:
 
 before_script:
  - git submodule --quiet update --init --recursive
- - (cd php-tests/library/Mustache; git checkout master )
- - (cd php-tests/library/Twig; git checkout master )
+ - (cd php-tests/library/Mustache; git checkout master)
+ - (cd php-tests/library/Twig; git checkout master)
  - (cd unit-tests/engines/; git clone -q git://github.com/bobthecow/mustache.php.git & git clone -q git://github.com/fabpot/Twig.git & wait)
- - (cd ext; export CFLAGS="-g3 -O1 -std=gnu90 -Wall"; phpize && ./configure --enable-phalcon && make --silent -j2 && sudo make --silent install && phpenv config-add ../unit-tests/ci/phalcon.ini)
+ - (cd ext; export CFLAGS="-g3 -O1 -std=gnu90 -Wall"; phpize && ./configure --enable-phalcon && make --silent -j4 && sudo make --silent install && phpenv config-add ../unit-tests/ci/phalcon.ini)
  - ulimit -c unlimited || true
 
 script:
@@ -33,4 +33,4 @@ notifications:
   email:
     - [email protected]
     - [email protected]
-    - [email protected]
+    - [email protected]
diff --git a/build/32bits/phalcon.c b/build/32bits/phalcon.c
diff --git a/build/32bits/phalcon.h b/build/32bits/phalcon.h
@@ -4919,6 +4919,11 @@ PHALCON_INIT_FUNCS(phalcon_flash_method_entry){
 
 
 
+#ifndef PHALCON_DISPATCHER_H
+#define PHALCON_DISPATCHER_H
+
+#include "php_phalcon.h"
+
 zend_class_entry *phalcon_dispatcher_ce;
 
 PHALCON_INIT_CLASS(Phalcon_Dispatcher);
@@ -5037,6 +5042,7 @@ PHALCON_INIT_FUNCS(phalcon_dispatcher_method_entry){
 	PHP_FE_END
 };
 
+#endif /* PHALCON_DISPATCHER_H */
 
 
 zend_class_entry *phalcon_mvc_view_engine_ce;
@@ -5176,6 +5182,7 @@ static PHP_METHOD(Phalcon_Config, offsetUnset);
 static PHP_METHOD(Phalcon_Config, merge);
 static PHP_METHOD(Phalcon_Config, toArray);
 static PHP_METHOD(Phalcon_Config, count);
+static PHP_METHOD(Phalcon_Config, __wakeup);
 static PHP_METHOD(Phalcon_Config, __set_state);
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_config___construct, 0, 0, 0)
@@ -5214,6 +5221,9 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_config_count, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_config___wakeup, 0, 0, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_config___set_state, 0, 0, 1)
 	ZEND_ARG_INFO(0, data)
 ZEND_END_ARG_INFO()
@@ -5228,6 +5238,7 @@ PHALCON_INIT_FUNCS(phalcon_config_method_entry){
 	PHP_ME(Phalcon_Config, merge, arginfo_phalcon_config_merge, ZEND_ACC_PUBLIC) 
 	PHP_ME(Phalcon_Config, toArray, arginfo_phalcon_config_toarray, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Config, count, arginfo_phalcon_config_count, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Config, __wakeup, arginfo_phalcon_config___wakeup, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Config, __set_state, arginfo_phalcon_config___set_state, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
 	PHP_MALIAS(Phalcon_Config, __get, offsetGet, arginfo_phalcon_config_offsetget, ZEND_ACC_PUBLIC)
 	PHP_MALIAS(Phalcon_Config, __set, offsetSet, arginfo_phalcon_config_offsetset, ZEND_ACC_PUBLIC)
@@ -10234,7 +10245,6 @@ zend_class_entry *phalcon_escaper_exception_ce;
 
 PHALCON_INIT_CLASS(Phalcon_Escaper_Exception);
 
-
 zend_class_entry *phalcon_assets_manager_ce;
 
 PHALCON_INIT_CLASS(Phalcon_Assets_Manager);
@@ -10307,6 +10317,7 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_assets_manager_output, 0, 0, 2)
 	ZEND_ARG_INFO(0, collection)
 	ZEND_ARG_INFO(0, callback)
+	ZEND_ARG_INFO(0, type)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_assets_manager_outputcss, 0, 0, 0)

diff --git a/build/32bits/php_phalcon.h b/build/32bits/php_phalcon.h
@@ -23,6 +23,8 @@
 #define PHP_PHALCON_VERSION "1.2.1"
 #define PHP_PHALCON_EXTNAME "phalcon"
 
+#include "main/php.h"
+
 /** Memory frame */
 typedef struct _phalcon_memory_entry {
 	size_t pointer;
@@ -125,13 +127,7 @@ extern zend_module_entry phalcon_module_entry;
 #endif
 
 /** Define FASTCALL */
-#if defined(__GNUC__) && ZEND_GCC_VERSION >= 3004 && defined(__i386__)
-# define PHALCON_FASTCALL __attribute__((fastcall))
-#elif defined(_MSC_VER) && defined(_M_IX86)
-# define PHALCON_FASTCALL __fastcall
-#else
-# define PHALCON_FASTCALL
-#endif
+#define PHALCON_FASTCALL ZEND_FASTCALL
 
 #define PHALCON_INIT_CLASS(name) \
 	int phalcon_ ##name## _init(INIT_FUNC_ARGS)
@@ -142,13 +138,8 @@ extern zend_module_entry phalcon_module_entry;
 	}
 
 /** Macros for branch prediction */
-#if defined(__GNUC__) && ZEND_GCC_VERSION >= 3004 && defined(__i386__)
-#define likely(x)       __builtin_expect((x),1)
-#define unlikely(x)     __builtin_expect((x),0)
-#else
 #define likely(x)       EXPECTED(x)
 #define unlikely(x)     UNEXPECTED(x)
-#endif
 
 #if defined(__GNUC__) && (defined(__clang__) || ((__GNUC__ * 100 + __GNUC_MINOR__) >= 405))
 #define UNREACHABLE() __builtin_unreachable()