Skip to content

Commit

Permalink
Merge pull request #1640 from sjinks/1.2.5
Browse files Browse the repository at this point in the history 
[1.2.5] Fix #1637
  • Loading branch information
Phalcon committed Dec 5, 2013
2 parents 59b11fd + bc3a8ee commit 68a6a2d
Show file tree
Hide file tree
Showing 7 changed files with 247 additions and 117 deletions.
4 changes: 3 additions & 1 deletion CHANGELOG
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,16 @@
- Camelize does not ignore the last character of a string anymore (#1436)
- APC tests do not run under CLI when apc.enable_cli is 0 (#1449)
- Phalcon\Debug::uri now supports both http and https (#987)
- Fixed inconsistency in Tag::stylesheetLink/javascriptInclude w.r.t local URLs (#1486)
- Fixed inconsistency in Tag::stylesheetLink/javascriptInclude w.r.t. local URLs (#1486)
- Fixed bug in Phalcon\Queue\Beanstalk::read() (#1348, #1612)
- Phalcon\Flash\Session::getMessages() incorrectly removed all messages (#1575)
- Fixed bug in phalcon_fix_path() (#1601)
- Added Phalcon\Mvc\Model\Row::toArray() method (#1506)
- Added support for POINT type in MySQL (#1536)
- Phalcon\Mvc\Model\Validator::getOption() returns NULL if the option does not exist (#1530)
- Fixed parsing of annotations containing / (#1480)
- Make sure that 'persistent' is resolved only when accessed for the first time (#1637)
- Fix Phalcon\Session\Bag::remove() (#1637)

1.2.4
- Fixed broken ACL inheritance (#905)
Expand Down
60 changes: 31 additions & 29 deletions build/32bits/phalcon.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26806,7 +26806,7 @@ static PHP_METHOD(Phalcon_DI_Injectable, __get){

PHALCON_INIT_VAR(persistent);
phalcon_call_method_p2_key(persistent, dependency_injector, "get", service, arguments, 2090288933UL);
phalcon_update_property_this_quick(this_ptr, SL("persistent"), persistent, 2222052598UL TSRMLS_CC);
zend_update_property(phalcon_di_injectable_ce, this_ptr, SL("persistent"), persistent TSRMLS_CC);
RETURN_CCTOR(persistent);
}

Expand Down Expand Up @@ -93695,7 +93695,7 @@ PHALCON_INIT_CLASS(Phalcon_Session_Bag){
zend_declare_property_null(phalcon_session_bag_ce, SL("_dependencyInjector"), ZEND_ACC_PROTECTED TSRMLS_CC);
zend_declare_property_null(phalcon_session_bag_ce, SL("_name"), ZEND_ACC_PROTECTED TSRMLS_CC);
zend_declare_property_null(phalcon_session_bag_ce, SL("_data"), ZEND_ACC_PROTECTED TSRMLS_CC);
zend_declare_property_bool(phalcon_session_bag_ce, SL("_initalized"), 0, ZEND_ACC_PROTECTED TSRMLS_CC);
zend_declare_property_bool(phalcon_session_bag_ce, SL("_initialized"), 0, ZEND_ACC_PROTECTED TSRMLS_CC);
zend_declare_property_null(phalcon_session_bag_ce, SL("_session"), ZEND_ACC_PROTECTED TSRMLS_CC);

zend_class_implements(phalcon_session_bag_ce TSRMLS_CC, 2, phalcon_di_injectionawareinterface_ce, phalcon_session_baginterface_ce);
Expand All @@ -93705,16 +93705,11 @@ PHALCON_INIT_CLASS(Phalcon_Session_Bag){

static PHP_METHOD(Phalcon_Session_Bag, __construct){

zval *name;
zval **name;

phalcon_fetch_params(0, 1, 0, &name);

if (Z_TYPE_P(name) != IS_STRING) {
PHALCON_THROW_EXCEPTION_STRW(phalcon_session_exception_ce, "The name parameter must be a string");
return;
}
phalcon_update_property_this_quick(this_ptr, SL("_name"), name, 3983977829UL TSRMLS_CC);

phalcon_fetch_params_ex(1, 0, &name);
PHALCON_ENSURE_IS_STRING(name);
phalcon_update_property_this(this_ptr, SL("_name"), *name TSRMLS_CC);
}

static PHP_METHOD(Phalcon_Session_Bag, setDI){
Expand Down Expand Up @@ -93781,20 +93776,20 @@ static PHP_METHOD(Phalcon_Session_Bag, initialize){
}

phalcon_update_property_this_quick(this_ptr, SL("_data"), data, 3972126110UL TSRMLS_CC);
phalcon_update_property_bool(this_ptr, SL("_initalized"), 1 TSRMLS_CC);
phalcon_update_property_bool(this_ptr, SL("_initialized"), 1 TSRMLS_CC);

PHALCON_MM_RESTORE();
}

static PHP_METHOD(Phalcon_Session_Bag, destroy){

zval *initalized, *name, *session;
zval *initialized, *name, *session;

PHALCON_MM_GROW();

PHALCON_OBS_VAR(initalized);
phalcon_read_property_this_quick(&initalized, this_ptr, SL("_initalized"), 4124099953UL, PH_NOISY_CC);
if (PHALCON_IS_FALSE(initalized)) {
PHALCON_OBS_VAR(initialized);
phalcon_read_property_this_quick(&initialized, this_ptr, SL("_initialized"), 3373198522UL, PH_NOISY_CC);
if (PHALCON_IS_FALSE(initialized)) {
phalcon_call_method_key(NULL, this_ptr, "initialize", 2896075127UL);
}

Expand All @@ -93810,16 +93805,16 @@ static PHP_METHOD(Phalcon_Session_Bag, destroy){

static PHP_METHOD(Phalcon_Session_Bag, set){

zval *property, *value, *initalized, *name, *data;
zval *property, *value, *initialized, *name, *data;
zval *session;

PHALCON_MM_GROW();

phalcon_fetch_params(1, 2, 0, &property, &value);

PHALCON_OBS_VAR(initalized);
phalcon_read_property_this_quick(&initalized, this_ptr, SL("_initalized"), 4124099953UL, PH_NOISY_CC);
if (PHALCON_IS_FALSE(initalized)) {
PHALCON_OBS_VAR(initialized);
phalcon_read_property_this_quick(&initialized, this_ptr, SL("_initialized"), 3373198522UL, PH_NOISY_CC);
if (PHALCON_IS_FALSE(initialized)) {
phalcon_call_method_key(NULL, this_ptr, "initialize", 2896075127UL);
}

Expand All @@ -93841,7 +93836,7 @@ static PHP_METHOD(Phalcon_Session_Bag, set){

static PHP_METHOD(Phalcon_Session_Bag, get){

zval *property, *default_value = NULL, *initalized;
zval *property, *default_value = NULL, *initialized;
zval *data, *value;

PHALCON_MM_GROW();
Expand All @@ -93852,9 +93847,9 @@ static PHP_METHOD(Phalcon_Session_Bag, get){
PHALCON_INIT_VAR(default_value);
}

PHALCON_OBS_VAR(initalized);
phalcon_read_property_this_quick(&initalized, this_ptr, SL("_initalized"), 4124099953UL, PH_NOISY_CC);
if (PHALCON_IS_FALSE(initalized)) {
PHALCON_OBS_VAR(initialized);
phalcon_read_property_this_quick(&initialized, this_ptr, SL("_initialized"), 3373198522UL, PH_NOISY_CC);
if (PHALCON_IS_FALSE(initialized)) {
phalcon_call_method_key(NULL, this_ptr, "initialize", 2896075127UL);
}

Expand All @@ -93875,15 +93870,15 @@ static PHP_METHOD(Phalcon_Session_Bag, get){

static PHP_METHOD(Phalcon_Session_Bag, has){

zval *property, *initalized, *data;
zval *property, *initialized, *data;

PHALCON_MM_GROW();

phalcon_fetch_params(1, 1, 0, &property);

PHALCON_OBS_VAR(initalized);
phalcon_read_property_this_quick(&initalized, this_ptr, SL("_initalized"), 4124099953UL, PH_NOISY_CC);
if (PHALCON_IS_FALSE(initalized)) {
PHALCON_OBS_VAR(initialized);
phalcon_read_property_this_quick(&initialized, this_ptr, SL("_initialized"), 3373198522UL, PH_NOISY_CC);
if (PHALCON_IS_FALSE(initialized)) {
phalcon_call_method_key(NULL, this_ptr, "initialize", 2896075127UL);
}

Expand All @@ -93900,11 +93895,18 @@ static PHP_METHOD(Phalcon_Session_Bag, has){
static PHP_METHOD(Phalcon_Session_Bag, remove){

zval *property, *data = NULL, *name, *session;
zval *initialized;

PHALCON_MM_GROW();

phalcon_fetch_params(1, 1, 0, &property);


PHALCON_OBS_VAR(initialized);
phalcon_read_property_this_quick(&initialized, this_ptr, SL("_initialized"), 3373198522UL, PH_NOISY_CC);
if (PHALCON_IS_FALSE(initialized)) {
phalcon_call_method_key(NULL, this_ptr, "initialize", 2896075127UL);
}

PHALCON_OBS_VAR(data);
phalcon_read_property_this_quick(&data, this_ptr, SL("_data"), 3972126110UL, PH_NOISY_CC);
if (phalcon_array_isset(data, property)) {
Expand Down
60 changes: 31 additions & 29 deletions build/64bits/phalcon.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26806,7 +26806,7 @@ static PHP_METHOD(Phalcon_DI_Injectable, __get){

PHALCON_INIT_VAR(persistent);
phalcon_call_method_p2_key(persistent, dependency_injector, "get", service, arguments, 6385256229UL);
phalcon_update_property_this_quick(this_ptr, SL("persistent"), persistent, 13889047896653944054UL TSRMLS_CC);
zend_update_property(phalcon_di_injectable_ce, this_ptr, SL("persistent"), persistent TSRMLS_CC);
RETURN_CCTOR(persistent);
}

Expand Down Expand Up @@ -93695,7 +93695,7 @@ PHALCON_INIT_CLASS(Phalcon_Session_Bag){
zend_declare_property_null(phalcon_session_bag_ce, SL("_dependencyInjector"), ZEND_ACC_PROTECTED TSRMLS_CC);
zend_declare_property_null(phalcon_session_bag_ce, SL("_name"), ZEND_ACC_PROTECTED TSRMLS_CC);
zend_declare_property_null(phalcon_session_bag_ce, SL("_data"), ZEND_ACC_PROTECTED TSRMLS_CC);
zend_declare_property_bool(phalcon_session_bag_ce, SL("_initalized"), 0, ZEND_ACC_PROTECTED TSRMLS_CC);
zend_declare_property_bool(phalcon_session_bag_ce, SL("_initialized"), 0, ZEND_ACC_PROTECTED TSRMLS_CC);
zend_declare_property_null(phalcon_session_bag_ce, SL("_session"), ZEND_ACC_PROTECTED TSRMLS_CC);

zend_class_implements(phalcon_session_bag_ce TSRMLS_CC, 2, phalcon_di_injectionawareinterface_ce, phalcon_session_baginterface_ce);
Expand All @@ -93705,16 +93705,11 @@ PHALCON_INIT_CLASS(Phalcon_Session_Bag){

static PHP_METHOD(Phalcon_Session_Bag, __construct){

zval *name;
zval **name;

phalcon_fetch_params(0, 1, 0, &name);

if (Z_TYPE_P(name) != IS_STRING) {
PHALCON_THROW_EXCEPTION_STRW(phalcon_session_exception_ce, "The name parameter must be a string");
return;
}
phalcon_update_property_this_quick(this_ptr, SL("_name"), name, 6953241062757UL TSRMLS_CC);

phalcon_fetch_params_ex(1, 0, &name);
PHALCON_ENSURE_IS_STRING(name);
phalcon_update_property_this(this_ptr, SL("_name"), *name TSRMLS_CC);
}

static PHP_METHOD(Phalcon_Session_Bag, setDI){
Expand Down Expand Up @@ -93781,20 +93776,20 @@ static PHP_METHOD(Phalcon_Session_Bag, initialize){
}

phalcon_update_property_this_quick(this_ptr, SL("_data"), data, 6953229211038UL TSRMLS_CC);
phalcon_update_property_bool(this_ptr, SL("_initalized"), 1 TSRMLS_CC);
phalcon_update_property_bool(this_ptr, SL("_initialized"), 1 TSRMLS_CC);

PHALCON_MM_RESTORE();
}

static PHP_METHOD(Phalcon_Session_Bag, destroy){

zval *initalized, *name, *session;
zval *initialized, *name, *session;

PHALCON_MM_GROW();

PHALCON_OBS_VAR(initalized);
phalcon_read_property_this_quick(&initalized, this_ptr, SL("_initalized"), 14763434060983354737UL, PH_NOISY_CC);
if (PHALCON_IS_FALSE(initalized)) {
PHALCON_OBS_VAR(initialized);
phalcon_read_property_this_quick(&initialized, this_ptr, SL("_initialized"), 7577978422841765050UL, PH_NOISY_CC);
if (PHALCON_IS_FALSE(initialized)) {
phalcon_call_method_key(NULL, this_ptr, "initialize", 13878731931343821175UL);
}

Expand All @@ -93810,16 +93805,16 @@ static PHP_METHOD(Phalcon_Session_Bag, destroy){

static PHP_METHOD(Phalcon_Session_Bag, set){

zval *property, *value, *initalized, *name, *data;
zval *property, *value, *initialized, *name, *data;
zval *session;

PHALCON_MM_GROW();

phalcon_fetch_params(1, 2, 0, &property, &value);

PHALCON_OBS_VAR(initalized);
phalcon_read_property_this_quick(&initalized, this_ptr, SL("_initalized"), 14763434060983354737UL, PH_NOISY_CC);
if (PHALCON_IS_FALSE(initalized)) {
PHALCON_OBS_VAR(initialized);
phalcon_read_property_this_quick(&initialized, this_ptr, SL("_initialized"), 7577978422841765050UL, PH_NOISY_CC);
if (PHALCON_IS_FALSE(initialized)) {
phalcon_call_method_key(NULL, this_ptr, "initialize", 13878731931343821175UL);
}

Expand All @@ -93841,7 +93836,7 @@ static PHP_METHOD(Phalcon_Session_Bag, set){

static PHP_METHOD(Phalcon_Session_Bag, get){

zval *property, *default_value = NULL, *initalized;
zval *property, *default_value = NULL, *initialized;
zval *data, *value;

PHALCON_MM_GROW();
Expand All @@ -93852,9 +93847,9 @@ static PHP_METHOD(Phalcon_Session_Bag, get){
PHALCON_INIT_VAR(default_value);
}

PHALCON_OBS_VAR(initalized);
phalcon_read_property_this_quick(&initalized, this_ptr, SL("_initalized"), 14763434060983354737UL, PH_NOISY_CC);
if (PHALCON_IS_FALSE(initalized)) {
PHALCON_OBS_VAR(initialized);
phalcon_read_property_this_quick(&initialized, this_ptr, SL("_initialized"), 7577978422841765050UL, PH_NOISY_CC);
if (PHALCON_IS_FALSE(initialized)) {
phalcon_call_method_key(NULL, this_ptr, "initialize", 13878731931343821175UL);
}

Expand All @@ -93875,15 +93870,15 @@ static PHP_METHOD(Phalcon_Session_Bag, get){

static PHP_METHOD(Phalcon_Session_Bag, has){

zval *property, *initalized, *data;
zval *property, *initialized, *data;

PHALCON_MM_GROW();

phalcon_fetch_params(1, 1, 0, &property);

PHALCON_OBS_VAR(initalized);
phalcon_read_property_this_quick(&initalized, this_ptr, SL("_initalized"), 14763434060983354737UL, PH_NOISY_CC);
if (PHALCON_IS_FALSE(initalized)) {
PHALCON_OBS_VAR(initialized);
phalcon_read_property_this_quick(&initialized, this_ptr, SL("_initialized"), 7577978422841765050UL, PH_NOISY_CC);
if (PHALCON_IS_FALSE(initialized)) {
phalcon_call_method_key(NULL, this_ptr, "initialize", 13878731931343821175UL);
}

Expand All @@ -93900,11 +93895,18 @@ static PHP_METHOD(Phalcon_Session_Bag, has){
static PHP_METHOD(Phalcon_Session_Bag, remove){

zval *property, *data = NULL, *name, *session;
zval *initialized;

PHALCON_MM_GROW();

phalcon_fetch_params(1, 1, 0, &property);


PHALCON_OBS_VAR(initialized);
phalcon_read_property_this_quick(&initialized, this_ptr, SL("_initialized"), 7577978422841765050UL, PH_NOISY_CC);
if (PHALCON_IS_FALSE(initialized)) {
phalcon_call_method_key(NULL, this_ptr, "initialize", 13878731931343821175UL);
}

PHALCON_OBS_VAR(data);
phalcon_read_property_this_quick(&data, this_ptr, SL("_data"), 6953229211038UL, PH_NOISY_CC);
if (phalcon_array_isset(data, property)) {
Expand Down
Loading

0 comments on commit 68a6a2d

Please sign in to comment.