Skip to content

Commit

Permalink
Using latest Zephir, fixing view caching, enabling tests
Browse files Browse the repository at this point in the history
  • Loading branch information
phalcon committed Aug 23, 2014
1 parent 5c8ff18 commit a50687c
Show file tree
Hide file tree
Showing 46 changed files with 433 additions and 348 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ before_script:

script:
- ZEND_DONT_UNLOAD_MODULES=1 $(phpenv which php) ./unit-tests/ci/phpunit.php --debug -c unit-tests/phpunit.xml --testsuite=stable
- ZEND_DONT_UNLOAD_MODULES=1 $(phpenv which php) ./unit-tests/ci/phpunit.php --debug -c php-tests/tests/phpunit.xml --testsuite=stable

after_failure:
- sudo apt-get -qq install gdb
Expand Down
31 changes: 31 additions & 0 deletions ext/kernel/main.h
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,37 @@ int zephir_fetch_parameters(int num_args TSRMLS_DC, int required_args, int optio
}\
}

/** Get current hash key copying the iterator if needed */

#if PHP_VERSION_ID < 50500

#define ZEPHIR_GET_IMKEY(var, it) \
{\
int key_type, str_key_len; \
long int_key; \
char *str_key; \
\
ZEPHIR_INIT_NVAR(var); \
key_type = it->funcs->get_current_key(it, &str_key, &str_key_len, &int_key TSRMLS_CC); \
if (key_type == HASH_KEY_IS_STRING) { \
ZVAL_STRINGL(var, str_key, str_key_len, 1); \
} else { \
if (key_type == HASH_KEY_IS_LONG) { \
ZVAL_LONG(var, int_key); \
} else { \
ZVAL_NULL(var); \
} \
} \
}

#else

#define ZEPHIR_GET_IMKEY(var, it) \
{\
ZEPHIR_INIT_NVAR(var); \
it->funcs->get_current_key(it, var TSRMLS_CC); \
}

/** Foreach */
#define ZEPHIR_GET_FOREACH_KEY(var, hash, hash_pointer) ZEPHIR_GET_HMKEY(var, hash, hash_pointer)

Expand Down
2 changes: 1 addition & 1 deletion ext/phalcon/cache/backend.zep.c

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions ext/phalcon/cache/backend/apc.zep.c

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions ext/phalcon/cache/backend/file.zep.c

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions ext/phalcon/cache/frontend/none.zep.c

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 7 additions & 6 deletions ext/phalcon/cache/frontend/output.zep.c

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion ext/phalcon/db/adapter/pdo.zep.c

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion ext/phalcon/db/adapter/pdo/mysql.zep.c

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion ext/phalcon/db/dialect.zep.c

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions ext/phalcon/debug.zep.c

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 11 additions & 7 deletions ext/phalcon/di.zep.c

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit a50687c

Please sign in to comment.