Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Phalcon\Session\Adapter and Phalcon\Session\Bag improvements #1917

Merged
merged 19 commits into from Jan 26, 2014
Merged

Phalcon\Session\Adapter and Phalcon\Session\Bag improvements #1917

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
7e54b69
Phalcon\Session\Bag::__get() returns by reference
sjinks Jan 24, 2014
ba1a107
Test case for #1895
sjinks Jan 24, 2014
987b9a9
Updated CHANGELOG
sjinks Jan 24, 2014
9ba9b7e
Updated test cases
sjinks Jan 24, 2014
e18a8b4
&__get() should create a property when it does not exist
sjinks Jan 24, 2014
d5fcf03
Use object handlers in Phalcon\Session\Adapter
sjinks Jan 24, 2014
4d6fc69
Add remove() to Phalcon\Session\BagInterface
sjinks Jan 25, 2014
7dfa7df
BP_VAR_W/BP_VAR_RW should not return NULL
sjinks Jan 26, 2014
d06c035
Optimized Phalcon\Session\Bag
sjinks Jan 26, 2014
871ce64
object_properties_init() for PHP 5.3
sjinks Jan 26, 2014
f5288dd
Properly initialize objects in PHP 5.3
sjinks Jan 26, 2014
1b3932d
Phalcon\Session\Bag implements IteratorAggregate
sjinks Jan 26, 2014
6edc4a5
Phalcon\Session\Adapter implements IteratorAggregate, Countable
sjinks Jan 26, 2014
5276a9b
arginfo optimization
sjinks Jan 26, 2014
6c6766d
Phalcon\Session\Adapter implements ArrayAccess
sjinks Jan 26, 2014
4cc0079
Handle null offset in phalcon_update_property_array()
sjinks Jan 26, 2014
a46cbef
Phalcon\Session\Bag implements ArrayAccess, Countable
sjinks Jan 26, 2014
2d78961
Updated tests
sjinks Jan 26, 2014
8228026
Updated CHANGELOG [ci skip]
sjinks Jan 26, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Phalcon\Session\Bag implements IteratorAggregate
  • Loading branch information
@sjinks
sjinks committed Jan 26, 2014
commit 1b3932d8da9c70bf833574a3a2c9ced6af293a0e
122 changes: 77 additions & 45 deletions ext/session/bag.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
#include "di.h"
#include "diinterface.h"

#include <ext/spl/spl_array.h>

#include "kernel/main.h"
#include "kernel/memory.h"
#include "kernel/exception.h"
Expand Down Expand Up @@ -59,6 +61,7 @@ PHP_METHOD(Phalcon_Session_Bag, get);
PHP_METHOD(Phalcon_Session_Bag, has);
PHP_METHOD(Phalcon_Session_Bag, __get);
PHP_METHOD(Phalcon_Session_Bag, remove);
PHP_METHOD(Phalcon_Session_Bag, getIterator);

ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_session_bag___construct, 0, 0, 1)
ZEND_ARG_INFO(0, name)
Expand All @@ -68,6 +71,9 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_session_bag___get, 0, 1, 1)
ZEND_ARG_INFO(0, property)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_session_bag_getiterator, 0, 0, 0)
ZEND_END_ARG_INFO()

static const zend_function_entry phalcon_session_bag_method_entry[] = {
PHP_ME(Phalcon_Session_Bag, __construct, arginfo_phalcon_session_bag___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
PHP_ME(Phalcon_Session_Bag, setDI, arginfo_phalcon_di_injectionawareinterface_setdi, ZEND_ACC_PUBLIC)
Expand All @@ -82,9 +88,50 @@ static const zend_function_entry phalcon_session_bag_method_entry[] = {
PHP_MALIAS(Phalcon_Session_Bag, __isset, has, arginfo_phalcon_session_baginterface_has, ZEND_ACC_PUBLIC)
PHP_ME(Phalcon_Session_Bag, remove, arginfo_phalcon_session_baginterface_remove, ZEND_ACC_PUBLIC)
PHP_MALIAS(Phalcon_Session_Bag, __unset, remove, arginfo_phalcon_session_baginterface_remove, ZEND_ACC_PUBLIC)
PHP_ME(Phalcon_Session_Bag, getIterator, arginfo_phalcon_session_bag_getiterator, ZEND_ACC_PUBLIC)
PHP_FE_END
};

static int phalcon_session_bag_maybe_initialize(zval *this_ptr TSRMLS_DC)
{
zval *initialized;

initialized = phalcon_fetch_nproperty_this(this_ptr, SL("_initialized"), PH_NOISY TSRMLS_CC);
if (PHALCON_IS_FALSE(initialized)) {
return phalcon_call_method_params(NULL, NULL, this_ptr, SL("initialize"), zend_inline_hash_func(SS("initialize")) TSRMLS_CC, 0);
}

return SUCCESS;
}

static zend_object_iterator* phalcon_session_bag_get_iterator(zend_class_entry *ce, zval *object, int by_ref TSRMLS_DC)
{
zval *iterator;
zval *data;
zend_object_iterator *ret;

if (FAILURE == phalcon_session_bag_maybe_initialize(object TSRMLS_CC)) {
return NULL;
}

data = phalcon_fetch_nproperty_this(object, SL("_data"), PH_NOISY TSRMLS_CC);

MAKE_STD_ZVAL(iterator);
object_init_ex(iterator, spl_ce_ArrayIterator);
if (FAILURE == phalcon_call_method_params(NULL, NULL, iterator, SL("__construct"), zend_inline_hash_func(SS("__construct")) TSRMLS_CC, 1, data)) {
ret = NULL;
}
else if (Z_TYPE_P(iterator) == IS_OBJECT) {
ret = spl_ce_ArrayIterator->get_iterator(spl_ce_ArrayIterator, iterator, by_ref TSRMLS_CC);
}
else {
ret = NULL;
}

zval_ptr_dtor(&iterator);
return ret;
}

/**
* Phalcon\Session\Bag initializer
*/
Expand All @@ -98,7 +145,14 @@ PHALCON_INIT_CLASS(Phalcon_Session_Bag){
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);
phalcon_session_bag_ce->get_iterator = phalcon_session_bag_get_iterator;

zend_class_implements(
phalcon_session_bag_ce TSRMLS_CC, 3,
phalcon_di_injectionawareinterface_ce,
phalcon_session_baginterface_ce,
zend_ce_aggregate
);

return SUCCESS;
}
Expand Down Expand Up @@ -208,14 +262,9 @@ PHP_METHOD(Phalcon_Session_Bag, initialize){
*/
PHP_METHOD(Phalcon_Session_Bag, destroy){

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

initialized = phalcon_fetch_nproperty_this(this_ptr, SL("_initialized"), PH_NOISY TSRMLS_CC);
if (PHALCON_IS_FALSE(initialized)) {
PHALCON_MM_GROW();
phalcon_call_method_noret(this_ptr, "initialize");
PHALCON_MM_RESTORE();
}
RETURN_ON_FAILURE(phalcon_session_bag_maybe_initialize(this_ptr TSRMLS_CC));

name = phalcon_fetch_nproperty_this(this_ptr, SL("_name"), PH_NOISY TSRMLS_CC);
session = phalcon_fetch_nproperty_this(this_ptr, SL("_session"), PH_NOISY TSRMLS_CC);
Expand All @@ -234,17 +283,11 @@ PHP_METHOD(Phalcon_Session_Bag, destroy){
*/
PHP_METHOD(Phalcon_Session_Bag, set){

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

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

initialized = phalcon_fetch_nproperty_this(this_ptr, SL("_initialized"), PH_NOISY TSRMLS_CC);
if (PHALCON_IS_FALSE(initialized)) {
PHALCON_MM_GROW();
phalcon_call_method_noret(this_ptr, "initialize");
PHALCON_MM_RESTORE();
}
RETURN_ON_FAILURE(phalcon_session_bag_maybe_initialize(this_ptr TSRMLS_CC));

phalcon_update_property_array(this_ptr, SL("_data"), property, value TSRMLS_CC);

Expand Down Expand Up @@ -280,7 +323,7 @@ PHALCON_DOC_METHOD(Phalcon_Session_Bag, __set);
*/
PHP_METHOD(Phalcon_Session_Bag, get){

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

phalcon_fetch_params(0, 1, 1, &property, &default_value);
Expand All @@ -290,12 +333,7 @@ PHP_METHOD(Phalcon_Session_Bag, get){
}

/* Check first if the bag is initialized */
initialized = phalcon_fetch_nproperty_this(this_ptr, SL("_initialized"), PH_NOISY TSRMLS_CC);
if (PHALCON_IS_FALSE(initialized)) {
PHALCON_MM_GROW();
phalcon_call_method_noret(this_ptr, "initialize");
PHALCON_MM_RESTORE();
}
RETURN_ON_FAILURE(phalcon_session_bag_maybe_initialize(this_ptr TSRMLS_CC));

/* Retrieve the data */
data = phalcon_fetch_nproperty_this(this_ptr, SL("_data"), PH_NOISY TSRMLS_CC);
Expand All @@ -318,20 +356,14 @@ PHP_METHOD(Phalcon_Session_Bag, get){
*/
PHP_METHOD(Phalcon_Session_Bag, __get)
{
zval *property, *initialized;
zval *data, *value;
zval *property, *data, *value;

assert(return_value_ptr != NULL);

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

/* Check first if the bag is initialized */
initialized = phalcon_fetch_nproperty_this(this_ptr, SL("_initialized"), PH_NOISY TSRMLS_CC);
if (PHALCON_IS_FALSE(initialized)) {
PHALCON_MM_GROW();
phalcon_call_method_noret(this_ptr, "initialize");
PHALCON_MM_RESTORE();
}
RETURN_ON_FAILURE(phalcon_session_bag_maybe_initialize(this_ptr TSRMLS_CC));

/* Retrieve the data */
data = phalcon_fetch_nproperty_this(this_ptr, SL("_data"), PH_NOISY TSRMLS_CC);
Expand Down Expand Up @@ -364,16 +396,11 @@ PHP_METHOD(Phalcon_Session_Bag, __get)
*/
PHP_METHOD(Phalcon_Session_Bag, has){

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

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

initialized = phalcon_fetch_nproperty_this(this_ptr, SL("_initialized"), PH_NOISY TSRMLS_CC);
if (PHALCON_IS_FALSE(initialized)) {
PHALCON_MM_GROW();
phalcon_call_method_noret(this_ptr, "initialize");
PHALCON_MM_RESTORE();
}
RETURN_ON_FAILURE(phalcon_session_bag_maybe_initialize(this_ptr TSRMLS_CC));

data = phalcon_fetch_nproperty_this(this_ptr, SL("_data"), PH_NOISY TSRMLS_CC);
RETURN_BOOL(phalcon_array_isset(data, property));
Expand Down Expand Up @@ -405,16 +432,10 @@ PHALCON_DOC_METHOD(Phalcon_Session_Bag, __isset);
PHP_METHOD(Phalcon_Session_Bag, remove){

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

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

initialized = phalcon_fetch_nproperty_this(this_ptr, SL("_initialized"), PH_NOISY TSRMLS_CC);
if (PHALCON_IS_FALSE(initialized)) {
PHALCON_MM_GROW();
phalcon_call_method_noret(this_ptr, "initialize");
PHALCON_MM_RESTORE();
}
RETURN_ON_FAILURE(phalcon_session_bag_maybe_initialize(this_ptr TSRMLS_CC));

data = phalcon_fetch_nproperty_this(this_ptr, SL("_data"), PH_NOISY TSRMLS_CC);
if (phalcon_array_isset(data, property)) {
Expand Down Expand Up @@ -442,3 +463,14 @@ PHP_METHOD(Phalcon_Session_Bag, remove){
* @return boolean
*/
PHALCON_DOC_METHOD(Phalcon_Session_Bag, __unset);

PHP_METHOD(Phalcon_Session_Bag, getIterator)
{
zval *data;

RETURN_ON_FAILURE(phalcon_session_bag_maybe_initialize(this_ptr TSRMLS_CC));

data = phalcon_fetch_nproperty_this(getThis(), SL("_data"), PH_NOISY TSRMLS_CC);
object_init_ex(return_value, spl_ce_ArrayIterator);
RETURN_ON_FAILURE(phalcon_call_method_params(NULL, NULL, return_value, SL("__construct"), zend_inline_hash_func(SS("__construct")) TSRMLS_CC, 1, data));
}