archived
/
ext-collections
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

PHP 7.2+ compatibility. Add `drop()` and `dropLast()`.

This commit is contained in:
CismonX 2018-04-11 15:16:20 +08:00
parent 84afc0012e
commit 4597e0d42a
2 changed files with 60 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/collections_methods.c
View File

@ -86,8 +86,16 @@
ARRAY_NEW_EX(dest, src); \
zend_hash_copy(dest, Z_ARRVAL_P(src), NULL)
// Compatible with PHP 7.2
#if PHP_VERSION_ID >= 70200
#define ALLOW_COW_VIOLATION(ht) HT_ALLOW_COW_VIOLATION(ht)
#else
#define ALLOW_COW_VIOLATION(ht)
#endif
#define RETVAL_NEW_COLLECTION(collection) \
do { \
ALLOW_COW_VIOLATION(collection); \
NEW_COLLECTION_OBJ(obj); \
zval _retval; \
ZVAL_OBJ(&_retval, obj); \
@ -136,7 +144,7 @@ void collection_offset_set(zval* object, zval* offset, zval* value)
zval* collection_offset_get(zval* object, zval* offset, int type, zval* retval)
{
// Note that we don't handler type. So don't do any fancy things with Collection
// Note that we don't handle type. So don't do any fancy things with Collection
// such as fetching a reference of a value, etc.
zval rv;
zval* current = COLLECTION_FETCH(object);
@ -491,12 +499,48 @@ PHP_METHOD(Collection, distinctBy)
PHP_METHOD(Collection, drop)
{
zend_long n;
ZEND_PARSE_PARAMETERS_START(1, 1)
Z_PARAM_LONG(n)
ZEND_PARSE_PARAMETERS_END();
if (n < 0) {
ERR_BAD_SIZE();
RETURN_NULL();
}
zval rv;
zval* current = COLLECTION_FETCH_EX();
ARRAY_CLONE(new_collection, current);
Bucket* bucket = new_collection->arData;
Bucket* end = bucket + new_collection->nNumUsed;
for (; n > 0 && bucket < end; ++bucket, --n) {
if (Z_REFCOUNTED_P(&bucket->val))
GC_ADDREF(Z_COUNTED_P(&bucket->val));
zend_hash_del_bucket(new_collection, bucket);
}
RETVAL_NEW_COLLECTION(new_collection);
}
PHP_METHOD(Collection, dropLast)
{
zend_long n;
ZEND_PARSE_PARAMETERS_START(1, 1)
Z_PARAM_LONG(n)
ZEND_PARSE_PARAMETERS_END();
if (n < 0) {
ERR_BAD_SIZE();
RETURN_NULL();
}
zval rv;
zval* current = COLLECTION_FETCH_EX();
ARRAY_CLONE(new_collection, current);
unsigned idx = new_collection->nNumUsed;
for (; n > 0 && idx > 0; --idx, --n) {
Bucket* bucket = new_collection->arData + idx - 1;
if (Z_REFCOUNTED_P(&bucket->val))
GC_ADDREF(Z_COUNTED_P(&bucket->val));
zend_hash_del_bucket(new_collection, bucket);
}
RETVAL_NEW_COLLECTION(new_collection);
}
PHP_METHOD(Collection, dropLastWhile)

13
tests/014-drop.phpt Normal file
View File

@ -0,0 +1,13 @@
--TEST--
Test Collection::drop() and Collection::dropLast().
--FILE--
<?php
$collection = Collection::init(['ab' => 'c', 'd', 'e' => 'f', 12, 34]);
$collection1 = $collection->drop(2);
$collection2 = $collection->dropLast(3);
if ($collection1->toArray() != ['e' => 'f', 1 => 12, 2 => 34])
echo 'Collection::drop() failed.', PHP_EOL;
if ($collection2->toArray() != ['ab' => 'c', 'd'])
echo 'Collection::dropLast() failed.', PHP_EOL;
?>
--EXPECT--