Hello community,
here is the log from the commit of package php5-ice for openSUSE:Factory
checked in at 2017-02-25 00:54:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/php5-ice (Old)
and /work/SRC/openSUSE:Factory/.php5-ice.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "php5-ice"
Changes:
--------
--- /work/SRC/openSUSE:Factory/php5-ice/php5-ice.changes 2017-02-19
01:04:36.977370161 +0100
+++ /work/SRC/openSUSE:Factory/.php5-ice.new/php5-ice.changes 2017-02-25
00:54:52.504351246 +0100
@@ -1,0 +2,6 @@
+Fri Feb 24 00:26:18 UTC 2017 - m...@poczta.onet.pl
+
+- Ice 1.2.9
+ * Unique validator, fix mongodb
+
+-------------------------------------------------------------------
Old:
----
php5-ice-1.2.8.tar.gz
New:
----
php5-ice-1.2.9.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ php5-ice.spec ++++++
--- /var/tmp/diff_new_pack.OLoYXF/_old 2017-02-25 00:54:53.148252460 +0100
+++ /var/tmp/diff_new_pack.OLoYXF/_new 2017-02-25 00:54:53.148252460 +0100
@@ -22,7 +22,7 @@
%define _name ice
Name: %{_php}-%{_name}
-Version: 1.2.8
+Version: 1.2.9
Release: 0
Summary: Simple and fast PHP framework delivered as C-extension
License: BSD-3-Clause
++++++ php5-ice-1.2.8.tar.gz -> php5-ice-1.2.9.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/framework-1.2.8/CHANGELOG.md
new/framework-1.2.9/CHANGELOG.md
--- old/framework-1.2.8/CHANGELOG.md 2017-02-18 19:55:14.000000000 +0100
+++ new/framework-1.2.9/CHANGELOG.md 2017-02-24 01:36:45.000000000 +0100
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Fri Feb 24 00:26:18 UTC 2017
+
+- Ice 1.2.9
+ * Unique validator, fix mongodb
+
+-------------------------------------------------------------------
Sat Feb 18 18:50:05 UTC 2017
- Ice 1.2.8
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/framework-1.2.8/build/php5/ice/validation/validator/unique.zep.c
new/framework-1.2.9/build/php5/ice/validation/validator/unique.zep.c
--- old/framework-1.2.8/build/php5/ice/validation/validator/unique.zep.c
2017-02-18 19:55:14.000000000 +0100
+++ new/framework-1.2.9/build/php5/ice/validation/validator/unique.zep.c
2017-02-24 01:36:45.000000000 +0100
@@ -69,13 +69,13 @@
*/
PHP_METHOD(Ice_Validation_Validator_Unique, validate) {
- zval *_21$$18, *_22$$19;
+ zval *_22$$18, *_23$$19;
zephir_nts_static zend_class_entry *_17$$15 = NULL;
- zend_bool _0, _30$$20;
+ zend_bool _0, _31$$20;
zephir_fcall_cache_entry *_1 = NULL;
int ZEPHIR_LAST_CALL_STATUS;
zval *field = NULL;
- zval *validation, *field_param = NULL, *value = NULL, *label = NULL,
*message = NULL, *i18n = NULL, *replace = NULL, *di = NULL, *db = NULL, *from =
NULL, *custom = NULL, *except = NULL, *tmp = NULL, *caseInsensitive = NULL,
*result = NULL, *id = NULL, *_2 = NULL, *_3 = NULL, *_6 = NULL, *_9 = NULL,
*_12 = NULL, *_4$$4, *_5$$5, *_7$$6, *_8$$7, *_10$$9, *_11$$10, *_13$$11,
*_14$$12, *_15$$13 = NULL, *_16$$14 = NULL, *_18$$15, *_19$$16, *_20$$18 =
NULL, *_23$$20 = NULL, *_24$$20 = NULL, *_26$$20 = NULL, *_29$$20 = NULL,
*_31$$20 = NULL, *_32$$20 = NULL, *_36$$20 = NULL, *_25$$21, *_27$$23,
*_28$$24, *_33$$25 = NULL, *_34$$25, *_35$$25 = NULL;
+ zval *validation, *field_param = NULL, *value = NULL, *label = NULL,
*message = NULL, *i18n = NULL, *replace = NULL, *di = NULL, *db = NULL, *from =
NULL, *custom = NULL, *except = NULL, *tmp = NULL, *caseInsensitive = NULL,
*result = NULL, *id = NULL, *_2 = NULL, *_3 = NULL, *_6 = NULL, *_9 = NULL,
*_12 = NULL, *_4$$4, *_5$$5, *_7$$6, *_8$$7, *_10$$9, *_11$$10, *_13$$11,
*_14$$12, *_15$$13 = NULL, *_16$$14 = NULL, *_18$$15, *_19$$15, *_20$$16,
*_21$$18 = NULL, *_24$$20 = NULL, *_25$$20 = NULL, *_27$$20 = NULL, *_30$$20 =
NULL, *_32$$20 = NULL, *_33$$20 = NULL, *_37$$20 = NULL, *_26$$21, *_28$$23,
*_29$$24, *_34$$25 = NULL, *_35$$25, *_36$$25 = NULL;
ZEPHIR_MM_GROW();
zephir_fetch_params(1, 2, 0, &validation, &field_param);
@@ -190,16 +190,18 @@
object_init_ex(value, _17$$15);
if (zephir_has_constructor(value TSRMLS_CC)) {
ZEPHIR_INIT_VAR(_18$$15);
- ZVAL_STRING(_18$$15, "i",
ZEPHIR_TEMP_PARAM_COPY);
- ZEPHIR_CALL_METHOD(NULL, value,
"__construct", NULL, 0, tmp, _18$$15);
- zephir_check_temp_parameter(_18$$15);
+ ZEPHIR_CONCAT_SVS(_18$$15, "^", tmp,
"$");
+ ZEPHIR_INIT_VAR(_19$$15);
+ ZVAL_STRING(_19$$15, "i",
ZEPHIR_TEMP_PARAM_COPY);
+ ZEPHIR_CALL_METHOD(NULL, value,
"__construct", NULL, 0, _18$$15, _19$$15);
+ zephir_check_temp_parameter(_19$$15);
zephir_check_call_status();
}
} else {
object_init_ex(value,
zephir_get_internal_ce(SS("mongoregex") TSRMLS_CC));
- ZEPHIR_INIT_VAR(_19$$16);
- ZEPHIR_CONCAT_SVS(_19$$16, "/^", tmp, "$/i");
- ZEPHIR_CALL_METHOD(NULL, value, "__construct",
NULL, 0, _19$$16);
+ ZEPHIR_INIT_VAR(_20$$16);
+ ZEPHIR_CONCAT_SVS(_20$$16, "/^", tmp, "$/i");
+ ZEPHIR_CALL_METHOD(NULL, value, "__construct",
NULL, 0, _20$$16);
zephir_check_call_status();
}
} else {
@@ -210,92 +212,92 @@
if (zephir_is_true(except)) {
ZEPHIR_INIT_VAR(id);
zephir_create_array(id, 1, 0 TSRMLS_CC);
- ZEPHIR_CALL_METHOD(&_20$$18, db, "getidvalue", NULL, 0, except);
+ ZEPHIR_CALL_METHOD(&_21$$18, db, "getidvalue", NULL, 0, except);
zephir_check_call_status();
- zephir_array_update_string(&id, SL("!="), &_20$$18, PH_COPY |
PH_SEPARATE);
- ZEPHIR_INIT_VAR(_21$$18);
- zephir_create_array(_21$$18, 2, 0 TSRMLS_CC);
- zephir_array_update_zval(&_21$$18, custom, &value, PH_COPY);
- ZEPHIR_CALL_METHOD(&_20$$18, db, "getid", NULL, 0);
- zephir_check_call_status();
- zephir_array_update_zval(&_21$$18, _20$$18, &id, PH_COPY);
- ZEPHIR_CALL_METHOD(&result, db, "findone", NULL, 0, from,
_21$$18);
- zephir_check_call_status();
- } else {
- ZEPHIR_INIT_VAR(_22$$19);
- zephir_create_array(_22$$19, 1, 0 TSRMLS_CC);
- zephir_array_update_zval(&_22$$19, custom, &value, PH_COPY);
- ZEPHIR_CALL_METHOD(&result, db, "findone", NULL, 0, from,
_22$$19);
+ zephir_array_update_string(&id, SL("!="), &_21$$18, PH_COPY |
PH_SEPARATE);
+ ZEPHIR_INIT_VAR(_22$$18);
+ zephir_create_array(_22$$18, 2, 0 TSRMLS_CC);
+ zephir_array_update_zval(&_22$$18, custom, &value, PH_COPY);
+ ZEPHIR_CALL_METHOD(&_21$$18, db, "getid", NULL, 0);
+ zephir_check_call_status();
+ zephir_array_update_zval(&_22$$18, _21$$18, &id, PH_COPY);
+ ZEPHIR_CALL_METHOD(&result, db, "findone", NULL, 0, from,
_22$$18);
+ zephir_check_call_status();
+ } else {
+ ZEPHIR_INIT_VAR(_23$$19);
+ zephir_create_array(_23$$19, 1, 0 TSRMLS_CC);
+ zephir_array_update_zval(&_23$$19, custom, &value, PH_COPY);
+ ZEPHIR_CALL_METHOD(&result, db, "findone", NULL, 0, from,
_23$$19);
zephir_check_call_status();
}
if (zephir_is_true(result)) {
- ZEPHIR_INIT_VAR(_24$$20);
- ZVAL_STRING(_24$$20, "label", ZEPHIR_TEMP_PARAM_COPY);
- ZEPHIR_CALL_METHOD(&_23$$20, this_ptr, "has", NULL, 0, _24$$20);
- zephir_check_temp_parameter(_24$$20);
- zephir_check_call_status();
- if (zephir_is_true(_23$$20)) {
- ZEPHIR_INIT_VAR(_25$$21);
- ZVAL_STRING(_25$$21, "label", ZEPHIR_TEMP_PARAM_COPY);
- ZEPHIR_CALL_METHOD(&label, this_ptr, "get", NULL, 0,
_25$$21);
- zephir_check_temp_parameter(_25$$21);
+ ZEPHIR_INIT_VAR(_25$$20);
+ ZVAL_STRING(_25$$20, "label", ZEPHIR_TEMP_PARAM_COPY);
+ ZEPHIR_CALL_METHOD(&_24$$20, this_ptr, "has", NULL, 0, _25$$20);
+ zephir_check_temp_parameter(_25$$20);
+ zephir_check_call_status();
+ if (zephir_is_true(_24$$20)) {
+ ZEPHIR_INIT_VAR(_26$$21);
+ ZVAL_STRING(_26$$21, "label", ZEPHIR_TEMP_PARAM_COPY);
+ ZEPHIR_CALL_METHOD(&label, this_ptr, "get", NULL, 0,
_26$$21);
+ zephir_check_temp_parameter(_26$$21);
zephir_check_call_status();
} else {
ZEPHIR_CALL_METHOD(&label, validation, "getlabel",
NULL, 0, field);
zephir_check_call_status();
}
- ZEPHIR_INIT_NVAR(_24$$20);
- ZVAL_STRING(_24$$20, "message", ZEPHIR_TEMP_PARAM_COPY);
- ZEPHIR_CALL_METHOD(&_26$$20, this_ptr, "has", NULL, 0, _24$$20);
- zephir_check_temp_parameter(_24$$20);
- zephir_check_call_status();
- if (zephir_is_true(_26$$20)) {
- ZEPHIR_INIT_VAR(_27$$23);
- ZVAL_STRING(_27$$23, "message", ZEPHIR_TEMP_PARAM_COPY);
- ZEPHIR_CALL_METHOD(&message, this_ptr, "get", NULL, 0,
_27$$23);
- zephir_check_temp_parameter(_27$$23);
+ ZEPHIR_INIT_NVAR(_25$$20);
+ ZVAL_STRING(_25$$20, "message", ZEPHIR_TEMP_PARAM_COPY);
+ ZEPHIR_CALL_METHOD(&_27$$20, this_ptr, "has", NULL, 0, _25$$20);
+ zephir_check_temp_parameter(_25$$20);
+ zephir_check_call_status();
+ if (zephir_is_true(_27$$20)) {
+ ZEPHIR_INIT_VAR(_28$$23);
+ ZVAL_STRING(_28$$23, "message", ZEPHIR_TEMP_PARAM_COPY);
+ ZEPHIR_CALL_METHOD(&message, this_ptr, "get", NULL, 0,
_28$$23);
+ zephir_check_temp_parameter(_28$$23);
zephir_check_call_status();
} else {
- ZEPHIR_INIT_VAR(_28$$24);
- ZVAL_STRING(_28$$24, "unique", ZEPHIR_TEMP_PARAM_COPY);
- ZEPHIR_CALL_METHOD(&message, validation,
"getdefaultmessage", NULL, 0, _28$$24);
- zephir_check_temp_parameter(_28$$24);
+ ZEPHIR_INIT_VAR(_29$$24);
+ ZVAL_STRING(_29$$24, "unique", ZEPHIR_TEMP_PARAM_COPY);
+ ZEPHIR_CALL_METHOD(&message, validation,
"getdefaultmessage", NULL, 0, _29$$24);
+ zephir_check_temp_parameter(_29$$24);
zephir_check_call_status();
}
- ZEPHIR_CALL_METHOD(&_29$$20, validation, "gettranslate", NULL,
0);
+ ZEPHIR_CALL_METHOD(&_30$$20, validation, "gettranslate", NULL,
0);
zephir_check_call_status();
- _30$$20 = ZEPHIR_IS_TRUE_IDENTICAL(_29$$20);
- if (_30$$20) {
- ZEPHIR_CALL_METHOD(&_31$$20, validation, "getdi", NULL,
0);
- zephir_check_call_status();
- ZEPHIR_INIT_NVAR(_24$$20);
- ZVAL_STRING(_24$$20, "i18n", ZEPHIR_TEMP_PARAM_COPY);
- ZEPHIR_CALL_METHOD(&_32$$20, _31$$20, "has", NULL, 0,
_24$$20);
- zephir_check_temp_parameter(_24$$20);
+ _31$$20 = ZEPHIR_IS_TRUE_IDENTICAL(_30$$20);
+ if (_31$$20) {
+ ZEPHIR_CALL_METHOD(&_32$$20, validation, "getdi", NULL,
0);
+ zephir_check_call_status();
+ ZEPHIR_INIT_NVAR(_25$$20);
+ ZVAL_STRING(_25$$20, "i18n", ZEPHIR_TEMP_PARAM_COPY);
+ ZEPHIR_CALL_METHOD(&_33$$20, _32$$20, "has", NULL, 0,
_25$$20);
+ zephir_check_temp_parameter(_25$$20);
zephir_check_call_status();
- _30$$20 = zephir_is_true(_32$$20);
+ _31$$20 = zephir_is_true(_33$$20);
}
- if (_30$$20) {
- ZEPHIR_CALL_METHOD(&_33$$25, validation, "getdi", NULL,
0);
+ if (_31$$20) {
+ ZEPHIR_CALL_METHOD(&_34$$25, validation, "getdi", NULL,
0);
zephir_check_call_status();
- ZEPHIR_INIT_VAR(_34$$25);
- ZVAL_STRING(_34$$25, "i18n", ZEPHIR_TEMP_PARAM_COPY);
- ZEPHIR_CALL_METHOD(&i18n, _33$$25, "get", NULL, 0,
_34$$25);
- zephir_check_temp_parameter(_34$$25);
+ ZEPHIR_INIT_VAR(_35$$25);
+ ZVAL_STRING(_35$$25, "i18n", ZEPHIR_TEMP_PARAM_COPY);
+ ZEPHIR_CALL_METHOD(&i18n, _34$$25, "get", NULL, 0,
_35$$25);
+ zephir_check_temp_parameter(_35$$25);
zephir_check_call_status();
- ZEPHIR_CALL_METHOD(&_35$$25, i18n, "translate", NULL,
0, label);
+ ZEPHIR_CALL_METHOD(&_36$$25, i18n, "translate", NULL,
0, label);
zephir_check_call_status();
- ZEPHIR_CPY_WRT(label, _35$$25);
- ZEPHIR_CALL_METHOD(&_35$$25, i18n, "translate", NULL,
0, message);
+ ZEPHIR_CPY_WRT(label, _36$$25);
+ ZEPHIR_CALL_METHOD(&_36$$25, i18n, "translate", NULL,
0, message);
zephir_check_call_status();
- ZEPHIR_CPY_WRT(message, _35$$25);
+ ZEPHIR_CPY_WRT(message, _36$$25);
}
ZEPHIR_INIT_VAR(replace);
zephir_create_array(replace, 1, 0 TSRMLS_CC);
zephir_array_update_string(&replace, SL(":field"), &label,
PH_COPY | PH_SEPARATE);
- ZEPHIR_CALL_FUNCTION(&_36$$20, "strtr", NULL, 88, message,
replace);
+ ZEPHIR_CALL_FUNCTION(&_37$$20, "strtr", NULL, 88, message,
replace);
zephir_check_call_status();
- ZEPHIR_CALL_METHOD(NULL, validation, "addmessage", NULL, 0,
field, _36$$20);
+ ZEPHIR_CALL_METHOD(NULL, validation, "addmessage", NULL, 0,
field, _37$$20);
zephir_check_call_status();
RETURN_MM_BOOL(0);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/framework-1.2.8/build/php5/ice/version.zep.c
new/framework-1.2.9/build/php5/ice/version.zep.c
--- old/framework-1.2.8/build/php5/ice/version.zep.c 2017-02-18
19:55:14.000000000 +0100
+++ new/framework-1.2.9/build/php5/ice/version.zep.c 2017-02-24
01:36:45.000000000 +0100
@@ -47,7 +47,7 @@
zend_declare_class_constant_long(ice_version_ce, SL("MINOR"), 2
TSRMLS_CC);
- zend_declare_class_constant_long(ice_version_ce, SL("PATCH"), 8
TSRMLS_CC);
+ zend_declare_class_constant_long(ice_version_ce, SL("PATCH"), 9
TSRMLS_CC);
zend_declare_class_constant_long(ice_version_ce, SL("STAGE"), 4
TSRMLS_CC);
@@ -69,7 +69,7 @@
zephir_create_array(return_value, 5, 0 TSRMLS_CC);
add_assoc_long_ex(return_value, SS("major"), 1);
add_assoc_long_ex(return_value, SS("minor"), 2);
- add_assoc_long_ex(return_value, SS("patch"), 8);
+ add_assoc_long_ex(return_value, SS("patch"), 9);
add_assoc_long_ex(return_value, SS("stage"), 4);
add_assoc_long_ex(return_value, SS("build"), 0);
return;
@@ -138,7 +138,7 @@
ZEPHIR_SINIT_VAR(_8);
ZVAL_LONG(&_8, 2);
ZEPHIR_SINIT_VAR(_9);
- ZVAL_LONG(&_9, 8);
+ ZVAL_LONG(&_9, 9);
ZEPHIR_CONCAT_VSVSVV(return_value, &_7, ".", &_8, ".", &_9, suffix);
RETURN_MM();
@@ -171,7 +171,7 @@
ZEPHIR_SINIT_NVAR(_1);
ZVAL_STRING(&_1, "%02s", 0);
ZEPHIR_SINIT_NVAR(_2);
- ZVAL_LONG(&_2, 8);
+ ZVAL_LONG(&_2, 9);
ZEPHIR_CALL_FUNCTION(&_5, "sprintf", &_4, 12, &_1, &_2);
zephir_check_call_status();
ZEPHIR_SINIT_NVAR(_1);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/framework-1.2.8/build/php5/php_ice.h
new/framework-1.2.9/build/php5/php_ice.h
--- old/framework-1.2.8/build/php5/php_ice.h 2017-02-18 19:55:14.000000000
+0100
+++ new/framework-1.2.9/build/php5/php_ice.h 2017-02-24 01:36:45.000000000
+0100
@@ -11,7 +11,7 @@
#include "kernel/globals.h"
#define PHP_ICE_NAME "ice"
-#define PHP_ICE_VERSION "1.2.8"
+#define PHP_ICE_VERSION "1.2.9"
#define PHP_ICE_EXTNAME "ice"
#define PHP_ICE_AUTHOR "Ice Team"
#define PHP_ICE_ZEPVERSION "0.9.6a-dev-aef205594b"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/framework-1.2.8/build/php7/ice/validation/validator/unique.zep.c
new/framework-1.2.9/build/php7/ice/validation/validator/unique.zep.c
--- old/framework-1.2.8/build/php7/ice/validation/validator/unique.zep.c
2017-02-18 19:55:14.000000000 +0100
+++ new/framework-1.2.9/build/php7/ice/validation/validator/unique.zep.c
2017-02-24 01:36:45.000000000 +0100
@@ -69,13 +69,13 @@
*/
PHP_METHOD(Ice_Validation_Validator_Unique, validate) {
- zval _22$$18, _23$$19;
+ zval _23$$18, _24$$19;
zephir_nts_static zend_class_entry *_18$$15 = NULL;
- zend_bool _0, _31$$20;
+ zend_bool _0, _32$$20;
zephir_fcall_cache_entry *_1 = NULL;
int ZEPHIR_LAST_CALL_STATUS;
zval field;
- zval *validation, validation_sub, *field_param = NULL, value, label,
message, i18n, replace, di, db, from, custom, except, tmp, caseInsensitive,
result, id, _2, _3, _4, _7, _10, _13, _5$$4, _6$$5, _8$$6, _9$$7, _11$$9,
_12$$10, _14$$11, _15$$12, _16$$13, _17$$14, _19$$15, _20$$16, _21$$18,
_24$$20, _25$$20, _27$$20, _30$$20, _32$$20, _33$$20, _37$$20, _26$$21,
_28$$23, _29$$24, _34$$25, _35$$25, _36$$25;
+ zval *validation, validation_sub, *field_param = NULL, value, label,
message, i18n, replace, di, db, from, custom, except, tmp, caseInsensitive,
result, id, _2, _3, _4, _7, _10, _13, _5$$4, _6$$5, _8$$6, _9$$7, _11$$9,
_12$$10, _14$$11, _15$$12, _16$$13, _17$$14, _19$$15, _20$$15, _21$$16,
_22$$18, _25$$20, _26$$20, _28$$20, _31$$20, _33$$20, _34$$20, _38$$20,
_27$$21, _29$$23, _30$$24, _35$$25, _36$$25, _37$$25;
ZEPHIR_INIT_THIS();
ZVAL_UNDEF(&validation_sub);
@@ -110,24 +110,25 @@
ZVAL_UNDEF(&_16$$13);
ZVAL_UNDEF(&_17$$14);
ZVAL_UNDEF(&_19$$15);
- ZVAL_UNDEF(&_20$$16);
- ZVAL_UNDEF(&_21$$18);
- ZVAL_UNDEF(&_24$$20);
+ ZVAL_UNDEF(&_20$$15);
+ ZVAL_UNDEF(&_21$$16);
+ ZVAL_UNDEF(&_22$$18);
ZVAL_UNDEF(&_25$$20);
- ZVAL_UNDEF(&_27$$20);
- ZVAL_UNDEF(&_30$$20);
- ZVAL_UNDEF(&_32$$20);
+ ZVAL_UNDEF(&_26$$20);
+ ZVAL_UNDEF(&_28$$20);
+ ZVAL_UNDEF(&_31$$20);
ZVAL_UNDEF(&_33$$20);
- ZVAL_UNDEF(&_37$$20);
- ZVAL_UNDEF(&_26$$21);
- ZVAL_UNDEF(&_28$$23);
- ZVAL_UNDEF(&_29$$24);
- ZVAL_UNDEF(&_34$$25);
+ ZVAL_UNDEF(&_34$$20);
+ ZVAL_UNDEF(&_38$$20);
+ ZVAL_UNDEF(&_27$$21);
+ ZVAL_UNDEF(&_29$$23);
+ ZVAL_UNDEF(&_30$$24);
ZVAL_UNDEF(&_35$$25);
ZVAL_UNDEF(&_36$$25);
+ ZVAL_UNDEF(&_37$$25);
ZVAL_UNDEF(&field);
- ZVAL_UNDEF(&_22$$18);
- ZVAL_UNDEF(&_23$$19);
+ ZVAL_UNDEF(&_23$$18);
+ ZVAL_UNDEF(&_24$$19);
ZEPHIR_MM_GROW();
zephir_fetch_params(1, 2, 0, &validation, &field_param);
@@ -229,16 +230,18 @@
object_init_ex(&value, _18$$15);
if (zephir_has_constructor(&value TSRMLS_CC)) {
ZEPHIR_INIT_VAR(&_19$$15);
- ZVAL_STRING(&_19$$15, "i");
- ZEPHIR_CALL_METHOD(NULL, &value,
"__construct", NULL, 0, &tmp, &_19$$15);
+ ZEPHIR_CONCAT_SVS(&_19$$15, "^", &tmp,
"$");
+ ZEPHIR_INIT_VAR(&_20$$15);
+ ZVAL_STRING(&_20$$15, "i");
+ ZEPHIR_CALL_METHOD(NULL, &value,
"__construct", NULL, 0, &_19$$15, &_20$$15);
zephir_check_call_status();
}
} else {
object_init_ex(&value,
zephir_get_internal_ce(SL("mongoregex")));
if (zephir_has_constructor(&value TSRMLS_CC)) {
- ZEPHIR_INIT_VAR(&_20$$16);
- ZEPHIR_CONCAT_SVS(&_20$$16, "/^", &tmp,
"$/i");
- ZEPHIR_CALL_METHOD(NULL, &value,
"__construct", NULL, 0, &_20$$16);
+ ZEPHIR_INIT_VAR(&_21$$16);
+ ZEPHIR_CONCAT_SVS(&_21$$16, "/^", &tmp,
"$/i");
+ ZEPHIR_CALL_METHOD(NULL, &value,
"__construct", NULL, 0, &_21$$16);
zephir_check_call_status();
}
}
@@ -250,85 +253,85 @@
if (zephir_is_true(&except)) {
ZEPHIR_INIT_VAR(&id);
zephir_create_array(&id, 1, 0 TSRMLS_CC);
- ZEPHIR_CALL_METHOD(&_21$$18, &db, "getidvalue", NULL, 0,
&except);
+ ZEPHIR_CALL_METHOD(&_22$$18, &db, "getidvalue", NULL, 0,
&except);
zephir_check_call_status();
- zephir_array_update_string(&id, SL("!="), &_21$$18, PH_COPY |
PH_SEPARATE);
- ZEPHIR_INIT_VAR(&_22$$18);
- zephir_create_array(&_22$$18, 2, 0 TSRMLS_CC);
- zephir_array_update_zval(&_22$$18, &custom, &value, PH_COPY);
- ZEPHIR_CALL_METHOD(&_21$$18, &db, "getid", NULL, 0);
+ zephir_array_update_string(&id, SL("!="), &_22$$18, PH_COPY |
PH_SEPARATE);
+ ZEPHIR_INIT_VAR(&_23$$18);
+ zephir_create_array(&_23$$18, 2, 0 TSRMLS_CC);
+ zephir_array_update_zval(&_23$$18, &custom, &value, PH_COPY);
+ ZEPHIR_CALL_METHOD(&_22$$18, &db, "getid", NULL, 0);
zephir_check_call_status();
- zephir_array_update_zval(&_22$$18, &_21$$18, &id, PH_COPY);
- ZEPHIR_CALL_METHOD(&result, &db, "findone", NULL, 0, &from,
&_22$$18);
+ zephir_array_update_zval(&_23$$18, &_22$$18, &id, PH_COPY);
+ ZEPHIR_CALL_METHOD(&result, &db, "findone", NULL, 0, &from,
&_23$$18);
zephir_check_call_status();
} else {
- ZEPHIR_INIT_VAR(&_23$$19);
- zephir_create_array(&_23$$19, 1, 0 TSRMLS_CC);
- zephir_array_update_zval(&_23$$19, &custom, &value, PH_COPY);
- ZEPHIR_CALL_METHOD(&result, &db, "findone", NULL, 0, &from,
&_23$$19);
+ ZEPHIR_INIT_VAR(&_24$$19);
+ zephir_create_array(&_24$$19, 1, 0 TSRMLS_CC);
+ zephir_array_update_zval(&_24$$19, &custom, &value, PH_COPY);
+ ZEPHIR_CALL_METHOD(&result, &db, "findone", NULL, 0, &from,
&_24$$19);
zephir_check_call_status();
}
if (zephir_is_true(&result)) {
- ZEPHIR_INIT_VAR(&_25$$20);
- ZVAL_STRING(&_25$$20, "label");
- ZEPHIR_CALL_METHOD(&_24$$20, this_ptr, "has", NULL, 0,
&_25$$20);
- zephir_check_call_status();
- if (zephir_is_true(&_24$$20)) {
- ZEPHIR_INIT_VAR(&_26$$21);
- ZVAL_STRING(&_26$$21, "label");
- ZEPHIR_CALL_METHOD(&label, this_ptr, "get", NULL, 0,
&_26$$21);
+ ZEPHIR_INIT_VAR(&_26$$20);
+ ZVAL_STRING(&_26$$20, "label");
+ ZEPHIR_CALL_METHOD(&_25$$20, this_ptr, "has", NULL, 0,
&_26$$20);
+ zephir_check_call_status();
+ if (zephir_is_true(&_25$$20)) {
+ ZEPHIR_INIT_VAR(&_27$$21);
+ ZVAL_STRING(&_27$$21, "label");
+ ZEPHIR_CALL_METHOD(&label, this_ptr, "get", NULL, 0,
&_27$$21);
zephir_check_call_status();
} else {
ZEPHIR_CALL_METHOD(&label, validation, "getlabel",
NULL, 0, &field);
zephir_check_call_status();
}
- ZEPHIR_INIT_NVAR(&_25$$20);
- ZVAL_STRING(&_25$$20, "message");
- ZEPHIR_CALL_METHOD(&_27$$20, this_ptr, "has", NULL, 0,
&_25$$20);
- zephir_check_call_status();
- if (zephir_is_true(&_27$$20)) {
- ZEPHIR_INIT_VAR(&_28$$23);
- ZVAL_STRING(&_28$$23, "message");
- ZEPHIR_CALL_METHOD(&message, this_ptr, "get", NULL, 0,
&_28$$23);
+ ZEPHIR_INIT_NVAR(&_26$$20);
+ ZVAL_STRING(&_26$$20, "message");
+ ZEPHIR_CALL_METHOD(&_28$$20, this_ptr, "has", NULL, 0,
&_26$$20);
+ zephir_check_call_status();
+ if (zephir_is_true(&_28$$20)) {
+ ZEPHIR_INIT_VAR(&_29$$23);
+ ZVAL_STRING(&_29$$23, "message");
+ ZEPHIR_CALL_METHOD(&message, this_ptr, "get", NULL, 0,
&_29$$23);
zephir_check_call_status();
} else {
- ZEPHIR_INIT_VAR(&_29$$24);
- ZVAL_STRING(&_29$$24, "unique");
- ZEPHIR_CALL_METHOD(&message, validation,
"getdefaultmessage", NULL, 0, &_29$$24);
+ ZEPHIR_INIT_VAR(&_30$$24);
+ ZVAL_STRING(&_30$$24, "unique");
+ ZEPHIR_CALL_METHOD(&message, validation,
"getdefaultmessage", NULL, 0, &_30$$24);
zephir_check_call_status();
}
- ZEPHIR_CALL_METHOD(&_30$$20, validation, "gettranslate", NULL,
0);
+ ZEPHIR_CALL_METHOD(&_31$$20, validation, "gettranslate", NULL,
0);
zephir_check_call_status();
- _31$$20 = ZEPHIR_IS_TRUE_IDENTICAL(&_30$$20);
- if (_31$$20) {
- ZEPHIR_CALL_METHOD(&_32$$20, validation, "getdi", NULL,
0);
+ _32$$20 = ZEPHIR_IS_TRUE_IDENTICAL(&_31$$20);
+ if (_32$$20) {
+ ZEPHIR_CALL_METHOD(&_33$$20, validation, "getdi", NULL,
0);
zephir_check_call_status();
- ZEPHIR_INIT_NVAR(&_25$$20);
- ZVAL_STRING(&_25$$20, "i18n");
- ZEPHIR_CALL_METHOD(&_33$$20, &_32$$20, "has", NULL, 0,
&_25$$20);
+ ZEPHIR_INIT_NVAR(&_26$$20);
+ ZVAL_STRING(&_26$$20, "i18n");
+ ZEPHIR_CALL_METHOD(&_34$$20, &_33$$20, "has", NULL, 0,
&_26$$20);
zephir_check_call_status();
- _31$$20 = zephir_is_true(&_33$$20);
+ _32$$20 = zephir_is_true(&_34$$20);
}
- if (_31$$20) {
- ZEPHIR_CALL_METHOD(&_34$$25, validation, "getdi", NULL,
0);
+ if (_32$$20) {
+ ZEPHIR_CALL_METHOD(&_35$$25, validation, "getdi", NULL,
0);
zephir_check_call_status();
- ZEPHIR_INIT_VAR(&_35$$25);
- ZVAL_STRING(&_35$$25, "i18n");
- ZEPHIR_CALL_METHOD(&i18n, &_34$$25, "get", NULL, 0,
&_35$$25);
+ ZEPHIR_INIT_VAR(&_36$$25);
+ ZVAL_STRING(&_36$$25, "i18n");
+ ZEPHIR_CALL_METHOD(&i18n, &_35$$25, "get", NULL, 0,
&_36$$25);
zephir_check_call_status();
- ZEPHIR_CALL_METHOD(&_36$$25, &i18n, "translate", NULL,
0, &label);
+ ZEPHIR_CALL_METHOD(&_37$$25, &i18n, "translate", NULL,
0, &label);
zephir_check_call_status();
- ZEPHIR_CPY_WRT(&label, &_36$$25);
- ZEPHIR_CALL_METHOD(&_36$$25, &i18n, "translate", NULL,
0, &message);
+ ZEPHIR_CPY_WRT(&label, &_37$$25);
+ ZEPHIR_CALL_METHOD(&_37$$25, &i18n, "translate", NULL,
0, &message);
zephir_check_call_status();
- ZEPHIR_CPY_WRT(&message, &_36$$25);
+ ZEPHIR_CPY_WRT(&message, &_37$$25);
}
ZEPHIR_INIT_VAR(&replace);
zephir_create_array(&replace, 1, 0 TSRMLS_CC);
zephir_array_update_string(&replace, SL(":field"), &label,
PH_COPY | PH_SEPARATE);
- ZEPHIR_CALL_FUNCTION(&_37$$20, "strtr", NULL, 87, &message,
&replace);
+ ZEPHIR_CALL_FUNCTION(&_38$$20, "strtr", NULL, 87, &message,
&replace);
zephir_check_call_status();
- ZEPHIR_CALL_METHOD(NULL, validation, "addmessage", NULL, 0,
&field, &_37$$20);
+ ZEPHIR_CALL_METHOD(NULL, validation, "addmessage", NULL, 0,
&field, &_38$$20);
zephir_check_call_status();
RETURN_MM_BOOL(0);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/framework-1.2.8/build/php7/ice/version.zep.c
new/framework-1.2.9/build/php7/ice/version.zep.c
--- old/framework-1.2.8/build/php7/ice/version.zep.c 2017-02-18
19:55:14.000000000 +0100
+++ new/framework-1.2.9/build/php7/ice/version.zep.c 2017-02-24
01:36:45.000000000 +0100
@@ -47,7 +47,7 @@
zephir_declare_class_constant_long(ice_version_ce, SL("MINOR"), 2);
- zephir_declare_class_constant_long(ice_version_ce, SL("PATCH"), 8);
+ zephir_declare_class_constant_long(ice_version_ce, SL("PATCH"), 9);
zephir_declare_class_constant_long(ice_version_ce, SL("STAGE"), 4);
@@ -70,7 +70,7 @@
zephir_create_array(return_value, 5, 0 TSRMLS_CC);
add_assoc_long_ex(return_value, SL("major"), 1);
add_assoc_long_ex(return_value, SL("minor"), 2);
- add_assoc_long_ex(return_value, SL("patch"), 8);
+ add_assoc_long_ex(return_value, SL("patch"), 9);
add_assoc_long_ex(return_value, SL("stage"), 4);
add_assoc_long_ex(return_value, SL("build"), 0);
return;
@@ -151,7 +151,7 @@
ZEPHIR_SINIT_VAR(_8);
ZVAL_LONG(&_8, 2);
ZEPHIR_SINIT_VAR(_9);
- ZVAL_LONG(&_9, 8);
+ ZVAL_LONG(&_9, 9);
ZEPHIR_CONCAT_VSVSVV(return_value, &_7, ".", &_8, ".", &_9, &suffix);
RETURN_MM();
@@ -192,7 +192,7 @@
zephir_check_call_status();
ZEPHIR_INIT_NVAR(&_1);
ZVAL_STRING(&_1, "%02s");
- ZVAL_LONG(&_2, 8);
+ ZVAL_LONG(&_2, 9);
ZEPHIR_CALL_FUNCTION(&_5, "sprintf", &_4, 12, &_1, &_2);
zephir_check_call_status();
ZEPHIR_SINIT_VAR(_6);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/framework-1.2.8/build/php7/php_ice.h
new/framework-1.2.9/build/php7/php_ice.h
--- old/framework-1.2.8/build/php7/php_ice.h 2017-02-18 19:55:14.000000000
+0100
+++ new/framework-1.2.9/build/php7/php_ice.h 2017-02-24 01:36:45.000000000
+0100
@@ -11,7 +11,7 @@
#include "kernel/globals.h"
#define PHP_ICE_NAME "ice"
-#define PHP_ICE_VERSION "1.2.8"
+#define PHP_ICE_VERSION "1.2.9"
#define PHP_ICE_EXTNAME "ice"
#define PHP_ICE_AUTHOR "Ice Team"
#define PHP_ICE_ZEPVERSION "0.9.6a-dev-aef205594b"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/framework-1.2.8/config.json
new/framework-1.2.9/config.json
--- old/framework-1.2.8/config.json 2017-02-18 19:55:14.000000000 +0100
+++ new/framework-1.2.9/config.json 2017-02-24 01:36:45.000000000 +0100
@@ -3,7 +3,7 @@
"name": "ice",
"description": "Simple and fast PHP framework delivered as
C-extension.<br>Copyright (c) 2014-2016 Ice Team.",
"author": "Ice Team",
- "version": "1.2.8",
+ "version": "1.2.9",
"verbose": false,
"info": [
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/framework-1.2.8/ice/validation/validator/unique.zep
new/framework-1.2.9/ice/validation/validator/unique.zep
--- old/framework-1.2.8/ice/validation/validator/unique.zep 2017-02-18
19:55:14.000000000 +0100
+++ new/framework-1.2.9/ice/validation/validator/unique.zep 2017-02-24
01:36:45.000000000 +0100
@@ -93,7 +93,7 @@
if db->getType() == "NOSQL" {
if db->getDriver() instanceof Mongodb {
- let value = new \MongoDB\BSON\Regex(tmp, "i");
+ let value = new \MongoDB\BSON\Regex("^" . tmp . "$", "i");
} else {
let value = new \MongoRegex("/^" . tmp . "$/i");
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/framework-1.2.8/ice/version.zep
new/framework-1.2.9/ice/version.zep
--- old/framework-1.2.8/ice/version.zep 2017-02-18 19:55:14.000000000 +0100
+++ new/framework-1.2.9/ice/version.zep 2017-02-24 01:36:45.000000000 +0100
@@ -22,7 +22,7 @@
// Don't forget to update config.json and run zephir fullclean
const MAJOR = 1;
const MINOR = 2;
- const PATCH = 8;
+ const PATCH = 9;
const STAGE = self::STABLE;
const BUILD = 0;
