diff --git a/CHANGELOG-5.0.md b/CHANGELOG-5.0.md index d747a10f5d..fb4dd340b2 100644 --- a/CHANGELOG-5.0.md +++ b/CHANGELOG-5.0.md @@ -10,6 +10,9 @@ All notable changes are documented here. The format is based on [Keep a Changelo ### Changed +- Faster creation of `Phalcon\Di\FactoryDefault` and faster shared service lookups in `Phalcon\Di\Di`. [#17617](https://github.com/phalcon/cphalcon/issues/17617) +- Faster creation of `Phalcon\Filter\Filter`. [#17617](https://github.com/phalcon/cphalcon/issues/17617) + ### Added - Benchmark suite in `tests/benchmarks` (PHPBench, instruction counts, memory, reference apps) and a `bench` Docker service to compare builds of the extension. [#17613](https://github.com/phalcon/cphalcon/issues/17613) diff --git a/ext/phalcon/12__closure.zep.c b/ext/phalcon/12__closure.zep.c index fe183d645c..fdc8358ade 100644 --- a/ext/phalcon/12__closure.zep.c +++ b/ext/phalcon/12__closure.zep.c @@ -45,7 +45,7 @@ PHP_METHOD(phalcon_12__closure, __invoke) zephir_check_call_status(); } - ZEPHIR_RETURN_CALL_METHOD(&_0, "newinstance", NULL, 258); + ZEPHIR_RETURN_CALL_METHOD(&_0, "newinstance", NULL, 0); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/13__closure.zep.c b/ext/phalcon/13__closure.zep.c index 1fc0806ea6..767e812da3 100644 --- a/ext/phalcon/13__closure.zep.c +++ b/ext/phalcon/13__closure.zep.c @@ -38,7 +38,7 @@ PHP_METHOD(phalcon_13__closure, __invoke) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &container); object_init_ex(return_value, phalcon_auth_access_accesslocator_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 438, container); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 437, container); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/14__closure.zep.c b/ext/phalcon/14__closure.zep.c index dfbe7aa749..2fea798331 100644 --- a/ext/phalcon/14__closure.zep.c +++ b/ext/phalcon/14__closure.zep.c @@ -45,7 +45,7 @@ PHP_METHOD(phalcon_14__closure, __invoke) zephir_check_call_status(); } - ZEPHIR_RETURN_CALL_METHOD(&_0, "newinstance", NULL, 258); + ZEPHIR_RETURN_CALL_METHOD(&_0, "newinstance", NULL, 0); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/15__closure.zep.c b/ext/phalcon/15__closure.zep.c index c98318a0e9..ffc718788e 100644 --- a/ext/phalcon/15__closure.zep.c +++ b/ext/phalcon/15__closure.zep.c @@ -38,7 +38,7 @@ PHP_METHOD(phalcon_15__closure, __invoke) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &container); object_init_ex(return_value, phalcon_auth_access_accesslocator_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 438, container); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 437, container); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/acl/adapter/storage.zep.c b/ext/phalcon/acl/adapter/storage.zep.c index 00e3a4208f..7cbbb1f9a9 100644 --- a/ext/phalcon/acl/adapter/storage.zep.c +++ b/ext/phalcon/acl/adapter/storage.zep.c @@ -230,7 +230,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Storage, load) ZEPHIR_CALL_METHOD(&data, &_0, "get", NULL, 0, &_1); zephir_check_call_status(); if (Z_TYPE_P(&data) == IS_OBJECT) { - ZEPHIR_CALL_METHOD(&_2$$3, this_ptr, "normalizetoarray", NULL, 359, &data); + ZEPHIR_CALL_METHOD(&_2$$3, this_ptr, "normalizetoarray", NULL, 358, &data); zephir_check_call_status(); ZEPHIR_CPY_WRT(&data, &_2$$3); } @@ -930,7 +930,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Storage, normalizeToArray) return; } if (Z_TYPE_P(value) == IS_OBJECT) { - ZEPHIR_CALL_FUNCTION(&_0$$4, "get_object_vars", NULL, 360, value); + ZEPHIR_CALL_FUNCTION(&_0$$4, "get_object_vars", NULL, 359, value); zephir_check_call_status(); ZEPHIR_CPY_WRT(value, &_0$$4); } @@ -960,7 +960,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Storage, normalizeToArray) ZEPHIR_INIT_NVAR(&item); ZVAL_COPY(&item, _3); ZVAL_LONG(&_7$$6, (depth + 1)); - ZEPHIR_CALL_METHOD(&_6$$6, this_ptr, "normalizetoarray", &_8, 359, &item, &_7$$6); + ZEPHIR_CALL_METHOD(&_6$$6, this_ptr, "normalizetoarray", &_8, 358, &item, &_7$$6); zephir_check_call_status(); zephir_array_update_zval(&result, &key, &_6$$6, PH_COPY | PH_SEPARATE); } ZEND_HASH_FOREACH_END(); @@ -985,7 +985,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Storage, normalizeToArray) ZEPHIR_CALL_METHOD(&item, _1, "current", NULL, 0); zephir_check_call_status(); ZVAL_LONG(&_12$$7, (depth + 1)); - ZEPHIR_CALL_METHOD(&_11$$7, this_ptr, "normalizetoarray", &_8, 359, &item, &_12$$7); + ZEPHIR_CALL_METHOD(&_11$$7, this_ptr, "normalizetoarray", &_8, 358, &item, &_12$$7); zephir_check_call_status(); zephir_array_update_zval(&result, &key, &_11$$7, PH_COPY | PH_SEPARATE); } diff --git a/ext/phalcon/adr/application.zep.c b/ext/phalcon/adr/application.zep.c index bbee647444..c08398e5ed 100644 --- a/ext/phalcon/adr/application.zep.c +++ b/ext/phalcon/adr/application.zep.c @@ -132,7 +132,7 @@ PHP_METHOD(Phalcon_ADR_Application, __construct) zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(&_1$$3, &_0$$3, "addprovider", NULL, 314, &_2$$3); + ZEPHIR_CALL_METHOD(&_1$$3, &_0$$3, "addprovider", NULL, 313, &_2$$3); zephir_check_call_status(); ZEPHIR_CALL_METHOD(container, &_1$$3, "newcontainer", NULL, 0); zephir_check_call_status(); @@ -492,7 +492,7 @@ PHP_METHOD(Phalcon_ADR_Application, handle) if (Z_TYPE_P(&match) == IS_NULL) { ZEPHIR_INIT_VAR(&_13$$8); object_init_ex(&_13$$8, phalcon_adr_exceptions_routenotfound_ce); - ZEPHIR_CALL_METHOD(NULL, &_13$$8, "__construct", NULL, 315); + ZEPHIR_CALL_METHOD(NULL, &_13$$8, "__construct", NULL, 314); zephir_check_call_status_or_jump(try_end_1); zephir_throw_exception_debug(&_13$$8, "phalcon/ADR/Application.zep", 169); goto try_end_1; @@ -587,7 +587,7 @@ PHP_METHOD(Phalcon_ADR_Application, handle) zephir_check_call_status_or_jump(try_end_2); ZEPHIR_INIT_NVAR(&_34$$12); object_init_ex(&_34$$12, phalcon_http_response_ce); - ZEPHIR_CALL_METHOD(NULL, &_34$$12, "__construct", NULL, 316); + ZEPHIR_CALL_METHOD(NULL, &_34$$12, "__construct", NULL, 315); zephir_check_call_status_or_jump(try_end_2); ZEPHIR_CALL_METHOD(&response, &_33$$12, "handle", NULL, 0, request, &_34$$12, &exception); zephir_check_call_status_or_jump(try_end_2); @@ -604,10 +604,10 @@ PHP_METHOD(Phalcon_ADR_Application, handle) ZEPHIR_CPY_WRT(&_36$$11, &_35$$11); ZEPHIR_INIT_NVAR(&response); object_init_ex(&response, phalcon_http_response_ce); - ZEPHIR_CALL_METHOD(NULL, &response, "__construct", NULL, 316); + ZEPHIR_CALL_METHOD(NULL, &response, "__construct", NULL, 315); zephir_check_call_status(); ZVAL_LONG(&_38$$13, 500); - ZEPHIR_CALL_METHOD(&_37$$13, &response, "setstatuscode", NULL, 317, &_38$$13); + ZEPHIR_CALL_METHOD(&_37$$13, &response, "setstatuscode", NULL, 316, &_38$$13); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_39$$13); ZVAL_STRING(&_39$$13, "Internal Server Error"); diff --git a/ext/phalcon/adr/dispatcher.zep.c b/ext/phalcon/adr/dispatcher.zep.c index 65ba6e2a4d..317e6b4946 100644 --- a/ext/phalcon/adr/dispatcher.zep.c +++ b/ext/phalcon/adr/dispatcher.zep.c @@ -191,33 +191,33 @@ PHP_METHOD(Phalcon_ADR_Dispatcher, dispatch) if (!(zephir_instance_of_ev(&action, phalcon_contracts_adr_action_ce))) { ZEPHIR_INIT_VAR(&_1$$3); object_init_ex(&_1$$3, phalcon_adr_exceptions_notanaction_ce); - ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 318, &actionClass_zv); + ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 317, &actionClass_zv); zephir_check_call_status(); zephir_throw_exception_debug(&_1$$3, "phalcon/ADR/Dispatcher.zep", 77); ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(&_2, this_ptr, "resolveglobal", NULL, 319); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "resolveglobal", NULL, 318); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_3, this_ptr, "resolveall", NULL, 320, &routeMiddleware); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "resolveall", NULL, 319, &routeMiddleware); zephir_check_call_status(); ZEPHIR_INIT_VAR(&middleware); zephir_fast_array_merge(&middleware, &_2, &_3); ZEPHIR_INIT_VAR(&terminal); object_init_ex(&terminal, phalcon_adr_eventfulhandler_ce); zephir_read_property_cached(&_4, this_ptr, _zephir_prop_1, 348, PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(NULL, &terminal, "__construct", NULL, 321, &action, &_4); + ZEPHIR_CALL_METHOD(NULL, &terminal, "__construct", NULL, 320, &action, &_4); zephir_check_call_status(); ZEPHIR_INIT_VAR(&pipeline); object_init_ex(&pipeline, phalcon_adr_pipeline_ce); - ZEPHIR_CALL_METHOD(NULL, &pipeline, "__construct", NULL, 322, &middleware, &terminal); + ZEPHIR_CALL_METHOD(NULL, &pipeline, "__construct", NULL, 321, &middleware, &terminal); zephir_check_call_status(); zephir_read_property_cached(&_5, this_ptr, _zephir_prop_1, 348, PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_6); ZVAL_STRING(&_6, "pipeline:beforeDispatch"); ZEPHIR_CALL_METHOD(NULL, &_5, "fire", NULL, 0, &_6, this_ptr, request); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&response, &pipeline, "__invoke", NULL, 323, request); + ZEPHIR_CALL_METHOD(&response, &pipeline, "__invoke", NULL, 322, request); zephir_check_call_status(); zephir_read_property_cached(&_7, this_ptr, _zephir_prop_1, 348, PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_NVAR(&_6); @@ -321,7 +321,7 @@ PHP_METHOD(Phalcon_ADR_Dispatcher, resolveGlobal) zephir_read_property_cached(&_0, this_ptr, _zephir_prop_0, 350, PH_NOISY_CC | PH_READONLY); if (Z_TYPE_P(&_0) == IS_NULL) { zephir_read_property_cached(&_2$$3, this_ptr, _zephir_prop_1, 349, PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "resolveall", NULL, 320, &_2$$3); + ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "resolveall", NULL, 319, &_2$$3); zephir_check_call_status(); zephir_update_property_zval_cached(this_ptr, _zephir_prop_0, 350, &_1$$3); } diff --git a/ext/phalcon/adr/emitter/sapiemitter.zep.c b/ext/phalcon/adr/emitter/sapiemitter.zep.c index f4bbf3d597..973698a589 100644 --- a/ext/phalcon/adr/emitter/sapiemitter.zep.c +++ b/ext/phalcon/adr/emitter/sapiemitter.zep.c @@ -62,7 +62,7 @@ PHP_METHOD(Phalcon_ADR_Emitter_SapiEmitter, emit) if (zephir_is_true(&_0)) { ZEPHIR_INIT_VAR(&_1$$3); object_init_ex(&_1$$3, phalcon_adr_exceptions_headersalreadysent_ce); - ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 324); + ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 323); zephir_check_call_status(); zephir_throw_exception_debug(&_1$$3, "phalcon/ADR/Emitter/SapiEmitter.zep", 29); ZEPHIR_MM_RESTORE(); diff --git a/ext/phalcon/adr/errorresponder.zep.c b/ext/phalcon/adr/errorresponder.zep.c index caf9ab9fe7..5a3f44d5e3 100644 --- a/ext/phalcon/adr/errorresponder.zep.c +++ b/ext/phalcon/adr/errorresponder.zep.c @@ -140,7 +140,7 @@ PHP_METHOD(Phalcon_ADR_ErrorResponder, __construct) } else { zephir_update_property_zval_cached(this_ptr, _zephir_prop_2, 353, &__$false); } - ZEPHIR_CALL_METHOD(&_0, this_ptr, "defaultmap", NULL, 325); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "defaultmap", NULL, 324); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_1); zephir_add_function(&_1, &exceptionMap, &_0); @@ -190,7 +190,7 @@ PHP_METHOD(Phalcon_ADR_ErrorResponder, handle) ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 3, 0, &request, &response, &exception); - ZEPHIR_CALL_METHOD(&ref, this_ptr, "correlationid", NULL, 326, request); + ZEPHIR_CALL_METHOD(&ref, this_ptr, "correlationid", NULL, 325, request); zephir_check_call_status(); zephir_read_property_cached(&_0, this_ptr, _zephir_prop_0, 352, PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_1); @@ -211,7 +211,7 @@ PHP_METHOD(Phalcon_ADR_ErrorResponder, handle) zephir_array_update_string(&_7, SL("ref"), &ref, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(NULL, &_0, "error", NULL, 0, &_6, &_7); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&status, this_ptr, "resolvestatus", NULL, 327, exception); + ZEPHIR_CALL_METHOD(&status, this_ptr, "resolvestatus", NULL, 326, exception); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_5); object_init_ex(&_5, phalcon_adr_payload_payload_ce); @@ -220,9 +220,9 @@ PHP_METHOD(Phalcon_ADR_ErrorResponder, handle) zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(&_8, &_5, "withstatus", NULL, 328, &status); + ZEPHIR_CALL_METHOD(&_8, &_5, "withstatus", NULL, 327, &status); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_9, this_ptr, "details", NULL, 329, exception, &ref, &status); + ZEPHIR_CALL_METHOD(&_9, this_ptr, "details", NULL, 328, exception, &ref, &status); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&payload, &_8, "withresult", NULL, 0, &_9); zephir_check_call_status(); @@ -257,9 +257,9 @@ PHP_METHOD(Phalcon_ADR_ErrorResponder, correlationId) zephir_check_call_status(); if (ZEPHIR_IS_EMPTY(&id)) { ZVAL_LONG(&_1$$3, 8); - ZEPHIR_CALL_FUNCTION(&_2$$3, "random_bytes", NULL, 330, &_1$$3); + ZEPHIR_CALL_FUNCTION(&_2$$3, "random_bytes", NULL, 329, &_1$$3); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&id, "bin2hex", NULL, 331, &_2$$3); + ZEPHIR_CALL_FUNCTION(&id, "bin2hex", NULL, 330, &_2$$3); zephir_check_call_status(); } zephir_cast_to_string(&_3, &id); @@ -334,7 +334,7 @@ PHP_METHOD(Phalcon_ADR_ErrorResponder, details) RETURN_MM(); } zephir_create_array(return_value, 2, 0); - ZEPHIR_CALL_METHOD(&_2, this_ptr, "reason", NULL, 332, &status); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "reason", NULL, 331, &status); zephir_check_call_status(); zephir_array_update_string(return_value, SL("message"), &_2, PH_COPY | PH_SEPARATE); zephir_array_update_string(return_value, SL("ref"), &ref_zv, PH_COPY | PH_SEPARATE); @@ -427,11 +427,11 @@ PHP_METHOD(Phalcon_ADR_ErrorResponder, resolveStatus) zephir_array_fetch(&_2$$3, &_1$$3, &className, PH_NOISY, "phalcon/ADR/ErrorResponder.zep", 170); RETURN_CCTOR(&_2$$3); } - ZEPHIR_CALL_FUNCTION(&_3, "class_parents", NULL, 333, exception); + ZEPHIR_CALL_FUNCTION(&_3, "class_parents", NULL, 332, exception); zephir_check_call_status(); ZEPHIR_CALL_FUNCTION(&_4, "array_values", NULL, 28, &_3); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_5, "class_implements", NULL, 334, exception); + ZEPHIR_CALL_FUNCTION(&_5, "class_implements", NULL, 333, exception); zephir_check_call_status(); ZEPHIR_CALL_FUNCTION(&_6, "array_values", NULL, 28, &_5); zephir_check_call_status(); diff --git a/ext/phalcon/adr/input/input.zep.c b/ext/phalcon/adr/input/input.zep.c index 3e84713d24..f521cdd292 100644 --- a/ext/phalcon/adr/input/input.zep.c +++ b/ext/phalcon/adr/input/input.zep.c @@ -108,7 +108,7 @@ PHP_METHOD(Phalcon_ADR_Input_Input, fromArray) zephir_fetch_params(1, 1, 0, &data_param); zephir_get_arrval(&data, data_param); object_init_ex(return_value, zend_get_called_scope(execute_data)); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 335, &data); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 334, &data); zephir_check_call_status(); RETURN_MM(); } @@ -146,7 +146,7 @@ PHP_METHOD(Phalcon_ADR_Input_Input, fromRequest) zephir_cast_to_string(&_1, &_0); ZEPHIR_INIT_VAR(&_2); ZVAL_STRING(&_2, "json"); - ZEPHIR_CALL_FUNCTION(&_3, "str_contains", NULL, 336, &_1, &_2); + ZEPHIR_CALL_FUNCTION(&_3, "str_contains", NULL, 335, &_1, &_2); zephir_check_call_status(); if (zephir_is_true(&_3)) { ZVAL_BOOL(&_4$$3, 1); @@ -167,7 +167,7 @@ PHP_METHOD(Phalcon_ADR_Input_Input, fromRequest) zephir_check_call_status(); ZEPHIR_CALL_FUNCTION(&_9, "array_merge", NULL, 202, &_5, &_6, &json, &_8); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 335, &_9); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 334, &_9); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/adr/middleware/corsmiddleware.zep.c b/ext/phalcon/adr/middleware/corsmiddleware.zep.c index d0dcaaddef..6627e18e9e 100644 --- a/ext/phalcon/adr/middleware/corsmiddleware.zep.c +++ b/ext/phalcon/adr/middleware/corsmiddleware.zep.c @@ -278,10 +278,10 @@ PHP_METHOD(Phalcon_ADR_Middleware_CorsMiddleware, __invoke) if (ZEPHIR_IS_IDENTICAL(&_4, &_3)) { ZEPHIR_INIT_VAR(&response); object_init_ex(&response, phalcon_http_response_ce); - ZEPHIR_CALL_METHOD(NULL, &response, "__construct", NULL, 316); + ZEPHIR_CALL_METHOD(NULL, &response, "__construct", NULL, 315); zephir_check_call_status(); ZVAL_LONG(&_5$$4, 204); - ZEPHIR_CALL_METHOD(NULL, &response, "setstatuscode", NULL, 317, &_5$$4); + ZEPHIR_CALL_METHOD(NULL, &response, "setstatuscode", NULL, 316, &_5$$4); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, this_ptr, "applyheaders", NULL, 0, &response, &origin); zephir_check_call_status(); @@ -290,14 +290,14 @@ PHP_METHOD(Phalcon_ADR_Middleware_CorsMiddleware, __invoke) zephir_fast_join_str(&_6$$4, SL(", "), &_5$$4); ZEPHIR_INIT_VAR(&_7$$4); ZVAL_STRING(&_7$$4, "Access-Control-Allow-Methods"); - ZEPHIR_CALL_METHOD(NULL, &response, "setheader", NULL, 337, &_7$$4, &_6$$4); + ZEPHIR_CALL_METHOD(NULL, &response, "setheader", NULL, 336, &_7$$4, &_6$$4); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_7$$4); zephir_read_property_cached(&_8$$4, this_ptr, _zephir_prop_1, 360, PH_NOISY_CC | PH_READONLY); zephir_fast_join_str(&_7$$4, SL(", "), &_8$$4); ZEPHIR_INIT_VAR(&_9$$4); ZVAL_STRING(&_9$$4, "Access-Control-Allow-Headers"); - ZEPHIR_CALL_METHOD(NULL, &response, "setheader", NULL, 337, &_9$$4, &_7$$4); + ZEPHIR_CALL_METHOD(NULL, &response, "setheader", NULL, 336, &_9$$4, &_7$$4); zephir_check_call_status(); zephir_read_property_cached(&_10$$4, this_ptr, _zephir_prop_2, 362, PH_NOISY_CC | PH_READONLY); if (ZEPHIR_GT_LONG(&_10$$4, 0)) { @@ -306,7 +306,7 @@ PHP_METHOD(Phalcon_ADR_Middleware_CorsMiddleware, __invoke) zephir_cast_to_string(&_12$$5, &_11$$5); ZEPHIR_INIT_VAR(&_13$$5); ZVAL_STRING(&_13$$5, "Access-Control-Max-Age"); - ZEPHIR_CALL_METHOD(NULL, &response, "setheader", NULL, 337, &_13$$5, &_12$$5); + ZEPHIR_CALL_METHOD(NULL, &response, "setheader", NULL, 336, &_13$$5, &_12$$5); zephir_check_call_status(); } RETURN_CCTOR(&response); diff --git a/ext/phalcon/adr/middleware/requestidmiddleware.zep.c b/ext/phalcon/adr/middleware/requestidmiddleware.zep.c index 3ff9de9cf6..4d921aa128 100644 --- a/ext/phalcon/adr/middleware/requestidmiddleware.zep.c +++ b/ext/phalcon/adr/middleware/requestidmiddleware.zep.c @@ -68,9 +68,9 @@ PHP_METHOD(Phalcon_ADR_Middleware_RequestIdMiddleware, __invoke) zephir_check_call_status(); if (ZEPHIR_IS_EMPTY(&id)) { ZVAL_LONG(&_1$$3, 16); - ZEPHIR_CALL_FUNCTION(&_2$$3, "random_bytes", NULL, 330, &_1$$3); + ZEPHIR_CALL_FUNCTION(&_2$$3, "random_bytes", NULL, 329, &_1$$3); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&id, "bin2hex", NULL, 331, &_2$$3); + ZEPHIR_CALL_FUNCTION(&id, "bin2hex", NULL, 330, &_2$$3); zephir_check_call_status(); } ZEPHIR_CALL_METHOD(&_3, request, "getattributes", NULL, 0); diff --git a/ext/phalcon/adr/payload/payload.zep.c b/ext/phalcon/adr/payload/payload.zep.c index cf1334407b..4fdca56aca 100644 --- a/ext/phalcon/adr/payload/payload.zep.c +++ b/ext/phalcon/adr/payload/payload.zep.c @@ -115,7 +115,7 @@ PHP_METHOD(Phalcon_ADR_Payload_Payload, accepted) ZEPHIR_INIT_VAR(&_2); ZVAL_STRING(&_2, "ACCEPTED"); - ZEPHIR_CALL_METHOD(&_1, &_0, "withstatus", NULL, 328, &_2); + ZEPHIR_CALL_METHOD(&_1, &_0, "withstatus", NULL, 327, &_2); zephir_check_call_status(); ZEPHIR_RETURN_CALL_METHOD(&_1, "withresult", NULL, 0, result); zephir_check_call_status(); @@ -157,7 +157,7 @@ PHP_METHOD(Phalcon_ADR_Payload_Payload, authenticated) ZEPHIR_INIT_VAR(&_2); ZVAL_STRING(&_2, "AUTHENTICATED"); - ZEPHIR_CALL_METHOD(&_1, &_0, "withstatus", NULL, 328, &_2); + ZEPHIR_CALL_METHOD(&_1, &_0, "withstatus", NULL, 327, &_2); zephir_check_call_status(); ZEPHIR_RETURN_CALL_METHOD(&_1, "withresult", NULL, 0, result); zephir_check_call_status(); @@ -199,7 +199,7 @@ PHP_METHOD(Phalcon_ADR_Payload_Payload, authorized) ZEPHIR_INIT_VAR(&_2); ZVAL_STRING(&_2, "AUTHORIZED"); - ZEPHIR_CALL_METHOD(&_1, &_0, "withstatus", NULL, 328, &_2); + ZEPHIR_CALL_METHOD(&_1, &_0, "withstatus", NULL, 327, &_2); zephir_check_call_status(); ZEPHIR_RETURN_CALL_METHOD(&_1, "withresult", NULL, 0, result); zephir_check_call_status(); @@ -241,7 +241,7 @@ PHP_METHOD(Phalcon_ADR_Payload_Payload, created) ZEPHIR_INIT_VAR(&_2); ZVAL_STRING(&_2, "CREATED"); - ZEPHIR_CALL_METHOD(&_1, &_0, "withstatus", NULL, 328, &_2); + ZEPHIR_CALL_METHOD(&_1, &_0, "withstatus", NULL, 327, &_2); zephir_check_call_status(); ZEPHIR_RETURN_CALL_METHOD(&_1, "withresult", NULL, 0, result); zephir_check_call_status(); @@ -283,7 +283,7 @@ PHP_METHOD(Phalcon_ADR_Payload_Payload, deleted) ZEPHIR_INIT_VAR(&_2); ZVAL_STRING(&_2, "DELETED"); - ZEPHIR_CALL_METHOD(&_1, &_0, "withstatus", NULL, 328, &_2); + ZEPHIR_CALL_METHOD(&_1, &_0, "withstatus", NULL, 327, &_2); zephir_check_call_status(); ZEPHIR_RETURN_CALL_METHOD(&_1, "withresult", NULL, 0, result); zephir_check_call_status(); @@ -325,7 +325,7 @@ PHP_METHOD(Phalcon_ADR_Payload_Payload, error) ZEPHIR_INIT_VAR(&_2); ZVAL_STRING(&_2, "ERROR"); - ZEPHIR_CALL_METHOD(&_1, &_0, "withstatus", NULL, 328, &_2); + ZEPHIR_CALL_METHOD(&_1, &_0, "withstatus", NULL, 327, &_2); zephir_check_call_status(); ZEPHIR_RETURN_CALL_METHOD(&_1, "withmessages", NULL, 0, messages); zephir_check_call_status(); @@ -368,7 +368,7 @@ PHP_METHOD(Phalcon_ADR_Payload_Payload, forbidden) ZEPHIR_INIT_VAR(&_2); ZVAL_STRING(&_2, "NOT_AUTHORIZED"); - ZEPHIR_CALL_METHOD(&_1, &_0, "withstatus", NULL, 328, &_2); + ZEPHIR_CALL_METHOD(&_1, &_0, "withstatus", NULL, 327, &_2); zephir_check_call_status(); ZEPHIR_RETURN_CALL_METHOD(&_1, "withmessages", NULL, 0, messages); zephir_check_call_status(); @@ -410,7 +410,7 @@ PHP_METHOD(Phalcon_ADR_Payload_Payload, found) ZEPHIR_INIT_VAR(&_2); ZVAL_STRING(&_2, "FOUND"); - ZEPHIR_CALL_METHOD(&_1, &_0, "withstatus", NULL, 328, &_2); + ZEPHIR_CALL_METHOD(&_1, &_0, "withstatus", NULL, 327, &_2); zephir_check_call_status(); ZEPHIR_RETURN_CALL_METHOD(&_1, "withresult", NULL, 0, result); zephir_check_call_status(); @@ -452,7 +452,7 @@ PHP_METHOD(Phalcon_ADR_Payload_Payload, invalid) ZEPHIR_INIT_VAR(&_2); ZVAL_STRING(&_2, "NOT_VALID"); - ZEPHIR_CALL_METHOD(&_1, &_0, "withstatus", NULL, 328, &_2); + ZEPHIR_CALL_METHOD(&_1, &_0, "withstatus", NULL, 327, &_2); zephir_check_call_status(); ZEPHIR_RETURN_CALL_METHOD(&_1, "withmessages", NULL, 0, messages); zephir_check_call_status(); @@ -494,7 +494,7 @@ PHP_METHOD(Phalcon_ADR_Payload_Payload, notAccepted) ZEPHIR_INIT_VAR(&_2); ZVAL_STRING(&_2, "NOT_ACCEPTED"); - ZEPHIR_CALL_METHOD(&_1, &_0, "withstatus", NULL, 328, &_2); + ZEPHIR_CALL_METHOD(&_1, &_0, "withstatus", NULL, 327, &_2); zephir_check_call_status(); ZEPHIR_RETURN_CALL_METHOD(&_1, "withmessages", NULL, 0, messages); zephir_check_call_status(); @@ -536,7 +536,7 @@ PHP_METHOD(Phalcon_ADR_Payload_Payload, notCreated) ZEPHIR_INIT_VAR(&_2); ZVAL_STRING(&_2, "NOT_CREATED"); - ZEPHIR_CALL_METHOD(&_1, &_0, "withstatus", NULL, 328, &_2); + ZEPHIR_CALL_METHOD(&_1, &_0, "withstatus", NULL, 327, &_2); zephir_check_call_status(); ZEPHIR_RETURN_CALL_METHOD(&_1, "withmessages", NULL, 0, messages); zephir_check_call_status(); @@ -578,7 +578,7 @@ PHP_METHOD(Phalcon_ADR_Payload_Payload, notDeleted) ZEPHIR_INIT_VAR(&_2); ZVAL_STRING(&_2, "NOT_DELETED"); - ZEPHIR_CALL_METHOD(&_1, &_0, "withstatus", NULL, 328, &_2); + ZEPHIR_CALL_METHOD(&_1, &_0, "withstatus", NULL, 327, &_2); zephir_check_call_status(); ZEPHIR_RETURN_CALL_METHOD(&_1, "withmessages", NULL, 0, messages); zephir_check_call_status(); @@ -620,7 +620,7 @@ PHP_METHOD(Phalcon_ADR_Payload_Payload, notFound) ZEPHIR_INIT_VAR(&_2); ZVAL_STRING(&_2, "NOT_FOUND"); - ZEPHIR_CALL_METHOD(&_1, &_0, "withstatus", NULL, 328, &_2); + ZEPHIR_CALL_METHOD(&_1, &_0, "withstatus", NULL, 327, &_2); zephir_check_call_status(); ZEPHIR_RETURN_CALL_METHOD(&_1, "withmessages", NULL, 0, messages); zephir_check_call_status(); @@ -662,7 +662,7 @@ PHP_METHOD(Phalcon_ADR_Payload_Payload, notUpdated) ZEPHIR_INIT_VAR(&_2); ZVAL_STRING(&_2, "NOT_UPDATED"); - ZEPHIR_CALL_METHOD(&_1, &_0, "withstatus", NULL, 328, &_2); + ZEPHIR_CALL_METHOD(&_1, &_0, "withstatus", NULL, 327, &_2); zephir_check_call_status(); ZEPHIR_RETURN_CALL_METHOD(&_1, "withmessages", NULL, 0, messages); zephir_check_call_status(); @@ -704,7 +704,7 @@ PHP_METHOD(Phalcon_ADR_Payload_Payload, processing) ZEPHIR_INIT_VAR(&_2); ZVAL_STRING(&_2, "PROCESSING"); - ZEPHIR_CALL_METHOD(&_1, &_0, "withstatus", NULL, 328, &_2); + ZEPHIR_CALL_METHOD(&_1, &_0, "withstatus", NULL, 327, &_2); zephir_check_call_status(); ZEPHIR_RETURN_CALL_METHOD(&_1, "withresult", NULL, 0, result); zephir_check_call_status(); @@ -746,7 +746,7 @@ PHP_METHOD(Phalcon_ADR_Payload_Payload, success) ZEPHIR_INIT_VAR(&_2); ZVAL_STRING(&_2, "SUCCESS"); - ZEPHIR_CALL_METHOD(&_1, &_0, "withstatus", NULL, 328, &_2); + ZEPHIR_CALL_METHOD(&_1, &_0, "withstatus", NULL, 327, &_2); zephir_check_call_status(); ZEPHIR_RETURN_CALL_METHOD(&_1, "withresult", NULL, 0, result); zephir_check_call_status(); @@ -789,7 +789,7 @@ PHP_METHOD(Phalcon_ADR_Payload_Payload, unauthenticated) ZEPHIR_INIT_VAR(&_2); ZVAL_STRING(&_2, "NOT_AUTHENTICATED"); - ZEPHIR_CALL_METHOD(&_1, &_0, "withstatus", NULL, 328, &_2); + ZEPHIR_CALL_METHOD(&_1, &_0, "withstatus", NULL, 327, &_2); zephir_check_call_status(); ZEPHIR_RETURN_CALL_METHOD(&_1, "withmessages", NULL, 0, messages); zephir_check_call_status(); @@ -831,7 +831,7 @@ PHP_METHOD(Phalcon_ADR_Payload_Payload, updated) ZEPHIR_INIT_VAR(&_2); ZVAL_STRING(&_2, "UPDATED"); - ZEPHIR_CALL_METHOD(&_1, &_0, "withstatus", NULL, 328, &_2); + ZEPHIR_CALL_METHOD(&_1, &_0, "withstatus", NULL, 327, &_2); zephir_check_call_status(); ZEPHIR_RETURN_CALL_METHOD(&_1, "withresult", NULL, 0, result); zephir_check_call_status(); @@ -873,7 +873,7 @@ PHP_METHOD(Phalcon_ADR_Payload_Payload, valid) ZEPHIR_INIT_VAR(&_2); ZVAL_STRING(&_2, "VALID"); - ZEPHIR_CALL_METHOD(&_1, &_0, "withstatus", NULL, 328, &_2); + ZEPHIR_CALL_METHOD(&_1, &_0, "withstatus", NULL, 327, &_2); zephir_check_call_status(); ZEPHIR_RETURN_CALL_METHOD(&_1, "withresult", NULL, 0, result); zephir_check_call_status(); diff --git a/ext/phalcon/adr/pipeline.zep.c b/ext/phalcon/adr/pipeline.zep.c index c4fca40300..8508f29a16 100644 --- a/ext/phalcon/adr/pipeline.zep.c +++ b/ext/phalcon/adr/pipeline.zep.c @@ -169,7 +169,7 @@ PHP_METHOD(Phalcon_ADR_Pipeline, __invoke) zephir_read_property_cached(&_6, this_ptr, _zephir_prop_2, 365, PH_NOISY_CC | PH_READONLY); zephir_read_property_cached(&_7, this_ptr, _zephir_prop_0, 366, PH_NOISY_CC | PH_READONLY); ZVAL_LONG(&_8, (zephir_get_numberval(&_7) + 1)); - ZEPHIR_CALL_METHOD(NULL, &next, "__construct", NULL, 322, &_5, &_6, &_8); + ZEPHIR_CALL_METHOD(NULL, &next, "__construct", NULL, 321, &_5, &_6, &_8); zephir_check_call_status(); ZEPHIR_RETURN_CALL_METHOD(&mw, "__invoke", NULL, 0, request, &next); zephir_check_call_status(); diff --git a/ext/phalcon/adr/responder/redirect.zep.c b/ext/phalcon/adr/responder/redirect.zep.c index a068de8d5a..c7fb04020b 100644 --- a/ext/phalcon/adr/responder/redirect.zep.c +++ b/ext/phalcon/adr/responder/redirect.zep.c @@ -144,7 +144,7 @@ PHP_METHOD(Phalcon_ADR_Responder_Redirect, permanent) ZVAL_STR_COPY(&url_zv, url); object_init_ex(return_value, phalcon_adr_responder_redirect_ce); ZVAL_LONG(&_0, 301); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 338, &url_zv, &_0); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 337, &url_zv, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -167,7 +167,7 @@ PHP_METHOD(Phalcon_ADR_Responder_Redirect, seeOther) ZVAL_STR_COPY(&url_zv, url); object_init_ex(return_value, phalcon_adr_responder_redirect_ce); ZVAL_LONG(&_0, 303); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 338, &url_zv, &_0); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 337, &url_zv, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -190,7 +190,7 @@ PHP_METHOD(Phalcon_ADR_Responder_Redirect, temporary) ZVAL_STR_COPY(&url_zv, url); object_init_ex(return_value, phalcon_adr_responder_redirect_ce); ZVAL_LONG(&_0, 302); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 338, &url_zv, &_0); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 337, &url_zv, &_0); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/adr/responder/statusresponder.zep.c b/ext/phalcon/adr/responder/statusresponder.zep.c index 9ed29ee890..c3cdf1a7f1 100644 --- a/ext/phalcon/adr/responder/statusresponder.zep.c +++ b/ext/phalcon/adr/responder/statusresponder.zep.c @@ -79,7 +79,7 @@ PHP_METHOD(Phalcon_ADR_Responder_StatusResponder, __construct) if (Z_TYPE_P(mapper) == IS_NULL) { ZEPHIR_INIT_VAR(&_0$$3); object_init_ex(&_0$$3, phalcon_adr_responder_statusmapper_ce); - ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 339); + ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 338); zephir_check_call_status(); zephir_update_property_zval_cached(this_ptr, _zephir_prop_0, 372, &_0$$3); } else { diff --git a/ext/phalcon/adr/responder/viewresponder.zep.c b/ext/phalcon/adr/responder/viewresponder.zep.c index 5bf0f9b9a0..47a7ac84e6 100644 --- a/ext/phalcon/adr/responder/viewresponder.zep.c +++ b/ext/phalcon/adr/responder/viewresponder.zep.c @@ -158,7 +158,7 @@ PHP_METHOD(Phalcon_ADR_Responder_ViewResponder, __invoke) zephir_fetch_params(1, 3, 0, &request, &response, &payload); zephir_read_property_cached(&_0, this_ptr, _zephir_prop_0, 373, PH_NOISY_CC | PH_READONLY); zephir_read_property_cached(&_1, this_ptr, _zephir_prop_1, 375, PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(&_2, this_ptr, "viewdata", NULL, 340, payload); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "viewdata", NULL, 339, payload); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&html, &_0, "render", NULL, 0, &_1, &_2); zephir_check_call_status(); diff --git a/ext/phalcon/adr/router/attributefilter.zep.c b/ext/phalcon/adr/router/attributefilter.zep.c index 026a61c797..b10326761e 100644 --- a/ext/phalcon/adr/router/attributefilter.zep.c +++ b/ext/phalcon/adr/router/attributefilter.zep.c @@ -157,7 +157,7 @@ PHP_METHOD(Phalcon_ADR_Router_AttributeFilter, filter) if (!(zephir_is_true(&_8$$7))) { ZEPHIR_INIT_NVAR(&_9$$8); object_init_ex(&_9$$8, phalcon_adr_exceptions_routenotfound_ce); - ZEPHIR_CALL_METHOD(NULL, &_9$$8, "__construct", &_10, 315); + ZEPHIR_CALL_METHOD(NULL, &_9$$8, "__construct", &_10, 314); zephir_check_call_status(); zephir_throw_exception_debug(&_9$$8, "phalcon/ADR/Router/AttributeFilter.zep", 68); ZEPHIR_MM_RESTORE(); @@ -171,7 +171,7 @@ PHP_METHOD(Phalcon_ADR_Router_AttributeFilter, filter) ZEPHIR_INIT_NVAR(&type); ZVAL_STRING(&type, "string"); } - ZEPHIR_CALL_METHOD(&value, this_ptr, "cast", &_11, 341, &segment, &type); + ZEPHIR_CALL_METHOD(&value, this_ptr, "cast", &_11, 340, &segment, &type); zephir_check_call_status(); if (zephir_array_isset_value_string(&rule, SL("convert"))) { ZEPHIR_OBS_NVAR(&convert); @@ -261,7 +261,7 @@ PHP_METHOD(Phalcon_ADR_Router_AttributeFilter, cast) zephir_check_call_status(); RETURN_MM(); zephir_switch_0_clause_2: ; - ZEPHIR_RETURN_CALL_FUNCTION("strval", NULL, 342, &value_zv); + ZEPHIR_RETURN_CALL_FUNCTION("strval", NULL, 341, &value_zv); zephir_check_call_status(); RETURN_MM(); diff --git a/ext/phalcon/adr/router/router.zep.c b/ext/phalcon/adr/router/router.zep.c index b4aaf6bca3..1af78e61b9 100644 --- a/ext/phalcon/adr/router/router.zep.c +++ b/ext/phalcon/adr/router/router.zep.c @@ -165,10 +165,10 @@ PHP_METHOD(Phalcon_ADR_Router_Router, candidatesFor) ZVAL_STR_COPY(&method_zv, method); zephir_memory_observe(&path_zv); ZVAL_STR_COPY(&path_zv, path); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "derivecandidates", NULL, 343, &method_zv, &path_zv); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "derivecandidates", NULL, 342, &method_zv, &path_zv); zephir_check_call_status(); ZVAL_LONG(&_1, 0); - ZEPHIR_RETURN_CALL_FUNCTION("array_column", NULL, 344, &_0, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("array_column", NULL, 343, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -259,7 +259,7 @@ PHP_METHOD(Phalcon_ADR_Router_Router, classFor) { ZEPHIR_INIT_NVAR(&segment); ZVAL_COPY(&segment, _5); - ZEPHIR_CALL_METHOD(&_6$$4, this_ptr, "camelize", &_7, 345, &segment); + ZEPHIR_CALL_METHOD(&_6$$4, this_ptr, "camelize", &_7, 344, &segment); zephir_check_call_status(); zephir_array_append(&parts, &_6$$4, PH_SEPARATE, "phalcon/ADR/Router/Router.zep", 140); } ZEND_HASH_FOREACH_END(); @@ -318,7 +318,7 @@ PHP_METHOD(Phalcon_ADR_Router_Router, match) if (ZEPHIR_IS_STRING_IDENTICAL(&_0, "")) { ZEPHIR_INIT_VAR(&_1$$3); object_init_ex(&_1$$3, phalcon_adr_exceptions_actiondirectorynotset_ce); - ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 346); + ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 345); zephir_check_call_status(); zephir_throw_exception_debug(&_1$$3, "phalcon/ADR/Router/Router.zep", 153); ZEPHIR_MM_RESTORE(); @@ -329,7 +329,7 @@ PHP_METHOD(Phalcon_ADR_Router_Router, match) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&method, request, "getmethod", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&located, this_ptr, "locate", NULL, 347, &method, &path); + ZEPHIR_CALL_METHOD(&located, this_ptr, "locate", NULL, 346, &method, &path); zephir_check_call_status(); if (Z_TYPE_P(&located) == IS_ARRAY) { object_init_ex(return_value, phalcon_adr_router_routermatch_ce); @@ -339,13 +339,13 @@ PHP_METHOD(Phalcon_ADR_Router_Router, match) zephir_array_fetch_long(&_4$$4, &located, 1, PH_NOISY, "phalcon/ADR/Router/Router.zep", 163); zephir_memory_observe(&_6$$4); zephir_array_fetch_long(&_6$$4, &located, 0, PH_NOISY, "phalcon/ADR/Router/Router.zep", 164); - ZEPHIR_CALL_METHOD(&_5$$4, this_ptr, "middlewarefor", NULL, 348, &_6$$4); + ZEPHIR_CALL_METHOD(&_5$$4, this_ptr, "middlewarefor", NULL, 347, &_6$$4); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 349, &_3$$4, &_4$$4, &_5$$4); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 348, &_3$$4, &_4$$4, &_5$$4); zephir_check_call_status(); RETURN_MM(); } - ZEPHIR_CALL_METHOD(&_7, this_ptr, "verbs", NULL, 350); + ZEPHIR_CALL_METHOD(&_7, this_ptr, "verbs", NULL, 349); zephir_check_call_status(); if (Z_TYPE_P(&_7) == IS_STRING) { ZEPHIR_INIT_VAR(&_9); @@ -364,14 +364,14 @@ PHP_METHOD(Phalcon_ADR_Router_Router, match) zephir_check_call_status(); _13$$5 = !ZEPHIR_IS_LONG_IDENTICAL(&_11$$5, 0); if (_13$$5) { - ZEPHIR_CALL_METHOD(&_14$$5, this_ptr, "locate", NULL, 347, &other, &path); + ZEPHIR_CALL_METHOD(&_14$$5, this_ptr, "locate", NULL, 346, &other, &path); zephir_check_call_status(); _13$$5 = Z_TYPE_P(&_14$$5) == IS_ARRAY; } if (_13$$5) { ZEPHIR_INIT_NVAR(&_15$$6); object_init_ex(&_15$$6, phalcon_adr_exceptions_methodnotallowed_ce); - ZEPHIR_CALL_METHOD(NULL, &_15$$6, "__construct", &_16, 351); + ZEPHIR_CALL_METHOD(NULL, &_15$$6, "__construct", &_16, 350); zephir_check_call_status(); zephir_throw_exception_debug(&_15$$6, "phalcon/ADR/Router/Router.zep", 170); ZEPHIR_MM_RESTORE(); @@ -400,14 +400,14 @@ PHP_METHOD(Phalcon_ADR_Router_Router, match) zephir_check_call_status(); _20$$7 = !ZEPHIR_IS_LONG_IDENTICAL(&_19$$7, 0); if (_20$$7) { - ZEPHIR_CALL_METHOD(&_21$$7, this_ptr, "locate", NULL, 347, &other, &path); + ZEPHIR_CALL_METHOD(&_21$$7, this_ptr, "locate", NULL, 346, &other, &path); zephir_check_call_status(); _20$$7 = Z_TYPE_P(&_21$$7) == IS_ARRAY; } if (_20$$7) { ZEPHIR_INIT_NVAR(&_22$$8); object_init_ex(&_22$$8, phalcon_adr_exceptions_methodnotallowed_ce); - ZEPHIR_CALL_METHOD(NULL, &_22$$8, "__construct", &_16, 351); + ZEPHIR_CALL_METHOD(NULL, &_22$$8, "__construct", &_16, 350); zephir_check_call_status(); zephir_throw_exception_debug(&_22$$8, "phalcon/ADR/Router/Router.zep", 170); ZEPHIR_MM_RESTORE(); @@ -437,7 +437,7 @@ PHP_METHOD(Phalcon_ADR_Router_Router, methodFor) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_memory_observe(&className_zv); ZVAL_STR_COPY(&className_zv, className); - ZEPHIR_CALL_METHOD(&verb, this_ptr, "verbof", NULL, 352, &className_zv); + ZEPHIR_CALL_METHOD(&verb, this_ptr, "verbof", NULL, 351, &className_zv); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_0); if (Z_TYPE_P(&verb) == IS_NULL) { @@ -491,7 +491,7 @@ PHP_METHOD(Phalcon_ADR_Router_Router, pathFor) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_memory_observe(&className_zv); ZVAL_STR_COPY(&className_zv, className); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "verbof", NULL, 352, &className_zv); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "verbof", NULL, 351, &className_zv); zephir_check_call_status(); if (Z_TYPE_P(&_0) == IS_NULL) { RETURN_MM_NULL(); @@ -503,7 +503,7 @@ PHP_METHOD(Phalcon_ADR_Router_Router, pathFor) ZEPHIR_INIT_VAR(&parts); zephir_fast_explode_str(&parts, SL("\\"), &_3, ZEND_LONG_MAX); ZEPHIR_MAKE_REF(&parts); - ZEPHIR_CALL_FUNCTION(NULL, "array_pop", NULL, 353, &parts); + ZEPHIR_CALL_FUNCTION(NULL, "array_pop", NULL, 352, &parts); ZEPHIR_UNREF(&parts); zephir_check_call_status(); if (ZEPHIR_IS_EMPTY(&parts)) { @@ -524,7 +524,7 @@ PHP_METHOD(Phalcon_ADR_Router_Router, pathFor) { ZEPHIR_INIT_NVAR(&part); ZVAL_COPY(&part, _6); - ZEPHIR_CALL_METHOD(&_7$$5, this_ptr, "decamelize", &_8, 354, &part); + ZEPHIR_CALL_METHOD(&_7$$5, this_ptr, "decamelize", &_8, 353, &part); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_9$$5); ZEPHIR_CONCAT_VSV(&_9$$5, &path, "/", &_7$$5); @@ -548,7 +548,7 @@ PHP_METHOD(Phalcon_ADR_Router_Router, pathFor) } ZEPHIR_CALL_METHOD(&part, _4, "current", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_12$$6, this_ptr, "decamelize", &_8, 354, &part); + ZEPHIR_CALL_METHOD(&_12$$6, this_ptr, "decamelize", &_8, 353, &part); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_13$$6); ZEPHIR_CONCAT_VSV(&_13$$6, &path, "/", &_12$$6); @@ -556,7 +556,7 @@ PHP_METHOD(Phalcon_ADR_Router_Router, pathFor) } } ZEPHIR_INIT_NVAR(&part); - ZEPHIR_CALL_METHOD(&_14, this_ptr, "actionparams", NULL, 355, &className_zv); + ZEPHIR_CALL_METHOD(&_14, this_ptr, "actionparams", NULL, 354, &className_zv); zephir_check_call_status(); ZEPHIR_INIT_VAR(&names); zephir_array_keys(&names, &_14); @@ -774,7 +774,7 @@ PHP_METHOD(Phalcon_ADR_Router_Router, camelize) ZVAL_STR_COPY(&segment_zv, segment); zephir_read_property_cached(&_0, this_ptr, _zephir_prop_0, 379, PH_NOISY_CC | PH_READONLY); zephir_read_property_cached(&_1, this_ptr, _zephir_prop_0, 379, PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_2, "ucwords", NULL, 356, &segment_zv, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "ucwords", NULL, 355, &segment_zv, &_1); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_3); ZVAL_STRING(&_3, ""); @@ -918,11 +918,11 @@ PHP_METHOD(Phalcon_ADR_Router_Router, deriveCandidates) } ZEPHIR_OBS_NVAR(&_5$$4); zephir_array_fetch_long(&_5$$4, &segments, 0, PH_NOISY, "phalcon/ADR/Router/Router.zep", 338); - ZEPHIR_CALL_METHOD(&segment, this_ptr, "camelize", &_6, 345, &_5$$4); + ZEPHIR_CALL_METHOD(&segment, this_ptr, "camelize", &_6, 344, &_5$$4); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&candidate); ZEPHIR_CONCAT_VSV(&candidate, &subNamespace, "\\", &segment); - ZEPHIR_CALL_METHOD(&_7$$4, this_ptr, "hassubnamespace", &_8, 357, &candidate); + ZEPHIR_CALL_METHOD(&_7$$4, this_ptr, "hassubnamespace", &_8, 356, &candidate); zephir_check_call_status(); if (!(zephir_is_true(&_7$$4))) { break; @@ -1036,7 +1036,7 @@ PHP_METHOD(Phalcon_ADR_Router_Router, locate) ZVAL_STR_COPY(&method_zv, method); zephir_memory_observe(&path_zv); ZVAL_STR_COPY(&path_zv, path); - ZEPHIR_CALL_METHOD(&candidates, this_ptr, "derivecandidates", NULL, 343, &method_zv, &path_zv); + ZEPHIR_CALL_METHOD(&candidates, this_ptr, "derivecandidates", NULL, 342, &method_zv, &path_zv); zephir_check_call_status(); if (Z_TYPE_P(&candidates) == IS_STRING) { ZEPHIR_INIT_VAR(&_1); @@ -1185,7 +1185,7 @@ PHP_METHOD(Phalcon_ADR_Router_Router, middlewareFor) ZEPHIR_INIT_NVAR(&full); ZEPHIR_CONCAT_VV(&full, &_6$$3, &prefix); ZVAL_LONG(&_7$$3, zephir_fast_strlen_ev(&full)); - ZEPHIR_CALL_FUNCTION(&_8$$3, "strncmp", &_9, 358, &className_zv, &full, &_7$$3); + ZEPHIR_CALL_FUNCTION(&_8$$3, "strncmp", &_9, 357, &className_zv, &full, &_7$$3); zephir_check_call_status(); if (ZEPHIR_IS_LONG_IDENTICAL(&_8$$3, 0)) { ZEPHIR_INIT_NVAR(&_10$$4); @@ -1217,7 +1217,7 @@ PHP_METHOD(Phalcon_ADR_Router_Router, middlewareFor) ZEPHIR_INIT_NVAR(&full); ZEPHIR_CONCAT_VV(&full, &_13$$5, &prefix); ZVAL_LONG(&_14$$5, zephir_fast_strlen_ev(&full)); - ZEPHIR_CALL_FUNCTION(&_15$$5, "strncmp", &_9, 358, &className_zv, &full, &_14$$5); + ZEPHIR_CALL_FUNCTION(&_15$$5, "strncmp", &_9, 357, &className_zv, &full, &_14$$5); zephir_check_call_status(); if (ZEPHIR_IS_LONG_IDENTICAL(&_15$$5, 0)) { ZEPHIR_INIT_NVAR(&_16$$6); @@ -1287,7 +1287,7 @@ PHP_METHOD(Phalcon_ADR_Router_Router, verbOf) ZEPHIR_INIT_VAR(&prefix); ZEPHIR_CONCAT_VS(&prefix, &_0, "\\"); ZVAL_LONG(&_1, zephir_fast_strlen_ev(&prefix)); - ZEPHIR_CALL_FUNCTION(&_2, "strncmp", NULL, 358, &className_zv, &prefix, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "strncmp", NULL, 357, &className_zv, &prefix, &_1); zephir_check_call_status(); if (!ZEPHIR_IS_LONG_IDENTICAL(&_2, 0)) { RETURN_MM_NULL(); @@ -1298,12 +1298,12 @@ PHP_METHOD(Phalcon_ADR_Router_Router, verbOf) ZEPHIR_INIT_VAR(&parts); zephir_fast_explode_str(&parts, SL("\\"), &_3, ZEND_LONG_MAX); ZEPHIR_MAKE_REF(&parts); - ZEPHIR_CALL_FUNCTION(&last, "array_pop", NULL, 353, &parts); + ZEPHIR_CALL_FUNCTION(&last, "array_pop", NULL, 352, &parts); ZEPHIR_UNREF(&parts); zephir_check_call_status(); if (ZEPHIR_IS_EMPTY(&parts)) { ZEPHIR_INIT_VAR(&_4$$4); - ZEPHIR_CALL_METHOD(&_5$$4, this_ptr, "verbs", NULL, 350); + ZEPHIR_CALL_METHOD(&_5$$4, this_ptr, "verbs", NULL, 349); zephir_check_call_status(); ZEPHIR_CALL_FUNCTION(&_6$$4, "in_array", NULL, 89, &last, &_5$$4, &__$true); zephir_check_call_status(); @@ -1315,7 +1315,7 @@ PHP_METHOD(Phalcon_ADR_Router_Router, verbOf) } RETURN_CCTOR(&_4$$4); } - ZEPHIR_CALL_METHOD(&_7, this_ptr, "verbs", NULL, 350); + ZEPHIR_CALL_METHOD(&_7, this_ptr, "verbs", NULL, 349); zephir_check_call_status(); if (Z_TYPE_P(&_7) == IS_STRING) { ZEPHIR_INIT_VAR(&_9); diff --git a/ext/phalcon/annotations/adapter/apcu.zep.c b/ext/phalcon/annotations/adapter/apcu.zep.c index ff3d9754d2..6f2c5b0163 100644 --- a/ext/phalcon/annotations/adapter/apcu.zep.c +++ b/ext/phalcon/annotations/adapter/apcu.zep.c @@ -140,7 +140,7 @@ PHP_METHOD(Phalcon_Annotations_Adapter_Apcu, read) ZEPHIR_INIT_VAR(&_2); ZEPHIR_CONCAT_SVV(&_2, "_PHAN", &_1, &key_zv); zephir_fast_strtolower(&_0, &_2); - ZEPHIR_RETURN_CALL_FUNCTION("apcu_fetch", NULL, 287, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("apcu_fetch", NULL, 286, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -186,7 +186,7 @@ PHP_METHOD(Phalcon_Annotations_Adapter_Apcu, write) ZEPHIR_CONCAT_SVV(&_2, "_PHAN", &_1, &key_zv); zephir_fast_strtolower(&_0, &_2); zephir_read_property_cached(&_3, this_ptr, _zephir_prop_1, 400, PH_NOISY_CC | PH_READONLY); - ZEPHIR_RETURN_CALL_FUNCTION("apcu_store", NULL, 289, &_0, data, &_3); + ZEPHIR_RETURN_CALL_FUNCTION("apcu_store", NULL, 288, &_0, data, &_3); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/annotations/adapter/stream.zep.c b/ext/phalcon/annotations/adapter/stream.zep.c index de79a73a2f..6e274ffef9 100644 --- a/ext/phalcon/annotations/adapter/stream.zep.c +++ b/ext/phalcon/annotations/adapter/stream.zep.c @@ -131,7 +131,7 @@ PHP_METHOD(Phalcon_Annotations_Adapter_Stream, read) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_memory_observe(&key_zv); ZVAL_STR_COPY(&key_zv, key); - ZEPHIR_CALL_METHOD(&path, this_ptr, "getfilepath", NULL, 361, &key_zv); + ZEPHIR_CALL_METHOD(&path, this_ptr, "getfilepath", NULL, 360, &key_zv); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_0, this_ptr, "phpfileexists", NULL, 0, &path); zephir_check_call_status(); @@ -148,7 +148,7 @@ PHP_METHOD(Phalcon_Annotations_Adapter_Stream, read) ZEPHIR_INIT_NVAR(&_1); zephir_create_closure_ex(&_1, NULL, phalcon_6__closure_ce, SL("__invoke")); ZVAL_LONG(&_2, 2); - ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 306, &_1, &_2); + ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 305, &_1, &_2); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_3); zephir_create_array(&_3, 1, 0); @@ -167,12 +167,12 @@ PHP_METHOD(Phalcon_Annotations_Adapter_Stream, read) ZEPHIR_CALL_FUNCTION(&_6, "unserialize", NULL, 27, &contents, &_3); zephir_check_call_status(); ZEPHIR_CPY_WRT(&contents, &_6); - ZEPHIR_CALL_FUNCTION(NULL, "restore_error_handler", NULL, 307); + ZEPHIR_CALL_FUNCTION(NULL, "restore_error_handler", NULL, 306); zephir_check_call_status(); if (UNEXPECTED(ZEPHIR_GLOBAL(warning).enable)) { ZEPHIR_INIT_VAR(&_7$$5); object_init_ex(&_7$$5, phalcon_annotations_exceptions_cannotreadannotationdata_ce); - ZEPHIR_CALL_METHOD(NULL, &_7$$5, "__construct", NULL, 362); + ZEPHIR_CALL_METHOD(NULL, &_7$$5, "__construct", NULL, 361); zephir_check_call_status(); zephir_throw_exception_debug(&_7$$5, "phalcon/Annotations/Adapter/Stream.zep", 113); ZEPHIR_MM_RESTORE(); @@ -207,7 +207,7 @@ PHP_METHOD(Phalcon_Annotations_Adapter_Stream, write) data = ZEND_CALL_ARG(execute_data, 2); zephir_memory_observe(&key_zv); ZVAL_STR_COPY(&key_zv, key); - ZEPHIR_CALL_METHOD(&path, this_ptr, "getfilepath", NULL, 361, &key_zv); + ZEPHIR_CALL_METHOD(&path, this_ptr, "getfilepath", NULL, 360, &key_zv); zephir_check_call_status(); ZEPHIR_CALL_FUNCTION(&code, "serialize", NULL, 22, data); zephir_check_call_status(); @@ -216,7 +216,7 @@ PHP_METHOD(Phalcon_Annotations_Adapter_Stream, write) if (UNEXPECTED(ZEPHIR_IS_FALSE_IDENTICAL(&_0))) { ZEPHIR_INIT_VAR(&_1$$3); object_init_ex(&_1$$3, phalcon_annotations_exceptions_annotationsdirectorynotwritable_ce); - ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 363); + ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 362); zephir_check_call_status(); zephir_throw_exception_debug(&_1$$3, "phalcon/Annotations/Adapter/Stream.zep", 134); ZEPHIR_MM_RESTORE(); @@ -261,7 +261,7 @@ PHP_METHOD(Phalcon_Annotations_Adapter_Stream, getFilePath) ZEPHIR_INIT_VAR(&name); zephir_prepare_virtual_path(&name, &key_zv, &_0); if (zephir_memnstr_str(&key_zv, SL("_"), "phalcon/Annotations/Adapter/Stream.zep", 149)) { - ZEPHIR_CALL_FUNCTION(&_1$$3, "sha1", NULL, 302, &key_zv); + ZEPHIR_CALL_FUNCTION(&_1$$3, "sha1", NULL, 301, &key_zv); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_2$$3); ZEPHIR_CONCAT_VSV(&_2$$3, &name, "_", &_1$$3); diff --git a/ext/phalcon/annotations/annotation.zep.c b/ext/phalcon/annotations/annotation.zep.c index d0b92d967a..26d38cf42d 100644 --- a/ext/phalcon/annotations/annotation.zep.c +++ b/ext/phalcon/annotations/annotation.zep.c @@ -344,7 +344,7 @@ PHP_METHOD(Phalcon_Annotations_Annotation, getExpression) ZVAL_COPY(&item, _3$$8); ZEPHIR_OBS_NVAR(&_4$$9); zephir_array_fetch_string(&_4$$9, &item, SL("expr"), PH_NOISY, "phalcon/Annotations/Annotation.zep", 184); - ZEPHIR_CALL_METHOD(&resolvedItem, this_ptr, "getexpression", &_5, 364, &_4$$9); + ZEPHIR_CALL_METHOD(&resolvedItem, this_ptr, "getexpression", &_5, 363, &_4$$9); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&name); if (zephir_array_isset_string_fetch(&name, &item, SL("name"), 0)) { @@ -373,7 +373,7 @@ PHP_METHOD(Phalcon_Annotations_Annotation, getExpression) zephir_check_call_status(); ZEPHIR_OBS_NVAR(&_8$$12); zephir_array_fetch_string(&_8$$12, &item, SL("expr"), PH_NOISY, "phalcon/Annotations/Annotation.zep", 184); - ZEPHIR_CALL_METHOD(&resolvedItem, this_ptr, "getexpression", &_5, 364, &_8$$12); + ZEPHIR_CALL_METHOD(&resolvedItem, this_ptr, "getexpression", &_5, 363, &_8$$12); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&name); if (zephir_array_isset_string_fetch(&name, &item, SL("name"), 0)) { @@ -387,13 +387,13 @@ PHP_METHOD(Phalcon_Annotations_Annotation, getExpression) RETURN_CCTOR(&arrayValue); zephir_switch_0_clause_9: ; object_init_ex(return_value, phalcon_annotations_annotation_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 365, &expr); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 364, &expr); zephir_check_call_status(); RETURN_MM(); zephir_switch_0_clause_10: ; ZEPHIR_INIT_VAR(&_9$$16); object_init_ex(&_9$$16, phalcon_annotations_exceptions_unknownannotationexpression_ce); - ZEPHIR_CALL_METHOD(NULL, &_9$$16, "__construct", NULL, 366, &type); + ZEPHIR_CALL_METHOD(NULL, &_9$$16, "__construct", NULL, 365, &type); zephir_check_call_status(); zephir_throw_exception_debug(&_9$$16, "phalcon/Annotations/Annotation.zep", 199); ZEPHIR_MM_RESTORE(); diff --git a/ext/phalcon/annotations/attributesreader.zep.c b/ext/phalcon/annotations/attributesreader.zep.c index 4ae0994356..c85fbddd7c 100644 --- a/ext/phalcon/annotations/attributesreader.zep.c +++ b/ext/phalcon/annotations/attributesreader.zep.c @@ -143,16 +143,16 @@ PHP_METHOD(Phalcon_Annotations_AttributesReader, parse) object_init_ex(&reflection, zephir_get_internal_ce(SL("reflectionclass"))); ZEPHIR_CALL_METHOD(NULL, &reflection, "__construct", NULL, 252, &className_zv); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&file, &reflection, "getfilename", NULL, 367); + ZEPHIR_CALL_METHOD(&file, &reflection, "getfilename", NULL, 366); zephir_check_call_status(); if (Z_TYPE_P(&file) != IS_STRING) { ZEPHIR_INIT_NVAR(&file); ZVAL_STRING(&file, "eval code"); } - ZEPHIR_CALL_METHOD(&_0, &reflection, "getstartline", NULL, 368); + ZEPHIR_CALL_METHOD(&_0, &reflection, "getstartline", NULL, 367); zephir_check_call_status(); line = zephir_get_intval(&_0); - ZEPHIR_CALL_METHOD(&_1, &reflection, "getattributes", NULL, 369); + ZEPHIR_CALL_METHOD(&_1, &reflection, "getattributes", NULL, 368); zephir_check_call_status(); ZVAL_LONG(&_2, line); ZEPHIR_CALL_METHOD(&classAttributes, this_ptr, "buildnodes", NULL, 0, &_1, &file, &_2); @@ -160,7 +160,7 @@ PHP_METHOD(Phalcon_Annotations_AttributesReader, parse) if (!(ZEPHIR_IS_EMPTY(&classAttributes))) { zephir_array_update_string(&annotations, SL("class"), &classAttributes, PH_COPY | PH_SEPARATE); } - ZEPHIR_CALL_METHOD(&constants, &reflection, "getreflectionconstants", NULL, 370); + ZEPHIR_CALL_METHOD(&constants, &reflection, "getreflectionconstants", NULL, 369); zephir_check_call_status(); ZEPHIR_INIT_VAR(&annotationsConstants); array_init(&annotationsConstants); @@ -222,7 +222,7 @@ PHP_METHOD(Phalcon_Annotations_AttributesReader, parse) if (!(ZEPHIR_IS_EMPTY(&annotationsConstants))) { zephir_array_update_string(&annotations, SL("constants"), &annotationsConstants, PH_COPY | PH_SEPARATE); } - ZEPHIR_CALL_METHOD(&properties, &reflection, "getproperties", NULL, 371); + ZEPHIR_CALL_METHOD(&properties, &reflection, "getproperties", NULL, 370); zephir_check_call_status(); ZEPHIR_INIT_VAR(&annotationsProperties); array_init(&annotationsProperties); @@ -284,7 +284,7 @@ PHP_METHOD(Phalcon_Annotations_AttributesReader, parse) if (!(ZEPHIR_IS_EMPTY(&annotationsProperties))) { zephir_array_update_string(&annotations, SL("properties"), &annotationsProperties, PH_COPY | PH_SEPARATE); } - ZEPHIR_CALL_METHOD(&methods, &reflection, "getmethods", NULL, 372); + ZEPHIR_CALL_METHOD(&methods, &reflection, "getmethods", NULL, 371); zephir_check_call_status(); ZEPHIR_INIT_VAR(&annotationsMethods); array_init(&annotationsMethods); diff --git a/ext/phalcon/annotations/collection.zep.c b/ext/phalcon/annotations/collection.zep.c index 7df8d02fe3..cdd7e606f7 100644 --- a/ext/phalcon/annotations/collection.zep.c +++ b/ext/phalcon/annotations/collection.zep.c @@ -122,7 +122,7 @@ PHP_METHOD(Phalcon_Annotations_Collection, __construct) ZVAL_COPY(&annotationData, _0); ZEPHIR_INIT_NVAR(&_1$$3); object_init_ex(&_1$$3, phalcon_annotations_annotation_ce); - ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", &_2, 365, &annotationData); + ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", &_2, 364, &annotationData); zephir_check_call_status(); zephir_array_append(&annotations, &_1$$3, PH_SEPARATE, "phalcon/Annotations/Collection.zep", 69); } ZEND_HASH_FOREACH_END(); @@ -146,7 +146,7 @@ PHP_METHOD(Phalcon_Annotations_Collection, __construct) zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_5$$4); object_init_ex(&_5$$4, phalcon_annotations_annotation_ce); - ZEPHIR_CALL_METHOD(NULL, &_5$$4, "__construct", &_2, 365, &annotationData); + ZEPHIR_CALL_METHOD(NULL, &_5$$4, "__construct", &_2, 364, &annotationData); zephir_check_call_status(); zephir_array_append(&annotations, &_5$$4, PH_SEPARATE, "phalcon/Annotations/Collection.zep", 69); } @@ -289,7 +289,7 @@ PHP_METHOD(Phalcon_Annotations_Collection, get) ZEPHIR_INIT_NVAR(&annotation); ZEPHIR_INIT_VAR(&_8); object_init_ex(&_8, phalcon_annotations_exceptions_annotationnotfound_ce); - ZEPHIR_CALL_METHOD(NULL, &_8, "__construct", NULL, 373, &name_zv); + ZEPHIR_CALL_METHOD(NULL, &_8, "__construct", NULL, 372, &name_zv); zephir_check_call_status(); zephir_throw_exception_debug(&_8, "phalcon/Annotations/Collection.zep", 114); ZEPHIR_MM_RESTORE(); diff --git a/ext/phalcon/annotations/reader.zep.c b/ext/phalcon/annotations/reader.zep.c index 3a65c009bb..5035a5f288 100644 --- a/ext/phalcon/annotations/reader.zep.c +++ b/ext/phalcon/annotations/reader.zep.c @@ -119,13 +119,13 @@ PHP_METHOD(Phalcon_Annotations_Reader, parse) object_init_ex(&reflection, zephir_get_internal_ce(SL("reflectionclass"))); ZEPHIR_CALL_METHOD(NULL, &reflection, "__construct", NULL, 252, &className_zv); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&comment, &reflection, "getdoccomment", NULL, 374); + ZEPHIR_CALL_METHOD(&comment, &reflection, "getdoccomment", NULL, 373); zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(&comment)) { ZEPHIR_INIT_VAR(&classAnnotations); - ZEPHIR_CALL_METHOD(&_0$$3, &reflection, "getfilename", NULL, 367); + ZEPHIR_CALL_METHOD(&_0$$3, &reflection, "getfilename", NULL, 366); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_1$$3, &reflection, "getstartline", NULL, 368); + ZEPHIR_CALL_METHOD(&_1$$3, &reflection, "getstartline", NULL, 367); zephir_check_call_status(); ZEPHIR_LAST_CALL_STATUS = phannot_parse_annotations(&classAnnotations, &comment, &_0$$3, &_1$$3); zephir_check_call_status(); @@ -133,7 +133,7 @@ PHP_METHOD(Phalcon_Annotations_Reader, parse) zephir_array_update_string(&annotations, SL("class"), &classAnnotations, PH_COPY | PH_SEPARATE); } } - ZEPHIR_CALL_METHOD(&constants, &reflection, "getconstants", NULL, 375); + ZEPHIR_CALL_METHOD(&constants, &reflection, "getconstants", NULL, 374); zephir_check_call_status(); if (!(ZEPHIR_IS_EMPTY(&constants))) { line = 1; @@ -153,13 +153,13 @@ PHP_METHOD(Phalcon_Annotations_Reader, parse) { ZEPHIR_INIT_NVAR(&constant); ZVAL_COPY(&constant, _4$$5); - ZEPHIR_CALL_METHOD(&constantReflection, &reflection, "getreflectionconstant", &_5, 376, &constant); + ZEPHIR_CALL_METHOD(&constantReflection, &reflection, "getreflectionconstant", &_5, 375, &constant); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&comment, &constantReflection, "getdoccomment", NULL, 0); zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(&comment)) { ZEPHIR_INIT_NVAR(&constantAnnotations); - ZEPHIR_CALL_METHOD(&_6$$7, &reflection, "getfilename", NULL, 367); + ZEPHIR_CALL_METHOD(&_6$$7, &reflection, "getfilename", NULL, 366); zephir_check_call_status(); ZVAL_LONG(&_7$$7, line); ZEPHIR_LAST_CALL_STATUS = phannot_parse_annotations(&constantAnnotations, &comment, &_6$$7, &_7$$7); @@ -174,7 +174,7 @@ PHP_METHOD(Phalcon_Annotations_Reader, parse) zephir_array_update_string(&annotations, SL("constants"), &anotationsConstants, PH_COPY | PH_SEPARATE); } } - ZEPHIR_CALL_METHOD(&properties, &reflection, "getproperties", NULL, 371); + ZEPHIR_CALL_METHOD(&properties, &reflection, "getproperties", NULL, 370); zephir_check_call_status(); if (!(ZEPHIR_IS_EMPTY(&properties))) { line = 1; @@ -197,7 +197,7 @@ PHP_METHOD(Phalcon_Annotations_Reader, parse) zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(&comment)) { ZEPHIR_INIT_NVAR(&propertyAnnotations); - ZEPHIR_CALL_METHOD(&_11$$12, &reflection, "getfilename", NULL, 367); + ZEPHIR_CALL_METHOD(&_11$$12, &reflection, "getfilename", NULL, 366); zephir_check_call_status(); ZVAL_LONG(&_12$$12, line); ZEPHIR_LAST_CALL_STATUS = phannot_parse_annotations(&propertyAnnotations, &comment, &_11$$12, &_12$$12); @@ -231,7 +231,7 @@ PHP_METHOD(Phalcon_Annotations_Reader, parse) zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(&comment)) { ZEPHIR_INIT_NVAR(&propertyAnnotations); - ZEPHIR_CALL_METHOD(&_16$$15, &reflection, "getfilename", NULL, 367); + ZEPHIR_CALL_METHOD(&_16$$15, &reflection, "getfilename", NULL, 366); zephir_check_call_status(); ZVAL_LONG(&_17$$15, line); ZEPHIR_LAST_CALL_STATUS = phannot_parse_annotations(&propertyAnnotations, &comment, &_16$$15, &_17$$15); @@ -249,7 +249,7 @@ PHP_METHOD(Phalcon_Annotations_Reader, parse) zephir_array_update_string(&annotations, SL("properties"), &annotationsProperties, PH_COPY | PH_SEPARATE); } } - ZEPHIR_CALL_METHOD(&methods, &reflection, "getmethods", NULL, 372); + ZEPHIR_CALL_METHOD(&methods, &reflection, "getmethods", NULL, 371); zephir_check_call_status(); if (0 == ZEPHIR_IS_EMPTY(&methods)) { ZEPHIR_INIT_VAR(&annotationsMethods); diff --git a/ext/phalcon/assets/collection.zep.c b/ext/phalcon/assets/collection.zep.c index b210161a20..e7d7f316ef 100644 --- a/ext/phalcon/assets/collection.zep.c +++ b/ext/phalcon/assets/collection.zep.c @@ -152,7 +152,7 @@ PHP_METHOD(Phalcon_Assets_Collection, add) ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &asset); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "addasset", NULL, 377, asset); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "addasset", NULL, 376, asset); zephir_check_call_status(); RETURN_THIS(); } @@ -243,7 +243,7 @@ PHP_METHOD(Phalcon_Assets_Collection, addCss) } else { ZVAL_BOOL(&_2, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processadd", NULL, 378, &_0, &path_zv, isLocal, &_1, &attributes, &version_zv, &_2); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processadd", NULL, 377, &_0, &path_zv, isLocal, &_1, &attributes, &version_zv, &_2); zephir_check_call_status(); RETURN_MM(); } @@ -282,7 +282,7 @@ PHP_METHOD(Phalcon_Assets_Collection, addInline) ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &code); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "addasset", NULL, 377, code); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "addasset", NULL, 376, code); zephir_check_call_status(); RETURN_THIS(); } @@ -339,7 +339,7 @@ PHP_METHOD(Phalcon_Assets_Collection, addInlineCss) } else { ZVAL_BOOL(&_1, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processaddinline", NULL, 379, &_0, &content_zv, &_1, &attributes); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processaddinline", NULL, 378, &_0, &content_zv, &_1, &attributes); zephir_check_call_status(); RETURN_MM(); } @@ -396,7 +396,7 @@ PHP_METHOD(Phalcon_Assets_Collection, addInlineJs) } else { ZVAL_BOOL(&_1, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processaddinline", NULL, 379, &_0, &content_zv, &_1, &attributes); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processaddinline", NULL, 378, &_0, &content_zv, &_1, &attributes); zephir_check_call_status(); RETURN_MM(); } @@ -487,7 +487,7 @@ PHP_METHOD(Phalcon_Assets_Collection, addJs) } else { ZVAL_BOOL(&_2, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processadd", NULL, 378, &_0, &path_zv, isLocal, &_1, &attributes, &version_zv, &_2); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processadd", NULL, 377, &_0, &path_zv, isLocal, &_1, &attributes, &version_zv, &_2); zephir_check_call_status(); RETURN_MM(); } @@ -1007,7 +1007,7 @@ PHP_METHOD(Phalcon_Assets_Collection, processAdd) ZEPHIR_CPY_WRT(&name, &_0); zephir_memory_observe(&flag); zephir_read_property_cached(&flag, this_ptr, _zephir_prop_0, 429, PH_NOISY_CC); - ZEPHIR_CALL_METHOD(&attrs, this_ptr, "processattributes", NULL, 380, &attributes); + ZEPHIR_CALL_METHOD(&attrs, this_ptr, "processattributes", NULL, 379, &attributes); zephir_check_call_status(); if (Z_TYPE_P(isLocal) != IS_NULL) { ZEPHIR_INIT_NVAR(&flag); @@ -1101,7 +1101,7 @@ PHP_METHOD(Phalcon_Assets_Collection, processAddInline) ZEPHIR_INIT_VAR(&_0); ZEPHIR_CONCAT_SV(&_0, "Phalcon\\Assets\\Inline\\", &className_zv); ZEPHIR_CPY_WRT(&name, &_0); - ZEPHIR_CALL_METHOD(&attrs, this_ptr, "processattributes", NULL, 380, &attributes); + ZEPHIR_CALL_METHOD(&attrs, this_ptr, "processattributes", NULL, 379, &attributes); zephir_check_call_status(); ZEPHIR_INIT_VAR(&asset); zephir_fetch_safe_class(&_1, &name); diff --git a/ext/phalcon/assets/manager.zep.c b/ext/phalcon/assets/manager.zep.c index b3720c86d2..82afcec29f 100644 --- a/ext/phalcon/assets/manager.zep.c +++ b/ext/phalcon/assets/manager.zep.c @@ -172,7 +172,7 @@ PHP_METHOD(Phalcon_Assets_Manager, addAssetByType) asset = ZEND_CALL_ARG(execute_data, 2); zephir_memory_observe(&type_zv); ZVAL_STR_COPY(&type_zv, type); - ZEPHIR_CALL_METHOD(&collection, this_ptr, "checkandcreatecollection", NULL, 381, &type_zv); + ZEPHIR_CALL_METHOD(&collection, this_ptr, "checkandcreatecollection", NULL, 380, &type_zv); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &collection, "add", NULL, 0, asset); zephir_check_call_status(); @@ -269,7 +269,7 @@ PHP_METHOD(Phalcon_Assets_Manager, addCss) } else { ZVAL_BOOL(&_3, 0); } - ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 382, &path_zv, &_1, &_2, &attributes, &version_zv, &_3); + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 381, &path_zv, &_1, &_2, &attributes, &version_zv, &_3); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_4); ZVAL_STRING(&_4, "css"); @@ -331,7 +331,7 @@ PHP_METHOD(Phalcon_Assets_Manager, addInlineCodeByType) code = ZEND_CALL_ARG(execute_data, 2); zephir_memory_observe(&type_zv); ZVAL_STR_COPY(&type_zv, type); - ZEPHIR_CALL_METHOD(&collection, this_ptr, "checkandcreatecollection", NULL, 381, &type_zv); + ZEPHIR_CALL_METHOD(&collection, this_ptr, "checkandcreatecollection", NULL, 380, &type_zv); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &collection, "addinline", NULL, 0, code); zephir_check_call_status(); @@ -391,7 +391,7 @@ PHP_METHOD(Phalcon_Assets_Manager, addInlineCss) } else { ZVAL_BOOL(&_1, 0); } - ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 383, &content_zv, &_1, &attributes); + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 382, &content_zv, &_1, &attributes); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_2); ZVAL_STRING(&_2, "css"); @@ -453,7 +453,7 @@ PHP_METHOD(Phalcon_Assets_Manager, addInlineJs) } else { ZVAL_BOOL(&_1, 0); } - ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 384, &content_zv, &_1, &attributes); + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 383, &content_zv, &_1, &attributes); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_2); ZVAL_STRING(&_2, "js"); @@ -557,7 +557,7 @@ PHP_METHOD(Phalcon_Assets_Manager, addJs) } else { ZVAL_BOOL(&_3, 0); } - ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 385, &path_zv, &_1, &_2, &attributes, &version_zv, &_3); + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 384, &path_zv, &_1, &_2, &attributes, &version_zv, &_3); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_4); ZVAL_STRING(&_4, "js"); @@ -585,7 +585,7 @@ PHP_METHOD(Phalcon_Assets_Manager, collection) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_memory_observe(&name_zv); ZVAL_STR_COPY(&name_zv, name); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkandcreatecollection", NULL, 381, &name_zv); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkandcreatecollection", NULL, 380, &name_zv); zephir_check_call_status(); RETURN_MM(); } @@ -745,7 +745,7 @@ PHP_METHOD(Phalcon_Assets_Manager, get) if (UNEXPECTED(1 != zephir_array_isset_value(&_0, &name_zv))) { ZEPHIR_INIT_VAR(&_1$$3); object_init_ex(&_1$$3, phalcon_assets_exceptions_collectionnotfound_ce); - ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 386, &name_zv); + ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 385, &name_zv); zephir_check_call_status(); zephir_throw_exception_debug(&_1$$3, "phalcon/Assets/Manager.zep", 277); ZEPHIR_MM_RESTORE(); @@ -784,7 +784,7 @@ PHP_METHOD(Phalcon_Assets_Manager, getCss) ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "css"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkandcreatecollection", NULL, 381, &_0); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkandcreatecollection", NULL, 380, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -805,7 +805,7 @@ PHP_METHOD(Phalcon_Assets_Manager, getJs) ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "js"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkandcreatecollection", NULL, 381, &_0); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkandcreatecollection", NULL, 380, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -1007,7 +1007,7 @@ PHP_METHOD(Phalcon_Assets_Manager, output) if (1 != ZEPHIR_IS_EMPTY(&collectionTargetPath)) { zephir_concat_self(&completeTargetPath, &collectionTargetPath); } - ZEPHIR_CALL_METHOD(&join, this_ptr, "getjoin", NULL, 387, collection, &completeTargetPath); + ZEPHIR_CALL_METHOD(&join, this_ptr, "getjoin", NULL, 386, collection, &completeTargetPath); zephir_check_call_status(); } if (Z_TYPE_P(&assets) == IS_STRING) { @@ -1031,7 +1031,7 @@ PHP_METHOD(Phalcon_Assets_Manager, output) zephir_check_call_status(); if (ZEPHIR_IS_TRUE_IDENTICAL(&_6$$9)) { filterNeeded = 1; - ZEPHIR_CALL_METHOD(&sourcePath, this_ptr, "getsourcepath", &_7, 388, &asset, &completeSourcePath); + ZEPHIR_CALL_METHOD(&sourcePath, this_ptr, "getsourcepath", &_7, 387, &asset, &completeSourcePath); zephir_check_call_status(); } ZEPHIR_CALL_METHOD(&targetPath, &asset, "getrealtargetpath", NULL, 0, &completeTargetPath); @@ -1041,7 +1041,7 @@ PHP_METHOD(Phalcon_Assets_Manager, output) object_init_ex(&_8$$11, phalcon_assets_exceptions_invalidassettargetpath_ce); ZEPHIR_CALL_METHOD(&_9$$11, &asset, "getpath", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &_8$$11, "__construct", &_10, 389, &_9$$11); + ZEPHIR_CALL_METHOD(NULL, &_8$$11, "__construct", &_10, 388, &_9$$11); zephir_check_call_status(); zephir_throw_exception_debug(&_8$$11, "phalcon/Assets/Manager.zep", 447); ZEPHIR_MM_RESTORE(); @@ -1052,7 +1052,7 @@ PHP_METHOD(Phalcon_Assets_Manager, output) } else { ZVAL_BOOL(&_12$$9, 0); } - ZEPHIR_CALL_METHOD(&_11$$9, this_ptr, "isfilterneeded", &_13, 390, &asset, &targetPath, &sourcePath, &_12$$9); + ZEPHIR_CALL_METHOD(&_11$$9, this_ptr, "isfilterneeded", &_13, 389, &asset, &targetPath, &sourcePath, &_12$$9); zephir_check_call_status(); filterNeeded = zephir_is_true(&_11$$9); } else { @@ -1060,13 +1060,13 @@ PHP_METHOD(Phalcon_Assets_Manager, output) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_15$$12, &asset, "getrealsourcepath", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "calculateprefixedpath", &_16, 391, collection, &_14$$12, &_15$$12); + ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "calculateprefixedpath", &_16, 390, collection, &_14$$12, &_15$$12); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_17$$12, &asset, "getattributes", NULL, 0); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_18$$12, &asset, "islocal", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&html, this_ptr, "docallback", &_19, 392, &callback, &_17$$12, &prefixedPath, &_18$$12); + ZEPHIR_CALL_METHOD(&html, this_ptr, "docallback", &_19, 391, &callback, &_17$$12, &prefixedPath, &_18$$12); zephir_check_call_status(); zephir_read_property_cached(&_20$$12, this_ptr, _zephir_prop_1, 435, PH_NOISY_CC | PH_READONLY); if (ZEPHIR_IS_TRUE_IDENTICAL(&_20$$12)) { @@ -1081,7 +1081,7 @@ PHP_METHOD(Phalcon_Assets_Manager, output) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&mustFilter, &asset, "getfilter", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&filteredContent, this_ptr, "applyfilters", &_21, 393, &content, &filters, &mustFilter); + ZEPHIR_CALL_METHOD(&filteredContent, this_ptr, "applyfilters", &_21, 392, &content, &filters, &mustFilter); zephir_check_call_status(); if (zephir_is_true(&join)) { zephir_concat_self(&filteredJoinedContent, &filteredContent); @@ -1105,12 +1105,12 @@ PHP_METHOD(Phalcon_Assets_Manager, output) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_26$$19, &asset, "getrealsourcepath", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "calculateprefixedpath", &_16, 391, collection, &_25$$19, &_26$$19); + ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "calculateprefixedpath", &_16, 390, collection, &_25$$19, &_26$$19); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_27$$19, collection, "getattributes", &_28, 0); zephir_check_call_status(); ZVAL_BOOL(&_29$$19, 1); - ZEPHIR_CALL_METHOD(&html, this_ptr, "docallback", &_19, 392, &callback, &_27$$19, &prefixedPath, &_29$$19); + ZEPHIR_CALL_METHOD(&html, this_ptr, "docallback", &_19, 391, &callback, &_27$$19, &prefixedPath, &_29$$19); zephir_check_call_status(); zephir_read_property_cached(&_29$$19, this_ptr, _zephir_prop_1, 435, PH_NOISY_CC | PH_READONLY); if (ZEPHIR_IS_TRUE_IDENTICAL(&_29$$19)) { @@ -1146,7 +1146,7 @@ PHP_METHOD(Phalcon_Assets_Manager, output) zephir_check_call_status(); if (ZEPHIR_IS_TRUE_IDENTICAL(&_32$$23)) { filterNeeded = 1; - ZEPHIR_CALL_METHOD(&sourcePath, this_ptr, "getsourcepath", &_7, 388, &asset, &completeSourcePath); + ZEPHIR_CALL_METHOD(&sourcePath, this_ptr, "getsourcepath", &_7, 387, &asset, &completeSourcePath); zephir_check_call_status(); } ZEPHIR_CALL_METHOD(&targetPath, &asset, "getrealtargetpath", NULL, 0, &completeTargetPath); @@ -1156,7 +1156,7 @@ PHP_METHOD(Phalcon_Assets_Manager, output) object_init_ex(&_33$$25, phalcon_assets_exceptions_invalidassettargetpath_ce); ZEPHIR_CALL_METHOD(&_34$$25, &asset, "getpath", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &_33$$25, "__construct", &_10, 389, &_34$$25); + ZEPHIR_CALL_METHOD(NULL, &_33$$25, "__construct", &_10, 388, &_34$$25); zephir_check_call_status(); zephir_throw_exception_debug(&_33$$25, "phalcon/Assets/Manager.zep", 447); ZEPHIR_MM_RESTORE(); @@ -1167,7 +1167,7 @@ PHP_METHOD(Phalcon_Assets_Manager, output) } else { ZVAL_BOOL(&_36$$23, 0); } - ZEPHIR_CALL_METHOD(&_35$$23, this_ptr, "isfilterneeded", &_13, 390, &asset, &targetPath, &sourcePath, &_36$$23); + ZEPHIR_CALL_METHOD(&_35$$23, this_ptr, "isfilterneeded", &_13, 389, &asset, &targetPath, &sourcePath, &_36$$23); zephir_check_call_status(); filterNeeded = zephir_is_true(&_35$$23); } else { @@ -1175,13 +1175,13 @@ PHP_METHOD(Phalcon_Assets_Manager, output) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_38$$26, &asset, "getrealsourcepath", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "calculateprefixedpath", &_16, 391, collection, &_37$$26, &_38$$26); + ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "calculateprefixedpath", &_16, 390, collection, &_37$$26, &_38$$26); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_39$$26, &asset, "getattributes", NULL, 0); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_40$$26, &asset, "islocal", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&html, this_ptr, "docallback", &_19, 392, &callback, &_39$$26, &prefixedPath, &_40$$26); + ZEPHIR_CALL_METHOD(&html, this_ptr, "docallback", &_19, 391, &callback, &_39$$26, &prefixedPath, &_40$$26); zephir_check_call_status(); zephir_read_property_cached(&_41$$26, this_ptr, _zephir_prop_1, 435, PH_NOISY_CC | PH_READONLY); if (ZEPHIR_IS_TRUE_IDENTICAL(&_41$$26)) { @@ -1196,7 +1196,7 @@ PHP_METHOD(Phalcon_Assets_Manager, output) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&mustFilter, &asset, "getfilter", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&filteredContent, this_ptr, "applyfilters", &_21, 393, &content, &filters, &mustFilter); + ZEPHIR_CALL_METHOD(&filteredContent, this_ptr, "applyfilters", &_21, 392, &content, &filters, &mustFilter); zephir_check_call_status(); if (zephir_is_true(&join)) { zephir_concat_self(&filteredJoinedContent, &filteredContent); @@ -1220,12 +1220,12 @@ PHP_METHOD(Phalcon_Assets_Manager, output) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_45$$33, &asset, "getrealsourcepath", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "calculateprefixedpath", &_16, 391, collection, &_44$$33, &_45$$33); + ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "calculateprefixedpath", &_16, 390, collection, &_44$$33, &_45$$33); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_46$$33, collection, "getattributes", &_28, 0); zephir_check_call_status(); ZVAL_BOOL(&_47$$33, 1); - ZEPHIR_CALL_METHOD(&html, this_ptr, "docallback", &_19, 392, &callback, &_46$$33, &prefixedPath, &_47$$33); + ZEPHIR_CALL_METHOD(&html, this_ptr, "docallback", &_19, 391, &callback, &_46$$33, &prefixedPath, &_47$$33); zephir_check_call_status(); zephir_read_property_cached(&_47$$33, this_ptr, _zephir_prop_1, 435, PH_NOISY_CC | PH_READONLY); if (ZEPHIR_IS_TRUE_IDENTICAL(&_47$$33)) { @@ -1247,7 +1247,7 @@ PHP_METHOD(Phalcon_Assets_Manager, output) if (ZEPHIR_IS_TRUE_IDENTICAL(&_49$$36)) { ZEPHIR_INIT_VAR(&_50$$37); object_init_ex(&_50$$37, phalcon_assets_exceptions_invalidassettargetpath_ce); - ZEPHIR_CALL_METHOD(NULL, &_50$$37, "__construct", &_10, 389, &completeTargetPath); + ZEPHIR_CALL_METHOD(NULL, &_50$$37, "__construct", &_10, 388, &completeTargetPath); zephir_check_call_status(); zephir_throw_exception_debug(&_50$$37, "phalcon/Assets/Manager.zep", 557); ZEPHIR_MM_RESTORE(); @@ -1255,7 +1255,7 @@ PHP_METHOD(Phalcon_Assets_Manager, output) } ZEPHIR_CALL_METHOD(NULL, this_ptr, "phpfileputcontents", &_24, 0, &completeTargetPath, &filteredJoinedContent); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_51$$36, this_ptr, "getoutput", NULL, 394, collection, &completeTargetPath, &callback, &output); + ZEPHIR_CALL_METHOD(&_51$$36, this_ptr, "getoutput", NULL, 393, collection, &completeTargetPath, &callback, &output); zephir_check_call_status(); zephir_get_strval(&output, &_51$$36); } @@ -1409,7 +1409,7 @@ PHP_METHOD(Phalcon_Assets_Manager, outputInline) ZEPHIR_CALL_METHOD(&content, &code, "getcontent", NULL, 0); zephir_check_call_status(); ZVAL_BOOL(&_4$$4, 1); - ZEPHIR_CALL_METHOD(&_3$$4, this_ptr, "applyfilters", &_5, 393, &content, &filters, &_4$$4); + ZEPHIR_CALL_METHOD(&_3$$4, this_ptr, "applyfilters", &_5, 392, &content, &filters, &_4$$4); zephir_check_call_status(); ZEPHIR_CPY_WRT(&content, &_3$$4); if (ZEPHIR_IS_TRUE_IDENTICAL(&join)) { @@ -1449,7 +1449,7 @@ PHP_METHOD(Phalcon_Assets_Manager, outputInline) ZEPHIR_CALL_METHOD(&content, &code, "getcontent", NULL, 0); zephir_check_call_status(); ZVAL_BOOL(&_14$$7, 1); - ZEPHIR_CALL_METHOD(&_13$$7, this_ptr, "applyfilters", &_5, 393, &content, &filters, &_14$$7); + ZEPHIR_CALL_METHOD(&_13$$7, this_ptr, "applyfilters", &_5, 392, &content, &filters, &_14$$7); zephir_check_call_status(); ZEPHIR_CPY_WRT(&content, &_13$$7); if (ZEPHIR_IS_TRUE_IDENTICAL(&join)) { @@ -1756,7 +1756,7 @@ PHP_METHOD(Phalcon_Assets_Manager, applyFilters) if (UNEXPECTED(_1$$4)) { ZEPHIR_INIT_NVAR(&_2$$5); object_init_ex(&_2$$5, phalcon_assets_exceptions_invalidfilter_ce); - ZEPHIR_CALL_METHOD(NULL, &_2$$5, "__construct", &_3, 395); + ZEPHIR_CALL_METHOD(NULL, &_2$$5, "__construct", &_3, 394); zephir_check_call_status(); zephir_throw_exception_debug(&_2$$5, "phalcon/Assets/Manager.zep", 771); ZEPHIR_MM_RESTORE(); @@ -1791,7 +1791,7 @@ PHP_METHOD(Phalcon_Assets_Manager, applyFilters) if (UNEXPECTED(_7$$6)) { ZEPHIR_INIT_NVAR(&_8$$7); object_init_ex(&_8$$7, phalcon_assets_exceptions_invalidfilter_ce); - ZEPHIR_CALL_METHOD(NULL, &_8$$7, "__construct", &_3, 395); + ZEPHIR_CALL_METHOD(NULL, &_8$$7, "__construct", &_3, 394); zephir_check_call_status(); zephir_throw_exception_debug(&_8$$7, "phalcon/Assets/Manager.zep", 771); ZEPHIR_MM_RESTORE(); @@ -1962,7 +1962,7 @@ PHP_METHOD(Phalcon_Assets_Manager, cssLink) ZVAL_STRING(&_2, "text/css"); ZEPHIR_INIT_VAR(&_3); ZVAL_STRING(&_3, "href"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processparameters", NULL, 396, parameters, &_0, &_1, &_2, &_3); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processparameters", NULL, 395, parameters, &_0, &_1, &_2, &_3); zephir_check_call_status(); RETURN_MM(); } @@ -2059,7 +2059,7 @@ PHP_METHOD(Phalcon_Assets_Manager, getJoin) if (1 == ZEPHIR_IS_EMPTY(&completeTargetPath_zv)) { ZEPHIR_INIT_VAR(&_0$$4); object_init_ex(&_0$$4, phalcon_assets_exceptions_invalidtargetpath_ce); - ZEPHIR_CALL_METHOD(NULL, &_0$$4, "__construct", NULL, 397, &completeTargetPath_zv); + ZEPHIR_CALL_METHOD(NULL, &_0$$4, "__construct", NULL, 396, &completeTargetPath_zv); zephir_check_call_status(); zephir_throw_exception_debug(&_0$$4, "phalcon/Assets/Manager.zep", 894); ZEPHIR_MM_RESTORE(); @@ -2070,7 +2070,7 @@ PHP_METHOD(Phalcon_Assets_Manager, getJoin) if (ZEPHIR_IS_TRUE_IDENTICAL(&_1$$3)) { ZEPHIR_INIT_VAR(&_2$$5); object_init_ex(&_2$$5, phalcon_assets_exceptions_targetpathisdirectory_ce); - ZEPHIR_CALL_METHOD(NULL, &_2$$5, "__construct", NULL, 398, &completeTargetPath_zv); + ZEPHIR_CALL_METHOD(NULL, &_2$$5, "__construct", NULL, 397, &completeTargetPath_zv); zephir_check_call_status(); zephir_throw_exception_debug(&_2$$5, "phalcon/Assets/Manager.zep", 898); ZEPHIR_MM_RESTORE(); @@ -2130,13 +2130,13 @@ PHP_METHOD(Phalcon_Assets_Manager, getOutput) zephir_get_strval(&output, output_param); ZEPHIR_CALL_METHOD(&_0, collection, "gettargeturi", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "calculateprefixedpath", NULL, 391, collection, &_0, &completeTargetPath_zv); + ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "calculateprefixedpath", NULL, 390, collection, &_0, &completeTargetPath_zv); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_1, collection, "getattributes", NULL, 0); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_2, collection, "gettargetislocal", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&html, this_ptr, "docallback", NULL, 392, &callback, &_1, &prefixedPath, &_2); + ZEPHIR_CALL_METHOD(&html, this_ptr, "docallback", NULL, 391, &callback, &_1, &prefixedPath, &_2); zephir_check_call_status(); zephir_read_property_cached(&_3, this_ptr, _zephir_prop_0, 435, PH_NOISY_CC | PH_READONLY); if (ZEPHIR_IS_TRUE_IDENTICAL(&_3)) { @@ -2177,7 +2177,7 @@ PHP_METHOD(Phalcon_Assets_Manager, getSourcePath) zephir_check_call_status(); ZEPHIR_INIT_VAR(&_0$$3); object_init_ex(&_0$$3, phalcon_assets_exceptions_invalidassetsourcepath_ce); - ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 399, &sourcePath); + ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 398, &sourcePath); zephir_check_call_status(); zephir_throw_exception_debug(&_0$$3, "phalcon/Assets/Manager.zep", 964); ZEPHIR_MM_RESTORE(); @@ -2226,7 +2226,7 @@ PHP_METHOD(Phalcon_Assets_Manager, isFilterNeeded) if (ZEPHIR_IS_IDENTICAL(&targetPath_zv, &sourcePath_zv)) { ZEPHIR_INIT_VAR(&_1$$4); object_init_ex(&_1$$4, phalcon_assets_exceptions_assetsourcetargetcollision_ce); - ZEPHIR_CALL_METHOD(NULL, &_1$$4, "__construct", NULL, 400, &targetPath_zv); + ZEPHIR_CALL_METHOD(NULL, &_1$$4, "__construct", NULL, 399, &targetPath_zv); zephir_check_call_status(); zephir_throw_exception_debug(&_1$$4, "phalcon/Assets/Manager.zep", 984); ZEPHIR_MM_RESTORE(); @@ -2296,7 +2296,7 @@ PHP_METHOD(Phalcon_Assets_Manager, jsLink) ZVAL_STRING(&_2, "application/javascript"); ZEPHIR_INIT_VAR(&_3); ZVAL_STRING(&_3, "src"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processparameters", NULL, 396, parameters, &_0, &_1, &_2, &_3); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processparameters", NULL, 395, parameters, &_0, &_1, &_2, &_3); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/auth/access/acl.zep.c b/ext/phalcon/auth/access/acl.zep.c index d8475703c0..8c990a8526 100644 --- a/ext/phalcon/auth/access/acl.zep.c +++ b/ext/phalcon/auth/access/acl.zep.c @@ -225,7 +225,7 @@ PHP_METHOD(Phalcon_Auth_Access_Acl, isAllowed) if (_6) { ZEPHIR_INIT_VAR(&_7$$5); object_init_ex(&_7$$5, phalcon_auth_exceptions_missinghandlercontext_ce); - ZEPHIR_CALL_METHOD(NULL, &_7$$5, "__construct", NULL, 401); + ZEPHIR_CALL_METHOD(NULL, &_7$$5, "__construct", NULL, 400); zephir_check_call_status(); zephir_throw_exception_debug(&_7$$5, "phalcon/Auth/Access/Acl.zep", 84); ZEPHIR_MM_RESTORE(); @@ -311,7 +311,7 @@ PHP_METHOD(Phalcon_Auth_Access_Acl, resolveRole) ZVAL_STRING(&_1, "Authenticated user"); ZEPHIR_INIT_VAR(&_2); ZVAL_STRING(&_2, "Phalcon\\Acl\\RoleAwareInterface"); - ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 402, &_1, &_2); + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 401, &_1, &_2); zephir_check_call_status(); zephir_throw_exception_debug(&_0, "phalcon/Auth/Access/Acl.zep", 138); ZEPHIR_MM_RESTORE(); diff --git a/ext/phalcon/auth/adapter/memory.zep.c b/ext/phalcon/auth/adapter/memory.zep.c index d782babe37..58fe10e9de 100644 --- a/ext/phalcon/auth/adapter/memory.zep.c +++ b/ext/phalcon/auth/adapter/memory.zep.c @@ -166,9 +166,9 @@ PHP_METHOD(Phalcon_Auth_Adapter_Memory, fromOptions) ZVAL_STRING(&_3, "model"); ZEPHIR_CALL_CE_STATIC(&_4, phalcon_auth_internal_options_ce, "stringornull", NULL, 0, &options, &_3); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 403, &_1, &_4); + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 402, &_1, &_4); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 404, hasher, &_0); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 403, hasher, &_0); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/auth/adapter/model.zep.c b/ext/phalcon/auth/adapter/model.zep.c index 7e46204b4f..fe9daad7b4 100644 --- a/ext/phalcon/auth/adapter/model.zep.c +++ b/ext/phalcon/auth/adapter/model.zep.c @@ -112,9 +112,9 @@ PHP_METHOD(Phalcon_Auth_Adapter_Model, fromOptions) ZEPHIR_INIT_NVAR(&_4); ZVAL_STRING(&_4, "id"); } - ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 405, &_1, &_4); + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 404, &_1, &_4); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 406, hasher, &_0); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 405, hasher, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -152,9 +152,9 @@ PHP_METHOD(Phalcon_Auth_Adapter_Model, createRememberToken) ZEPHIR_CALL_CE_STATIC(NULL, phalcon_auth_exceptions_doesnotimplement_ce, "assert", NULL, 0, user, &_0, &_1, &_2); zephir_check_call_status(); ZVAL_LONG(&_3, 30); - ZEPHIR_CALL_FUNCTION(&_4, "random_bytes", NULL, 330, &_3); + ZEPHIR_CALL_FUNCTION(&_4, "random_bytes", NULL, 329, &_3); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_5, "bin2hex", NULL, 331, &_4); + ZEPHIR_CALL_FUNCTION(&_5, "bin2hex", NULL, 330, &_4); zephir_check_call_status(); ZEPHIR_RETURN_CALL_METHOD(user, "createremembertoken", NULL, 0, &_5); zephir_check_call_status(); @@ -235,7 +235,7 @@ PHP_METHOD(Phalcon_Auth_Adapter_Model, retrieveByCredentials) if (UNEXPECTED(!zephir_is_true(&_5$$3))) { ZEPHIR_INIT_NVAR(&_7$$5); object_init_ex(&_7$$5, phalcon_auth_exceptions_invalidcredentialkey_ce); - ZEPHIR_CALL_METHOD(NULL, &_7$$5, "__construct", &_8, 407, &key); + ZEPHIR_CALL_METHOD(NULL, &_7$$5, "__construct", &_8, 406, &key); zephir_check_call_status(); zephir_throw_exception_debug(&_7$$5, "phalcon/Auth/Adapter/Model.zep", 99); ZEPHIR_MM_RESTORE(); @@ -279,7 +279,7 @@ PHP_METHOD(Phalcon_Auth_Adapter_Model, retrieveByCredentials) if (UNEXPECTED(!zephir_is_true(&_14$$6))) { ZEPHIR_INIT_NVAR(&_16$$8); object_init_ex(&_16$$8, phalcon_auth_exceptions_invalidcredentialkey_ce); - ZEPHIR_CALL_METHOD(NULL, &_16$$8, "__construct", &_8, 407, &key); + ZEPHIR_CALL_METHOD(NULL, &_16$$8, "__construct", &_8, 406, &key); zephir_check_call_status(); zephir_throw_exception_debug(&_16$$8, "phalcon/Auth/Adapter/Model.zep", 99); ZEPHIR_MM_RESTORE(); @@ -302,7 +302,7 @@ PHP_METHOD(Phalcon_Auth_Adapter_Model, retrieveByCredentials) zephir_fast_join_str(&_19, SL(" AND "), &conditions); zephir_array_update_string(&_18, SL("conditions"), &_19, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_18, SL("bind"), &bind, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&found, this_ptr, "findfirstasauthuser", NULL, 408, &_18); + ZEPHIR_CALL_METHOD(&found, this_ptr, "findfirstasauthuser", NULL, 407, &_18); zephir_check_call_status(); if (Z_TYPE_P(&found) == IS_NULL) { ZEPHIR_CALL_METHOD(NULL, this_ptr, "burnhash", NULL, 0); @@ -351,7 +351,7 @@ PHP_METHOD(Phalcon_Auth_Adapter_Model, retrieveById) zephir_create_array(&_4, 1, 0); zephir_array_update_string(&_4, SL("id"), id, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_0, SL("bind"), &_4, PH_COPY | PH_SEPARATE); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "findfirstasauthuser", NULL, 408, &_0); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "findfirstasauthuser", NULL, 407, &_0); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/auth/adapter/stream.zep.c b/ext/phalcon/auth/adapter/stream.zep.c index 1cfd0b6aae..21e4f21a7f 100644 --- a/ext/phalcon/auth/adapter/stream.zep.c +++ b/ext/phalcon/auth/adapter/stream.zep.c @@ -104,9 +104,9 @@ PHP_METHOD(Phalcon_Auth_Adapter_Stream, fromOptions) ZVAL_STRING(&_2, "model"); ZEPHIR_CALL_CE_STATIC(&_4, phalcon_auth_internal_options_ce, "stringornull", NULL, 0, &options, &_2); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 409, &_1, &_4); + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 408, &_1, &_4); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 410, hasher, &_0); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 409, hasher, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -155,7 +155,7 @@ PHP_METHOD(Phalcon_Auth_Adapter_Stream, loadUsers) if (!zephir_is_true(&_1)) { ZEPHIR_INIT_VAR(&_2$$3); object_init_ex(&_2$$3, phalcon_auth_exceptions_filedoesnotexist_ce); - ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 411, &path); + ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 410, &path); zephir_check_call_status(); zephir_throw_exception_debug(&_2$$3, "phalcon/Auth/Adapter/Stream.zep", 74); ZEPHIR_MM_RESTORE(); @@ -166,7 +166,7 @@ PHP_METHOD(Phalcon_Auth_Adapter_Stream, loadUsers) if (ZEPHIR_IS_FALSE_IDENTICAL(&contents)) { ZEPHIR_INIT_VAR(&_3$$4); object_init_ex(&_3$$4, phalcon_auth_exceptions_filecannotread_ce); - ZEPHIR_CALL_METHOD(NULL, &_3$$4, "__construct", NULL, 412, &path); + ZEPHIR_CALL_METHOD(NULL, &_3$$4, "__construct", NULL, 411, &path); zephir_check_call_status(); zephir_throw_exception_debug(&_3$$4, "phalcon/Auth/Adapter/Stream.zep", 80); ZEPHIR_MM_RESTORE(); @@ -183,7 +183,7 @@ PHP_METHOD(Phalcon_Auth_Adapter_Stream, loadUsers) } ZVAL_BOOL(&_5$$5, 1); - ZEPHIR_CALL_METHOD(&data, &_4$$5, "__invoke", NULL, 413, &contents, &_5$$5); + ZEPHIR_CALL_METHOD(&data, &_4$$5, "__invoke", NULL, 412, &contents, &_5$$5); zephir_check_call_status_or_jump(try_end_1); try_end_1: @@ -197,7 +197,7 @@ PHP_METHOD(Phalcon_Auth_Adapter_Stream, loadUsers) ZEPHIR_CPY_WRT(&ex, &_6); ZEPHIR_INIT_VAR(&_7$$6); object_init_ex(&_7$$6, phalcon_auth_exceptions_filenotvalidjson_ce); - ZEPHIR_CALL_METHOD(NULL, &_7$$6, "__construct", NULL, 414, &path, &ex); + ZEPHIR_CALL_METHOD(NULL, &_7$$6, "__construct", NULL, 413, &path, &ex); zephir_check_call_status(); zephir_throw_exception_debug(&_7$$6, "phalcon/Auth/Adapter/Stream.zep", 86); ZEPHIR_MM_RESTORE(); @@ -207,7 +207,7 @@ PHP_METHOD(Phalcon_Auth_Adapter_Stream, loadUsers) if (Z_TYPE_P(&data) != IS_ARRAY) { ZEPHIR_INIT_VAR(&_8$$7); object_init_ex(&_8$$7, phalcon_auth_exceptions_filedoesnotcontainjson_ce); - ZEPHIR_CALL_METHOD(NULL, &_8$$7, "__construct", NULL, 415, &path); + ZEPHIR_CALL_METHOD(NULL, &_8$$7, "__construct", NULL, 414, &path); zephir_check_call_status(); zephir_throw_exception_debug(&_8$$7, "phalcon/Auth/Adapter/Stream.zep", 90); ZEPHIR_MM_RESTORE(); diff --git a/ext/phalcon/auth/authuser.zep.c b/ext/phalcon/auth/authuser.zep.c index f36654adf8..19d5b47747 100644 --- a/ext/phalcon/auth/authuser.zep.c +++ b/ext/phalcon/auth/authuser.zep.c @@ -97,7 +97,7 @@ PHP_METHOD(Phalcon_Auth_AuthUser, __construct) if (_0) { ZEPHIR_INIT_VAR(&_4$$3); object_init_ex(&_4$$3, phalcon_auth_exceptions_datamustcontainidkey_ce); - ZEPHIR_CALL_METHOD(NULL, &_4$$3, "__construct", NULL, 416); + ZEPHIR_CALL_METHOD(NULL, &_4$$3, "__construct", NULL, 415); zephir_check_call_status(); zephir_throw_exception_debug(&_4$$3, "phalcon/Auth/AuthUser.zep", 38); ZEPHIR_MM_RESTORE(); diff --git a/ext/phalcon/auth/exceptions/configrequiresnonemptyvalue.zep.c b/ext/phalcon/auth/exceptions/configrequiresnonemptyvalue.zep.c index e2884300c9..0bb43742c6 100644 --- a/ext/phalcon/auth/exceptions/configrequiresnonemptyvalue.zep.c +++ b/ext/phalcon/auth/exceptions/configrequiresnonemptyvalue.zep.c @@ -125,7 +125,7 @@ PHP_METHOD(Phalcon_Auth_Exceptions_ConfigRequiresNonEmptyValue, assert) if (ZEPHIR_IS_STRING_IDENTICAL(value, "")) { ZEPHIR_INIT_VAR(&_0$$3); object_init_ex(&_0$$3, phalcon_auth_exceptions_configrequiresnonemptyvalue_ce); - ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 417, &configName_zv, &configKey_zv, &suffix_zv); + ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 416, &configName_zv, &configKey_zv, &suffix_zv); zephir_check_call_status(); zephir_throw_exception_debug(&_0$$3, "phalcon/Auth/Exceptions/ConfigRequiresNonEmptyValue.zep", 49); ZEPHIR_MM_RESTORE(); diff --git a/ext/phalcon/auth/exceptions/doesnotimplement.zep.c b/ext/phalcon/auth/exceptions/doesnotimplement.zep.c index bc5a79dfba..ffa6378ab3 100644 --- a/ext/phalcon/auth/exceptions/doesnotimplement.zep.c +++ b/ext/phalcon/auth/exceptions/doesnotimplement.zep.c @@ -109,7 +109,7 @@ PHP_METHOD(Phalcon_Auth_Exceptions_DoesNotImplement, assert) if (_0) { ZEPHIR_INIT_VAR(&_1$$3); object_init_ex(&_1$$3, phalcon_auth_exceptions_doesnotimplement_ce); - ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 402, &type_zv, &name_zv); + ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 401, &type_zv, &name_zv); zephir_check_call_status(); zephir_throw_exception_debug(&_1$$3, "phalcon/Auth/Exceptions/DoesNotImplement.zep", 43); ZEPHIR_MM_RESTORE(); diff --git a/ext/phalcon/auth/guard/config/sessionguardconfig.zep.c b/ext/phalcon/auth/guard/config/sessionguardconfig.zep.c index 6fd9c4ac36..8812e94a07 100644 --- a/ext/phalcon/auth/guard/config/sessionguardconfig.zep.c +++ b/ext/phalcon/auth/guard/config/sessionguardconfig.zep.c @@ -162,15 +162,15 @@ PHP_METHOD(Phalcon_Auth_Guard_Config_SessionGuardConfig, __construct) } ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "suffix"); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "validatenonempty", NULL, 418, &_0, &suffix_zv); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "validatenonempty", NULL, 417, &_0, &suffix_zv); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_0); ZVAL_STRING(&_0, "name"); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "validatenonempty", NULL, 418, &_0, &name_zv); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "validatenonempty", NULL, 417, &_0, &name_zv); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_0); ZVAL_STRING(&_0, "rememberName"); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "validatenonempty", NULL, 418, &_0, &rememberName_zv); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "validatenonempty", NULL, 417, &_0, &rememberName_zv); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_1); if (Z_TYPE_P(&name_zv) != IS_NULL) { @@ -178,7 +178,7 @@ PHP_METHOD(Phalcon_Auth_Guard_Config_SessionGuardConfig, __construct) } else { ZEPHIR_INIT_NVAR(&_0); ZVAL_STRING(&_0, "auth"); - ZEPHIR_CALL_METHOD(&_1, this_ptr, "derive", NULL, 419, &_0, &suffix_zv); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "derive", NULL, 418, &_0, &suffix_zv); zephir_check_call_status(); } zephir_update_property_zval_cached(this_ptr, _zephir_prop_0, 456, &_1); @@ -188,7 +188,7 @@ PHP_METHOD(Phalcon_Auth_Guard_Config_SessionGuardConfig, __construct) } else { ZEPHIR_INIT_NVAR(&_0); ZVAL_STRING(&_0, "remember"); - ZEPHIR_CALL_METHOD(&_2, this_ptr, "derive", NULL, 419, &_0, &suffix_zv); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "derive", NULL, 418, &_0, &suffix_zv); zephir_check_call_status(); } zephir_update_property_zval_cached(this_ptr, _zephir_prop_1, 457, &_2); @@ -211,7 +211,7 @@ PHP_METHOD(Phalcon_Auth_Guard_Config_SessionGuardConfig, __construct) if (ZEPHIR_IS_IDENTICAL(&_4, &_5)) { ZEPHIR_INIT_VAR(&_6$$3); object_init_ex(&_6$$3, phalcon_auth_exceptions_sessionnamesmustdiffer_ce); - ZEPHIR_CALL_METHOD(NULL, &_6$$3, "__construct", NULL, 420); + ZEPHIR_CALL_METHOD(NULL, &_6$$3, "__construct", NULL, 419); zephir_check_call_status(); zephir_throw_exception_debug(&_6$$3, "phalcon/Auth/Guard/Config/SessionGuardConfig.zep", 61); ZEPHIR_MM_RESTORE(); diff --git a/ext/phalcon/auth/guard/session.zep.c b/ext/phalcon/auth/guard/session.zep.c index b03f3b1b41..50d6a93575 100644 --- a/ext/phalcon/auth/guard/session.zep.c +++ b/ext/phalcon/auth/guard/session.zep.c @@ -136,7 +136,7 @@ PHP_METHOD(Phalcon_Auth_Guard_Session, __construct) if (Z_TYPE_P(config) == IS_NULL) { ZEPHIR_INIT_NVAR(config); object_init_ex(config, phalcon_auth_guard_config_sessionguardconfig_ce); - ZEPHIR_CALL_METHOD(NULL, config, "__construct", NULL, 421); + ZEPHIR_CALL_METHOD(NULL, config, "__construct", NULL, 420); zephir_check_call_status(); } if (Z_TYPE_P(clock) == IS_NULL) { @@ -220,7 +220,7 @@ PHP_METHOD(Phalcon_Auth_Guard_Session, fromOptions) ZEPHIR_INIT_NVAR(&_6); ZVAL_BOOL(&_6, 1); } - ZEPHIR_CALL_METHOD(NULL, &config, "__construct", NULL, 421, &_0, &_2, &_3, &_4, &_6); + ZEPHIR_CALL_METHOD(NULL, &config, "__construct", NULL, 420, &_0, &_2, &_3, &_4, &_6); zephir_check_call_status(); object_init_ex(return_value, zend_get_called_scope(execute_data)); ZEPHIR_INIT_NVAR(&_1); @@ -253,7 +253,7 @@ PHP_METHOD(Phalcon_Auth_Guard_Session, fromOptions) ZVAL_STRING(&_11, "Session guard"); ZEPHIR_CALL_CE_STATIC(&_13, phalcon_auth_internal_containerresolver_ce, "resolvecandidate", NULL, 0, container, &options, &_1, &_9, &_10, &_11); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 422, adapter, &_8, &_12, &_13, &config); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 421, adapter, &_8, &_12, &_13, &config); zephir_check_call_status(); RETURN_MM(); } @@ -594,7 +594,7 @@ PHP_METHOD(Phalcon_Auth_Guard_Session, logout) zephir_check_call_status(); if (Z_TYPE_P(&recaller) != IS_NULL) { if (zephir_instance_of_ev(¤t, phalcon_contracts_auth_authremember_ce)) { - ZEPHIR_CALL_METHOD(&token, &recaller, "gettoken", NULL, 423); + ZEPHIR_CALL_METHOD(&token, &recaller, "gettoken", NULL, 422); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&tokenRow, ¤t, "getremembertoken", NULL, 0, &token); zephir_check_call_status(); @@ -1057,7 +1057,7 @@ PHP_METHOD(Phalcon_Auth_Guard_Session, recaller) } if (Z_TYPE_P(&raw) == IS_STRING) { object_init_ex(return_value, phalcon_auth_guard_userremember_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 424, &raw); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 423, &raw); zephir_check_call_status(); RETURN_MM(); } @@ -1065,7 +1065,7 @@ PHP_METHOD(Phalcon_Auth_Guard_Session, recaller) RETURN_MM_NULL(); } object_init_ex(return_value, phalcon_auth_guard_userremember_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 424, &raw); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 423, &raw); zephir_check_call_status(); RETURN_MM(); } @@ -1218,13 +1218,13 @@ PHP_METHOD(Phalcon_Auth_Guard_Session, userFromRecaller) if (!(zephir_instance_of_ev(&_0, phalcon_contracts_auth_adapter_rememberadapter_ce))) { RETURN_MM_NULL(); } - ZEPHIR_CALL_METHOD(&id, recaller, "getid", NULL, 425); + ZEPHIR_CALL_METHOD(&id, recaller, "getid", NULL, 424); zephir_check_call_status(); if (Z_TYPE_P(&id) == IS_NULL) { RETURN_MM_NULL(); } zephir_read_property_cached(&_1, this_ptr, _zephir_prop_0, 468, PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(&_2, recaller, "gettoken", NULL, 423); + ZEPHIR_CALL_METHOD(&_2, recaller, "gettoken", NULL, 422); zephir_check_call_status(); zephir_read_property_cached(&_3, this_ptr, _zephir_prop_1, 462, PH_NOISY_CC | PH_READONLY); ZEPHIR_CALL_METHOD(&_4, &_3, "getuseragent", NULL, 0); diff --git a/ext/phalcon/auth/guard/token.zep.c b/ext/phalcon/auth/guard/token.zep.c index a66da0888a..47ffa6403f 100644 --- a/ext/phalcon/auth/guard/token.zep.c +++ b/ext/phalcon/auth/guard/token.zep.c @@ -132,9 +132,9 @@ PHP_METHOD(Phalcon_Auth_Guard_Token, fromOptions) ZVAL_STRING(&_3, "token guard"); ZEPHIR_CALL_CE_STATIC(&_6, phalcon_auth_internal_options_ce, "requirestring", NULL, 0, &options, &_2, &_3); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &_1, "__construct", NULL, 426, &_5, &_6); + ZEPHIR_CALL_METHOD(NULL, &_1, "__construct", NULL, 425, &_5, &_6); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 427, adapter, &_0, &_1); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 426, adapter, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -213,7 +213,7 @@ PHP_METHOD(Phalcon_Auth_Guard_Token, getTokenForRequest) ZVAL_LONG(&_10$$4, 7); ZEPHIR_INIT_VAR(&_11$$4); ZVAL_STRING(&_11$$4, "UTF-8"); - ZEPHIR_CALL_FUNCTION(&bearer, "mb_substr", NULL, 310, &header, &_10$$4, &__$null, &_11$$4); + ZEPHIR_CALL_FUNCTION(&bearer, "mb_substr", NULL, 309, &header, &_10$$4, &__$null, &_11$$4); zephir_check_call_status(); if (!ZEPHIR_IS_STRING_IDENTICAL(&bearer, "")) { RETURN_CCTOR(&bearer); diff --git a/ext/phalcon/auth/guard/userremember.zep.c b/ext/phalcon/auth/guard/userremember.zep.c index b3bd9b1418..1221c41335 100644 --- a/ext/phalcon/auth/guard/userremember.zep.c +++ b/ext/phalcon/auth/guard/userremember.zep.c @@ -129,7 +129,7 @@ PHP_METHOD(Phalcon_Auth_Guard_UserRemember, __construct) } ZVAL_BOOL(&_2$$4, 1); - ZEPHIR_CALL_METHOD(&data, &_1$$4, "__invoke", NULL, 413, payload, &_2$$4); + ZEPHIR_CALL_METHOD(&data, &_1$$4, "__invoke", NULL, 412, payload, &_2$$4); zephir_check_call_status_or_jump(try_end_1); } else { ZEPHIR_CPY_WRT(&data, payload); diff --git a/ext/phalcon/auth/internal/containerresolver.zep.c b/ext/phalcon/auth/internal/containerresolver.zep.c index 31e59a3f6a..cb0acd1f06 100644 --- a/ext/phalcon/auth/internal/containerresolver.zep.c +++ b/ext/phalcon/auth/internal/containerresolver.zep.c @@ -131,7 +131,7 @@ PHP_METHOD(Phalcon_Auth_Internal_ContainerResolver, requireService) ZEPHIR_CALL_METHOD(&_1$$3, container, "has", NULL, 0, &name); zephir_check_call_status(); if (zephir_is_true(&_1$$3)) { - ZEPHIR_RETURN_CALL_SELF("resolveshared", &_2, 428, container, &name); + ZEPHIR_RETURN_CALL_SELF("resolveshared", &_2, 427, container, &name); zephir_check_call_status(); RETURN_MM(); } @@ -157,7 +157,7 @@ PHP_METHOD(Phalcon_Auth_Internal_ContainerResolver, requireService) ZEPHIR_CALL_METHOD(&_5$$5, container, "has", NULL, 0, &name); zephir_check_call_status(); if (zephir_is_true(&_5$$5)) { - ZEPHIR_RETURN_CALL_SELF("resolveshared", &_2, 428, container, &name); + ZEPHIR_RETURN_CALL_SELF("resolveshared", &_2, 427, container, &name); zephir_check_call_status(); RETURN_MM(); } @@ -349,7 +349,7 @@ PHP_METHOD(Phalcon_Auth_Internal_ContainerResolver, resolveFresh) ZEPHIR_CALL_METHOD(NULL, &fresh, "__construct", NULL, 182, &definition, &_12$$8); zephir_check_call_status_or_jump(try_end_1); ZVAL_NULL(&_12$$8); - ZEPHIR_RETURN_CALL_METHOD(&fresh, "resolve", NULL, 429, &_12$$8, container); + ZEPHIR_RETURN_CALL_METHOD(&fresh, "resolve", NULL, 428, &_12$$8, container); zephir_check_call_status_or_jump(try_end_1); RETURN_MM(); } diff --git a/ext/phalcon/auth/internal/options.zep.c b/ext/phalcon/auth/internal/options.zep.c index a4d32c635c..c9f2e76b51 100644 --- a/ext/phalcon/auth/internal/options.zep.c +++ b/ext/phalcon/auth/internal/options.zep.c @@ -131,7 +131,7 @@ PHP_METHOD(Phalcon_Auth_Internal_Options, requireArray) if (_0) { ZEPHIR_INIT_VAR(&_1$$3); object_init_ex(&_1$$3, phalcon_auth_exceptions_optionrequiresarray_ce); - ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 430, &context_zv, &key_zv); + ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 429, &context_zv, &key_zv); zephir_check_call_status(); zephir_throw_exception_debug(&_1$$3, "phalcon/Auth/Internal/Options.zep", 62); ZEPHIR_MM_RESTORE(); @@ -181,7 +181,7 @@ PHP_METHOD(Phalcon_Auth_Internal_Options, requireString) if (_0) { ZEPHIR_INIT_VAR(&_1$$3); object_init_ex(&_1$$3, phalcon_auth_exceptions_optionrequiresstring_ce); - ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 431, &context_zv, &key_zv); + ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 430, &context_zv, &key_zv); zephir_check_call_status(); zephir_throw_exception_debug(&_1$$3, "phalcon/Auth/Internal/Options.zep", 80); ZEPHIR_MM_RESTORE(); diff --git a/ext/phalcon/auth/manager.zep.c b/ext/phalcon/auth/manager.zep.c index 6a481da9c4..84a8f64e79 100644 --- a/ext/phalcon/auth/manager.zep.c +++ b/ext/phalcon/auth/manager.zep.c @@ -136,7 +136,7 @@ PHP_METHOD(Phalcon_Auth_Manager, access) if (!zephir_is_true(&_1)) { ZEPHIR_INIT_VAR(&_2$$3); object_init_ex(&_2$$3, phalcon_auth_exceptions_accessnotregistered_ce); - ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 432, &accessName_zv); + ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 431, &accessName_zv); zephir_check_call_status(); zephir_throw_exception_debug(&_2$$3, "phalcon/Auth/Manager.zep", 60); ZEPHIR_MM_RESTORE(); @@ -308,7 +308,7 @@ PHP_METHOD(Phalcon_Auth_Manager, attempt) remember = 0; } else { } - ZEPHIR_CALL_METHOD(&_0, this_ptr, "requirestatefulguard", NULL, 433); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "requirestatefulguard", NULL, 432); zephir_check_call_status(); if (remember) { ZVAL_BOOL(&_1, 1); @@ -357,7 +357,7 @@ PHP_METHOD(Phalcon_Auth_Manager, except) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); ZEPHIR_INIT_VAR(&actions); zephir_get_args_from(&actions, 0); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "requireactiveaccess", NULL, 434); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "requireactiveaccess", NULL, 433); zephir_check_call_status(); ZEPHIR_CALL_FUNCTION(&_1, "array_values", NULL, 28, &actions); zephir_check_call_status(); @@ -456,7 +456,7 @@ PHP_METHOD(Phalcon_Auth_Manager, guard) if (Z_TYPE_P(&_0$$3) == IS_NULL) { ZEPHIR_INIT_VAR(&_1$$4); object_init_ex(&_1$$4, phalcon_auth_exceptions_defaultguardnotregistered_ce); - ZEPHIR_CALL_METHOD(NULL, &_1$$4, "__construct", NULL, 435); + ZEPHIR_CALL_METHOD(NULL, &_1$$4, "__construct", NULL, 434); zephir_check_call_status(); zephir_throw_exception_debug(&_1$$4, "phalcon/Auth/Manager.zep", 161); ZEPHIR_MM_RESTORE(); @@ -468,7 +468,7 @@ PHP_METHOD(Phalcon_Auth_Manager, guard) if (!(zephir_array_isset_value(&_2, &name_zv))) { ZEPHIR_INIT_VAR(&_3$$5); object_init_ex(&_3$$5, phalcon_auth_exceptions_guardnotdefined_ce); - ZEPHIR_CALL_METHOD(NULL, &_3$$5, "__construct", NULL, 436, &name_zv); + ZEPHIR_CALL_METHOD(NULL, &_3$$5, "__construct", NULL, 435, &name_zv); zephir_check_call_status(); zephir_throw_exception_debug(&_3$$5, "phalcon/Auth/Manager.zep", 168); ZEPHIR_MM_RESTORE(); @@ -509,7 +509,7 @@ PHP_METHOD(Phalcon_Auth_Manager, logout) ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "requirestatefulguard", NULL, 433); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "requirestatefulguard", NULL, 432); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_0, "logout", NULL, 0); zephir_check_call_status(); @@ -535,7 +535,7 @@ PHP_METHOD(Phalcon_Auth_Manager, only) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); ZEPHIR_INIT_VAR(&actions); zephir_get_args_from(&actions, 0); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "requireactiveaccess", NULL, 434); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "requireactiveaccess", NULL, 433); zephir_check_call_status(); ZEPHIR_CALL_FUNCTION(&_1, "array_values", NULL, 28, &actions); zephir_check_call_status(); @@ -656,7 +656,7 @@ PHP_METHOD(Phalcon_Auth_Manager, requireActiveAccess) if (Z_TYPE_P(&_0) == IS_NULL) { ZEPHIR_INIT_VAR(&_1$$3); object_init_ex(&_1$$3, phalcon_auth_exceptions_activeaccessrequired_ce); - ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 437); + ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 436); zephir_check_call_status(); zephir_throw_exception_debug(&_1$$3, "phalcon/Auth/Manager.zep", 227); ZEPHIR_MM_RESTORE(); diff --git a/ext/phalcon/auth/managerfactory.zep.c b/ext/phalcon/auth/managerfactory.zep.c index d6dd8711f9..0cfdffaecb 100644 --- a/ext/phalcon/auth/managerfactory.zep.c +++ b/ext/phalcon/auth/managerfactory.zep.c @@ -184,7 +184,7 @@ PHP_METHOD(Phalcon_Auth_ManagerFactory, __construct) } else { ZEPHIR_INIT_NVAR(&_0); object_init_ex(&_0, phalcon_auth_adapter_adapterlocator_ce); - ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 438, container); + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 437, container); zephir_check_call_status(); } zephir_update_property_zval_cached(this_ptr, _zephir_prop_2, 484, &_0); @@ -194,7 +194,7 @@ PHP_METHOD(Phalcon_Auth_ManagerFactory, __construct) } else { ZEPHIR_INIT_NVAR(&_1); object_init_ex(&_1, phalcon_auth_guard_guardlocator_ce); - ZEPHIR_CALL_METHOD(NULL, &_1, "__construct", NULL, 438, container); + ZEPHIR_CALL_METHOD(NULL, &_1, "__construct", NULL, 437, container); zephir_check_call_status(); } zephir_update_property_zval_cached(this_ptr, _zephir_prop_3, 485, &_1); @@ -204,7 +204,7 @@ PHP_METHOD(Phalcon_Auth_ManagerFactory, __construct) } else { ZEPHIR_INIT_NVAR(&_2); object_init_ex(&_2, phalcon_auth_access_accesslocator_ce); - ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 438, container); + ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 437, container); zephir_check_call_status(); } zephir_update_property_zval_cached(this_ptr, _zephir_prop_4, 486, &_2); @@ -288,7 +288,7 @@ PHP_METHOD(Phalcon_Auth_ManagerFactory, load) ZEPHIR_INIT_VAR(&manager); object_init_ex(&manager, phalcon_auth_manager_ce); zephir_read_property_cached(&_1, this_ptr, _zephir_prop_0, 486, PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(NULL, &manager, "__construct", NULL, 439, &_1); + ZEPHIR_CALL_METHOD(NULL, &manager, "__construct", NULL, 438, &_1); zephir_check_call_status(); if (zephir_array_isset_value_string(config, SL("guards"))) { zephir_memory_observe(&guards); @@ -352,7 +352,7 @@ PHP_METHOD(Phalcon_Auth_ManagerFactory, load) ZVAL_BOOL(&_20$$3, 0); } ZVAL_BOOL(&_21$$3, zephir_get_boolval(&_20$$3)); - ZEPHIR_CALL_METHOD(NULL, &manager, "addguard", &_22, 440, &_19$$3, &guard, &_21$$3); + ZEPHIR_CALL_METHOD(NULL, &manager, "addguard", &_22, 439, &_19$$3, &guard, &_21$$3); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); } else { @@ -411,7 +411,7 @@ PHP_METHOD(Phalcon_Auth_ManagerFactory, load) ZVAL_BOOL(&_34$$4, 0); } ZVAL_BOOL(&_35$$4, zephir_get_boolval(&_34$$4)); - ZEPHIR_CALL_METHOD(NULL, &manager, "addguard", &_22, 440, &_33$$4, &guard, &_35$$4); + ZEPHIR_CALL_METHOD(NULL, &manager, "addguard", &_22, 439, &_33$$4, &guard, &_35$$4); zephir_check_call_status(); } } @@ -425,7 +425,7 @@ PHP_METHOD(Phalcon_Auth_ManagerFactory, load) array_init(&accessList); } if (!(ZEPHIR_IS_EMPTY(&accessList))) { - ZEPHIR_CALL_METHOD(NULL, &manager, "addaccesslist", NULL, 441, &accessList); + ZEPHIR_CALL_METHOD(NULL, &manager, "addaccesslist", NULL, 440, &accessList); zephir_check_call_status(); } RETURN_CCTOR(&manager); @@ -479,7 +479,7 @@ PHP_METHOD(Phalcon_Auth_ManagerFactory, buildAdapter) if (!zephir_is_true(&_2)) { ZEPHIR_INIT_VAR(&_3$$3); object_init_ex(&_3$$3, phalcon_auth_exceptions_unknownadapter_ce); - ZEPHIR_CALL_METHOD(NULL, &_3$$3, "__construct", NULL, 442, &name); + ZEPHIR_CALL_METHOD(NULL, &_3$$3, "__construct", NULL, 441, &name); zephir_check_call_status(); zephir_throw_exception_debug(&_3$$3, "phalcon/Auth/ManagerFactory.zep", 157); ZEPHIR_MM_RESTORE(); @@ -549,7 +549,7 @@ PHP_METHOD(Phalcon_Auth_ManagerFactory, buildGuard) if (!zephir_is_true(&_0)) { ZEPHIR_INIT_VAR(&_1$$3); object_init_ex(&_1$$3, phalcon_auth_exceptions_unknownguard_ce); - ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 443, &type_zv); + ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 442, &type_zv); zephir_check_call_status(); zephir_throw_exception_debug(&_1$$3, "phalcon/Auth/ManagerFactory.zep", 182); ZEPHIR_MM_RESTORE(); diff --git a/ext/phalcon/autoload/loader.zep.c b/ext/phalcon/autoload/loader.zep.c index 26bc04e810..b9d85bc16c 100644 --- a/ext/phalcon/autoload/loader.zep.c +++ b/ext/phalcon/autoload/loader.zep.c @@ -322,7 +322,7 @@ PHP_METHOD(Phalcon_Autoload_Loader, addNamespace) ZEPHIR_INIT_VAR(&_1); ZEPHIR_CONCAT_VV(&_1, &_0, &nsSeparator); ZEPHIR_CPY_WRT(&nsName, &_1); - ZEPHIR_CALL_METHOD(&_2, this_ptr, "checkdirectories", NULL, 444, directories, &dirSeparator, &name_zv); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "checkdirectories", NULL, 443, directories, &dirSeparator, &name_zv); zephir_check_call_status(); ZEPHIR_CPY_WRT(directories, &_2); zephir_read_property_cached(&_3, this_ptr, _zephir_prop_0, 489, PH_NOISY_CC | PH_READONLY); @@ -347,7 +347,7 @@ PHP_METHOD(Phalcon_Autoload_Loader, addNamespace) } ZEPHIR_INIT_VAR(&_7); zephir_fast_array_merge(&_7, &source, &target); - ZEPHIR_CALL_FUNCTION(&_2, "array_unique", NULL, 445, &_7); + ZEPHIR_CALL_FUNCTION(&_2, "array_unique", NULL, 444, &_7); zephir_check_call_status(); zephir_update_property_array(this_ptr, SL("namespaces"), &nsName, &_2); RETURN_THIS(); @@ -417,34 +417,34 @@ PHP_METHOD(Phalcon_Autoload_Loader, autoload) zephir_update_property_zval_cached(this_ptr, _zephir_prop_0, 490, &_3); ZEPHIR_INIT_VAR(&_4); ZEPHIR_CONCAT_SV(&_4, "Loading: ", &className_zv); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 446, &_4); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 445, &_4); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_5); ZVAL_STRING(&_5, "loader:beforeCheckClass"); ZEPHIR_CALL_METHOD(NULL, this_ptr, "firemanagerevent", NULL, 0, &_5, &className_zv); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_6, this_ptr, "autoloadcheckclasses", NULL, 447, &className_zv); + ZEPHIR_CALL_METHOD(&_6, this_ptr, "autoloadcheckclasses", NULL, 446, &className_zv); zephir_check_call_status(); if (!ZEPHIR_IS_TRUE_IDENTICAL(&_6)) { ZEPHIR_INIT_VAR(&_7$$4); ZEPHIR_CONCAT_SV(&_7$$4, "Class: 404: ", &className_zv); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 446, &_7$$4); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 445, &_7$$4); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_8$$4, this_ptr, "autoloadchecknamespaces", NULL, 448, &className_zv); + ZEPHIR_CALL_METHOD(&_8$$4, this_ptr, "autoloadchecknamespaces", NULL, 447, &className_zv); zephir_check_call_status(); if (!ZEPHIR_IS_TRUE_IDENTICAL(&_8$$4)) { ZEPHIR_INIT_VAR(&_9$$5); ZEPHIR_CONCAT_SV(&_9$$5, "Namespace: 404: ", &className_zv); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 446, &_9$$5); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 445, &_9$$5); zephir_check_call_status(); zephir_read_property_cached(&_11$$5, this_ptr, _zephir_prop_2, 492, PH_NOISY_CC | PH_READONLY); ZVAL_BOOL(&_12$$5, 1); - ZEPHIR_CALL_METHOD(&_10$$5, this_ptr, "autoloadcheckdirectories", NULL, 449, &_11$$5, &className_zv, &_12$$5); + ZEPHIR_CALL_METHOD(&_10$$5, this_ptr, "autoloadcheckdirectories", NULL, 448, &_11$$5, &className_zv, &_12$$5); zephir_check_call_status(); if (!ZEPHIR_IS_TRUE_IDENTICAL(&_10$$5)) { ZEPHIR_INIT_VAR(&_13$$6); ZEPHIR_CONCAT_SV(&_13$$6, "Directories: 404: ", &className_zv); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 446, &_13$$6); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 445, &_13$$6); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_14$$6); ZVAL_STRING(&_14$$6, "loader:afterCheckClass"); @@ -674,7 +674,7 @@ PHP_METHOD(Phalcon_Autoload_Loader, register) } else { ZVAL_BOOL(&_1$$3, 0); } - ZEPHIR_CALL_METHOD(NULL, this_ptr, "registerautoload", NULL, 450, &_1$$3); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "registerautoload", NULL, 449, &_1$$3); zephir_check_call_status(); if (1) { zephir_update_property_zval_cached(this_ptr, _zephir_prop_0, 494, &__$true); @@ -814,7 +814,7 @@ PHP_METHOD(Phalcon_Autoload_Loader, setDirectories) } else { ZVAL_BOOL(&_2, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "addtocollection", NULL, 451, &directories, &_0, &_1, &_2); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "addtocollection", NULL, 450, &directories, &_0, &_1, &_2); zephir_check_call_status(); RETURN_MM(); } @@ -961,7 +961,7 @@ PHP_METHOD(Phalcon_Autoload_Loader, setFileCheckingCallback) } else { ZEPHIR_INIT_VAR(&_1$$5); object_init_ex(&_1$$5, phalcon_autoload_exceptions_loadermethodnotcallable_ce); - ZEPHIR_CALL_METHOD(NULL, &_1$$5, "__construct", NULL, 452); + ZEPHIR_CALL_METHOD(NULL, &_1$$5, "__construct", NULL, 451); zephir_check_call_status(); zephir_throw_exception_debug(&_1$$5, "phalcon/Autoload/Loader.zep", 404); ZEPHIR_MM_RESTORE(); @@ -1011,7 +1011,7 @@ PHP_METHOD(Phalcon_Autoload_Loader, setFiles) } else { ZVAL_BOOL(&_2, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "addtocollection", NULL, 451, &files, &_0, &_1, &_2); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "addtocollection", NULL, 450, &files, &_0, &_1, &_2); zephir_check_call_status(); RETURN_MM(); } @@ -1136,7 +1136,7 @@ PHP_METHOD(Phalcon_Autoload_Loader, unregister) ZEPHIR_INIT_VAR(&_2$$3); ZVAL_STRING(&_2$$3, "autoload"); zephir_array_fast_append(&_1$$3, &_2$$3); - ZEPHIR_CALL_FUNCTION(NULL, "spl_autoload_unregister", NULL, 453, &_1$$3); + ZEPHIR_CALL_FUNCTION(NULL, "spl_autoload_unregister", NULL, 452, &_1$$3); zephir_check_call_status(); if (0) { zephir_update_property_zval_cached(this_ptr, _zephir_prop_0, 494, &__$true); @@ -1194,7 +1194,7 @@ PHP_METHOD(Phalcon_Autoload_Loader, requireFile) zephir_check_call_status(); ZEPHIR_INIT_VAR(&_3$$3); ZEPHIR_CONCAT_SV(&_3$$3, "Require: ", &file_zv); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 446, &_3$$3); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 445, &_3$$3); zephir_check_call_status(); if (zephir_require_once_zval(&file_zv) == FAILURE) { RETURN_MM_NULL(); @@ -1203,7 +1203,7 @@ PHP_METHOD(Phalcon_Autoload_Loader, requireFile) } ZEPHIR_INIT_VAR(&_4); ZEPHIR_CONCAT_SV(&_4, "Require: 404: ", &file_zv); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 446, &_4); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 445, &_4); zephir_check_call_status(); RETURN_MM_BOOL(0); } @@ -1365,7 +1365,7 @@ PHP_METHOD(Phalcon_Autoload_Loader, autoloadCheckClasses) if (ZEPHIR_IS_TRUE_IDENTICAL(&_3$$3)) { ZEPHIR_INIT_VAR(&_4$$4); ZEPHIR_CONCAT_SV(&_4$$4, "Class: load: ", &filePath); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 446, &_4$$4); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 445, &_4$$4); zephir_check_call_status(); RETURN_MM_BOOL(1); } @@ -1494,7 +1494,7 @@ PHP_METHOD(Phalcon_Autoload_Loader, autoloadCheckDirectories) if (isDirectory) { ZEPHIR_INIT_NVAR(&_10$$6); ZEPHIR_CONCAT_SV(&_10$$6, "Directories: ", &filePath); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_11, 446, &_10$$6); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_11, 445, &_10$$6); zephir_check_call_status(); } RETURN_MM_BOOL(1); @@ -1531,7 +1531,7 @@ PHP_METHOD(Phalcon_Autoload_Loader, autoloadCheckDirectories) if (isDirectory) { ZEPHIR_INIT_NVAR(&_16$$9); ZEPHIR_CONCAT_SV(&_16$$9, "Directories: ", &filePath); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_11, 446, &_16$$9); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_11, 445, &_16$$9); zephir_check_call_status(); } RETURN_MM_BOOL(1); @@ -1588,7 +1588,7 @@ PHP_METHOD(Phalcon_Autoload_Loader, autoloadCheckDirectories) if (isDirectory) { ZEPHIR_INIT_NVAR(&_25$$13); ZEPHIR_CONCAT_SV(&_25$$13, "Directories: ", &filePath); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_11, 446, &_25$$13); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_11, 445, &_25$$13); zephir_check_call_status(); } RETURN_MM_BOOL(1); @@ -1625,7 +1625,7 @@ PHP_METHOD(Phalcon_Autoload_Loader, autoloadCheckDirectories) if (isDirectory) { ZEPHIR_INIT_NVAR(&_30$$16); ZEPHIR_CONCAT_SV(&_30$$16, "Directories: ", &filePath); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_11, 446, &_30$$16); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_11, 445, &_30$$16); zephir_check_call_status(); } RETURN_MM_BOOL(1); @@ -1715,13 +1715,13 @@ PHP_METHOD(Phalcon_Autoload_Loader, autoloadCheckNamespaces) ZVAL_LONG(&_6$$3, zephir_fast_strlen_ev(&prefix)); ZEPHIR_INIT_NVAR(&fileName); zephir_substr(&fileName, &className_zv, zephir_get_intval(&_6$$3), 0, ZEPHIR_SUBSTR_NO_LENGTH); - ZEPHIR_CALL_METHOD(&_7$$3, this_ptr, "autoloadcheckdirectories", &_8, 449, &directories, &fileName); + ZEPHIR_CALL_METHOD(&_7$$3, this_ptr, "autoloadcheckdirectories", &_8, 448, &directories, &fileName); zephir_check_call_status(); if (ZEPHIR_IS_TRUE_IDENTICAL(&_7$$3)) { zephir_read_property_cached(&_9$$5, this_ptr, _zephir_prop_1, 499, PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_NVAR(&_10$$5); ZEPHIR_CONCAT_SVSV(&_10$$5, "Namespace: ", &prefix, " - ", &_9$$5); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_11, 446, &_10$$5); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_11, 445, &_10$$5); zephir_check_call_status(); RETURN_MM_BOOL(1); } @@ -1752,13 +1752,13 @@ PHP_METHOD(Phalcon_Autoload_Loader, autoloadCheckNamespaces) ZVAL_LONG(&_14$$6, zephir_fast_strlen_ev(&prefix)); ZEPHIR_INIT_NVAR(&fileName); zephir_substr(&fileName, &className_zv, zephir_get_intval(&_14$$6), 0, ZEPHIR_SUBSTR_NO_LENGTH); - ZEPHIR_CALL_METHOD(&_15$$6, this_ptr, "autoloadcheckdirectories", &_8, 449, &directories, &fileName); + ZEPHIR_CALL_METHOD(&_15$$6, this_ptr, "autoloadcheckdirectories", &_8, 448, &directories, &fileName); zephir_check_call_status(); if (ZEPHIR_IS_TRUE_IDENTICAL(&_15$$6)) { zephir_read_property_cached(&_16$$8, this_ptr, _zephir_prop_1, 499, PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_NVAR(&_17$$8); ZEPHIR_CONCAT_SVSV(&_17$$8, "Namespace: ", &prefix, " - ", &_16$$8); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_11, 446, &_17$$8); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_11, 445, &_17$$8); zephir_check_call_status(); RETURN_MM_BOOL(1); } @@ -1828,7 +1828,7 @@ PHP_METHOD(Phalcon_Autoload_Loader, checkDirectories) if (_0) { ZEPHIR_INIT_VAR(&_1$$3); object_init_ex(&_1$$3, phalcon_autoload_exceptions_loaderdirectoriesnotarray_ce); - ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 454, &name_zv); + ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 453, &name_zv); zephir_check_call_status(); zephir_throw_exception_debug(&_1$$3, "phalcon/Autoload/Loader.zep", 652); ZEPHIR_MM_RESTORE(); @@ -1918,7 +1918,7 @@ PHP_METHOD(Phalcon_Autoload_Loader, registerAutoload) ZVAL_STRING(&_1, "autoload"); zephir_array_fast_append(&_0, &_1); ZVAL_BOOL(&_2, (prepend ? 1 : 0)); - ZEPHIR_RETURN_CALL_FUNCTION("spl_autoload_register", NULL, 455, &_0, &__$true, &_2); + ZEPHIR_RETURN_CALL_FUNCTION("spl_autoload_register", NULL, 454, &_0, &__$true, &_2); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/cache/cachefactory.zep.c b/ext/phalcon/cache/cachefactory.zep.c index d1ca964394..c5881569a8 100644 --- a/ext/phalcon/cache/cachefactory.zep.c +++ b/ext/phalcon/cache/cachefactory.zep.c @@ -208,7 +208,7 @@ PHP_METHOD(Phalcon_Cache_CacheFactory, newInstance) ZEPHIR_CALL_METHOD(&adapter, &_0, "newinstance", NULL, 0, &name_zv, &options); zephir_check_call_status(); object_init_ex(return_value, phalcon_cache_cache_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 456, &adapter); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 455, &adapter); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/cli/console.zep.c b/ext/phalcon/cli/console.zep.c index fc8091f4b2..03ba31f270 100644 --- a/ext/phalcon/cli/console.zep.c +++ b/ext/phalcon/cli/console.zep.c @@ -165,7 +165,7 @@ PHP_METHOD(Phalcon_Cli_Console, handle) if (Z_TYPE_P(&_0) == IS_NULL) { ZEPHIR_INIT_VAR(&_1$$3); object_init_ex(&_1$$3, phalcon_cli_console_exceptions_containerrequired_ce); - ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 457); + ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 456); zephir_check_call_status(); zephir_throw_exception_debug(&_1$$3, "phalcon/Cli/Console.zep", 55); ZEPHIR_MM_RESTORE(); @@ -230,7 +230,7 @@ PHP_METHOD(Phalcon_Cli_Console, handle) object_init_ex(&_17$$12, phalcon_cli_console_exceptions_invalidmoduledefinition_ce); ZEPHIR_INIT_VAR(&_18$$12); ZVAL_STRING(&_18$$12, "The module definition must be an array or an object"); - ZEPHIR_CALL_METHOD(NULL, &_17$$12, "__construct", NULL, 458, &moduleName, &_18$$12); + ZEPHIR_CALL_METHOD(NULL, &_17$$12, "__construct", NULL, 457, &moduleName, &_18$$12); zephir_check_call_status(); zephir_throw_exception_debug(&_17$$12, "phalcon/Cli/Console.zep", 104); ZEPHIR_MM_RESTORE(); @@ -249,7 +249,7 @@ PHP_METHOD(Phalcon_Cli_Console, handle) if (UNEXPECTED(!zephir_is_true(&_19$$15))) { ZEPHIR_INIT_VAR(&_20$$16); object_init_ex(&_20$$16, phalcon_cli_console_exceptions_moduledefinitionpathnotfound_ce); - ZEPHIR_CALL_METHOD(NULL, &_20$$16, "__construct", NULL, 459, &path); + ZEPHIR_CALL_METHOD(NULL, &_20$$16, "__construct", NULL, 458, &path); zephir_check_call_status(); zephir_throw_exception_debug(&_20$$16, "phalcon/Cli/Console.zep", 124); ZEPHIR_MM_RESTORE(); @@ -277,7 +277,7 @@ PHP_METHOD(Phalcon_Cli_Console, handle) object_init_ex(&_25$$19, phalcon_cli_console_exceptions_invalidmoduledefinition_ce); ZEPHIR_INIT_VAR(&_26$$19); ZVAL_STRING(&_26$$19, "The module definition object must be a Closure"); - ZEPHIR_CALL_METHOD(NULL, &_25$$19, "__construct", NULL, 458, &moduleName, &_26$$19); + ZEPHIR_CALL_METHOD(NULL, &_25$$19, "__construct", NULL, 457, &moduleName, &_26$$19); zephir_check_call_status(); zephir_throw_exception_debug(&_25$$19, "phalcon/Cli/Console.zep", 148); ZEPHIR_MM_RESTORE(); @@ -475,7 +475,7 @@ PHP_METHOD(Phalcon_Cli_Console, setArgument) ZEPHIR_INIT_NVAR(&_2$$5); ZVAL_STRING(&_2$$5, "--"); ZVAL_LONG(&_3$$5, 2); - ZEPHIR_CALL_FUNCTION(&_4$$5, "strncmp", &_5, 358, &arg, &_2$$5, &_3$$5); + ZEPHIR_CALL_FUNCTION(&_4$$5, "strncmp", &_5, 357, &arg, &_2$$5, &_3$$5); zephir_check_call_status(); if (ZEPHIR_IS_LONG(&_4$$5, 0)) { ZEPHIR_INIT_NVAR(&_6$$6); @@ -507,7 +507,7 @@ PHP_METHOD(Phalcon_Cli_Console, setArgument) ZEPHIR_INIT_NVAR(&_17$$9); ZVAL_STRING(&_17$$9, "-"); ZVAL_LONG(&_18$$9, 1); - ZEPHIR_CALL_FUNCTION(&_19$$9, "strncmp", &_5, 358, &arg, &_17$$9, &_18$$9); + ZEPHIR_CALL_FUNCTION(&_19$$9, "strncmp", &_5, 357, &arg, &_17$$9, &_18$$9); zephir_check_call_status(); if (ZEPHIR_IS_LONG(&_19$$9, 0)) { ZVAL_LONG(&_20$$10, 1); @@ -544,7 +544,7 @@ PHP_METHOD(Phalcon_Cli_Console, setArgument) ZEPHIR_INIT_NVAR(&_24$$14); ZVAL_STRING(&_24$$14, "--"); ZVAL_LONG(&_25$$14, 2); - ZEPHIR_CALL_FUNCTION(&_26$$14, "strncmp", &_5, 358, &arg, &_24$$14, &_25$$14); + ZEPHIR_CALL_FUNCTION(&_26$$14, "strncmp", &_5, 357, &arg, &_24$$14, &_25$$14); zephir_check_call_status(); if (ZEPHIR_IS_LONG(&_26$$14, 0)) { ZEPHIR_INIT_NVAR(&_27$$15); @@ -576,7 +576,7 @@ PHP_METHOD(Phalcon_Cli_Console, setArgument) ZEPHIR_INIT_NVAR(&_38$$18); ZVAL_STRING(&_38$$18, "-"); ZVAL_LONG(&_39$$18, 1); - ZEPHIR_CALL_FUNCTION(&_40$$18, "strncmp", &_5, 358, &arg, &_38$$18, &_39$$18); + ZEPHIR_CALL_FUNCTION(&_40$$18, "strncmp", &_5, 357, &arg, &_38$$18, &_39$$18); zephir_check_call_status(); if (ZEPHIR_IS_LONG(&_40$$18, 0)) { ZVAL_LONG(&_41$$19, 1); diff --git a/ext/phalcon/cli/router.zep.c b/ext/phalcon/cli/router.zep.c index 8f697074dd..b004c5797e 100644 --- a/ext/phalcon/cli/router.zep.c +++ b/ext/phalcon/cli/router.zep.c @@ -232,9 +232,9 @@ PHP_METHOD(Phalcon_Cli_Router, add) } ZEPHIR_INIT_VAR(&route); object_init_ex(&route, phalcon_cli_router_route_ce); - ZEPHIR_CALL_METHOD(NULL, &route, "__construct", NULL, 460, &pattern_zv, paths); + ZEPHIR_CALL_METHOD(NULL, &route, "__construct", NULL, 459, &pattern_zv, paths); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_0, &route, "getrouteid", NULL, 461); + ZEPHIR_CALL_METHOD(&_0, &route, "getrouteid", NULL, 460); zephir_check_call_status(); zephir_update_property_array(this_ptr, SL("routes"), &_0, &route); RETURN_CCTOR(&route); @@ -608,7 +608,7 @@ PHP_METHOD(Phalcon_Cli_Router, handle) object_init_ex(&_1$$4, phalcon_cli_router_exceptions_routerargumentsinvalidtype_ce); ZEPHIR_INIT_VAR(&_2$$4); zephir_gettype(&_2$$4, arguments); - ZEPHIR_CALL_METHOD(NULL, &_1$$4, "__construct", NULL, 462, &_2$$4); + ZEPHIR_CALL_METHOD(NULL, &_1$$4, "__construct", NULL, 461, &_2$$4); zephir_check_call_status(); zephir_throw_exception_debug(&_1$$4, "phalcon/Cli/Router.zep", 239); ZEPHIR_MM_RESTORE(); @@ -650,7 +650,7 @@ PHP_METHOD(Phalcon_Cli_Router, handle) object_init_ex(&_7$$11, phalcon_cli_router_exceptions_beforematchnotcallable_ce); ZEPHIR_CALL_METHOD(&_8$$11, &route, "getpattern", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &_7$$11, "__construct", &_9, 463, &_8$$11); + ZEPHIR_CALL_METHOD(NULL, &_7$$11, "__construct", &_9, 462, &_8$$11); zephir_check_call_status(); zephir_throw_exception_debug(&_7$$11, "phalcon/Cli/Router.zep", 273); ZEPHIR_MM_RESTORE(); @@ -811,7 +811,7 @@ PHP_METHOD(Phalcon_Cli_Router, handle) object_init_ex(&_28$$31, phalcon_cli_router_exceptions_beforematchnotcallable_ce); ZEPHIR_CALL_METHOD(&_29$$31, &route, "getpattern", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &_28$$31, "__construct", &_9, 463, &_29$$31); + ZEPHIR_CALL_METHOD(NULL, &_28$$31, "__construct", &_9, 462, &_29$$31); zephir_check_call_status(); zephir_throw_exception_debug(&_28$$31, "phalcon/Cli/Router.zep", 273); ZEPHIR_MM_RESTORE(); diff --git a/ext/phalcon/cli/router/route.zep.c b/ext/phalcon/cli/router/route.zep.c index 7b36b17fbc..4518fbb95c 100644 --- a/ext/phalcon/cli/router/route.zep.c +++ b/ext/phalcon/cli/router/route.zep.c @@ -282,7 +282,7 @@ PHP_METHOD(Phalcon_Cli_Router_Route, beforeMatch) ZEPHIR_INIT_VAR(&_0$$3); object_init_ex(&_0$$3, phalcon_cli_router_exceptions_beforematchnotcallable_ce); zephir_read_property_cached(&_1$$3, this_ptr, _zephir_prop_0, 529, PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 463, &_1$$3); + ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 462, &_1$$3); zephir_check_call_status(); zephir_throw_exception_debug(&_0$$3, "phalcon/Cli/Router/Route.zep", 123); ZEPHIR_MM_RESTORE(); @@ -749,7 +749,7 @@ PHP_METHOD(Phalcon_Cli_Router_Route, getReversedPaths) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_read_property_cached(&_0, this_ptr, _zephir_prop_0, 531, PH_NOISY_CC | PH_READONLY); - ZEPHIR_RETURN_CALL_FUNCTION("array_flip", NULL, 266, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("array_flip", NULL, 265, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -887,7 +887,7 @@ PHP_METHOD(Phalcon_Cli_Router_Route, reConfigure) if (UNEXPECTED(_1$$10)) { ZEPHIR_INIT_VAR(&_2$$11); object_init_ex(&_2$$11, phalcon_cli_router_exceptions_invalidroutepaths_ce); - ZEPHIR_CALL_METHOD(NULL, &_2$$11, "__construct", NULL, 464, &pattern); + ZEPHIR_CALL_METHOD(NULL, &_2$$11, "__construct", NULL, 463, &pattern); zephir_check_call_status(); zephir_throw_exception_debug(&_2$$11, "phalcon/Cli/Router/Route.zep", 459); ZEPHIR_MM_RESTORE(); @@ -912,7 +912,7 @@ PHP_METHOD(Phalcon_Cli_Router_Route, reConfigure) if (UNEXPECTED(Z_TYPE_P(&routePaths) != IS_ARRAY)) { ZEPHIR_INIT_VAR(&_4$$16); object_init_ex(&_4$$16, phalcon_cli_router_exceptions_invalidroutepaths_ce); - ZEPHIR_CALL_METHOD(NULL, &_4$$16, "__construct", NULL, 464, &pattern); + ZEPHIR_CALL_METHOD(NULL, &_4$$16, "__construct", NULL, 463, &pattern); zephir_check_call_status(); zephir_throw_exception_debug(&_4$$16, "phalcon/Cli/Router/Route.zep", 483); ZEPHIR_MM_RESTORE(); diff --git a/ext/phalcon/config/adapter/grouped.zep.c b/ext/phalcon/config/adapter/grouped.zep.c index 6983708764..c437fe4b6d 100644 --- a/ext/phalcon/config/adapter/grouped.zep.c +++ b/ext/phalcon/config/adapter/grouped.zep.c @@ -175,7 +175,7 @@ PHP_METHOD(Phalcon_Config_Adapter_Grouped, __construct) if (Z_TYPE_P(&configFactory) == IS_NULL) { ZEPHIR_INIT_NVAR(&configFactory); object_init_ex(&configFactory, phalcon_config_configfactory_ce); - ZEPHIR_CALL_METHOD(NULL, &configFactory, "__construct", NULL, 465); + ZEPHIR_CALL_METHOD(NULL, &configFactory, "__construct", NULL, 464); zephir_check_call_status(); } zephir_is_iterable(&arrayConfig, 0, "phalcon/Config/Adapter/Grouped.zep", 137); @@ -197,7 +197,7 @@ PHP_METHOD(Phalcon_Config_Adapter_Grouped, __construct) ZEPHIR_INIT_NVAR(&_4$$6); ZVAL_STRING(&_4$$6, ""); if (ZEPHIR_IS_IDENTICAL(&_4$$6, &defaultAdapter_zv)) { - ZEPHIR_CALL_METHOD(&_5$$7, &configFactory, "load", &_6, 466, &configName); + ZEPHIR_CALL_METHOD(&_5$$7, &configFactory, "load", &_6, 465, &configName); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, this_ptr, "merge", &_3, 0, &_5$$7); zephir_check_call_status(); @@ -219,7 +219,7 @@ PHP_METHOD(Phalcon_Config_Adapter_Grouped, __construct) if (!(zephir_array_isset_value_string(&configInstance, SL("config")))) { ZEPHIR_INIT_NVAR(&_10$$10); object_init_ex(&_10$$10, phalcon_config_exceptions_groupedadapterrequiresarray_ce); - ZEPHIR_CALL_METHOD(NULL, &_10$$10, "__construct", &_11, 467); + ZEPHIR_CALL_METHOD(NULL, &_10$$10, "__construct", &_11, 466); zephir_check_call_status(); zephir_throw_exception_debug(&_10$$10, "phalcon/Config/Adapter/Grouped.zep", 126); ZEPHIR_MM_RESTORE(); @@ -233,7 +233,7 @@ PHP_METHOD(Phalcon_Config_Adapter_Grouped, __construct) ZEPHIR_CALL_METHOD(NULL, &configInstance, "__construct", &_13, 42, &configArray, &_12$$9); zephir_check_call_status(); } else { - ZEPHIR_CALL_METHOD(&_14$$11, &configFactory, "load", &_6, 466, &configInstance); + ZEPHIR_CALL_METHOD(&_14$$11, &configFactory, "load", &_6, 465, &configInstance); zephir_check_call_status(); ZEPHIR_CPY_WRT(&configInstance, &_14$$11); } @@ -271,7 +271,7 @@ PHP_METHOD(Phalcon_Config_Adapter_Grouped, __construct) ZEPHIR_INIT_NVAR(&_18$$14); ZVAL_STRING(&_18$$14, ""); if (ZEPHIR_IS_IDENTICAL(&_18$$14, &defaultAdapter_zv)) { - ZEPHIR_CALL_METHOD(&_19$$15, &configFactory, "load", &_6, 466, &configName); + ZEPHIR_CALL_METHOD(&_19$$15, &configFactory, "load", &_6, 465, &configName); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, this_ptr, "merge", &_3, 0, &_19$$15); zephir_check_call_status(); @@ -293,7 +293,7 @@ PHP_METHOD(Phalcon_Config_Adapter_Grouped, __construct) if (!(zephir_array_isset_value_string(&configInstance, SL("config")))) { ZEPHIR_INIT_NVAR(&_23$$18); object_init_ex(&_23$$18, phalcon_config_exceptions_groupedadapterrequiresarray_ce); - ZEPHIR_CALL_METHOD(NULL, &_23$$18, "__construct", &_11, 467); + ZEPHIR_CALL_METHOD(NULL, &_23$$18, "__construct", &_11, 466); zephir_check_call_status(); zephir_throw_exception_debug(&_23$$18, "phalcon/Config/Adapter/Grouped.zep", 126); ZEPHIR_MM_RESTORE(); @@ -307,7 +307,7 @@ PHP_METHOD(Phalcon_Config_Adapter_Grouped, __construct) ZEPHIR_CALL_METHOD(NULL, &configInstance, "__construct", &_13, 42, &configArray, &_24$$17); zephir_check_call_status(); } else { - ZEPHIR_CALL_METHOD(&_25$$19, &configFactory, "load", &_6, 466, &configInstance); + ZEPHIR_CALL_METHOD(&_25$$19, &configFactory, "load", &_6, 465, &configInstance); zephir_check_call_status(); ZEPHIR_CPY_WRT(&configInstance, &_25$$19); } diff --git a/ext/phalcon/config/adapter/ini.zep.c b/ext/phalcon/config/adapter/ini.zep.c index 381a5bc01e..c436a9174f 100644 --- a/ext/phalcon/config/adapter/ini.zep.c +++ b/ext/phalcon/config/adapter/ini.zep.c @@ -159,7 +159,7 @@ PHP_METHOD(Phalcon_Config_Adapter_Ini, __construct) object_init_ex(&_2$$3, phalcon_config_exceptions_cannotloadconfigfile_ce); ZEPHIR_INIT_VAR(&_3$$3); zephir_basename(&_3$$3, &filePath_zv); - ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 468, &_3$$3); + ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 467, &_3$$3); zephir_check_call_status(); zephir_throw_exception_debug(&_2$$3, "phalcon/Config/Adapter/Ini.zep", 83); ZEPHIR_MM_RESTORE(); @@ -564,7 +564,7 @@ PHP_METHOD(Phalcon_Config_Adapter_Ini, parseIniString) ZEPHIR_INIT_VAR(&_3); zephir_substr(&_3, &path, zephir_get_intval(&_2), 0, ZEPHIR_SUBSTR_NO_LENGTH); zephir_get_strval(&path, &_3); - ZEPHIR_CALL_METHOD(&result, this_ptr, "parseinistring", NULL, 469, &path, &castValue); + ZEPHIR_CALL_METHOD(&result, this_ptr, "parseinistring", NULL, 468, &path, &castValue); zephir_check_call_status(); zephir_create_array(return_value, 1, 0); zephir_array_update_zval(return_value, &key, &result, PH_COPY); @@ -609,7 +609,7 @@ PHP_METHOD(Phalcon_Config_Adapter_Ini, phpIniGet) zephir_memory_observe(&defaultValue_zv); ZVAL_STR_COPY(&defaultValue_zv, defaultValue); } - ZEPHIR_CALL_FUNCTION(&value, "ini_get", NULL, 470, &input_zv); + ZEPHIR_CALL_FUNCTION(&value, "ini_get", NULL, 469, &input_zv); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&value)) { RETURN_MM_STR(zend_string_copy(defaultValue)); @@ -656,7 +656,7 @@ PHP_METHOD(Phalcon_Config_Adapter_Ini, phpIniGetBool) } else { } result = 0; - ZEPHIR_CALL_FUNCTION(&value, "ini_get", NULL, 470, &input_zv); + ZEPHIR_CALL_FUNCTION(&value, "ini_get", NULL, 469, &input_zv); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&value)) { RETURN_MM_BOOL(defaultValue); @@ -716,7 +716,7 @@ PHP_METHOD(Phalcon_Config_Adapter_Ini, phpIniGetInt) defaultValue = 0; } else { } - ZEPHIR_CALL_FUNCTION(&value, "ini_get", NULL, 470, &input_zv); + ZEPHIR_CALL_FUNCTION(&value, "ini_get", NULL, 469, &input_zv); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&value)) { RETURN_MM_LONG(defaultValue); @@ -772,7 +772,7 @@ PHP_METHOD(Phalcon_Config_Adapter_Ini, phpParseIniFile) } ZVAL_BOOL(&_0, (processSections ? 1 : 0)); ZVAL_LONG(&_1, scannerMode); - ZEPHIR_RETURN_CALL_FUNCTION("parse_ini_file", NULL, 471, &filename_zv, &_0, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("parse_ini_file", NULL, 470, &filename_zv, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/config/adapter/json.zep.c b/ext/phalcon/config/adapter/json.zep.c index 26e4ecd58b..e8fc158203 100644 --- a/ext/phalcon/config/adapter/json.zep.c +++ b/ext/phalcon/config/adapter/json.zep.c @@ -91,7 +91,7 @@ PHP_METHOD(Phalcon_Config_Adapter_Json, __construct) object_init_ex(&_0$$3, phalcon_config_exceptions_cannotloadconfigfile_ce); ZEPHIR_INIT_VAR(&_1$$3); zephir_basename(&_1$$3, &filePath_zv); - ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 468, &_1$$3); + ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 467, &_1$$3); zephir_check_call_status(); zephir_throw_exception_debug(&_0$$3, "phalcon/Config/Adapter/Json.zep", 57); ZEPHIR_MM_RESTORE(); @@ -105,7 +105,7 @@ PHP_METHOD(Phalcon_Config_Adapter_Json, __construct) } ZVAL_BOOL(&_4, 1); - ZEPHIR_CALL_METHOD(&_3, &_2, "__invoke", NULL, 413, &content, &_4); + ZEPHIR_CALL_METHOD(&_3, &_2, "__invoke", NULL, 412, &content, &_4); zephir_check_call_status(); ZEPHIR_CALL_PARENT(NULL, phalcon_config_adapter_json_ce, getThis(), "__construct", NULL, 0, &_3); zephir_check_call_status(); diff --git a/ext/phalcon/config/adapter/php.zep.c b/ext/phalcon/config/adapter/php.zep.c index c85f8d82c3..a9ad5496dd 100644 --- a/ext/phalcon/config/adapter/php.zep.c +++ b/ext/phalcon/config/adapter/php.zep.c @@ -97,14 +97,14 @@ PHP_METHOD(Phalcon_Config_Adapter_Php, __construct) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_memory_observe(&filePath_zv); ZVAL_STR_COPY(&filePath_zv, filePath); - ZEPHIR_CALL_FUNCTION(&_0, "is_file", NULL, 472, &filePath_zv); + ZEPHIR_CALL_FUNCTION(&_0, "is_file", NULL, 471, &filePath_zv); zephir_check_call_status(); if (UNEXPECTED(!ZEPHIR_IS_TRUE_IDENTICAL(&_0))) { ZEPHIR_INIT_VAR(&_1$$3); object_init_ex(&_1$$3, phalcon_config_exceptions_cannotloadconfigfile_ce); ZEPHIR_INIT_VAR(&_2$$3); zephir_basename(&_2$$3, &filePath_zv); - ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 468, &_2$$3); + ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 467, &_2$$3); zephir_check_call_status(); zephir_throw_exception_debug(&_1$$3, "phalcon/Config/Adapter/Php.zep", 64); ZEPHIR_MM_RESTORE(); diff --git a/ext/phalcon/config/adapter/yaml.zep.c b/ext/phalcon/config/adapter/yaml.zep.c index 87e080ff18..9c52fdc3a8 100644 --- a/ext/phalcon/config/adapter/yaml.zep.c +++ b/ext/phalcon/config/adapter/yaml.zep.c @@ -122,7 +122,7 @@ PHP_METHOD(Phalcon_Config_Adapter_Yaml, __construct) if (UNEXPECTED(!zephir_is_true(&_0))) { ZEPHIR_INIT_VAR(&_2$$3); object_init_ex(&_2$$3, phalcon_config_exceptions_missingyamlextension_ce); - ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 473); + ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 472); zephir_check_call_status(); zephir_throw_exception_debug(&_2$$3, "phalcon/Config/Adapter/Yaml.zep", 74); ZEPHIR_MM_RESTORE(); @@ -145,7 +145,7 @@ PHP_METHOD(Phalcon_Config_Adapter_Yaml, __construct) object_init_ex(&_4$$7, phalcon_config_exceptions_cannotloadconfigfile_ce); ZEPHIR_INIT_VAR(&_5$$7); zephir_basename(&_5$$7, &filePath_zv); - ZEPHIR_CALL_METHOD(NULL, &_4$$7, "__construct", NULL, 468, &_5$$7); + ZEPHIR_CALL_METHOD(NULL, &_4$$7, "__construct", NULL, 467, &_5$$7); zephir_check_call_status(); zephir_throw_exception_debug(&_4$$7, "phalcon/Config/Adapter/Yaml.zep", 88); ZEPHIR_MM_RESTORE(); @@ -180,7 +180,7 @@ PHP_METHOD(Phalcon_Config_Adapter_Yaml, phpExtensionLoaded) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_memory_observe(&name_zv); ZVAL_STR_COPY(&name_zv, name); - ZEPHIR_RETURN_CALL_FUNCTION("extension_loaded", NULL, 474, &name_zv); + ZEPHIR_RETURN_CALL_FUNCTION("extension_loaded", NULL, 473, &name_zv); zephir_check_call_status(); RETURN_MM(); } @@ -260,7 +260,7 @@ PHP_METHOD(Phalcon_Config_Adapter_Yaml, phpYamlParseFile) ZVAL_NULL(&ndocs); ZVAL_LONG(&_0, pos); ZEPHIR_MAKE_REF(&ndocs); - ZEPHIR_RETURN_CALL_FUNCTION("yaml_parse_file", NULL, 475, &filename_zv, &_0, &ndocs, &callbacks); + ZEPHIR_RETURN_CALL_FUNCTION("yaml_parse_file", NULL, 474, &filename_zv, &_0, &ndocs, &callbacks); ZEPHIR_UNREF(&ndocs); zephir_check_call_status(); RETURN_MM(); diff --git a/ext/phalcon/config/configfactory.zep.c b/ext/phalcon/config/configfactory.zep.c index 02811e7e29..5a7d5753b1 100644 --- a/ext/phalcon/config/configfactory.zep.c +++ b/ext/phalcon/config/configfactory.zep.c @@ -367,7 +367,7 @@ PHP_METHOD(Phalcon_Config_ConfigFactory, parseConfig) if (1 == ZEPHIR_IS_EMPTY(&extension)) { ZEPHIR_INIT_VAR(&_1$$4); object_init_ex(&_1$$4, phalcon_config_exceptions_missingfileextension_ce); - ZEPHIR_CALL_METHOD(NULL, &_1$$4, "__construct", NULL, 476); + ZEPHIR_CALL_METHOD(NULL, &_1$$4, "__construct", NULL, 475); zephir_check_call_status(); zephir_throw_exception_debug(&_1$$4, "phalcon/Config/ConfigFactory.zep", 193); ZEPHIR_MM_RESTORE(); @@ -391,13 +391,13 @@ PHP_METHOD(Phalcon_Config_ConfigFactory, parseConfig) if (Z_TYPE_P(config) != IS_ARRAY) { ZEPHIR_INIT_VAR(&_5$$6); object_init_ex(&_5$$6, phalcon_config_exceptions_confignotarrayorobject_ce); - ZEPHIR_CALL_METHOD(NULL, &_5$$6, "__construct", NULL, 477); + ZEPHIR_CALL_METHOD(NULL, &_5$$6, "__construct", NULL, 476); zephir_check_call_status(); zephir_throw_exception_debug(&_5$$6, "phalcon/Config/ConfigFactory.zep", 207); ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkconfigarray", NULL, 478, config); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkconfigarray", NULL, 477, config); zephir_check_call_status(); RETVAL_ZVAL(config, 1, 0); RETURN_MM(); diff --git a/ext/phalcon/container/container.zep.c b/ext/phalcon/container/container.zep.c index 8ec9408f61..38996849e8 100644 --- a/ext/phalcon/container/container.zep.c +++ b/ext/phalcon/container/container.zep.c @@ -330,14 +330,14 @@ PHP_METHOD(Phalcon_Container_Container, extend) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 2, 0, &name_param, &callableObject); zephir_get_strval(&name, name_param); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "resolvealias", NULL, 479, &name); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "resolvealias", NULL, 478, &name); zephir_check_call_status(); zephir_get_strval(&name, &_0); zephir_read_property_cached(&_1, this_ptr, _zephir_prop_0, 540, PH_NOISY_CC | PH_READONLY); if (zephir_array_key_exists(&_1, &name)) { ZEPHIR_INIT_VAR(&_2$$3); object_init_ex(&_2$$3, phalcon_container_exceptions_cannotextendresolved_ce); - ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 480, &name); + ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 479, &name); zephir_check_call_status(); zephir_throw_exception_debug(&_2$$3, "phalcon/Container/Container.zep", 156); ZEPHIR_MM_RESTORE(); @@ -347,7 +347,7 @@ PHP_METHOD(Phalcon_Container_Container, extend) if (!(zephir_array_key_exists(&_3, &name))) { ZEPHIR_INIT_VAR(&_4$$4); object_init_ex(&_4$$4, phalcon_container_exceptions_servicenotfound_ce); - ZEPHIR_CALL_METHOD(NULL, &_4$$4, "__construct", NULL, 481, &name); + ZEPHIR_CALL_METHOD(NULL, &_4$$4, "__construct", NULL, 480, &name); zephir_check_call_status(); zephir_throw_exception_debug(&_4$$4, "phalcon/Container/Container.zep", 160); ZEPHIR_MM_RESTORE(); @@ -397,12 +397,12 @@ PHP_METHOD(Phalcon_Container_Container, get) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &name_param); zephir_get_strval(&name, name_param); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "resolvealias", NULL, 479, &name); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "resolvealias", NULL, 478, &name); zephir_check_call_status(); zephir_get_strval(&name, &_0); zephir_read_property_cached(&_1, this_ptr, _zephir_prop_0, 542, PH_NOISY_CC | PH_READONLY); if (zephir_array_key_exists(&_1, &name)) { - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "resolveparameter", NULL, 482, &name); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "resolveparameter", NULL, 481, &name); zephir_check_call_status(); RETURN_MM(); } @@ -414,7 +414,7 @@ PHP_METHOD(Phalcon_Container_Container, get) RETURN_CCTOR(&_4$$4); } ZVAL_BOOL(&_5, 1); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "resolve", NULL, 483, &name, &_5); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "resolve", NULL, 482, &name, &_5); zephir_check_call_status(); RETURN_MM(); } @@ -574,7 +574,7 @@ PHP_METHOD(Phalcon_Container_Container, getDefinition) if (!(zephir_array_key_exists(&_0, &name_zv))) { ZEPHIR_INIT_VAR(&_1$$3); object_init_ex(&_1$$3, phalcon_container_exceptions_servicenotfound_ce); - ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 481, &name_zv); + ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 480, &name_zv); zephir_check_call_status(); zephir_throw_exception_debug(&_1$$3, "phalcon/Container/Container.zep", 230); ZEPHIR_MM_RESTORE(); @@ -620,7 +620,7 @@ PHP_METHOD(Phalcon_Container_Container, getInstance) if (!(zephir_array_key_exists(&_0, &name_zv))) { ZEPHIR_INIT_VAR(&_1$$3); object_init_ex(&_1$$3, phalcon_container_exceptions_instancenotfound_ce); - ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 484, &name_zv); + ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 483, &name_zv); zephir_check_call_status(); zephir_throw_exception_debug(&_1$$3, "phalcon/Container/Container.zep", 244); ZEPHIR_MM_RESTORE(); @@ -664,13 +664,13 @@ PHP_METHOD(Phalcon_Container_Container, getParameter) if (!(zephir_array_key_exists(&_0, &name_zv))) { ZEPHIR_INIT_VAR(&_1$$3); object_init_ex(&_1$$3, phalcon_container_exceptions_parameternotfound_ce); - ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 485, &name_zv); + ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 484, &name_zv); zephir_check_call_status(); zephir_throw_exception_debug(&_1$$3, "phalcon/Container/Container.zep", 258); ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "resolveparameter", NULL, 482, &name_zv); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "resolveparameter", NULL, 481, &name_zv); zephir_check_call_status(); RETURN_MM(); } @@ -713,7 +713,7 @@ PHP_METHOD(Phalcon_Container_Container, getService) if (!(Z_TYPE_P(&result) == IS_OBJECT)) { ZEPHIR_INIT_VAR(&_0$$3); object_init_ex(&_0$$3, phalcon_container_exceptions_servicenotregistered_ce); - ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 486, &serviceName_zv); + ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 485, &serviceName_zv); zephir_check_call_status(); zephir_throw_exception_debug(&_0$$3, "phalcon/Container/Container.zep", 285); ZEPHIR_MM_RESTORE(); @@ -794,7 +794,7 @@ PHP_METHOD(Phalcon_Container_Container, has) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &name_param); zephir_get_strval(&name, name_param); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "resolvealias", NULL, 479, &name); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "resolvealias", NULL, 478, &name); zephir_check_call_status(); zephir_get_strval(&name, &_0); zephir_read_property_cached(&_1, this_ptr, _zephir_prop_0, 542, PH_NOISY_CC | PH_READONLY); @@ -978,11 +978,11 @@ PHP_METHOD(Phalcon_Container_Container, new) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &name_param); zephir_get_strval(&name, name_param); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "resolvealias", NULL, 479, &name); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "resolvealias", NULL, 478, &name); zephir_check_call_status(); zephir_get_strval(&name, &_0); ZVAL_BOOL(&_1, 0); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "resolve", NULL, 483, &name, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "resolve", NULL, 482, &name, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -1009,7 +1009,7 @@ PHP_METHOD(Phalcon_Container_Container, newDefinition) object_init_ex(return_value, phalcon_container_definition_servicedefinition_ce); ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "string"); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 487, &name_zv, &_0); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 486, &name_zv, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -1040,7 +1040,7 @@ PHP_METHOD(Phalcon_Container_Container, set) definition = ZEND_CALL_ARG(execute_data, 2); zephir_memory_observe(&name_zv); ZVAL_STR_COPY(&name_zv, name); - ZEPHIR_CALL_METHOD(&processor, this_ptr, "findprocessor", NULL, 488, definition); + ZEPHIR_CALL_METHOD(&processor, this_ptr, "findprocessor", NULL, 487, definition); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&def, &processor, "process", NULL, 0, &name_zv, definition, this_ptr); zephir_check_call_status(); @@ -1075,7 +1075,7 @@ PHP_METHOD(Phalcon_Container_Container, setAlias) ZVAL_STR_COPY(&name_zv, name); zephir_memory_observe(&alias_zv); ZVAL_STR_COPY(&alias_zv, alias); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "detectcircularalias", NULL, 489, &alias_zv, &name_zv); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "detectcircularalias", NULL, 488, &alias_zv, &name_zv); zephir_check_call_status(); zephir_update_property_array(this_ptr, SL("aliases"), &alias_zv, &name_zv); RETURN_THIS(); @@ -1431,7 +1431,7 @@ PHP_METHOD(Phalcon_Container_Container, detectCircularAlias) if (ZEPHIR_IS_IDENTICAL(¤t, &alias_zv)) { ZEPHIR_INIT_NVAR(&_0$$4); object_init_ex(&_0$$4, phalcon_container_exceptions_circularaliasfound_ce); - ZEPHIR_CALL_METHOD(NULL, &_0$$4, "__construct", &_1, 490, &alias_zv); + ZEPHIR_CALL_METHOD(NULL, &_0$$4, "__construct", &_1, 489, &alias_zv); zephir_check_call_status(); zephir_throw_exception_debug(&_0$$4, "phalcon/Container/Container.zep", 543); ZEPHIR_MM_RESTORE(); @@ -1533,7 +1533,7 @@ PHP_METHOD(Phalcon_Container_Container, findProcessor) ZEPHIR_INIT_NVAR(&processor); ZEPHIR_INIT_VAR(&_8); object_init_ex(&_8, phalcon_container_exceptions_noprocessorfound_ce); - ZEPHIR_CALL_METHOD(NULL, &_8, "__construct", NULL, 491); + ZEPHIR_CALL_METHOD(NULL, &_8, "__construct", NULL, 490); zephir_check_call_status(); zephir_throw_exception_debug(&_8, "phalcon/Container/Container.zep", 574); ZEPHIR_MM_RESTORE(); @@ -1594,7 +1594,7 @@ PHP_METHOD(Phalcon_Container_Container, resolve) } else { ZEPHIR_INIT_VAR(&_3$$5); object_init_ex(&_3$$5, phalcon_container_exceptions_servicenotfound_ce); - ZEPHIR_CALL_METHOD(NULL, &_3$$5, "__construct", NULL, 481, &name_zv); + ZEPHIR_CALL_METHOD(NULL, &_3$$5, "__construct", NULL, 480, &name_zv); zephir_check_call_status(); zephir_throw_exception_debug(&_3$$5, "phalcon/Container/Container.zep", 591); ZEPHIR_MM_RESTORE(); @@ -1666,7 +1666,7 @@ PHP_METHOD(Phalcon_Container_Container, resolveAlias) if (zephir_array_key_exists(&seen, ¤t)) { ZEPHIR_INIT_NVAR(&_1$$4); object_init_ex(&_1$$4, phalcon_container_exceptions_circularaliasfound_ce); - ZEPHIR_CALL_METHOD(NULL, &_1$$4, "__construct", &_2, 490, &name_zv); + ZEPHIR_CALL_METHOD(NULL, &_1$$4, "__construct", &_2, 489, &name_zv); zephir_check_call_status(); zephir_throw_exception_debug(&_1$$4, "phalcon/Container/Container.zep", 633); ZEPHIR_MM_RESTORE(); diff --git a/ext/phalcon/container/definition/processor/closureprocessor.zep.c b/ext/phalcon/container/definition/processor/closureprocessor.zep.c index 8c351b24d1..8e10f3ca95 100644 --- a/ext/phalcon/container/definition/processor/closureprocessor.zep.c +++ b/ext/phalcon/container/definition/processor/closureprocessor.zep.c @@ -109,9 +109,9 @@ PHP_METHOD(Phalcon_Container_Definition_Processor_ClosureProcessor, process) object_init_ex(&def, phalcon_container_definition_servicedefinition_ce); ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "closure"); - ZEPHIR_CALL_METHOD(NULL, &def, "__construct", NULL, 487, &name_zv, &_0, definition); + ZEPHIR_CALL_METHOD(NULL, &def, "__construct", NULL, 486, &name_zv, &_0, definition); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &def, "setfactory", NULL, 492, definition); + ZEPHIR_CALL_METHOD(NULL, &def, "setfactory", NULL, 491, definition); zephir_check_call_status(); RETURN_CCTOR(&def); } diff --git a/ext/phalcon/container/definition/processor/objectprocessor.zep.c b/ext/phalcon/container/definition/processor/objectprocessor.zep.c index 950ef07938..c29d7c35b8 100644 --- a/ext/phalcon/container/definition/processor/objectprocessor.zep.c +++ b/ext/phalcon/container/definition/processor/objectprocessor.zep.c @@ -115,7 +115,7 @@ PHP_METHOD(Phalcon_Container_Definition_Processor_ObjectProcessor, process) object_init_ex(&def, phalcon_container_definition_servicedefinition_ce); ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "object"); - ZEPHIR_CALL_METHOD(NULL, &def, "__construct", NULL, 487, &name_zv, &_0, definition); + ZEPHIR_CALL_METHOD(NULL, &def, "__construct", NULL, 486, &name_zv, &_0, definition); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_0); object_init_ex(&_0, phalcon_11__closure_ce); @@ -123,7 +123,7 @@ PHP_METHOD(Phalcon_Container_Definition_Processor_ObjectProcessor, process) ZEPHIR_INIT_VAR(&_1); ZEPHIR_INIT_NVAR(&_1); zephir_create_closure_bound(&_1, &_0, NULL, phalcon_11__closure_ce, SL("__invoke")); - ZEPHIR_CALL_METHOD(NULL, &def, "setfactory", NULL, 492, &_1); + ZEPHIR_CALL_METHOD(NULL, &def, "setfactory", NULL, 491, &_1); zephir_check_call_status(); RETURN_CCTOR(&def); } diff --git a/ext/phalcon/container/definition/processor/parameterprocessor.zep.c b/ext/phalcon/container/definition/processor/parameterprocessor.zep.c index f34277b671..47761a855b 100644 --- a/ext/phalcon/container/definition/processor/parameterprocessor.zep.c +++ b/ext/phalcon/container/definition/processor/parameterprocessor.zep.c @@ -111,7 +111,7 @@ PHP_METHOD(Phalcon_Container_Definition_Processor_ParameterProcessor, process) object_init_ex(&def, phalcon_container_definition_servicedefinition_ce); ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "parameter"); - ZEPHIR_CALL_METHOD(NULL, &def, "__construct", NULL, 487, &name_zv, &_0, definition); + ZEPHIR_CALL_METHOD(NULL, &def, "__construct", NULL, 486, &name_zv, &_0, definition); zephir_check_call_status(); _1 = !((zephir_is_instance_of(definition, SL("Closure")))); if (_1) { @@ -123,7 +123,7 @@ PHP_METHOD(Phalcon_Container_Definition_Processor_ParameterProcessor, process) } else { ZVAL_BOOL(&_2, 0); } - ZEPHIR_CALL_METHOD(NULL, &def, "setiscacheable", NULL, 493, &_2); + ZEPHIR_CALL_METHOD(NULL, &def, "setiscacheable", NULL, 492, &_2); zephir_check_call_status(); RETURN_CCTOR(&def); } diff --git a/ext/phalcon/container/definition/processor/stringprocessor.zep.c b/ext/phalcon/container/definition/processor/stringprocessor.zep.c index 4ea2ea73a8..e7743e5ad6 100644 --- a/ext/phalcon/container/definition/processor/stringprocessor.zep.c +++ b/ext/phalcon/container/definition/processor/stringprocessor.zep.c @@ -114,12 +114,12 @@ PHP_METHOD(Phalcon_Container_Definition_Processor_StringProcessor, process) object_init_ex(&def, phalcon_container_definition_servicedefinition_ce); ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "string"); - ZEPHIR_CALL_METHOD(NULL, &def, "__construct", NULL, 487, &name_zv, &_0, definition); + ZEPHIR_CALL_METHOD(NULL, &def, "__construct", NULL, 486, &name_zv, &_0, definition); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &def, "setclass", NULL, 494, definition); + ZEPHIR_CALL_METHOD(NULL, &def, "setclass", NULL, 493, definition); zephir_check_call_status(); ZVAL_BOOL(&_1, 1); - ZEPHIR_CALL_METHOD(NULL, &def, "setiscacheable", NULL, 493, &_1); + ZEPHIR_CALL_METHOD(NULL, &def, "setiscacheable", NULL, 492, &_1); zephir_check_call_status(); RETURN_CCTOR(&def); } diff --git a/ext/phalcon/container/definition/servicedefinition.zep.c b/ext/phalcon/container/definition/servicedefinition.zep.c index 86a2f5c8fc..47666d15d2 100644 --- a/ext/phalcon/container/definition/servicedefinition.zep.c +++ b/ext/phalcon/container/definition/servicedefinition.zep.c @@ -350,13 +350,13 @@ PHP_METHOD(Phalcon_Container_Definition_ServiceDefinition, buildService) } ZEPHIR_CPY_WRT(&className, &_2$$4); zephir_read_property_cached(&_4$$4, this_ptr, _zephir_prop_3, 555, PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(&args, this_ptr, "resolveargs", NULL, 495, container, &_4$$4); + ZEPHIR_CALL_METHOD(&args, this_ptr, "resolveargs", NULL, 494, container, &_4$$4); zephir_check_call_status(); ZEPHIR_INIT_VAR(&reflection); object_init_ex(&reflection, zephir_get_internal_ce(SL("reflectionclass"))); ZEPHIR_CALL_METHOD(NULL, &reflection, "__construct", NULL, 252, &className); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&instance, &reflection, "newinstanceargs", NULL, 496, &args); + ZEPHIR_CALL_METHOD(&instance, &reflection, "newinstanceargs", NULL, 495, &args); zephir_check_call_status(); } zephir_read_property_cached(&_5, this_ptr, _zephir_prop_4, 556, PH_NOISY_CC | PH_READONLY); @@ -496,7 +496,7 @@ PHP_METHOD(Phalcon_Container_Definition_ServiceDefinition, freeze) object_init_ex(&reflection, zephir_get_internal_ce(SL("reflectionclass"))); ZEPHIR_CALL_METHOD(NULL, &reflection, "__construct", NULL, 252, &className); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&constructor, &reflection, "getconstructor", NULL, 497); + ZEPHIR_CALL_METHOD(&constructor, &reflection, "getconstructor", NULL, 496); zephir_check_call_status(); if (Z_TYPE_P(&constructor) != IS_NULL) { ZEPHIR_CALL_METHOD(¶ms, &constructor, "getparameters", NULL, 0); @@ -576,7 +576,7 @@ PHP_METHOD(Phalcon_Container_Definition_ServiceDefinition, getClass) ZEPHIR_INIT_VAR(&_1$$3); object_init_ex(&_1$$3, phalcon_container_exceptions_noclassset_ce); zephir_read_property_cached(&_2$$3, this_ptr, _zephir_prop_1, 548, PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 498, &_2$$3); + ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 497, &_2$$3); zephir_check_call_status(); zephir_throw_exception_debug(&_1$$3, "phalcon/Container/Definition/ServiceDefinition.zep", 222); ZEPHIR_MM_RESTORE(); @@ -638,7 +638,7 @@ PHP_METHOD(Phalcon_Container_Definition_ServiceDefinition, getFactory) ZEPHIR_INIT_VAR(&_1$$3); object_init_ex(&_1$$3, phalcon_container_exceptions_nofactoryset_ce); zephir_read_property_cached(&_2$$3, this_ptr, _zephir_prop_1, 548, PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 499, &_2$$3); + ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 498, &_2$$3); zephir_check_call_status(); zephir_throw_exception_debug(&_1$$3, "phalcon/Container/Definition/ServiceDefinition.zep", 256); ZEPHIR_MM_RESTORE(); @@ -930,7 +930,7 @@ PHP_METHOD(Phalcon_Container_Definition_ServiceDefinition, setExtenders) object_init_ex(&_3$$4, phalcon_container_exceptions_invalidextender_ce); zephir_read_property_cached(&_4$$4, this_ptr, _zephir_prop_0, 548, PH_NOISY_CC | PH_READONLY); zephir_cast_to_string(&_5$$4, &key); - ZEPHIR_CALL_METHOD(NULL, &_3$$4, "__construct", &_6, 500, &_4$$4, &_5$$4); + ZEPHIR_CALL_METHOD(NULL, &_3$$4, "__construct", &_6, 499, &_4$$4, &_5$$4); zephir_check_call_status(); zephir_throw_exception_debug(&_3$$4, "phalcon/Container/Definition/ServiceDefinition.zep", 393); ZEPHIR_MM_RESTORE(); @@ -962,7 +962,7 @@ PHP_METHOD(Phalcon_Container_Definition_ServiceDefinition, setExtenders) object_init_ex(&_9$$6, phalcon_container_exceptions_invalidextender_ce); zephir_read_property_cached(&_10$$6, this_ptr, _zephir_prop_0, 548, PH_NOISY_CC | PH_READONLY); zephir_cast_to_string(&_11$$6, &key); - ZEPHIR_CALL_METHOD(NULL, &_9$$6, "__construct", &_6, 500, &_10$$6, &_11$$6); + ZEPHIR_CALL_METHOD(NULL, &_9$$6, "__construct", &_6, 499, &_10$$6, &_11$$6); zephir_check_call_status(); zephir_throw_exception_debug(&_9$$6, "phalcon/Container/Definition/ServiceDefinition.zep", 393); ZEPHIR_MM_RESTORE(); @@ -1185,7 +1185,7 @@ PHP_METHOD(Phalcon_Container_Definition_ServiceDefinition, checkFrozen) ZEPHIR_INIT_VAR(&_1$$3); object_init_ex(&_1$$3, phalcon_container_exceptions_frozendefinition_ce); zephir_read_property_cached(&_2$$3, this_ptr, _zephir_prop_1, 548, PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 501, &_2$$3); + ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 500, &_2$$3); zephir_check_call_status(); zephir_throw_exception_debug(&_1$$3, "phalcon/Container/Definition/ServiceDefinition.zep", 489); ZEPHIR_MM_RESTORE(); diff --git a/ext/phalcon/container/resolver/lazy/csenv.zep.c b/ext/phalcon/container/resolver/lazy/csenv.zep.c index 08c5c29212..0ea99a6bc0 100644 --- a/ext/phalcon/container/resolver/lazy/csenv.zep.c +++ b/ext/phalcon/container/resolver/lazy/csenv.zep.c @@ -108,7 +108,7 @@ PHP_METHOD(Phalcon_Container_Resolver_Lazy_CsEnv, resolve) ZVAL_STRING(&_2, "\""); ZEPHIR_INIT_VAR(&_3); ZVAL_STRING(&_3, "\\"); - ZEPHIR_CALL_FUNCTION(&values, "str_getcsv", NULL, 502, &_0, &_1, &_2, &_3); + ZEPHIR_CALL_FUNCTION(&values, "str_getcsv", NULL, 501, &_0, &_1, &_2, &_3); zephir_check_call_status(); zephir_read_property_cached(&_4, this_ptr, _zephir_prop_0, 565, PH_NOISY_CC | PH_READONLY); if (Z_TYPE_P(&_4) != IS_NULL) { diff --git a/ext/phalcon/container/resolver/lazy/lazyfactory.zep.c b/ext/phalcon/container/resolver/lazy/lazyfactory.zep.c index ce70e23976..4055da3384 100644 --- a/ext/phalcon/container/resolver/lazy/lazyfactory.zep.c +++ b/ext/phalcon/container/resolver/lazy/lazyfactory.zep.c @@ -78,7 +78,7 @@ PHP_METHOD(Phalcon_Container_Resolver_Lazy_LazyFactory, arrayValues) zephir_fetch_params(1, 1, 0, &values_param); zephir_get_arrval(&values, values_param); object_init_ex(return_value, phalcon_container_resolver_lazy_arrayvalues_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 503, &values); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 502, &values); zephir_check_call_status(); RETURN_MM(); } @@ -97,7 +97,7 @@ PHP_METHOD(Phalcon_Container_Resolver_Lazy_LazyFactory, call) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &callableObject); object_init_ex(return_value, phalcon_container_resolver_lazy_call_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 504, callableObject); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 503, callableObject); zephir_check_call_status(); RETURN_MM(); } @@ -118,7 +118,7 @@ PHP_METHOD(Phalcon_Container_Resolver_Lazy_LazyFactory, callableGet) zephir_memory_observe(&id_zv); ZVAL_STR_COPY(&id_zv, id); object_init_ex(return_value, phalcon_container_resolver_lazy_callableget_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 505, &id_zv); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 504, &id_zv); zephir_check_call_status(); RETURN_MM(); } @@ -139,7 +139,7 @@ PHP_METHOD(Phalcon_Container_Resolver_Lazy_LazyFactory, callableNew) zephir_memory_observe(&id_zv); ZVAL_STR_COPY(&id_zv, id); object_init_ex(return_value, phalcon_container_resolver_lazy_callablenew_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 506, &id_zv); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 505, &id_zv); zephir_check_call_status(); RETURN_MM(); } @@ -170,7 +170,7 @@ PHP_METHOD(Phalcon_Container_Resolver_Lazy_LazyFactory, csEnv) ZVAL_STR_COPY(&type_zv, type); } object_init_ex(return_value, phalcon_container_resolver_lazy_csenv_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 507, &name_zv, &type_zv); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 506, &name_zv, &type_zv); zephir_check_call_status(); RETURN_MM(); } @@ -201,7 +201,7 @@ PHP_METHOD(Phalcon_Container_Resolver_Lazy_LazyFactory, env) ZVAL_STR_COPY(&type_zv, type); } object_init_ex(return_value, phalcon_container_resolver_lazy_env_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 507, &name_zv, &type_zv); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 506, &name_zv, &type_zv); zephir_check_call_status(); RETURN_MM(); } @@ -236,7 +236,7 @@ PHP_METHOD(Phalcon_Container_Resolver_Lazy_LazyFactory, envDefault) ZVAL_STR_COPY(&type_zv, type); } object_init_ex(return_value, phalcon_container_resolver_lazy_envdefault_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 508, &name_zv, defaultValue, &type_zv); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 507, &name_zv, defaultValue, &type_zv); zephir_check_call_status(); RETURN_MM(); } @@ -268,7 +268,7 @@ PHP_METHOD(Phalcon_Container_Resolver_Lazy_LazyFactory, functionCall) ZVAL_STR_COPY(&functionName_zv, functionName); zephir_get_arrval(&args, args_param); object_init_ex(return_value, phalcon_container_resolver_lazy_functioncall_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 509, &functionName_zv, &args); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 508, &functionName_zv, &args); zephir_check_call_status(); RETURN_MM(); } @@ -289,7 +289,7 @@ PHP_METHOD(Phalcon_Container_Resolver_Lazy_LazyFactory, get) zephir_memory_observe(&id_zv); ZVAL_STR_COPY(&id_zv, id); object_init_ex(return_value, phalcon_container_resolver_lazy_get_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 510, &id_zv); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 509, &id_zv); zephir_check_call_status(); RETURN_MM(); } @@ -324,7 +324,7 @@ PHP_METHOD(Phalcon_Container_Resolver_Lazy_LazyFactory, getCall) ZVAL_STR_COPY(&method_zv, method); zephir_get_arrval(&args, args_param); object_init_ex(return_value, phalcon_container_resolver_lazy_getcall_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 511, &id_zv, &method_zv, &args); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 510, &id_zv, &method_zv, &args); zephir_check_call_status(); RETURN_MM(); } @@ -359,7 +359,7 @@ PHP_METHOD(Phalcon_Container_Resolver_Lazy_LazyFactory, newCall) ZVAL_STR_COPY(&method_zv, method); zephir_get_arrval(&args, args_param); object_init_ex(return_value, phalcon_container_resolver_lazy_newcall_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 0, &id_zv, &method_zv, &args); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 511, &id_zv, &method_zv, &args); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/container/resolver/resolver.zep.c b/ext/phalcon/container/resolver/resolver.zep.c index 782589a2f6..ddafb9dffd 100644 --- a/ext/phalcon/container/resolver/resolver.zep.c +++ b/ext/phalcon/container/resolver/resolver.zep.c @@ -187,12 +187,12 @@ PHP_METHOD(Phalcon_Container_Resolver_Resolver, resolveClass) object_init_ex(&reflection, zephir_get_internal_ce(SL("reflectionclass"))); ZEPHIR_CALL_METHOD(NULL, &reflection, "__construct", NULL, 252, &className_zv); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&constructor, &reflection, "getconstructor", NULL, 497); + ZEPHIR_CALL_METHOD(&constructor, &reflection, "getconstructor", NULL, 496); zephir_check_call_status(); if (Z_TYPE_P(&constructor) == IS_NULL) { ZEPHIR_INIT_VAR(&_0$$3); array_init(&_0$$3); - ZEPHIR_RETURN_CALL_METHOD(&reflection, "newinstanceargs", NULL, 496, &_0$$3); + ZEPHIR_RETURN_CALL_METHOD(&reflection, "newinstanceargs", NULL, 495, &_0$$3); zephir_check_call_status(); RETURN_MM(); } @@ -200,7 +200,7 @@ PHP_METHOD(Phalcon_Container_Resolver_Resolver, resolveClass) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&resolved, this_ptr, "resolveparameters", NULL, 0, ioc, ¶ms, &arguments); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_METHOD(&reflection, "newinstanceargs", NULL, 496, &resolved); + ZEPHIR_RETURN_CALL_METHOD(&reflection, "newinstanceargs", NULL, 495, &resolved); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/di/di.zep.c b/ext/phalcon/di/di.zep.c index 77cf411983..145c3ce963 100644 --- a/ext/phalcon/di/di.zep.c +++ b/ext/phalcon/di/di.zep.c @@ -331,11 +331,11 @@ PHP_METHOD(Phalcon_Di_Di, attempt) */ PHP_METHOD(Phalcon_Di_Di, get) { - zval _8$$5, _17$$18; - zend_bool _2$$3, _14$$11; + zval _7$$5, _16$$18; + zend_bool _2$$3, _4$$3, _13$$11; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *name_param = NULL, *parameters = NULL, parameters_sub, __$null, service, isShared, instance, _0, _1, _6, _15, _3$$3, _4$$4, _5$$4, _7$$5, _9$$5, _10$$7, _11$$7, _12$$9, _13$$12, _16$$18, _18$$18; + zval *name_param = NULL, *parameters = NULL, parameters_sub, __$null, service, isShared, instance, _0, _1, _5, _14, _3$$3, _6$$5, _8$$5, _9$$7, _10$$7, _11$$9, _12$$12, _15$$18, _17$$18; zval name; zval *this_ptr = getThis(); @@ -347,21 +347,19 @@ PHP_METHOD(Phalcon_Di_Di, get) ZVAL_UNDEF(&instance); ZVAL_UNDEF(&_0); ZVAL_UNDEF(&_1); - ZVAL_UNDEF(&_6); - ZVAL_UNDEF(&_15); + ZVAL_UNDEF(&_5); + ZVAL_UNDEF(&_14); ZVAL_UNDEF(&_3$$3); - ZVAL_UNDEF(&_4$$4); - ZVAL_UNDEF(&_5$$4); - ZVAL_UNDEF(&_7$$5); - ZVAL_UNDEF(&_9$$5); - ZVAL_UNDEF(&_10$$7); - ZVAL_UNDEF(&_11$$7); - ZVAL_UNDEF(&_12$$9); - ZVAL_UNDEF(&_13$$12); - ZVAL_UNDEF(&_16$$18); - ZVAL_UNDEF(&_18$$18); + ZVAL_UNDEF(&_6$$5); ZVAL_UNDEF(&_8$$5); + ZVAL_UNDEF(&_9$$7); + ZVAL_UNDEF(&_10$$7); + ZVAL_UNDEF(&_11$$9); + ZVAL_UNDEF(&_12$$12); + ZVAL_UNDEF(&_15$$18); ZVAL_UNDEF(&_17$$18); + ZVAL_UNDEF(&_7$$5); + ZVAL_UNDEF(&_16$$18); static zend_string *_zephir_prop_0 = NULL; static zend_string *_zephir_prop_1 = NULL; static zend_string *_zephir_prop_2 = NULL; @@ -405,26 +403,28 @@ PHP_METHOD(Phalcon_Di_Di, get) zephir_check_call_status(); _2$$3 = zephir_is_true(&isShared); if (_2$$3) { + ZEPHIR_OBS_NVAR(&instance); zephir_read_property_cached(&_3$$3, this_ptr, _zephir_prop_1, 175, PH_NOISY_CC | PH_READONLY); - _2$$3 = zephir_array_isset_value(&_3$$3, &name); + _2$$3 = zephir_array_isset_fetch(&instance, &_3$$3, &name, 0); } - if (_2$$3) { - zephir_read_property_cached(&_4$$4, this_ptr, _zephir_prop_1, 175, PH_NOISY_CC | PH_READONLY); - zephir_memory_observe(&_5$$4); - zephir_array_fetch(&_5$$4, &_4$$4, &name, PH_NOISY, "phalcon/Di/Di.zep", 224); - RETURN_CCTOR(&_5$$4); + _4$$3 = _2$$3; + if (_4$$3) { + _4$$3 = Z_TYPE_P(&instance) != IS_NULL; + } + if (_4$$3) { + RETURN_CCTOR(&instance); } } - zephir_read_property_cached(&_6, this_ptr, _zephir_prop_2, 176, PH_NOISY_CC | PH_READONLY); - if (Z_TYPE_P(&_6) != IS_NULL) { - zephir_read_property_cached(&_7$$5, this_ptr, _zephir_prop_2, 176, PH_NOISY_CC | PH_READONLY); + zephir_read_property_cached(&_5, this_ptr, _zephir_prop_2, 176, PH_NOISY_CC | PH_READONLY); + if (Z_TYPE_P(&_5) != IS_NULL) { + zephir_read_property_cached(&_6$$5, this_ptr, _zephir_prop_2, 176, PH_NOISY_CC | PH_READONLY); + ZEPHIR_INIT_VAR(&_7$$5); + zephir_create_array(&_7$$5, 2, 0); + zephir_array_update_string(&_7$$5, SL("name"), &name, PH_COPY | PH_SEPARATE); + zephir_array_update_string(&_7$$5, SL("parameters"), parameters, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_VAR(&_8$$5); - zephir_create_array(&_8$$5, 2, 0); - zephir_array_update_string(&_8$$5, SL("name"), &name, PH_COPY | PH_SEPARATE); - zephir_array_update_string(&_8$$5, SL("parameters"), parameters, PH_COPY | PH_SEPARATE); - ZEPHIR_INIT_VAR(&_9$$5); - ZVAL_STRING(&_9$$5, "di:beforeServiceResolve"); - ZEPHIR_CALL_METHOD(&instance, &_7$$5, "fire", NULL, 0, &_9$$5, this_ptr, &_8$$5); + ZVAL_STRING(&_8$$5, "di:beforeServiceResolve"); + ZEPHIR_CALL_METHOD(&instance, &_6$$5, "fire", NULL, 0, &_8$$5, this_ptr, &_7$$5); zephir_check_call_status(); } if (Z_TYPE_P(&instance) == IS_NULL) { @@ -438,18 +438,18 @@ PHP_METHOD(Phalcon_Di_Di, get) try_end_1: if (EG(exception)) { + ZEPHIR_INIT_VAR(&_9$$7); + ZVAL_OBJ(&_9$$7, EG(exception)); + Z_ADDREF_P(&_9$$7); ZEPHIR_INIT_VAR(&_10$$7); - ZVAL_OBJ(&_10$$7, EG(exception)); - Z_ADDREF_P(&_10$$7); - ZEPHIR_INIT_VAR(&_11$$7); - if (zephir_instance_of_ev(&_10$$7, phalcon_di_exception_serviceresolutionexception_ce)) { + if (zephir_instance_of_ev(&_9$$7, phalcon_di_exception_serviceresolutionexception_ce)) { zend_clear_exception(); - ZEPHIR_CPY_WRT(&_11$$7, &_10$$7); - ZEPHIR_INIT_VAR(&_12$$9); - object_init_ex(&_12$$9, phalcon_di_exceptions_servicecannotberesolved_ce); - ZEPHIR_CALL_METHOD(NULL, &_12$$9, "__construct", NULL, 184, &name); + ZEPHIR_CPY_WRT(&_10$$7, &_9$$7); + ZEPHIR_INIT_VAR(&_11$$9); + object_init_ex(&_11$$9, phalcon_di_exceptions_servicecannotberesolved_ce); + ZEPHIR_CALL_METHOD(NULL, &_11$$9, "__construct", NULL, 184, &name); zephir_check_call_status(); - zephir_throw_exception_debug(&_12$$9, "phalcon/Di/Di.zep", 249); + zephir_throw_exception_debug(&_11$$9, "phalcon/Di/Di.zep", 249); ZEPHIR_MM_RESTORE(); return; } @@ -459,17 +459,17 @@ PHP_METHOD(Phalcon_Di_Di, get) } } else { if (UNEXPECTED(!(zephir_class_exists(&name, 1)))) { - ZEPHIR_CALL_CE_STATIC(&_13$$12, phalcon_di_exception_ce, "servicenotfound", NULL, 0, &name); + ZEPHIR_CALL_CE_STATIC(&_12$$12, phalcon_di_exception_ce, "servicenotfound", NULL, 0, &name); zephir_check_call_status(); - zephir_throw_exception_debug(&_13$$12, "phalcon/Di/Di.zep", 262); + zephir_throw_exception_debug(&_12$$12, "phalcon/Di/Di.zep", 262); ZEPHIR_MM_RESTORE(); return; } - _14$$11 = Z_TYPE_P(parameters) == IS_ARRAY; - if (_14$$11) { - _14$$11 = !(ZEPHIR_IS_EMPTY(parameters)); + _13$$11 = Z_TYPE_P(parameters) == IS_ARRAY; + if (_13$$11) { + _13$$11 = !(ZEPHIR_IS_EMPTY(parameters)); } - if (_14$$11) { + if (_13$$11) { ZEPHIR_INIT_NVAR(&instance); ZEPHIR_LAST_CALL_STATUS = zephir_create_instance_params(&instance, &name, parameters); zephir_check_call_status(); @@ -490,17 +490,17 @@ PHP_METHOD(Phalcon_Di_Di, get) zephir_check_call_status(); } } - zephir_read_property_cached(&_15, this_ptr, _zephir_prop_2, 176, PH_NOISY_CC | PH_READONLY); - if (Z_TYPE_P(&_15) != IS_NULL) { - zephir_read_property_cached(&_16$$18, this_ptr, _zephir_prop_2, 176, PH_NOISY_CC | PH_READONLY); + zephir_read_property_cached(&_14, this_ptr, _zephir_prop_2, 176, PH_NOISY_CC | PH_READONLY); + if (Z_TYPE_P(&_14) != IS_NULL) { + zephir_read_property_cached(&_15$$18, this_ptr, _zephir_prop_2, 176, PH_NOISY_CC | PH_READONLY); + ZEPHIR_INIT_VAR(&_16$$18); + zephir_create_array(&_16$$18, 3, 0); + zephir_array_update_string(&_16$$18, SL("name"), &name, PH_COPY | PH_SEPARATE); + zephir_array_update_string(&_16$$18, SL("parameters"), parameters, PH_COPY | PH_SEPARATE); + zephir_array_update_string(&_16$$18, SL("instance"), &instance, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_VAR(&_17$$18); - zephir_create_array(&_17$$18, 3, 0); - zephir_array_update_string(&_17$$18, SL("name"), &name, PH_COPY | PH_SEPARATE); - zephir_array_update_string(&_17$$18, SL("parameters"), parameters, PH_COPY | PH_SEPARATE); - zephir_array_update_string(&_17$$18, SL("instance"), &instance, PH_COPY | PH_SEPARATE); - ZEPHIR_INIT_VAR(&_18$$18); - ZVAL_STRING(&_18$$18, "di:afterServiceResolve"); - ZEPHIR_CALL_METHOD(NULL, &_16$$18, "fire", NULL, 0, &_18$$18, this_ptr, &_17$$18); + ZVAL_STRING(&_17$$18, "di:afterServiceResolve"); + ZEPHIR_CALL_METHOD(NULL, &_15$$18, "fire", NULL, 0, &_17$$18, this_ptr, &_16$$18); zephir_check_call_status(); } RETURN_CCTOR(&instance); @@ -644,20 +644,19 @@ PHP_METHOD(Phalcon_Di_Di, getServices) */ PHP_METHOD(Phalcon_Di_Di, getShared) { + zend_bool _2; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *name_param = NULL, *parameters = NULL, parameters_sub, __$null, _0, _1, _3, _4, _2$$3; + zval *name_param = NULL, *parameters = NULL, parameters_sub, __$null, instance, _0, _1; zval name; zval *this_ptr = getThis(); ZVAL_UNDEF(&name); ZVAL_UNDEF(¶meters_sub); ZVAL_NULL(&__$null); + ZVAL_UNDEF(&instance); ZVAL_UNDEF(&_0); ZVAL_UNDEF(&_1); - ZVAL_UNDEF(&_3); - ZVAL_UNDEF(&_4); - ZVAL_UNDEF(&_2$$3); static zend_string *_zephir_prop_0 = NULL; if (UNEXPECTED(!_zephir_prop_0)) { _zephir_prop_0 = zend_string_init("sharedInstances", 15, 1); @@ -680,16 +679,19 @@ PHP_METHOD(Phalcon_Di_Di, getShared) ZEPHIR_CALL_METHOD(&_0, this_ptr, "resolvealias", NULL, 183, &name); zephir_check_call_status(); zephir_get_strval(&name, &_0); + zephir_memory_observe(&instance); zephir_read_property_cached(&_1, this_ptr, _zephir_prop_0, 175, PH_NOISY_CC | PH_READONLY); - if (!(zephir_array_isset_value(&_1, &name))) { - ZEPHIR_CALL_METHOD(&_2$$3, this_ptr, "get", NULL, 0, &name, parameters); - zephir_check_call_status(); - zephir_update_property_array(this_ptr, SL("sharedInstances"), &name, &_2$$3); + _2 = zephir_array_isset_fetch(&instance, &_1, &name, 0); + if (_2) { + _2 = Z_TYPE_P(&instance) != IS_NULL; } - zephir_read_property_cached(&_3, this_ptr, _zephir_prop_0, 175, PH_NOISY_CC | PH_READONLY); - zephir_memory_observe(&_4); - zephir_array_fetch(&_4, &_3, &name, PH_NOISY, "phalcon/Di/Di.zep", 374); - RETURN_CCTOR(&_4); + if (_2) { + RETURN_CCTOR(&instance); + } + ZEPHIR_CALL_METHOD(&instance, this_ptr, "get", NULL, 0, &name, parameters); + zephir_check_call_status(); + zephir_update_property_array(this_ptr, SL("sharedInstances"), &name, &instance); + RETURN_CCTOR(&instance); } /** @@ -1102,7 +1104,7 @@ PHP_METHOD(Phalcon_Di_Di, remove) } else { _2 = &_0; } - zephir_is_iterable(_2, 0, "phalcon/Di/Di.zep", 588); + zephir_is_iterable(_2, 0, "phalcon/Di/Di.zep", 593); if (Z_TYPE_P(_2) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(_2), _5, _6, _4) { @@ -1201,7 +1203,7 @@ PHP_METHOD(Phalcon_Di_Di, removeShared) if (zephir_array_isset_value(&_0, &name)) { zephir_read_property_cached(&_2$$3, this_ptr, _zephir_prop_1, 174, PH_NOISY_CC | PH_READONLY); zephir_memory_observe(&service); - zephir_array_fetch(&service, &_2$$3, &name, PH_NOISY, "phalcon/Di/Di.zep", 618); + zephir_array_fetch(&service, &_2$$3, &name, PH_NOISY, "phalcon/Di/Di.zep", 623); if (zephir_instance_of_ev(&service, phalcon_di_service_ce)) { ZVAL_NULL(&_3$$4); ZEPHIR_CALL_METHOD(NULL, &service, "setsharedinstance", NULL, 0, &_3$$4); @@ -1264,7 +1266,7 @@ PHP_METHOD(Phalcon_Di_Di, set) zephir_update_property_array(this_ptr, SL("services"), &name, &_1); zephir_read_property_cached(&_3, this_ptr, _zephir_prop_0, 174, PH_NOISY_CC | PH_READONLY); zephir_memory_observe(&_4); - zephir_array_fetch(&_4, &_3, &name, PH_NOISY, "phalcon/Di/Di.zep", 637); + zephir_array_fetch(&_4, &_3, &name, PH_NOISY, "phalcon/Di/Di.zep", 642); RETURN_CCTOR(&_4); } @@ -1321,7 +1323,7 @@ PHP_METHOD(Phalcon_Di_Di, setAlias) if (!ZEPHIR_IS_TRUE_IDENTICAL(&_0)) { ZEPHIR_CALL_CE_STATIC(&_1$$3, phalcon_di_exception_ce, "servicenotfound", NULL, 0, &name_zv); zephir_check_call_status(); - zephir_throw_exception_debug(&_1$$3, "phalcon/Di/Di.zep", 653); + zephir_throw_exception_debug(&_1$$3, "phalcon/Di/Di.zep", 658); ZEPHIR_MM_RESTORE(); return; } @@ -1341,7 +1343,7 @@ PHP_METHOD(Phalcon_Di_Di, setAlias) } else { _3 = &localAliases; } - zephir_is_iterable(_3, 0, "phalcon/Di/Di.zep", 674); + zephir_is_iterable(_3, 0, "phalcon/Di/Di.zep", 679); if (Z_TYPE_P(_3) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(_3), _5) { @@ -1352,7 +1354,7 @@ PHP_METHOD(Phalcon_Di_Di, setAlias) object_init_ex(&_6$$6, phalcon_di_exceptions_aliasnamemustbestring_ce); ZEPHIR_CALL_METHOD(NULL, &_6$$6, "__construct", &_7, 187); zephir_check_call_status(); - zephir_throw_exception_debug(&_6$$6, "phalcon/Di/Di.zep", 664); + zephir_throw_exception_debug(&_6$$6, "phalcon/Di/Di.zep", 669); ZEPHIR_MM_RESTORE(); return; } @@ -1367,7 +1369,7 @@ PHP_METHOD(Phalcon_Di_Di, setAlias) object_init_ex(&_10$$7, phalcon_di_exceptions_aliasalreadyinuse_ce); ZEPHIR_CALL_METHOD(NULL, &_10$$7, "__construct", &_11, 188, &alias); zephir_check_call_status(); - zephir_throw_exception_debug(&_10$$7, "phalcon/Di/Di.zep", 668); + zephir_throw_exception_debug(&_10$$7, "phalcon/Di/Di.zep", 673); ZEPHIR_MM_RESTORE(); return; } @@ -1396,7 +1398,7 @@ PHP_METHOD(Phalcon_Di_Di, setAlias) object_init_ex(&_14$$9, phalcon_di_exceptions_aliasnamemustbestring_ce); ZEPHIR_CALL_METHOD(NULL, &_14$$9, "__construct", &_7, 187); zephir_check_call_status(); - zephir_throw_exception_debug(&_14$$9, "phalcon/Di/Di.zep", 664); + zephir_throw_exception_debug(&_14$$9, "phalcon/Di/Di.zep", 669); ZEPHIR_MM_RESTORE(); return; } @@ -1411,7 +1413,7 @@ PHP_METHOD(Phalcon_Di_Di, setAlias) object_init_ex(&_17$$10, phalcon_di_exceptions_aliasalreadyinuse_ce); ZEPHIR_CALL_METHOD(NULL, &_17$$10, "__construct", &_11, 188, &alias); zephir_check_call_status(); - zephir_throw_exception_debug(&_17$$10, "phalcon/Di/Di.zep", 668); + zephir_throw_exception_debug(&_17$$10, "phalcon/Di/Di.zep", 673); ZEPHIR_MM_RESTORE(); return; } @@ -1534,7 +1536,7 @@ PHP_METHOD(Phalcon_Di_Di, loadFromConfig) } else { _0 = &services; } - zephir_is_iterable(_0, 0, "phalcon/Di/Di.zep", 720); + zephir_is_iterable(_0, 0, "phalcon/Di/Di.zep", 725); if (Z_TYPE_P(_0) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(_0), _3, _4, _2) { @@ -1553,7 +1555,7 @@ PHP_METHOD(Phalcon_Di_Di, loadFromConfig) _6$$3 = _5$$3; if (_6$$3) { ZEPHIR_OBS_NVAR(&_7$$3); - zephir_array_fetch_string(&_7$$3, &service, SL("shared"), PH_NOISY, "phalcon/Di/Di.zep", 718); + zephir_array_fetch_string(&_7$$3, &service, SL("shared"), PH_NOISY, "phalcon/Di/Di.zep", 723); _6$$3 = zephir_is_true(&_7$$3); } ZVAL_BOOL(&_8$$3, _6$$3); @@ -1587,7 +1589,7 @@ PHP_METHOD(Phalcon_Di_Di, loadFromConfig) _13$$4 = _12$$4; if (_13$$4) { ZEPHIR_OBS_NVAR(&_14$$4); - zephir_array_fetch_string(&_14$$4, &service, SL("shared"), PH_NOISY, "phalcon/Di/Di.zep", 718); + zephir_array_fetch_string(&_14$$4, &service, SL("shared"), PH_NOISY, "phalcon/Di/Di.zep", 723); _13$$4 = zephir_is_true(&_14$$4); } ZVAL_BOOL(&_15$$4, _13$$4); @@ -1647,14 +1649,14 @@ PHP_METHOD(Phalcon_Di_Di, resolveAlias) object_init_ex(&_1$$4, phalcon_di_exceptions_circularaliasreference_ce); ZEPHIR_CALL_METHOD(NULL, &_1$$4, "__construct", &_2, 189, &name_zv); zephir_check_call_status(); - zephir_throw_exception_debug(&_1$$4, "phalcon/Di/Di.zep", 736); + zephir_throw_exception_debug(&_1$$4, "phalcon/Di/Di.zep", 741); ZEPHIR_MM_RESTORE(); return; } zephir_array_update_zval(&seen, ¤t, &__$true, PH_COPY | PH_SEPARATE); zephir_read_property_cached(&_3$$3, this_ptr, _zephir_prop_0, 177, PH_NOISY_CC | PH_READONLY); ZEPHIR_OBS_NVAR(&_4$$3); - zephir_array_fetch(&_4$$3, &_3$$3, ¤t, PH_NOISY, "phalcon/Di/Di.zep", 739); + zephir_array_fetch(&_4$$3, &_3$$3, ¤t, PH_NOISY, "phalcon/Di/Di.zep", 744); ZEPHIR_CPY_WRT(¤t, &_4$$3); } RETURN_CCTOR(¤t); diff --git a/ext/phalcon/di/factorydefault.zep.c b/ext/phalcon/di/factorydefault.zep.c index b22a38d6fa..0f4bab7c31 100644 --- a/ext/phalcon/di/factorydefault.zep.c +++ b/ext/phalcon/di/factorydefault.zep.c @@ -44,21 +44,21 @@ ZEPHIR_INIT_CLASS(Phalcon_Di_FactoryDefault) */ PHP_METHOD(Phalcon_Di_FactoryDefault, __construct) { - zval _0, _4, _5, _6, _8; - zval filter, _1, _2, _3, _7; + zval _1, _2, _3, _8; + zval _0, _4, _5, _6, _7, _9; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; zval *this_ptr = getThis(); - ZVAL_UNDEF(&filter); - ZVAL_UNDEF(&_1); - ZVAL_UNDEF(&_2); - ZVAL_UNDEF(&_3); - ZVAL_UNDEF(&_7); ZVAL_UNDEF(&_0); ZVAL_UNDEF(&_4); ZVAL_UNDEF(&_5); ZVAL_UNDEF(&_6); + ZVAL_UNDEF(&_7); + ZVAL_UNDEF(&_9); + ZVAL_UNDEF(&_1); + ZVAL_UNDEF(&_2); + ZVAL_UNDEF(&_3); ZVAL_UNDEF(&_8); static zend_string *_zephir_prop_0 = NULL; if (UNEXPECTED(!_zephir_prop_0)) { @@ -69,13 +69,6 @@ PHP_METHOD(Phalcon_Di_FactoryDefault, __construct) ZEPHIR_CALL_PARENT(NULL, phalcon_di_factorydefault_ce, getThis(), "__construct", NULL, 0); zephir_check_call_status(); - ZEPHIR_INIT_VAR(&filter); - object_init_ex(&filter, phalcon_filter_filterfactory_ce); - if (zephir_has_constructor(&filter)) { - ZEPHIR_CALL_METHOD(NULL, &filter, "__construct", NULL, 0); - zephir_check_call_status(); - } - ZEPHIR_INIT_VAR(&_0); zephir_create_array(&_0, 22, 0); ZEPHIR_INIT_VAR(&_1); @@ -161,10 +154,21 @@ PHP_METHOD(Phalcon_Di_FactoryDefault, __construct) zephir_array_update_string(&_0, SL("flashSession"), &_1, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_1); object_init_ex(&_1, phalcon_di_service_ce); - ZEPHIR_CALL_METHOD(&_7, &filter, "newinstance", NULL, 258); + ZEPHIR_INIT_NVAR(&_5); + zephir_create_array(&_5, 2, 0); + add_assoc_stringl_ex(&_5, SL("className"), SL("Phalcon\\Filter\\Filter")); + ZEPHIR_INIT_NVAR(&_6); + zephir_create_array(&_6, 1, 0); + ZEPHIR_INIT_VAR(&_7); + zephir_create_array(&_7, 2, 0); + add_assoc_stringl_ex(&_7, SL("type"), SL("parameter")); + ZEPHIR_CALL_CE_STATIC(&_8, phalcon_filter_filter_ce, "getdefaultmapper", NULL, 0); zephir_check_call_status(); + zephir_array_update_string(&_7, SL("value"), &_8, PH_COPY | PH_SEPARATE); + zephir_array_fast_append(&_6, &_7); + zephir_array_update_string(&_5, SL("arguments"), &_6, PH_COPY | PH_SEPARATE); ZVAL_BOOL(&_3, 1); - ZEPHIR_CALL_METHOD(NULL, &_1, "__construct", NULL, 182, &_7, &_3); + ZEPHIR_CALL_METHOD(NULL, &_1, "__construct", NULL, 182, &_5, &_3); zephir_check_call_status(); zephir_array_update_string(&_0, SL("filter"), &_1, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_1); @@ -241,19 +245,19 @@ PHP_METHOD(Phalcon_Di_FactoryDefault, __construct) zephir_array_update_string(&_0, SL("security"), &_1, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_1); object_init_ex(&_1, phalcon_di_service_ce); - ZEPHIR_INIT_NVAR(&_5); - zephir_create_array(&_5, 2, 0); - add_assoc_stringl_ex(&_5, SL("className"), SL("Phalcon\\Html\\TagFactory")); ZEPHIR_INIT_NVAR(&_6); - zephir_create_array(&_6, 1, 0); - ZEPHIR_INIT_VAR(&_8); - zephir_create_array(&_8, 2, 0); - add_assoc_stringl_ex(&_8, SL("type"), SL("service")); - add_assoc_stringl_ex(&_8, SL("name"), SL("escaper")); - zephir_array_fast_append(&_6, &_8); - zephir_array_update_string(&_5, SL("arguments"), &_6, PH_COPY | PH_SEPARATE); + zephir_create_array(&_6, 2, 0); + add_assoc_stringl_ex(&_6, SL("className"), SL("Phalcon\\Html\\TagFactory")); + ZEPHIR_INIT_NVAR(&_7); + zephir_create_array(&_7, 1, 0); + ZEPHIR_INIT_VAR(&_9); + zephir_create_array(&_9, 2, 0); + add_assoc_stringl_ex(&_9, SL("type"), SL("service")); + add_assoc_stringl_ex(&_9, SL("name"), SL("escaper")); + zephir_array_fast_append(&_7, &_9); + zephir_array_update_string(&_6, SL("arguments"), &_7, PH_COPY | PH_SEPARATE); ZVAL_BOOL(&_3, 1); - ZEPHIR_CALL_METHOD(NULL, &_1, "__construct", NULL, 182, &_5, &_3); + ZEPHIR_CALL_METHOD(NULL, &_1, "__construct", NULL, 182, &_6, &_3); zephir_check_call_status(); zephir_array_update_string(&_0, SL("tag"), &_1, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_1); diff --git a/ext/phalcon/di/factorydefault/cli.zep.c b/ext/phalcon/di/factorydefault/cli.zep.c index 57b961ebba..309891027e 100644 --- a/ext/phalcon/di/factorydefault/cli.zep.c +++ b/ext/phalcon/di/factorydefault/cli.zep.c @@ -46,20 +46,20 @@ ZEPHIR_INIT_CLASS(Phalcon_Di_FactoryDefault_Cli) */ PHP_METHOD(Phalcon_Di_FactoryDefault_Cli, __construct) { - zval _0, _5, _6, _7; - zval filter, _1, _2, _3, _4; + zval _1, _2, _3, _7; + zval _0, _4, _5, _6, _8; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; zval *this_ptr = getThis(); - ZVAL_UNDEF(&filter); - ZVAL_UNDEF(&_1); - ZVAL_UNDEF(&_2); - ZVAL_UNDEF(&_3); - ZVAL_UNDEF(&_4); ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_4); ZVAL_UNDEF(&_5); ZVAL_UNDEF(&_6); + ZVAL_UNDEF(&_8); + ZVAL_UNDEF(&_1); + ZVAL_UNDEF(&_2); + ZVAL_UNDEF(&_3); ZVAL_UNDEF(&_7); static zend_string *_zephir_prop_0 = NULL; if (UNEXPECTED(!_zephir_prop_0)) { @@ -70,13 +70,6 @@ PHP_METHOD(Phalcon_Di_FactoryDefault_Cli, __construct) ZEPHIR_CALL_PARENT(NULL, phalcon_di_factorydefault_cli_ce, getThis(), "__construct", NULL, 0); zephir_check_call_status(); - ZEPHIR_INIT_VAR(&filter); - object_init_ex(&filter, phalcon_filter_filterfactory_ce); - if (zephir_has_constructor(&filter)) { - ZEPHIR_CALL_METHOD(NULL, &filter, "__construct", NULL, 0); - zephir_check_call_status(); - } - ZEPHIR_INIT_VAR(&_0); zephir_create_array(&_0, 14, 0); ZEPHIR_INIT_VAR(&_1); @@ -113,8 +106,19 @@ PHP_METHOD(Phalcon_Di_FactoryDefault_Cli, __construct) zephir_array_update_string(&_0, SL("eventsManager"), &_1, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_1); object_init_ex(&_1, phalcon_di_service_ce); - ZEPHIR_CALL_METHOD(&_4, &filter, "newinstance", NULL, 258); + ZEPHIR_INIT_VAR(&_4); + zephir_create_array(&_4, 2, 0); + add_assoc_stringl_ex(&_4, SL("className"), SL("Phalcon\\Filter\\Filter")); + ZEPHIR_INIT_VAR(&_5); + zephir_create_array(&_5, 1, 0); + ZEPHIR_INIT_VAR(&_6); + zephir_create_array(&_6, 2, 0); + add_assoc_stringl_ex(&_6, SL("type"), SL("parameter")); + ZEPHIR_CALL_CE_STATIC(&_7, phalcon_filter_filter_ce, "getdefaultmapper", NULL, 0); zephir_check_call_status(); + zephir_array_update_string(&_6, SL("value"), &_7, PH_COPY | PH_SEPARATE); + zephir_array_fast_append(&_5, &_6); + zephir_array_update_string(&_4, SL("arguments"), &_5, PH_COPY | PH_SEPARATE); ZVAL_BOOL(&_3, 1); ZEPHIR_CALL_METHOD(NULL, &_1, "__construct", NULL, 182, &_4, &_3); zephir_check_call_status(); @@ -177,16 +181,16 @@ PHP_METHOD(Phalcon_Di_FactoryDefault_Cli, __construct) zephir_array_update_string(&_0, SL("security"), &_1, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_1); object_init_ex(&_1, phalcon_di_service_ce); - ZEPHIR_INIT_VAR(&_5); + ZEPHIR_INIT_NVAR(&_5); zephir_create_array(&_5, 2, 0); add_assoc_stringl_ex(&_5, SL("className"), SL("Phalcon\\Html\\TagFactory")); - ZEPHIR_INIT_VAR(&_6); + ZEPHIR_INIT_NVAR(&_6); zephir_create_array(&_6, 1, 0); - ZEPHIR_INIT_VAR(&_7); - zephir_create_array(&_7, 2, 0); - add_assoc_stringl_ex(&_7, SL("type"), SL("service")); - add_assoc_stringl_ex(&_7, SL("name"), SL("escaper")); - zephir_array_fast_append(&_6, &_7); + ZEPHIR_INIT_VAR(&_8); + zephir_create_array(&_8, 2, 0); + add_assoc_stringl_ex(&_8, SL("type"), SL("service")); + add_assoc_stringl_ex(&_8, SL("name"), SL("escaper")); + zephir_array_fast_append(&_6, &_8); zephir_array_update_string(&_5, SL("arguments"), &_6, PH_COPY | PH_SEPARATE); ZVAL_BOOL(&_3, 1); ZEPHIR_CALL_METHOD(NULL, &_1, "__construct", NULL, 182, &_5, &_3); diff --git a/ext/phalcon/encryption/crypt.zep.c b/ext/phalcon/encryption/crypt.zep.c index 9aa2edb463..cff46c7678 100644 --- a/ext/phalcon/encryption/crypt.zep.c +++ b/ext/phalcon/encryption/crypt.zep.c @@ -412,7 +412,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt, decrypt) ZVAL_LONG(&_1, 0); ZEPHIR_INIT_NVAR(&_2); ZVAL_STRING(&_2, "8bit"); - ZEPHIR_CALL_FUNCTION(&iv, "mb_substr", NULL, 310, &input_zv, &_1, &ivLength, &_2); + ZEPHIR_CALL_FUNCTION(&iv, "mb_substr", NULL, 309, &input_zv, &_1, &ivLength, &_2); zephir_check_call_status(); ZEPHIR_INIT_VAR(&digest); ZVAL_STRING(&digest, ""); @@ -434,18 +434,18 @@ PHP_METHOD(Phalcon_Encryption_Crypt, decrypt) } ZEPHIR_INIT_VAR(&_9$$6); ZVAL_STRING(&_9$$6, "8bit"); - ZEPHIR_CALL_FUNCTION(&digest, "mb_substr", NULL, 310, &input_zv, &ivLength, &hashLength, &_9$$6); + ZEPHIR_CALL_FUNCTION(&digest, "mb_substr", NULL, 309, &input_zv, &ivLength, &hashLength, &_9$$6); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_10$$6); zephir_add_function(&_10$$6, &ivLength, &hashLength); ZEPHIR_INIT_NVAR(&_9$$6); ZVAL_STRING(&_9$$6, "8bit"); - ZEPHIR_CALL_FUNCTION(&cipherText, "mb_substr", NULL, 310, &input_zv, &_10$$6, &__$null, &_9$$6); + ZEPHIR_CALL_FUNCTION(&cipherText, "mb_substr", NULL, 309, &input_zv, &_10$$6, &__$null, &_9$$6); zephir_check_call_status(); } else { ZEPHIR_INIT_VAR(&_11$$8); ZVAL_STRING(&_11$$8, "8bit"); - ZEPHIR_CALL_FUNCTION(&cipherText, "mb_substr", NULL, 310, &input_zv, &ivLength, &__$null, &_11$$8); + ZEPHIR_CALL_FUNCTION(&cipherText, "mb_substr", NULL, 309, &input_zv, &ivLength, &__$null, &_11$$8); zephir_check_call_status(); } zephir_read_property_cached(&_12, this_ptr, _zephir_prop_3, 702, PH_NOISY_CC | PH_READONLY); @@ -2323,7 +2323,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt, phpExtensionLoaded) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_memory_observe(&name_zv); ZVAL_STR_COPY(&name_zv, name); - ZEPHIR_RETURN_CALL_FUNCTION("extension_loaded", NULL, 474, &name_zv); + ZEPHIR_RETURN_CALL_FUNCTION("extension_loaded", NULL, 473, &name_zv); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/encryption/crypt/padding/iso10126.zep.c b/ext/phalcon/encryption/crypt/padding/iso10126.zep.c index de5ecc20d3..7019e9271a 100644 --- a/ext/phalcon/encryption/crypt/padding/iso10126.zep.c +++ b/ext/phalcon/encryption/crypt/padding/iso10126.zep.c @@ -76,7 +76,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt_Padding_Iso10126, pad) ZEPHIR_INIT_NVAR(&counter); ZVAL_LONG(&counter, _1); ZVAL_LONG(&_3$$3, 1); - ZEPHIR_CALL_FUNCTION(&_4$$3, "random_bytes", &_5, 330, &_3$$3); + ZEPHIR_CALL_FUNCTION(&_4$$3, "random_bytes", &_5, 329, &_3$$3); zephir_check_call_status(); zephir_concat_self(&padding, &_4$$3); } diff --git a/ext/phalcon/encryption/security/random.zep.c b/ext/phalcon/encryption/security/random.zep.c index 78f747961d..faf1c5f3f1 100644 --- a/ext/phalcon/encryption/security/random.zep.c +++ b/ext/phalcon/encryption/security/random.zep.c @@ -368,7 +368,7 @@ PHP_METHOD(Phalcon_Encryption_Security_Random, bytes) len = 16; } ZVAL_LONG(&_0, len); - ZEPHIR_RETURN_CALL_FUNCTION("random_bytes", NULL, 330, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("random_bytes", NULL, 329, &_0); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/encryption/security/uuid/randomnodeprovider.zep.c b/ext/phalcon/encryption/security/uuid/randomnodeprovider.zep.c index c43eca7420..f3887135fb 100644 --- a/ext/phalcon/encryption/security/uuid/randomnodeprovider.zep.c +++ b/ext/phalcon/encryption/security/uuid/randomnodeprovider.zep.c @@ -68,7 +68,7 @@ PHP_METHOD(Phalcon_Encryption_Security_Uuid_RandomNodeProvider, getNode) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); ZVAL_LONG(&_0, 6); - ZEPHIR_CALL_FUNCTION(&nodeBytes, "random_bytes", NULL, 330, &_0); + ZEPHIR_CALL_FUNCTION(&nodeBytes, "random_bytes", NULL, 329, &_0); zephir_check_call_status(); ZVAL_LONG(&_0, 0); ZVAL_LONG(&_1, 1); @@ -85,7 +85,7 @@ PHP_METHOD(Phalcon_Encryption_Security_Uuid_RandomNodeProvider, getNode) ZEPHIR_INIT_VAR(&_7); ZEPHIR_CONCAT_VV(&_7, &_5, &_6); ZEPHIR_CPY_WRT(&nodeBytes, &_7); - ZEPHIR_RETURN_CALL_FUNCTION("bin2hex", NULL, 331, &nodeBytes); + ZEPHIR_RETURN_CALL_FUNCTION("bin2hex", NULL, 330, &nodeBytes); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/encryption/security/uuid/sysnodeprovider.zep.c b/ext/phalcon/encryption/security/uuid/sysnodeprovider.zep.c index 2ec5e1d773..cfceaec54c 100644 --- a/ext/phalcon/encryption/security/uuid/sysnodeprovider.zep.c +++ b/ext/phalcon/encryption/security/uuid/sysnodeprovider.zep.c @@ -147,7 +147,7 @@ PHP_METHOD(Phalcon_Encryption_Security_Uuid_SysNodeProvider, getNode) if (zephir_is_true(&_1)) { ZEPHIR_INIT_VAR(&_3$$4); ZVAL_STRING(&_3$$4, "__phalcon_uuid_node"); - ZEPHIR_CALL_FUNCTION(&cached, "apcu_fetch", NULL, 287, &_3$$4); + ZEPHIR_CALL_FUNCTION(&cached, "apcu_fetch", NULL, 286, &_3$$4); zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(&cached)) { zephir_update_property_zval_cached(this_ptr, _zephir_prop_0, 737, &cached); @@ -375,7 +375,7 @@ PHP_METHOD(Phalcon_Encryption_Security_Uuid_SysNodeProvider, getNode) zephir_read_property_cached(&_56$$21, this_ptr, _zephir_prop_0, 737, PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_57$$21); ZVAL_STRING(&_57$$21, "__phalcon_uuid_node"); - ZEPHIR_CALL_FUNCTION(NULL, "apcu_store", NULL, 289, &_57$$21, &_56$$21); + ZEPHIR_CALL_FUNCTION(NULL, "apcu_store", NULL, 288, &_57$$21, &_56$$21); zephir_check_call_status(); } RETURN_MM_MEMBER_TYPED(getThis(), "node", IS_STRING); @@ -977,7 +977,7 @@ PHP_METHOD(Phalcon_Encryption_Security_Uuid_SysNodeProvider, phpExtensionLoaded) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_memory_observe(&name_zv); ZVAL_STR_COPY(&name_zv, name); - ZEPHIR_RETURN_CALL_FUNCTION("extension_loaded", NULL, 474, &name_zv); + ZEPHIR_RETURN_CALL_FUNCTION("extension_loaded", NULL, 473, &name_zv); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/encryption/security/uuid/version1.zep.c b/ext/phalcon/encryption/security/uuid/version1.zep.c index 5b352adb45..d172d23403 100644 --- a/ext/phalcon/encryption/security/uuid/version1.zep.c +++ b/ext/phalcon/encryption/security/uuid/version1.zep.c @@ -146,7 +146,7 @@ PHP_METHOD(Phalcon_Encryption_Security_Uuid_Version1, __construct) ZEPHIR_INIT_VAR(&timeHi); ZVAL_LONG(&timeHi, (((((timestamp >> 48)) & 0x0fff)) | 0x1000)); ZVAL_LONG(&_5, 2); - ZEPHIR_CALL_FUNCTION(&clockSeqBytes, "random_bytes", NULL, 330, &_5); + ZEPHIR_CALL_FUNCTION(&clockSeqBytes, "random_bytes", NULL, 329, &_5); zephir_check_call_status(); ZVAL_LONG(&_5, 0); ZVAL_LONG(&_6, 1); diff --git a/ext/phalcon/encryption/security/uuid/version3.zep.c b/ext/phalcon/encryption/security/uuid/version3.zep.c index e4c5cf5576..351c12e799 100644 --- a/ext/phalcon/encryption/security/uuid/version3.zep.c +++ b/ext/phalcon/encryption/security/uuid/version3.zep.c @@ -123,7 +123,7 @@ PHP_METHOD(Phalcon_Encryption_Security_Uuid_Version3, __construct) ZEPHIR_CALL_FUNCTION(&_14, "substr_replace", NULL, 0, &hash, &_12, &_11, &_13); zephir_check_call_status(); ZEPHIR_CPY_WRT(&hash, &_14); - ZEPHIR_CALL_FUNCTION(&_15, "bin2hex", NULL, 331, &hash); + ZEPHIR_CALL_FUNCTION(&_15, "bin2hex", NULL, 330, &hash); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_14, this_ptr, "format", NULL, 0, &_15); zephir_check_call_status(); diff --git a/ext/phalcon/encryption/security/uuid/version4.zep.c b/ext/phalcon/encryption/security/uuid/version4.zep.c index e53a678396..c320368057 100644 --- a/ext/phalcon/encryption/security/uuid/version4.zep.c +++ b/ext/phalcon/encryption/security/uuid/version4.zep.c @@ -70,7 +70,7 @@ PHP_METHOD(Phalcon_Encryption_Security_Uuid_Version4, __construct) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); ZVAL_LONG(&_0, 16); - ZEPHIR_CALL_FUNCTION(&_1, "random_bytes", NULL, 330, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "random_bytes", NULL, 329, &_0); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_2); ZVAL_STRING(&_2, "N1a/n1b/n1c/n1d/n1e/N1f"); diff --git a/ext/phalcon/encryption/security/uuid/version5.zep.c b/ext/phalcon/encryption/security/uuid/version5.zep.c index 42979157c8..b4452bfdbb 100644 --- a/ext/phalcon/encryption/security/uuid/version5.zep.c +++ b/ext/phalcon/encryption/security/uuid/version5.zep.c @@ -97,7 +97,7 @@ PHP_METHOD(Phalcon_Encryption_Security_Uuid_Version5, __construct) zephir_check_call_status(); ZEPHIR_INIT_VAR(&_1); ZEPHIR_CONCAT_VV(&_1, &_0, &name_zv); - ZEPHIR_CALL_FUNCTION(&_2, "sha1", NULL, 302, &_1, &__$true); + ZEPHIR_CALL_FUNCTION(&_2, "sha1", NULL, 301, &_1, &__$true); zephir_check_call_status(); ZVAL_LONG(&_3, 0); ZVAL_LONG(&_4, 16); @@ -131,7 +131,7 @@ PHP_METHOD(Phalcon_Encryption_Security_Uuid_Version5, __construct) ZEPHIR_CALL_FUNCTION(&_17, "substr_replace", NULL, 0, &hash, &_15, &_14, &_16); zephir_check_call_status(); ZEPHIR_CPY_WRT(&hash, &_17); - ZEPHIR_CALL_FUNCTION(&_18, "bin2hex", NULL, 331, &hash); + ZEPHIR_CALL_FUNCTION(&_18, "bin2hex", NULL, 330, &hash); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_17, this_ptr, "format", NULL, 0, &_18); zephir_check_call_status(); diff --git a/ext/phalcon/encryption/security/uuid/version6.zep.c b/ext/phalcon/encryption/security/uuid/version6.zep.c index 2cc33ceb85..805440603e 100644 --- a/ext/phalcon/encryption/security/uuid/version6.zep.c +++ b/ext/phalcon/encryption/security/uuid/version6.zep.c @@ -106,7 +106,7 @@ PHP_METHOD(Phalcon_Encryption_Security_Uuid_Version6, __construct) ZEPHIR_INIT_VAR(&timeLow12); ZVAL_LONG(&timeLow12, (0x6000 | ((timestamp & 0x0fff)))); ZVAL_LONG(&_3, 2); - ZEPHIR_CALL_FUNCTION(&clockSeqBytes, "random_bytes", NULL, 330, &_3); + ZEPHIR_CALL_FUNCTION(&clockSeqBytes, "random_bytes", NULL, 329, &_3); zephir_check_call_status(); ZVAL_LONG(&_3, 0); ZVAL_LONG(&_4, 1); diff --git a/ext/phalcon/encryption/security/uuid/version7.zep.c b/ext/phalcon/encryption/security/uuid/version7.zep.c index dbc4d36e41..3544f7941f 100644 --- a/ext/phalcon/encryption/security/uuid/version7.zep.c +++ b/ext/phalcon/encryption/security/uuid/version7.zep.c @@ -96,13 +96,13 @@ PHP_METHOD(Phalcon_Encryption_Security_Uuid_Version7, __construct) ZEPHIR_INIT_VAR(&timeLow16); ZVAL_LONG(&timeLow16, (msInt & 0xffff)); ZVAL_LONG(&_2, 10); - ZEPHIR_CALL_FUNCTION(&randBytes, "random_bytes", NULL, 330, &_2); + ZEPHIR_CALL_FUNCTION(&randBytes, "random_bytes", NULL, 329, &_2); zephir_check_call_status(); ZVAL_LONG(&_2, 0); ZVAL_LONG(&_3, 2); ZEPHIR_INIT_VAR(&_4); zephir_substr(&_4, &randBytes, 0 , 2 , 0); - ZEPHIR_CALL_FUNCTION(&_5, "bin2hex", NULL, 331, &_4); + ZEPHIR_CALL_FUNCTION(&_5, "bin2hex", NULL, 330, &_4); zephir_check_call_status(); ZEPHIR_CALL_FUNCTION(&_6, "hexdec", NULL, 0, &_5); zephir_check_call_status(); @@ -112,7 +112,7 @@ PHP_METHOD(Phalcon_Encryption_Security_Uuid_Version7, __construct) ZVAL_LONG(&_8, 2); ZEPHIR_INIT_VAR(&_9); zephir_substr(&_9, &randBytes, 2 , 2 , 0); - ZEPHIR_CALL_FUNCTION(&_10, "bin2hex", NULL, 331, &_9); + ZEPHIR_CALL_FUNCTION(&_10, "bin2hex", NULL, 330, &_9); zephir_check_call_status(); ZEPHIR_CALL_FUNCTION(&_11, "hexdec", NULL, 0, &_10); zephir_check_call_status(); @@ -122,7 +122,7 @@ PHP_METHOD(Phalcon_Encryption_Security_Uuid_Version7, __construct) ZVAL_LONG(&_13, 6); ZEPHIR_INIT_VAR(&_14); zephir_substr(&_14, &randBytes, 4 , 6 , 0); - ZEPHIR_CALL_FUNCTION(&_15, "bin2hex", NULL, 331, &_14); + ZEPHIR_CALL_FUNCTION(&_15, "bin2hex", NULL, 330, &_14); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_16); ZVAL_STRING(&_16, "%08x-%04x-%04x-%04x-%s"); diff --git a/ext/phalcon/filter/filter.zep.c b/ext/phalcon/filter/filter.zep.c index 6d4cf6f2b3..df5ac245f3 100644 --- a/ext/phalcon/filter/filter.zep.c +++ b/ext/phalcon/filter/filter.zep.c @@ -516,20 +516,27 @@ PHP_METHOD(Phalcon_Filter_Filter, set) */ PHP_METHOD(Phalcon_Filter_Filter, init) { - zend_bool _5; - zend_string *_2; - zend_ulong _1; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zephir_fcall_cache_entry *_3 = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *mapper_param = NULL, name, service, *_0, _4; + zval *mapper_param = NULL, _0, _1, _2, _3$$3, _4$$3; zval mapper; zval *this_ptr = getThis(); ZVAL_UNDEF(&mapper); - ZVAL_UNDEF(&name); - ZVAL_UNDEF(&service); - ZVAL_UNDEF(&_4); + ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_1); + ZVAL_UNDEF(&_2); + ZVAL_UNDEF(&_3$$3); + ZVAL_UNDEF(&_4$$3); + static zend_string *_zephir_prop_0 = NULL; + static zend_string *_zephir_prop_1 = NULL; + if (UNEXPECTED(!_zephir_prop_0)) { + _zephir_prop_0 = zend_string_init("mapper", 6, 1); + } + if (UNEXPECTED(!_zephir_prop_1)) { + _zephir_prop_1 = zend_string_init("services", 8, 1); + } + ZEND_PARSE_PARAMETERS_START(1, 1) ZEPHIR_Z_PARAM_ARRAY(mapper, mapper_param) ZEND_PARSE_PARAMETERS_END(); @@ -537,47 +544,17 @@ PHP_METHOD(Phalcon_Filter_Filter, init) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &mapper_param); zephir_get_arrval(&mapper, mapper_param); - zephir_is_iterable(&mapper, 0, "phalcon/Filter/Filter.zep", 380); - if (Z_TYPE_P(&mapper) == IS_ARRAY) { - ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&mapper), _1, _2, _0) - { - ZEPHIR_INIT_NVAR(&name); - if (_2 != NULL) { - ZVAL_STR_COPY(&name, _2); - } else { - ZVAL_LONG(&name, _1); - } - ZEPHIR_INIT_NVAR(&service); - ZVAL_COPY(&service, _0); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "set", &_3, 0, &name, &service); - zephir_check_call_status(); - } ZEND_HASH_FOREACH_END(); - } else { - ZEPHIR_CALL_METHOD(NULL, &mapper, "rewind", NULL, 0); + zephir_read_property_cached(&_0, this_ptr, _zephir_prop_0, 764, PH_NOISY_CC | PH_READONLY); + ZEPHIR_CALL_FUNCTION(&_1, "array_replace", NULL, 289, &_0, &mapper); + zephir_check_call_status(); + zephir_update_property_zval_cached(this_ptr, _zephir_prop_0, 764, &_1); + zephir_read_property_cached(&_2, this_ptr, _zephir_prop_1, 765, PH_NOISY_CC | PH_READONLY); + if (!(ZEPHIR_IS_EMPTY(&_2))) { + zephir_read_property_cached(&_3$$3, this_ptr, _zephir_prop_1, 765, PH_NOISY_CC | PH_READONLY); + ZEPHIR_CALL_FUNCTION(&_4$$3, "array_diff_key", NULL, 261, &_3$$3, &mapper); zephir_check_call_status(); - _5 = 1; - while (1) { - if (_5) { - _5 = 0; - } else { - ZEPHIR_CALL_METHOD(NULL, &mapper, "next", NULL, 0); - zephir_check_call_status(); - } - ZEPHIR_CALL_METHOD(&_4, &mapper, "valid", NULL, 0); - zephir_check_call_status(); - if (!zend_is_true(&_4)) { - break; - } - ZEPHIR_CALL_METHOD(&name, &mapper, "key", NULL, 0); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&service, &mapper, "current", NULL, 0); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "set", &_3, 0, &name, &service); - zephir_check_call_status(); - } + zephir_update_property_zval_cached(this_ptr, _zephir_prop_1, 765, &_4$$3); } - ZEPHIR_INIT_NVAR(&service); - ZEPHIR_INIT_NVAR(&name); ZEPHIR_MM_RESTORE(); } diff --git a/ext/phalcon/filter/validation/validator/confirmation.zep.c b/ext/phalcon/filter/validation/validator/confirmation.zep.c index 2d7dd6c2df..e54379b349 100644 --- a/ext/phalcon/filter/validation/validator/confirmation.zep.c +++ b/ext/phalcon/filter/validation/validator/confirmation.zep.c @@ -291,7 +291,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Confirmation, phpExtensionLoaded) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_memory_observe(&name_zv); ZVAL_STR_COPY(&name_zv, name); - ZEPHIR_RETURN_CALL_FUNCTION("extension_loaded", NULL, 474, &name_zv); + ZEPHIR_RETURN_CALL_FUNCTION("extension_loaded", NULL, 473, &name_zv); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/filter/validation/validator/creditcard.zep.c b/ext/phalcon/filter/validation/validator/creditcard.zep.c index fdc257951f..ede2a0e2ba 100644 --- a/ext/phalcon/filter/validation/validator/creditcard.zep.c +++ b/ext/phalcon/filter/validation/validator/creditcard.zep.c @@ -198,7 +198,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_CreditCard, verifyByLuhnAlgorithm } ZEPHIR_CALL_FUNCTION(&_1, "str_split", NULL, 216, &number_zv); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&digits, "array_reverse", NULL, 274, &_1); + ZEPHIR_CALL_FUNCTION(&digits, "array_reverse", NULL, 273, &_1); zephir_check_call_status(); if (Z_TYPE_P(&digits) == IS_STRING) { ZEPHIR_INIT_VAR(&_3); diff --git a/ext/phalcon/filter/validation/validator/file/mimetype.zep.c b/ext/phalcon/filter/validation/validator/file/mimetype.zep.c index 7bea094a39..9cf9aae09b 100644 --- a/ext/phalcon/filter/validation/validator/file/mimetype.zep.c +++ b/ext/phalcon/filter/validation/validator/file/mimetype.zep.c @@ -297,7 +297,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File_MimeType, phpExtensionLoaded zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_memory_observe(&name_zv); ZVAL_STR_COPY(&name_zv, name); - ZEPHIR_RETURN_CALL_FUNCTION("extension_loaded", NULL, 474, &name_zv); + ZEPHIR_RETURN_CALL_FUNCTION("extension_loaded", NULL, 473, &name_zv); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/filter/validation/validator/stringlength/max.zep.c b/ext/phalcon/filter/validation/validator/stringlength/max.zep.c index 4b74e41d2e..081c30288e 100644 --- a/ext/phalcon/filter/validation/validator/stringlength/max.zep.c +++ b/ext/phalcon/filter/validation/validator/stringlength/max.zep.c @@ -273,7 +273,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_StringLength_Max, phpExtensionLoa zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_memory_observe(&name_zv); ZVAL_STR_COPY(&name_zv, name); - ZEPHIR_RETURN_CALL_FUNCTION("extension_loaded", NULL, 474, &name_zv); + ZEPHIR_RETURN_CALL_FUNCTION("extension_loaded", NULL, 473, &name_zv); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/filter/validation/validator/stringlength/min.zep.c b/ext/phalcon/filter/validation/validator/stringlength/min.zep.c index 81bb54596a..2f60514052 100644 --- a/ext/phalcon/filter/validation/validator/stringlength/min.zep.c +++ b/ext/phalcon/filter/validation/validator/stringlength/min.zep.c @@ -273,7 +273,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_StringLength_Min, phpExtensionLoa zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_memory_observe(&name_zv); ZVAL_STR_COPY(&name_zv, name); - ZEPHIR_RETURN_CALL_FUNCTION("extension_loaded", NULL, 474, &name_zv); + ZEPHIR_RETURN_CALL_FUNCTION("extension_loaded", NULL, 473, &name_zv); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/forms/loader/jsonloader.zep.c b/ext/phalcon/forms/loader/jsonloader.zep.c index 3d47d9c3e4..ba4056cf20 100644 --- a/ext/phalcon/forms/loader/jsonloader.zep.c +++ b/ext/phalcon/forms/loader/jsonloader.zep.c @@ -110,7 +110,7 @@ PHP_METHOD(Phalcon_Forms_Loader_JsonLoader, load) zephir_memory_observe(&json); zephir_read_property_cached(&json, this_ptr, _zephir_prop_0, 814, PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(&_0, "is_file", NULL, 472, &json); + ZEPHIR_CALL_FUNCTION(&_0, "is_file", NULL, 471, &json); zephir_check_call_status(); _1 = zephir_is_true(&_0); if (_1) { @@ -137,7 +137,7 @@ PHP_METHOD(Phalcon_Forms_Loader_JsonLoader, load) ZVAL_BOOL(&_6$$4, 1); ZVAL_LONG(&_7$$4, 512); ZVAL_LONG(&_8$$4, 4194304); - ZEPHIR_CALL_METHOD(&definitions, &_5$$4, "__invoke", NULL, 413, &json, &_6$$4, &_7$$4, &_8$$4); + ZEPHIR_CALL_METHOD(&definitions, &_5$$4, "__invoke", NULL, 412, &json, &_6$$4, &_7$$4, &_8$$4); zephir_check_call_status_or_jump(try_end_1); try_end_1: diff --git a/ext/phalcon/forms/loader/yamlloader.zep.c b/ext/phalcon/forms/loader/yamlloader.zep.c index 759c3569e6..c43ff1512e 100644 --- a/ext/phalcon/forms/loader/yamlloader.zep.c +++ b/ext/phalcon/forms/loader/yamlloader.zep.c @@ -115,7 +115,7 @@ PHP_METHOD(Phalcon_Forms_Loader_YamlLoader, load) } zephir_read_property_cached(&_3, this_ptr, _zephir_prop_0, 815, PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&source, &_3); - ZEPHIR_CALL_FUNCTION(&_4, "is_file", NULL, 472, &source); + ZEPHIR_CALL_FUNCTION(&_4, "is_file", NULL, 471, &source); zephir_check_call_status(); _5 = zephir_is_true(&_4); if (_5) { @@ -124,7 +124,7 @@ PHP_METHOD(Phalcon_Forms_Loader_YamlLoader, load) _5 = zephir_is_true(&_6); } if (_5) { - ZEPHIR_CALL_FUNCTION(&definitions, "yaml_parse_file", NULL, 475, &source); + ZEPHIR_CALL_FUNCTION(&definitions, "yaml_parse_file", NULL, 474, &source); zephir_check_call_status(); } else { ZEPHIR_CALL_FUNCTION(&definitions, "yaml_parse", NULL, 0, &source); @@ -172,7 +172,7 @@ PHP_METHOD(Phalcon_Forms_Loader_YamlLoader, phpExtensionLoaded) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_memory_observe(&name_zv); ZVAL_STR_COPY(&name_zv, name); - ZEPHIR_RETURN_CALL_FUNCTION("extension_loaded", NULL, 474, &name_zv); + ZEPHIR_RETURN_CALL_FUNCTION("extension_loaded", NULL, 473, &name_zv); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/http/request.zep.c b/ext/phalcon/http/request.zep.c index f7fafbdd36..77c3bbd380 100644 --- a/ext/phalcon/http/request.zep.c +++ b/ext/phalcon/http/request.zep.c @@ -511,7 +511,7 @@ PHP_METHOD(Phalcon_Http_Request, getClientAddress) ZVAL_STRING(&_6$$8, "trim"); ZEPHIR_CALL_FUNCTION(&forwardedIps, "array_map", NULL, 20, &_6$$8, &_5$$8); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&reverseForwardedIps, "array_reverse", NULL, 274, &forwardedIps); + ZEPHIR_CALL_FUNCTION(&reverseForwardedIps, "array_reverse", NULL, 273, &forwardedIps); zephir_check_call_status(); if (Z_TYPE_P(&reverseForwardedIps) == IS_STRING) { ZEPHIR_INIT_NVAR(&_6$$8); @@ -1261,7 +1261,7 @@ PHP_METHOD(Phalcon_Http_Request, getHeaders) ZVAL_STRING(&_10$$4, " "); zephir_fast_str_replace(&_6$$4, &_9$$4, &_10$$4, &_8$$4); zephir_fast_strtolower(&_5$$4, &_6$$4); - ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_11, 356, &_5$$4); + ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_11, 355, &_5$$4); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_12$$4); ZEPHIR_INIT_NVAR(&_13$$4); @@ -1285,7 +1285,7 @@ PHP_METHOD(Phalcon_Http_Request, getHeaders) ZVAL_STRING(&_19$$5, " "); zephir_fast_str_replace(&_17$$5, &_18$$5, &_19$$5, &name); zephir_fast_strtolower(&_16$$5, &_17$$5); - ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_11, 356, &_16$$5); + ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_11, 355, &_16$$5); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_20$$5); ZEPHIR_INIT_NVAR(&_21$$5); @@ -1329,7 +1329,7 @@ PHP_METHOD(Phalcon_Http_Request, getHeaders) ZVAL_STRING(&_30$$7, " "); zephir_fast_str_replace(&_26$$7, &_29$$7, &_30$$7, &_28$$7); zephir_fast_strtolower(&_25$$7, &_26$$7); - ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_11, 356, &_25$$7); + ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_11, 355, &_25$$7); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_31$$7); ZEPHIR_INIT_NVAR(&_32$$7); @@ -1353,7 +1353,7 @@ PHP_METHOD(Phalcon_Http_Request, getHeaders) ZVAL_STRING(&_38$$8, " "); zephir_fast_str_replace(&_36$$8, &_37$$8, &_38$$8, &name); zephir_fast_strtolower(&_35$$8, &_36$$8); - ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_11, 356, &_35$$8); + ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_11, 355, &_35$$8); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_39$$8); ZEPHIR_INIT_NVAR(&_40$$8); @@ -1585,7 +1585,7 @@ PHP_METHOD(Phalcon_Http_Request, getJsonRawBody) } else { ZVAL_BOOL(&_1, 0); } - ZEPHIR_RETURN_CALL_METHOD(&_0, "__invoke", NULL, 413, &rawBody, &_1); + ZEPHIR_RETURN_CALL_METHOD(&_0, "__invoke", NULL, 412, &rawBody, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -4556,7 +4556,7 @@ PHP_METHOD(Phalcon_Http_Request, isIpAddressInCIDR) maskBytes = (int) zephir_floor(&_6); remainingBits = zephir_safe_mod_long_long(maskLength, 8); ZVAL_LONG(&_9, maskBytes); - ZEPHIR_CALL_FUNCTION(&_10, "strncmp", NULL, 358, &ipBits, &subnetBits, &_9); + ZEPHIR_CALL_FUNCTION(&_10, "strncmp", NULL, 357, &ipBits, &subnetBits, &_9); zephir_check_call_status(); if (!ZEPHIR_IS_LONG_IDENTICAL(&_10, 0)) { RETURN_MM_BOOL(0); @@ -5304,7 +5304,7 @@ PHP_METHOD(Phalcon_Http_Request, getFormData) ZEPHIR_CALL_FUNCTION(&bodyParts, "preg_split", NULL, 193, &_7, &_8); zephir_check_call_status(); ZEPHIR_MAKE_REF(&bodyParts); - ZEPHIR_CALL_FUNCTION(NULL, "array_pop", NULL, 353, &bodyParts); + ZEPHIR_CALL_FUNCTION(NULL, "array_pop", NULL, 352, &bodyParts); ZEPHIR_UNREF(&bodyParts); zephir_check_call_status(); ZEPHIR_INIT_VAR(&dataset); diff --git a/ext/phalcon/http/request/bag/abstractbag.zep.c b/ext/phalcon/http/request/bag/abstractbag.zep.c index 6d1bda46ad..42ec252417 100644 --- a/ext/phalcon/http/request/bag/abstractbag.zep.c +++ b/ext/phalcon/http/request/bag/abstractbag.zep.c @@ -603,7 +603,7 @@ PHP_METHOD(Phalcon_Http_Request_Bag_AbstractBag, offsetSet) if (Z_TYPE_P(offset) == IS_NULL) { ZEPHIR_INIT_VAR(&_0$$3); object_init_ex(&_0$$3, phalcon_http_request_exceptions_nullkeyexception_ce); - ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 259); + ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 258); zephir_check_call_status(); zephir_throw_exception_debug(&_0$$3, "phalcon/Http/Request/Bag/AbstractBag.zep", 252); ZEPHIR_MM_RESTORE(); diff --git a/ext/phalcon/http/response.zep.c b/ext/phalcon/http/response.zep.c index 1e55dbe6bf..68886e1571 100644 --- a/ext/phalcon/http/response.zep.c +++ b/ext/phalcon/http/response.zep.c @@ -1847,7 +1847,7 @@ PHP_METHOD(Phalcon_Http_Response, phpExtensionLoaded) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_memory_observe(&name_zv); ZVAL_STR_COPY(&name_zv, name); - ZEPHIR_RETURN_CALL_FUNCTION("extension_loaded", NULL, 474, &name_zv); + ZEPHIR_RETURN_CALL_FUNCTION("extension_loaded", NULL, 473, &name_zv); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/image/adapter/gd.zep.c b/ext/phalcon/image/adapter/gd.zep.c index b8bf419905..4b61b91095 100644 --- a/ext/phalcon/image/adapter/gd.zep.c +++ b/ext/phalcon/image/adapter/gd.zep.c @@ -2481,7 +2481,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, phpExtensionLoaded) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_memory_observe(&name_zv); ZVAL_STR_COPY(&name_zv, name); - ZEPHIR_RETURN_CALL_FUNCTION("extension_loaded", NULL, 474, &name_zv); + ZEPHIR_RETURN_CALL_FUNCTION("extension_loaded", NULL, 473, &name_zv); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/logger/abstractlogger.zep.c b/ext/phalcon/logger/abstractlogger.zep.c index 53ab05d3a7..4fcbb0508b 100644 --- a/ext/phalcon/logger/abstractlogger.zep.c +++ b/ext/phalcon/logger/abstractlogger.zep.c @@ -239,7 +239,7 @@ PHP_METHOD(Phalcon_Logger_AbstractLogger, __construct) ZEPHIR_SEPARATE_PARAM(clock); } if (Z_TYPE_P(timezone) == IS_NULL) { - ZEPHIR_CALL_FUNCTION(&defaultTimezone, "date_default_timezone_get", NULL, 260); + ZEPHIR_CALL_FUNCTION(&defaultTimezone, "date_default_timezone_get", NULL, 259); zephir_check_call_status(); if (UNEXPECTED(1 == ZEPHIR_IS_EMPTY(&defaultTimezone))) { ZEPHIR_INIT_NVAR(&defaultTimezone); @@ -255,7 +255,7 @@ PHP_METHOD(Phalcon_Logger_AbstractLogger, __construct) if (Z_TYPE_P(clock) == IS_NULL) { ZEPHIR_INIT_NVAR(clock); object_init_ex(clock, phalcon_time_clock_systemclock_ce); - ZEPHIR_CALL_METHOD(NULL, clock, "__construct", NULL, 261, timezone); + ZEPHIR_CALL_METHOD(NULL, clock, "__construct", NULL, 260, timezone); zephir_check_call_status(); } zephir_update_property_zval_cached(this_ptr, _zephir_prop_2, 283, clock); @@ -315,7 +315,7 @@ PHP_METHOD(Phalcon_Logger_AbstractLogger, begin) zephir_read_property_cached(&_0, this_ptr, _zephir_prop_0, 284, PH_NOISY_CC | PH_READONLY); zephir_read_property_cached(&_1, this_ptr, _zephir_prop_1, 285, PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&collection, "array_diff_key", NULL, 262, &_0, &_1); + ZEPHIR_CALL_FUNCTION(&collection, "array_diff_key", NULL, 261, &_0, &_1); zephir_check_call_status(); if (Z_TYPE_P(&collection) == IS_STRING) { ZEPHIR_INIT_VAR(&_3); @@ -389,7 +389,7 @@ PHP_METHOD(Phalcon_Logger_AbstractLogger, commit) zephir_read_property_cached(&_0, this_ptr, _zephir_prop_0, 284, PH_NOISY_CC | PH_READONLY); zephir_read_property_cached(&_1, this_ptr, _zephir_prop_1, 285, PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&collection, "array_diff_key", NULL, 262, &_0, &_1); + ZEPHIR_CALL_FUNCTION(&collection, "array_diff_key", NULL, 261, &_0, &_1); zephir_check_call_status(); if (Z_TYPE_P(&collection) == IS_STRING) { ZEPHIR_INIT_VAR(&_3); @@ -543,7 +543,7 @@ PHP_METHOD(Phalcon_Logger_AbstractLogger, getAdapter) if (1 != zephir_array_isset_value(&_0, &name_zv)) { ZEPHIR_INIT_VAR(&_1$$3); object_init_ex(&_1$$3, phalcon_logger_exceptions_adapternotfound_ce); - ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 263, &name_zv); + ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 262, &name_zv); zephir_check_call_status(); zephir_throw_exception_debug(&_1$$3, "phalcon/Logger/AbstractLogger.zep", 228); ZEPHIR_MM_RESTORE(); @@ -618,7 +618,7 @@ PHP_METHOD(Phalcon_Logger_AbstractLogger, removeAdapter) if (1 != zephir_array_isset_value(&_0, &name_zv)) { ZEPHIR_INIT_VAR(&_1$$3); object_init_ex(&_1$$3, phalcon_logger_exceptions_adapternotfound_ce); - ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 263, &name_zv); + ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 262, &name_zv); zephir_check_call_status(); zephir_throw_exception_debug(&_1$$3, "phalcon/Logger/AbstractLogger.zep", 270); ZEPHIR_MM_RESTORE(); @@ -658,7 +658,7 @@ PHP_METHOD(Phalcon_Logger_AbstractLogger, rollback) zephir_read_property_cached(&_0, this_ptr, _zephir_prop_0, 284, PH_NOISY_CC | PH_READONLY); zephir_read_property_cached(&_1, this_ptr, _zephir_prop_1, 285, PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&collection, "array_diff_key", NULL, 262, &_0, &_1); + ZEPHIR_CALL_FUNCTION(&collection, "array_diff_key", NULL, 261, &_0, &_1); zephir_check_call_status(); if (Z_TYPE_P(&collection) == IS_STRING) { ZEPHIR_INIT_VAR(&_3); @@ -852,7 +852,7 @@ PHP_METHOD(Phalcon_Logger_AbstractLogger, addMessage) if (ZEPHIR_IS_EMPTY(&_1$$3)) { ZEPHIR_INIT_VAR(&_2$$4); object_init_ex(&_2$$4, phalcon_logger_exceptions_noadaptersconfigured_ce); - ZEPHIR_CALL_METHOD(NULL, &_2$$4, "__construct", NULL, 264); + ZEPHIR_CALL_METHOD(NULL, &_2$$4, "__construct", NULL, 263); zephir_check_call_status(); zephir_throw_exception_debug(&_2$$4, "phalcon/Logger/AbstractLogger.zep", 338); ZEPHIR_MM_RESTORE(); @@ -873,11 +873,11 @@ PHP_METHOD(Phalcon_Logger_AbstractLogger, addMessage) ZEPHIR_CALL_METHOD(&_4$$3, &_3$$3, "now", NULL, 0); zephir_check_call_status(); ZVAL_LONG(&_5$$3, level); - ZEPHIR_CALL_METHOD(NULL, &item, "__construct", NULL, 265, &message_zv, &levelName, &_5$$3, &_4$$3, &context); + ZEPHIR_CALL_METHOD(NULL, &item, "__construct", NULL, 264, &message_zv, &levelName, &_5$$3, &_4$$3, &context); zephir_check_call_status(); zephir_read_property_cached(&_5$$3, this_ptr, _zephir_prop_1, 284, PH_NOISY_CC | PH_READONLY); zephir_read_property_cached(&_6$$3, this_ptr, _zephir_prop_3, 285, PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&collection, "array_diff_key", NULL, 262, &_5$$3, &_6$$3); + ZEPHIR_CALL_FUNCTION(&collection, "array_diff_key", NULL, 261, &_5$$3, &_6$$3); zephir_check_call_status(); if (Z_TYPE_P(&collection) == IS_STRING) { ZEPHIR_INIT_VAR(&_8$$3); @@ -965,7 +965,7 @@ PHP_METHOD(Phalcon_Logger_AbstractLogger, getLevelNumber) zephir_fast_strtolower(&levelName, level); ZEPHIR_CALL_METHOD(&_0$$3, this_ptr, "getlevels", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&levels, "array_flip", NULL, 266, &_0$$3); + ZEPHIR_CALL_FUNCTION(&levels, "array_flip", NULL, 265, &_0$$3); zephir_check_call_status(); if (zephir_array_isset_value(&levels, &levelName)) { zephir_memory_observe(&_1$$4); diff --git a/ext/phalcon/mvc/model.zep.c b/ext/phalcon/mvc/model.zep.c index ffc357e14b..52d64116d2 100644 --- a/ext/phalcon/mvc/model.zep.c +++ b/ext/phalcon/mvc/model.zep.c @@ -4863,7 +4863,7 @@ PHP_METHOD(Phalcon_Mvc_Model, dump) ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); - ZEPHIR_RETURN_CALL_FUNCTION("get_object_vars", NULL, 360, this_ptr); + ZEPHIR_RETURN_CALL_FUNCTION("get_object_vars", NULL, 359, this_ptr); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/mvc/model/eager/loader.zep.c b/ext/phalcon/mvc/model/eager/loader.zep.c index 056f1cf415..66ae4e21e0 100644 --- a/ext/phalcon/mvc/model/eager/loader.zep.c +++ b/ext/phalcon/mvc/model/eager/loader.zep.c @@ -950,7 +950,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Eager_Loader, buildThroughNode) ZEPHIR_INIT_VAR(&_12$$3); zephir_create_array(&_12$$3, 1, 0); ZVAL_LONG(&_13$$3, 0); - ZEPHIR_CALL_FUNCTION(&_7$$3, "array_column", NULL, 344, &keys, &_13$$3); + ZEPHIR_CALL_FUNCTION(&_7$$3, "array_column", NULL, 343, &keys, &_13$$3); zephir_check_call_status(); zephir_array_update_string(&_12$$3, SL("phEagerKeys"), &_7$$3, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_10$$3, SL("bind"), &_12$$3, PH_COPY | PH_SEPARATE); @@ -1526,7 +1526,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Eager_Loader, fetchReferenced) ZEPHIR_INIT_VAR(&_5$$4); zephir_create_array(&_5$$4, 1, 0); ZVAL_LONG(&_6$$4, 0); - ZEPHIR_CALL_FUNCTION(&_7$$4, "array_column", NULL, 344, &keys, &_6$$4); + ZEPHIR_CALL_FUNCTION(&_7$$4, "array_column", NULL, 343, &keys, &_6$$4); zephir_check_call_status(); zephir_array_update_string(&_5$$4, SL("phEagerKeys"), &_7$$4, PH_COPY | PH_SEPARATE); zephir_array_update_string(&findParams, SL("bind"), &_5$$4, PH_COPY | PH_SEPARATE); diff --git a/ext/phalcon/mvc/model/hydration/getprivateproperties.zep.c b/ext/phalcon/mvc/model/hydration/getprivateproperties.zep.c index ff880c8002..e0b5ec41d4 100644 --- a/ext/phalcon/mvc/model/hydration/getprivateproperties.zep.c +++ b/ext/phalcon/mvc/model/hydration/getprivateproperties.zep.c @@ -103,7 +103,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Hydration_GetPrivateProperties, getPrivatePropertie break; } ZVAL_LONG(&_0$$4, 4); - ZEPHIR_CALL_METHOD(&reflectionProperties, &reflection, "getproperties", &_1, 371, &_0$$4); + ZEPHIR_CALL_METHOD(&reflectionProperties, &reflection, "getproperties", &_1, 370, &_0$$4); zephir_check_call_status(); if (Z_TYPE_P(&reflectionProperties) == IS_STRING) { ZEPHIR_INIT_NVAR(&_3$$4); diff --git a/ext/phalcon/mvc/model/manager.zep.c b/ext/phalcon/mvc/model/manager.zep.c index fc0570c10a..75e628a965 100644 --- a/ext/phalcon/mvc/model/manager.zep.c +++ b/ext/phalcon/mvc/model/manager.zep.c @@ -4018,7 +4018,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, isVisibleModelProperty) ZEPHIR_CALL_METHOD(NULL, &classReflection, "__construct", NULL, 252, &className); zephir_check_call_status(); ZVAL_LONG(&_1$$3, 1); - ZEPHIR_CALL_METHOD(&reflectionProperties, &classReflection, "getproperties", NULL, 371, &_1$$3); + ZEPHIR_CALL_METHOD(&reflectionProperties, &classReflection, "getproperties", NULL, 370, &_1$$3); zephir_check_call_status(); if (Z_TYPE_P(&reflectionProperties) == IS_STRING) { ZEPHIR_INIT_VAR(&_3$$3); diff --git a/ext/phalcon/mvc/model/metadata/stream.zep.c b/ext/phalcon/mvc/model/metadata/stream.zep.c index e2cb509385..b051acd9e0 100644 --- a/ext/phalcon/mvc/model/metadata/stream.zep.c +++ b/ext/phalcon/mvc/model/metadata/stream.zep.c @@ -203,7 +203,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData_Stream, write) ZEPHIR_CALL_METHOD(&path, this_ptr, "getfilepath", NULL, 0, key); zephir_check_call_status_or_jump(try_end_1); - ZEPHIR_CALL_FUNCTION(&_1$$3, "getmypid", NULL, 269); + ZEPHIR_CALL_FUNCTION(&_1$$3, "getmypid", NULL, 268); zephir_check_call_status_or_jump(try_end_1); zephir_cast_to_string(&_2$$3, &_1$$3); ZEPHIR_INIT_VAR(&tmpPath); @@ -219,7 +219,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData_Stream, write) ZEPHIR_CALL_METHOD(NULL, this_ptr, "throwwriteexception", NULL, 0, &option); zephir_check_call_status_or_jump(try_end_1); } else { - ZEPHIR_CALL_FUNCTION(&_6$$3, "rename", NULL, 270, &tmpPath, &path); + ZEPHIR_CALL_FUNCTION(&_6$$3, "rename", NULL, 269, &tmpPath, &path); zephir_check_call_status_or_jump(try_end_1); if (!(zephir_is_true(&_6$$3))) { ZEPHIR_CALL_METHOD(NULL, this_ptr, "phpunlink", NULL, 0, &tmpPath); @@ -282,7 +282,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData_Stream, getFilePath) ZEPHIR_INIT_VAR(&name); zephir_prepare_virtual_path(&name, &key_zv, &_0); if (zephir_memnstr_str(&key_zv, SL("_"), "phalcon/Mvc/Model/MetaData/Stream.zep", 130)) { - ZEPHIR_CALL_FUNCTION(&_1$$3, "sha1", NULL, 302, &key_zv); + ZEPHIR_CALL_FUNCTION(&_1$$3, "sha1", NULL, 301, &key_zv); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_2$$3); ZEPHIR_CONCAT_VSV(&_2$$3, &name, "_", &_1$$3); diff --git a/ext/phalcon/mvc/model/query.zep.c b/ext/phalcon/mvc/model/query.zep.c index fe6e341655..4f32a4bd52 100644 --- a/ext/phalcon/mvc/model/query.zep.c +++ b/ext/phalcon/mvc/model/query.zep.c @@ -3465,7 +3465,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate) if (zephir_is_true(&_18$$12)) { ZEPHIR_OBS_NVAR(&_20$$13); zephir_array_fetch_long(&_20$$13, &namedParams, 1, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1663); - ZEPHIR_CALL_FUNCTION(¶mKeys, "array_unique", &_21, 445, &_20$$13); + ZEPHIR_CALL_FUNCTION(¶mKeys, "array_unique", &_21, 444, &_20$$13); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_22$$13); ZEPHIR_INIT_NVAR(&_22$$13); @@ -3676,7 +3676,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate) if (zephir_is_true(&_69$$29)) { ZEPHIR_OBS_NVAR(&_71$$30); zephir_array_fetch_long(&_71$$30, &namedParams, 1, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1663); - ZEPHIR_CALL_FUNCTION(¶mKeys, "array_unique", &_21, 445, &_71$$30); + ZEPHIR_CALL_FUNCTION(¶mKeys, "array_unique", &_21, 444, &_71$$30); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_72$$30); ZEPHIR_INIT_NVAR(&_72$$30); diff --git a/ext/phalcon/mvc/model/row.zep.c b/ext/phalcon/mvc/model/row.zep.c index 04f732ad31..c09d464e8e 100644 --- a/ext/phalcon/mvc/model/row.zep.c +++ b/ext/phalcon/mvc/model/row.zep.c @@ -257,7 +257,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Row, toArray) ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); - ZEPHIR_RETURN_CALL_FUNCTION("get_object_vars", NULL, 360, this_ptr); + ZEPHIR_RETURN_CALL_FUNCTION("get_object_vars", NULL, 359, this_ptr); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/mvc/router.zep.c b/ext/phalcon/mvc/router.zep.c index bfb00e5215..e537c3ef9b 100644 --- a/ext/phalcon/mvc/router.zep.c +++ b/ext/phalcon/mvc/router.zep.c @@ -465,7 +465,7 @@ PHP_METHOD(Phalcon_Mvc_Router, __construct) add_assoc_long_ex(&_1$$3, SL("controller"), 1); ZEPHIR_INIT_VAR(&_2$$3); ZVAL_STRING(&_2$$3, "#^/([\\w0-9\\_\\-]+)[/]{0,1}$#u"); - ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 267, &_2$$3, &_1$$3); + ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 266, &_2$$3, &_1$$3); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, this_ptr, "attach", NULL, 0, &_0$$3); zephir_check_call_status(); @@ -478,7 +478,7 @@ PHP_METHOD(Phalcon_Mvc_Router, __construct) add_assoc_long_ex(&_3$$3, SL("params"), 3); ZEPHIR_INIT_VAR(&_4$$3); ZVAL_STRING(&_4$$3, "#^/([\\w0-9\\_\\-]+)/([\\w0-9\\.\\_]+)(/.*)?$#u"); - ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 267, &_4$$3, &_3$$3); + ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 266, &_4$$3, &_3$$3); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, this_ptr, "attach", NULL, 0, &_2$$3); zephir_check_call_status(); @@ -569,7 +569,7 @@ PHP_METHOD(Phalcon_Mvc_Router, add) } ZEPHIR_INIT_VAR(&route); object_init_ex(&route, phalcon_mvc_router_route_ce); - ZEPHIR_CALL_METHOD(NULL, &route, "__construct", NULL, 267, &pattern_zv, paths, httpMethods); + ZEPHIR_CALL_METHOD(NULL, &route, "__construct", NULL, 266, &pattern_zv, paths, httpMethods); zephir_check_call_status(); ZVAL_LONG(&_0, position); ZEPHIR_CALL_METHOD(NULL, this_ptr, "attach", NULL, 0, &route, &_0); @@ -1258,7 +1258,7 @@ PHP_METHOD(Phalcon_Mvc_Router, attach) zephir_switch_0_clause_2: ; ZEPHIR_INIT_VAR(&_3$$5); object_init_ex(&_3$$5, phalcon_mvc_router_exceptions_invalidrouteposition_ce); - ZEPHIR_CALL_METHOD(NULL, &_3$$5, "__construct", NULL, 268); + ZEPHIR_CALL_METHOD(NULL, &_3$$5, "__construct", NULL, 267); zephir_check_call_status(); zephir_throw_exception_debug(&_3$$5, "phalcon/Mvc/Router.zep", 649); ZEPHIR_MM_RESTORE(); @@ -2553,7 +2553,7 @@ PHP_METHOD(Phalcon_Mvc_Router, dumpDispatcher) zephir_var_export_ex(&_0, &dump); ZEPHIR_INIT_VAR(&php); ZEPHIR_CONCAT_SVS(&php, " limit) { ZEPHIR_MAKE_REF(&items); - ZEPHIR_CALL_FUNCTION(NULL, "array_pop", NULL, 353, &items); + ZEPHIR_CALL_FUNCTION(NULL, "array_pop", NULL, 352, &items); ZEPHIR_UNREF(&items); zephir_check_call_status(); zephir_memory_observe(&lastItem); diff --git a/ext/phalcon/queue/adapter/beanstalk/beanstalkconnection.zep.c b/ext/phalcon/queue/adapter/beanstalk/beanstalkconnection.zep.c index ddd0ab800b..4422f89d89 100644 --- a/ext/phalcon/queue/adapter/beanstalk/beanstalkconnection.zep.c +++ b/ext/phalcon/queue/adapter/beanstalk/beanstalkconnection.zep.c @@ -267,7 +267,7 @@ PHP_METHOD(Phalcon_Queue_Adapter_Beanstalk_BeanstalkConnection, connect) zephir_check_call_status(); } ZVAL_LONG(&_0, 0); - ZEPHIR_CALL_FUNCTION(&errorLevel, "error_reporting", NULL, 308, &_0); + ZEPHIR_CALL_FUNCTION(&errorLevel, "error_reporting", NULL, 307, &_0); zephir_check_call_status(); zephir_read_property_cached(&_0, this_ptr, _zephir_prop_1, 1263, PH_NOISY_CC | PH_READONLY); if (zephir_is_true(&_0)) { @@ -293,7 +293,7 @@ PHP_METHOD(Phalcon_Queue_Adapter_Beanstalk_BeanstalkConnection, connect) ZEPHIR_UNREF(&_8$$5); zephir_check_call_status(); } - ZEPHIR_CALL_FUNCTION(NULL, "error_reporting", NULL, 308, &errorLevel); + ZEPHIR_CALL_FUNCTION(NULL, "error_reporting", NULL, 307, &errorLevel); zephir_check_call_status(); if (Z_TYPE_P(&connection) != IS_RESOURCE) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_queue_exceptions_exception_ce, "Can't connect to the Beanstalk server", "phalcon/Queue/Adapter/Beanstalk/BeanstalkConnection.zep", 111); diff --git a/ext/phalcon/queue/adapter/stream/streamcontext.zep.c b/ext/phalcon/queue/adapter/stream/streamcontext.zep.c index c7bea80435..9c50e0ec6d 100644 --- a/ext/phalcon/queue/adapter/stream/streamcontext.zep.c +++ b/ext/phalcon/queue/adapter/stream/streamcontext.zep.c @@ -300,7 +300,7 @@ PHP_METHOD(Phalcon_Queue_Adapter_Stream_StreamContext, popMessage) RETURN_MM_NULL(); } ZVAL_LONG(&_2, 2); - ZEPHIR_CALL_FUNCTION(&_3, "flock", NULL, 305, &pointer, &_2); + ZEPHIR_CALL_FUNCTION(&_3, "flock", NULL, 304, &pointer, &_2); zephir_check_call_status(); if (!(zephir_is_true(&_3))) { ZEPHIR_CALL_METHOD(NULL, this_ptr, "phpfclose", NULL, 0, &pointer); @@ -317,7 +317,7 @@ PHP_METHOD(Phalcon_Queue_Adapter_Stream_StreamContext, popMessage) zephir_check_call_status(); if (ZEPHIR_IS_EMPTY(&lines)) { ZVAL_LONG(&_5$$6, 3); - ZEPHIR_CALL_FUNCTION(NULL, "flock", NULL, 305, &pointer, &_5$$6); + ZEPHIR_CALL_FUNCTION(NULL, "flock", NULL, 304, &pointer, &_5$$6); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, this_ptr, "phpfclose", NULL, 0, &pointer); zephir_check_call_status(); @@ -347,7 +347,7 @@ PHP_METHOD(Phalcon_Queue_Adapter_Stream_StreamContext, popMessage) ZEPHIR_CALL_METHOD(NULL, this_ptr, "phpfwrite", NULL, 0, &pointer, &remaining); zephir_check_call_status(); ZVAL_LONG(&_2, 3); - ZEPHIR_CALL_FUNCTION(NULL, "flock", NULL, 305, &pointer, &_2); + ZEPHIR_CALL_FUNCTION(NULL, "flock", NULL, 304, &pointer, &_2); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, this_ptr, "phpfclose", NULL, 0, &pointer); zephir_check_call_status(); @@ -472,16 +472,16 @@ PHP_METHOD(Phalcon_Queue_Adapter_Stream_StreamContext, ensureDir) zephir_check_call_status(); if (!(zephir_is_true(&_0))) { ZVAL_LONG(&_2$$3, 0); - ZEPHIR_CALL_FUNCTION(&errorLevel, "error_reporting", NULL, 308, &_2$$3); + ZEPHIR_CALL_FUNCTION(&errorLevel, "error_reporting", NULL, 307, &_2$$3); zephir_check_call_status(); zephir_read_property_cached(&_2$$3, this_ptr, _zephir_prop_0, 1304, PH_NOISY_CC | PH_READONLY); ZVAL_LONG(&_3$$3, 0777); ZVAL_BOOL(&_4$$3, 1); ZEPHIR_CALL_METHOD(NULL, this_ptr, "phpmkdir", NULL, 0, &_2$$3, &_3$$3, &_4$$3); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "error_clear_last", NULL, 309); + ZEPHIR_CALL_FUNCTION(NULL, "error_clear_last", NULL, 308); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "error_reporting", NULL, 308, &errorLevel); + ZEPHIR_CALL_FUNCTION(NULL, "error_reporting", NULL, 307, &errorLevel); zephir_check_call_status(); } ZEPHIR_MM_RESTORE(); diff --git a/ext/phalcon/queue/consumer/worker.zep.c b/ext/phalcon/queue/consumer/worker.zep.c index daf215da49..f7851efcfc 100644 --- a/ext/phalcon/queue/consumer/worker.zep.c +++ b/ext/phalcon/queue/consumer/worker.zep.c @@ -343,7 +343,7 @@ PHP_METHOD(Phalcon_Queue_Consumer_Worker, phpExtensionLoaded) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_memory_observe(&name_zv); ZVAL_STR_COPY(&name_zv, name); - ZEPHIR_RETURN_CALL_FUNCTION("extension_loaded", NULL, 474, &name_zv); + ZEPHIR_RETURN_CALL_FUNCTION("extension_loaded", NULL, 473, &name_zv); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/session/adapter/redis.zep.c b/ext/phalcon/session/adapter/redis.zep.c index 5361caf773..e4045dcf99 100644 --- a/ext/phalcon/session/adapter/redis.zep.c +++ b/ext/phalcon/session/adapter/redis.zep.c @@ -432,9 +432,9 @@ PHP_METHOD(Phalcon_Session_Adapter_Redis, acquireLock) ZEPHIR_CALL_METHOD(&client, &_4, "getadapter", NULL, 0); zephir_check_call_status(); ZVAL_LONG(&_5, 16); - ZEPHIR_CALL_FUNCTION(&_6, "random_bytes", NULL, 330, &_5); + ZEPHIR_CALL_FUNCTION(&_6, "random_bytes", NULL, 329, &_5); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&token, "bin2hex", NULL, 331, &_6); + ZEPHIR_CALL_FUNCTION(&token, "bin2hex", NULL, 330, &_6); zephir_check_call_status(); attempt = 0; while (1) { diff --git a/ext/phalcon/session/adapter/stream.zep.c b/ext/phalcon/session/adapter/stream.zep.c index 005644360e..6542e95783 100644 --- a/ext/phalcon/session/adapter/stream.zep.c +++ b/ext/phalcon/session/adapter/stream.zep.c @@ -224,7 +224,7 @@ PHP_METHOD(Phalcon_Session_Adapter_Stream, destroy) zephir_check_call_status(); _3 = zephir_is_true(&_2); if (_3) { - ZEPHIR_CALL_FUNCTION(&_4, "is_file", NULL, 472, &file); + ZEPHIR_CALL_FUNCTION(&_4, "is_file", NULL, 471, &file); zephir_check_call_status(); _3 = zephir_is_true(&_4); } @@ -332,7 +332,7 @@ PHP_METHOD(Phalcon_Session_Adapter_Stream, gc) zephir_check_call_status(); _10$$7 = ZEPHIR_IS_TRUE_IDENTICAL(&_8$$7); if (_10$$7) { - ZEPHIR_CALL_FUNCTION(&_11$$7, "is_file", &_12, 472, &file); + ZEPHIR_CALL_FUNCTION(&_11$$7, "is_file", &_12, 471, &file); zephir_check_call_status(); _10$$7 = ZEPHIR_IS_TRUE_IDENTICAL(&_11$$7); } @@ -369,7 +369,7 @@ PHP_METHOD(Phalcon_Session_Adapter_Stream, gc) zephir_check_call_status(); _19$$9 = ZEPHIR_IS_TRUE_IDENTICAL(&_18$$9); if (_19$$9) { - ZEPHIR_CALL_FUNCTION(&_20$$9, "is_file", &_12, 472, &file); + ZEPHIR_CALL_FUNCTION(&_20$$9, "is_file", &_12, 471, &file); zephir_check_call_status(); _19$$9 = ZEPHIR_IS_TRUE_IDENTICAL(&_20$$9); } @@ -457,7 +457,7 @@ PHP_METHOD(Phalcon_Session_Adapter_Stream, read) ZEPHIR_CALL_METHOD(&pointer, this_ptr, "phpfopen", NULL, 0, &name, &_3$$3); zephir_check_call_status(); ZVAL_LONG(&_4$$3, 1); - ZEPHIR_CALL_FUNCTION(&_5$$3, "flock", NULL, 305, &pointer, &_4$$3); + ZEPHIR_CALL_FUNCTION(&_5$$3, "flock", NULL, 304, &pointer, &_4$$3); zephir_check_call_status(); if (zephir_is_true(&_5$$3)) { ZEPHIR_CALL_METHOD(&data, this_ptr, "phpfilegetcontents", NULL, 0, &name); @@ -619,13 +619,13 @@ PHP_METHOD(Phalcon_Session_Adapter_Stream, getGlobFiles) zephir_memory_observe(&pattern_zv); ZVAL_STR_COPY(&pattern_zv, pattern); ZVAL_LONG(&_0, 0); - ZEPHIR_CALL_FUNCTION(&errorLevel, "error_reporting", NULL, 308, &_0); + ZEPHIR_CALL_FUNCTION(&errorLevel, "error_reporting", NULL, 307, &_0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "error_clear_last", NULL, 309); + ZEPHIR_CALL_FUNCTION(NULL, "error_clear_last", NULL, 308); zephir_check_call_status(); ZEPHIR_CALL_FUNCTION(&glob, "glob", NULL, 0, &pattern_zv); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "error_reporting", NULL, 308, &errorLevel); + ZEPHIR_CALL_FUNCTION(NULL, "error_reporting", NULL, 307, &errorLevel); zephir_check_call_status(); RETURN_CCTOR(&glob); } @@ -1346,7 +1346,7 @@ PHP_METHOD(Phalcon_Session_Adapter_Stream, phpIniGet) zephir_memory_observe(&defaultValue_zv); ZVAL_STR_COPY(&defaultValue_zv, defaultValue); } - ZEPHIR_CALL_FUNCTION(&value, "ini_get", NULL, 470, &input_zv); + ZEPHIR_CALL_FUNCTION(&value, "ini_get", NULL, 469, &input_zv); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&value)) { RETURN_MM_STR(zend_string_copy(defaultValue)); @@ -1393,7 +1393,7 @@ PHP_METHOD(Phalcon_Session_Adapter_Stream, phpIniGetBool) } else { } result = 0; - ZEPHIR_CALL_FUNCTION(&value, "ini_get", NULL, 470, &input_zv); + ZEPHIR_CALL_FUNCTION(&value, "ini_get", NULL, 469, &input_zv); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&value)) { RETURN_MM_BOOL(defaultValue); @@ -1453,7 +1453,7 @@ PHP_METHOD(Phalcon_Session_Adapter_Stream, phpIniGetInt) defaultValue = 0; } else { } - ZEPHIR_CALL_FUNCTION(&value, "ini_get", NULL, 470, &input_zv); + ZEPHIR_CALL_FUNCTION(&value, "ini_get", NULL, 469, &input_zv); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&value)) { RETURN_MM_LONG(defaultValue); @@ -1509,7 +1509,7 @@ PHP_METHOD(Phalcon_Session_Adapter_Stream, phpParseIniFile) } ZVAL_BOOL(&_0, (processSections ? 1 : 0)); ZVAL_LONG(&_1, scannerMode); - ZEPHIR_RETURN_CALL_FUNCTION("parse_ini_file", NULL, 471, &filename_zv, &_0, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("parse_ini_file", NULL, 470, &filename_zv, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/storage/adapter/apcu.zep.c b/ext/phalcon/storage/adapter/apcu.zep.c index 9bbd9b6eee..2377cd5c6b 100644 --- a/ext/phalcon/storage/adapter/apcu.zep.c +++ b/ext/phalcon/storage/adapter/apcu.zep.c @@ -620,7 +620,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Apcu, phpApcuDec) } else { } ZVAL_LONG(&_0, step); - ZEPHIR_RETURN_CALL_FUNCTION("apcu_dec", NULL, 284, key, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("apcu_dec", NULL, 283, key, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -645,7 +645,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Apcu, phpApcuDelete) ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &key); - ZEPHIR_RETURN_CALL_FUNCTION("apcu_delete", NULL, 285, key); + ZEPHIR_RETURN_CALL_FUNCTION("apcu_delete", NULL, 284, key); zephir_check_call_status(); RETURN_MM(); } @@ -670,7 +670,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Apcu, phpApcuExists) ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &key); - ZEPHIR_RETURN_CALL_FUNCTION("apcu_exists", NULL, 286, key); + ZEPHIR_RETURN_CALL_FUNCTION("apcu_exists", NULL, 285, key); zephir_check_call_status(); RETURN_MM(); } @@ -695,7 +695,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Apcu, phpApcuFetch) ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &key); - ZEPHIR_RETURN_CALL_FUNCTION("apcu_fetch", NULL, 287, key); + ZEPHIR_RETURN_CALL_FUNCTION("apcu_fetch", NULL, 286, key); zephir_check_call_status(); RETURN_MM(); } @@ -729,7 +729,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Apcu, phpApcuInc) } else { } ZVAL_LONG(&_0, step); - ZEPHIR_RETURN_CALL_FUNCTION("apcu_inc", NULL, 288, key, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("apcu_inc", NULL, 287, key, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -794,7 +794,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Apcu, phpApcuStore) } else { } ZVAL_LONG(&_0, ttl); - ZEPHIR_RETURN_CALL_FUNCTION("apcu_store", NULL, 289, key, payload, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("apcu_store", NULL, 288, key, payload, &_0); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/storage/adapter/libmemcached.zep.c b/ext/phalcon/storage/adapter/libmemcached.zep.c index ba0174b04c..6c788c919a 100644 --- a/ext/phalcon/storage/adapter/libmemcached.zep.c +++ b/ext/phalcon/storage/adapter/libmemcached.zep.c @@ -242,17 +242,17 @@ PHP_METHOD(Phalcon_Storage_Adapter_Libmemcached, getAdapter) add_index_long(&failover, 21, 2); zephir_array_update_long(&failover, 35, &__$true, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY); add_index_long(&failover, 15, 1); - ZEPHIR_CALL_FUNCTION(&_9$$4, "array_replace", NULL, 290, &failover, &client); + ZEPHIR_CALL_FUNCTION(&_9$$4, "array_replace", NULL, 289, &failover, &client); zephir_check_call_status(); ZEPHIR_CPY_WRT(&client, &_9$$4); - ZEPHIR_CALL_METHOD(&_9$$4, this_ptr, "setoptions", NULL, 291, &connection, &client); + ZEPHIR_CALL_METHOD(&_9$$4, this_ptr, "setoptions", NULL, 290, &connection, &client); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_10$$4, &_9$$4, "setservers", NULL, 292, &connection, &servers); + ZEPHIR_CALL_METHOD(&_10$$4, &_9$$4, "setservers", NULL, 291, &connection, &servers); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &_10$$4, "setsasl", NULL, 293, &connection, &saslUser, &saslPass); + ZEPHIR_CALL_METHOD(NULL, &_10$$4, "setsasl", NULL, 292, &connection, &saslUser, &saslPass); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(NULL, this_ptr, "setserializer", NULL, 294, &connection); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "setserializer", NULL, 293, &connection); zephir_check_call_status(); zephir_update_property_zval_cached(this_ptr, _zephir_prop_0, 322, &connection); } diff --git a/ext/phalcon/storage/adapter/rediscluster.zep.c b/ext/phalcon/storage/adapter/rediscluster.zep.c index d29d13f392..7d2e151698 100644 --- a/ext/phalcon/storage/adapter/rediscluster.zep.c +++ b/ext/phalcon/storage/adapter/rediscluster.zep.c @@ -301,7 +301,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_RedisCluster, getAdapter) ZVAL_LONG(&_14$$3, 2); ZEPHIR_CALL_METHOD(NULL, &connection, "setoption", NULL, 0, &_14$$3, &_1$$3); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "setserializer", NULL, 295, &connection); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "setserializer", NULL, 294, &connection); zephir_check_call_status(); zephir_update_property_zval_cached(this_ptr, _zephir_prop_0, 328, &connection); } diff --git a/ext/phalcon/storage/adapter/stream.zep.c b/ext/phalcon/storage/adapter/stream.zep.c index d76d7f8d40..95916c63ec 100644 --- a/ext/phalcon/storage/adapter/stream.zep.c +++ b/ext/phalcon/storage/adapter/stream.zep.c @@ -154,14 +154,14 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, clear) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); result = 1; - ZEPHIR_CALL_METHOD(&directory, this_ptr, "getdir", NULL, 296); + ZEPHIR_CALL_METHOD(&directory, this_ptr, "getdir", NULL, 295); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_0, this_ptr, "phpfileexists", NULL, 0, &directory); zephir_check_call_status(); if (UNEXPECTED(!ZEPHIR_IS_TRUE_IDENTICAL(&_0))) { RETURN_MM_BOOL(result); } - ZEPHIR_CALL_METHOD(&iterator, this_ptr, "getiterator", NULL, 297, &directory); + ZEPHIR_CALL_METHOD(&iterator, this_ptr, "getiterator", NULL, 296, &directory); zephir_check_call_status(); if (Z_TYPE_P(&iterator) == IS_STRING) { ZEPHIR_INIT_VAR(&_2); @@ -279,7 +279,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, getKeys) } ZEPHIR_INIT_VAR(&files); array_init(&files); - ZEPHIR_CALL_METHOD(&directory, this_ptr, "getdir", NULL, 296); + ZEPHIR_CALL_METHOD(&directory, this_ptr, "getdir", NULL, 295); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_0, this_ptr, "phpfileexists", NULL, 0, &directory); zephir_check_call_status(); @@ -287,7 +287,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, getKeys) array_init(return_value); RETURN_MM(); } - ZEPHIR_CALL_METHOD(&iterator, this_ptr, "getiterator", NULL, 297, &directory); + ZEPHIR_CALL_METHOD(&iterator, this_ptr, "getiterator", NULL, 296, &directory); zephir_check_call_status(); if (Z_TYPE_P(&iterator) == IS_STRING) { ZEPHIR_INIT_VAR(&_2); @@ -385,7 +385,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, setForever) ZEPHIR_CALL_METHOD(&_1, this_ptr, "getserializeddata", NULL, 0, data); zephir_check_call_status(); zephir_array_update_string(&payload, SL("content"), &_1, PH_COPY | PH_SEPARATE); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "storepayload", NULL, 298, &payload, &key_zv); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "storepayload", NULL, 297, &payload, &key_zv); zephir_check_call_status(); RETURN_MM(); } @@ -465,7 +465,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, doDelete) if (!ZEPHIR_IS_TRUE_IDENTICAL(&_0)) { RETURN_MM_BOOL(0); } - ZEPHIR_CALL_METHOD(&filepath, this_ptr, "getfilepath", NULL, 299, &key_zv); + ZEPHIR_CALL_METHOD(&filepath, this_ptr, "getfilepath", NULL, 298, &key_zv); zephir_check_call_status(); ZEPHIR_RETURN_CALL_METHOD(this_ptr, "phpunlink", NULL, 0, &filepath); zephir_check_call_status(); @@ -510,7 +510,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, doGet) defaultValue = &defaultValue_sub; defaultValue = &__$null; } - ZEPHIR_CALL_METHOD(&filepath, this_ptr, "getfilepath", NULL, 299, &key_zv); + ZEPHIR_CALL_METHOD(&filepath, this_ptr, "getfilepath", NULL, 298, &key_zv); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_0, this_ptr, "phpfileexists", NULL, 0, &filepath); zephir_check_call_status(); @@ -518,11 +518,11 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, doGet) RETVAL_ZVAL(defaultValue, 1, 0); RETURN_MM(); } - ZEPHIR_CALL_METHOD(&payload, this_ptr, "getpayload", NULL, 300, &filepath); + ZEPHIR_CALL_METHOD(&payload, this_ptr, "getpayload", NULL, 299, &filepath); zephir_check_call_status(); _1 = ZEPHIR_IS_EMPTY(&payload); if (!(_1)) { - ZEPHIR_CALL_METHOD(&_2, this_ptr, "isexpired", NULL, 301, &payload); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "isexpired", NULL, 300, &payload); zephir_check_call_status(); _1 = zephir_is_true(&_2); } @@ -562,19 +562,19 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, doHas) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_memory_observe(&key_zv); ZVAL_STR_COPY(&key_zv, key); - ZEPHIR_CALL_METHOD(&filepath, this_ptr, "getfilepath", NULL, 299, &key_zv); + ZEPHIR_CALL_METHOD(&filepath, this_ptr, "getfilepath", NULL, 298, &key_zv); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_0, this_ptr, "phpfileexists", NULL, 0, &filepath); zephir_check_call_status(); if (UNEXPECTED(!ZEPHIR_IS_TRUE_IDENTICAL(&_0))) { RETURN_MM_BOOL(0); } - ZEPHIR_CALL_METHOD(&payload, this_ptr, "getpayload", NULL, 300, &filepath); + ZEPHIR_CALL_METHOD(&payload, this_ptr, "getpayload", NULL, 299, &filepath); zephir_check_call_status(); if (UNEXPECTED(ZEPHIR_IS_EMPTY(&payload))) { RETURN_MM_BOOL(0); } - ZEPHIR_CALL_METHOD(&_1, this_ptr, "isexpired", NULL, 301, &payload); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "isexpired", NULL, 300, &payload); zephir_check_call_status(); RETURN_MM_BOOL(!zephir_is_true(&_1)); } @@ -691,7 +691,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, doSet) ZEPHIR_CALL_METHOD(&_2, this_ptr, "getserializeddata", NULL, 0, value); zephir_check_call_status(); zephir_array_update_string(&payload, SL("content"), &_2, PH_COPY | PH_SEPARATE); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "storepayload", NULL, 298, &payload, &key_zv); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "storepayload", NULL, 297, &payload, &key_zv); zephir_check_call_status(); RETURN_MM(); } @@ -811,13 +811,13 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, getFilepath) _3 = zephir_memnstr_str(&plain, SL(":"), "phalcon/Storage/Adapter/Stream.zep", 315); } if (_3) { - ZEPHIR_CALL_FUNCTION(&_4$$3, "sha1", NULL, 302, &plain); + ZEPHIR_CALL_FUNCTION(&_4$$3, "sha1", NULL, 301, &plain); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_5$$3); ZEPHIR_CONCAT_VSV(&_5$$3, &name, "_", &_4$$3); ZEPHIR_CPY_WRT(&name, &_5$$3); } - ZEPHIR_CALL_METHOD(&_6, this_ptr, "getdir", NULL, 296, &key_zv); + ZEPHIR_CALL_METHOD(&_6, this_ptr, "getdir", NULL, 295, &key_zv); zephir_check_call_status(); ZEPHIR_CONCAT_VV(return_value, &_6, &name); RETURN_MM(); @@ -847,10 +847,10 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, getIterator) ZEPHIR_INIT_VAR(&_0); object_init_ex(&_0, spl_ce_RecursiveDirectoryIterator); ZVAL_LONG(&_1, 4096); - ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 303, &dir_zv, &_1); + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 302, &dir_zv, &_1); zephir_check_call_status(); ZVAL_LONG(&_1, 2); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 304, &_0, &_1); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 303, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -898,7 +898,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, getPayload) RETURN_MM(); } ZVAL_LONG(&_1, 1); - ZEPHIR_CALL_FUNCTION(&_2, "flock", NULL, 305, &pointer, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "flock", NULL, 304, &pointer, &_1); zephir_check_call_status(); if (EXPECTED(ZEPHIR_IS_TRUE_IDENTICAL(&_2))) { ZEPHIR_CALL_METHOD(&payload, this_ptr, "phpfilegetcontents", NULL, 0, &filepath_zv); @@ -915,7 +915,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, getPayload) ZEPHIR_INIT_NVAR(&_0); zephir_create_closure_ex(&_0, NULL, phalcon_2__closure_ce, SL("__invoke")); ZVAL_LONG(&_1, 8); - ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 306, &_0, &_1); + ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 305, &_0, &_1); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_3); zephir_create_array(&_3, 1, 0); @@ -923,7 +923,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, getPayload) ZEPHIR_CALL_FUNCTION(&_4, "unserialize", NULL, 27, &payload, &_3); zephir_check_call_status(); ZEPHIR_CPY_WRT(&payload, &_4); - ZEPHIR_CALL_FUNCTION(NULL, "restore_error_handler", NULL, 307); + ZEPHIR_CALL_FUNCTION(NULL, "restore_error_handler", NULL, 306); zephir_check_call_status(); _5 = ZEPHIR_GLOBAL(warning).enable; if (!(_5)) { @@ -1024,24 +1024,24 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, storePayload) ZVAL_STR_COPY(&key_zv, key); ZEPHIR_CALL_FUNCTION(&localPayload, "serialize", NULL, 22, &payload); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&directory, this_ptr, "getdir", NULL, 296, &key_zv); + ZEPHIR_CALL_METHOD(&directory, this_ptr, "getdir", NULL, 295, &key_zv); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_0, this_ptr, "phpisdir", NULL, 0, &directory); zephir_check_call_status(); if (!(zephir_is_true(&_0))) { ZVAL_LONG(&_1$$3, 0); - ZEPHIR_CALL_FUNCTION(&errorLevel, "error_reporting", NULL, 308, &_1$$3); + ZEPHIR_CALL_FUNCTION(&errorLevel, "error_reporting", NULL, 307, &_1$$3); zephir_check_call_status(); ZVAL_LONG(&_1$$3, 0755); ZVAL_BOOL(&_2$$3, 1); ZEPHIR_CALL_METHOD(NULL, this_ptr, "phpmkdir", NULL, 0, &directory, &_1$$3, &_2$$3); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "error_clear_last", NULL, 309); + ZEPHIR_CALL_FUNCTION(NULL, "error_clear_last", NULL, 308); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "error_reporting", NULL, 308, &errorLevel); + ZEPHIR_CALL_FUNCTION(NULL, "error_reporting", NULL, 307, &errorLevel); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(&_4, this_ptr, "getfilepath", NULL, 299, &key_zv); + ZEPHIR_CALL_METHOD(&_4, this_ptr, "getfilepath", NULL, 298, &key_zv); zephir_check_call_status(); ZVAL_LONG(&_5, 2); ZEPHIR_CALL_METHOD(&_3, this_ptr, "phpfileputcontents", NULL, 0, &_4, &localPayload, &_5); @@ -1096,7 +1096,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, toDirFromFile) zephir_check_call_status(); ZVAL_LONG(&_0, 0); ZVAL_LONG(&_1, -2); - ZEPHIR_CALL_FUNCTION(&start, "mb_substr", NULL, 310, &name, &_0, &_1); + ZEPHIR_CALL_FUNCTION(&start, "mb_substr", NULL, 309, &name, &_0, &_1); zephir_check_call_status(); _2 = filesystemSafe == 1; if (_2) { @@ -1114,12 +1114,12 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, toDirFromFile) if (!zephir_is_true(&start)) { ZVAL_LONG(&_6$$4, 0); ZVAL_LONG(&_7$$4, 1); - ZEPHIR_CALL_FUNCTION(&start, "mb_substr", NULL, 310, &name, &_6$$4, &_7$$4); + ZEPHIR_CALL_FUNCTION(&start, "mb_substr", NULL, 309, &name, &_6$$4, &_7$$4); zephir_check_call_status(); } ZEPHIR_INIT_VAR(&_8); ZVAL_LONG(&_0, 2); - ZEPHIR_CALL_FUNCTION(&_9, "mb_str_split", NULL, 311, &start, &_0); + ZEPHIR_CALL_FUNCTION(&_9, "mb_str_split", NULL, 310, &start, &_0); zephir_check_call_status(); zephir_fast_join_str(&_8, SL("/"), &_9); ZEPHIR_CONCAT_VS(return_value, &_8, "/"); diff --git a/ext/phalcon/storage/serializer/igbinary.zep.c b/ext/phalcon/storage/serializer/igbinary.zep.c index 0be097ce42..f0ad36e6af 100644 --- a/ext/phalcon/storage/serializer/igbinary.zep.c +++ b/ext/phalcon/storage/serializer/igbinary.zep.c @@ -131,11 +131,11 @@ PHP_METHOD(Phalcon_Storage_Serializer_Igbinary, unserialize) ZEPHIR_INIT_NVAR(&_1$$4); zephir_create_closure_ex(&_1$$4, NULL, phalcon_3__closure_ce, SL("__invoke")); ZVAL_LONG(&_2$$4, 2); - ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 306, &_1$$4, &_2$$4); + ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 305, &_1$$4, &_2$$4); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&result, this_ptr, "dounserialize", NULL, 0, data); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "restore_error_handler", NULL, 307); + ZEPHIR_CALL_FUNCTION(NULL, "restore_error_handler", NULL, 306); zephir_check_call_status(); _3$$4 = ZEPHIR_GLOBAL(warning).enable; if (!(_3$$4)) { @@ -229,7 +229,7 @@ PHP_METHOD(Phalcon_Storage_Serializer_Igbinary, phpIgbinarySerialize) ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &value); - ZEPHIR_RETURN_CALL_FUNCTION("igbinary_serialize", NULL, 312, value); + ZEPHIR_RETURN_CALL_FUNCTION("igbinary_serialize", NULL, 311, value); zephir_check_call_status(); RETURN_MM(); } @@ -254,7 +254,7 @@ PHP_METHOD(Phalcon_Storage_Serializer_Igbinary, phpIgbinaryUnserialize) ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &value); - ZEPHIR_RETURN_CALL_FUNCTION("igbinary_unserialize", NULL, 313, value); + ZEPHIR_RETURN_CALL_FUNCTION("igbinary_unserialize", NULL, 312, value); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/storage/serializer/php.zep.c b/ext/phalcon/storage/serializer/php.zep.c index 29714426fb..6b53517d93 100644 --- a/ext/phalcon/storage/serializer/php.zep.c +++ b/ext/phalcon/storage/serializer/php.zep.c @@ -177,7 +177,7 @@ PHP_METHOD(Phalcon_Storage_Serializer_Php, unserialize) ZEPHIR_INIT_NVAR(&_3); zephir_create_closure_ex(&_3, NULL, phalcon_100__closure_ce, SL("__invoke")); ZVAL_LONG(&_4, (8 | 2)); - ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 306, &_3, &_4); + ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 305, &_3, &_4); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_5); zephir_create_array(&_5, 1, 0); @@ -186,7 +186,7 @@ PHP_METHOD(Phalcon_Storage_Serializer_Php, unserialize) zephir_array_update_string(&_5, SL("allowed_classes"), &_6, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(&result, this_ptr, "phpunserialize", NULL, 0, data, &_5); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "restore_error_handler", NULL, 307); + ZEPHIR_CALL_FUNCTION(NULL, "restore_error_handler", NULL, 306); zephir_check_call_status(); _7 = ZEPHIR_GLOBAL(warning).enable; if (!(_7)) { diff --git a/ext/phalcon/support/debug.zep.c b/ext/phalcon/support/debug.zep.c index 0a5d8cac37..41df1e61c1 100644 --- a/ext/phalcon/support/debug.zep.c +++ b/ext/phalcon/support/debug.zep.c @@ -418,7 +418,7 @@ PHP_METHOD(Phalcon_Support_Debug, listenLowSeverity) ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "onUncaughtLowSeverity"); zephir_array_fast_append(&_0, &_1); - ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 306, &_0); + ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 305, &_0); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_2); zephir_create_array(&_2, 2, 0); @@ -510,7 +510,7 @@ PHP_METHOD(Phalcon_Support_Debug, onUncaughtLowSeverity) ZVAL_STR_COPY(&message_zv, message); zephir_memory_observe(&file_zv); ZVAL_STR_COPY(&file_zv, file); - ZEPHIR_CALL_FUNCTION(&_0, "error_reporting", NULL, 308); + ZEPHIR_CALL_FUNCTION(&_0, "error_reporting", NULL, 307); zephir_check_call_status(); if (((int) (zephir_get_numberval(&_0)) & severity)) { ZEPHIR_INIT_VAR(&_1$$3); diff --git a/ext/phalcon/support/debug/dump.zep.c b/ext/phalcon/support/debug/dump.zep.c index b2a265c722..7218b20481 100644 --- a/ext/phalcon/support/debug/dump.zep.c +++ b/ext/phalcon/support/debug/dump.zep.c @@ -1036,7 +1036,7 @@ PHP_METHOD(Phalcon_Support_Debug_Dump, output) _47$$9 = zephir_is_instance_of(variable, SL("stdClass")); } if (_47$$9) { - ZEPHIR_CALL_FUNCTION(&vars, "get_object_vars", NULL, 360, variable); + ZEPHIR_CALL_FUNCTION(&vars, "get_object_vars", NULL, 359, variable); zephir_check_call_status(); if (Z_TYPE_P(&vars) == IS_STRING) { ZEPHIR_INIT_VAR(&_52$$12); @@ -1142,7 +1142,7 @@ PHP_METHOD(Phalcon_Support_Debug_Dump, output) ZEPHIR_CALL_METHOD(NULL, &reflect, "__construct", NULL, 252, variable); zephir_check_call_status(); ZVAL_LONG(&_72$$15, ((1 | 2) | 4)); - ZEPHIR_CALL_METHOD(&props, &reflect, "getproperties", NULL, 371, &_72$$15); + ZEPHIR_CALL_METHOD(&props, &reflect, "getproperties", NULL, 370, &_72$$15); zephir_check_call_status(); if (Z_TYPE_P(&props) == IS_STRING) { ZEPHIR_INIT_VAR(&_74$$15); diff --git a/ext/phalcon/support/debug/reportbuilder.zep.c b/ext/phalcon/support/debug/reportbuilder.zep.c index df4bff1b95..40593a2f16 100644 --- a/ext/phalcon/support/debug/reportbuilder.zep.c +++ b/ext/phalcon/support/debug/reportbuilder.zep.c @@ -708,7 +708,7 @@ PHP_METHOD(Phalcon_Support_Debug_ReportBuilder, phpExtensionLoaded) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_memory_observe(&name_zv); ZVAL_STR_COPY(&name_zv, name); - ZEPHIR_RETURN_CALL_FUNCTION("extension_loaded", NULL, 474, &name_zv); + ZEPHIR_RETURN_CALL_FUNCTION("extension_loaded", NULL, 473, &name_zv); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/support/helper/arr/blacklist.zep.c b/ext/phalcon/support/helper/arr/blacklist.zep.c index 57d8972f1a..6bb8eb36c6 100644 --- a/ext/phalcon/support/helper/arr/blacklist.zep.c +++ b/ext/phalcon/support/helper/arr/blacklist.zep.c @@ -70,9 +70,9 @@ PHP_METHOD(Phalcon_Support_Helper_Arr_Blacklist, __invoke) zephir_create_closure_ex(&_0, NULL, phalcon_101__closure_ce, SL("__invoke")); ZEPHIR_CALL_METHOD(&blackListed, this_ptr, "tofilter", NULL, 0, &blackList, &_0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_1, "array_flip", NULL, 266, &blackListed); + ZEPHIR_CALL_FUNCTION(&_1, "array_flip", NULL, 265, &blackListed); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("array_diff_key", NULL, 262, &collection, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("array_diff_key", NULL, 261, &collection, &_1); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/support/helper/arr/group.zep.c b/ext/phalcon/support/helper/arr/group.zep.c index e563d267da..c256b02c16 100644 --- a/ext/phalcon/support/helper/arr/group.zep.c +++ b/ext/phalcon/support/helper/arr/group.zep.c @@ -334,7 +334,7 @@ PHP_METHOD(Phalcon_Support_Helper_Arr_Group, phpExtensionLoaded) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_memory_observe(&name_zv); ZVAL_STR_COPY(&name_zv, name); - ZEPHIR_RETURN_CALL_FUNCTION("extension_loaded", NULL, 474, &name_zv); + ZEPHIR_RETURN_CALL_FUNCTION("extension_loaded", NULL, 473, &name_zv); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/support/helper/arr/isunique.zep.c b/ext/phalcon/support/helper/arr/isunique.zep.c index 519fadc380..dc3c8c2669 100644 --- a/ext/phalcon/support/helper/arr/isunique.zep.c +++ b/ext/phalcon/support/helper/arr/isunique.zep.c @@ -58,7 +58,7 @@ PHP_METHOD(Phalcon_Support_Helper_Arr_IsUnique, __invoke) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &collection_param); zephir_get_arrval(&collection, collection_param); - ZEPHIR_CALL_FUNCTION(&_0, "array_unique", NULL, 445, &collection); + ZEPHIR_CALL_FUNCTION(&_0, "array_unique", NULL, 444, &collection); zephir_check_call_status(); RETURN_MM_BOOL(zephir_fast_count_int(&collection) == zephir_fast_count_int(&_0)); } diff --git a/ext/phalcon/support/helper/arr/sliceleft.zep.c b/ext/phalcon/support/helper/arr/sliceleft.zep.c index 47123499a1..310477d041 100644 --- a/ext/phalcon/support/helper/arr/sliceleft.zep.c +++ b/ext/phalcon/support/helper/arr/sliceleft.zep.c @@ -67,7 +67,7 @@ PHP_METHOD(Phalcon_Support_Helper_Arr_SliceLeft, __invoke) } ZVAL_LONG(&_0, 0); ZVAL_LONG(&_1, elements); - ZEPHIR_RETURN_CALL_FUNCTION("array_slice", NULL, 283, &collection, &_0, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("array_slice", NULL, 282, &collection, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/support/helper/arr/sliceright.zep.c b/ext/phalcon/support/helper/arr/sliceright.zep.c index 13853e2db5..1a9d62d3d9 100644 --- a/ext/phalcon/support/helper/arr/sliceright.zep.c +++ b/ext/phalcon/support/helper/arr/sliceright.zep.c @@ -65,7 +65,7 @@ PHP_METHOD(Phalcon_Support_Helper_Arr_SliceRight, __invoke) } else { } ZVAL_LONG(&_0, elements); - ZEPHIR_RETURN_CALL_FUNCTION("array_slice", NULL, 283, &collection, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("array_slice", NULL, 282, &collection, &_0); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/support/helper/arr/whitelist.zep.c b/ext/phalcon/support/helper/arr/whitelist.zep.c index 4ce4726093..9867391892 100644 --- a/ext/phalcon/support/helper/arr/whitelist.zep.c +++ b/ext/phalcon/support/helper/arr/whitelist.zep.c @@ -70,7 +70,7 @@ PHP_METHOD(Phalcon_Support_Helper_Arr_Whitelist, __invoke) zephir_create_closure_ex(&_0, NULL, phalcon_102__closure_ce, SL("__invoke")); ZEPHIR_CALL_METHOD(&filtered, this_ptr, "tofilter", NULL, 0, &whiteList, &_0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_1, "array_flip", NULL, 266, &filtered); + ZEPHIR_CALL_FUNCTION(&_1, "array_flip", NULL, 265, &filtered); zephir_check_call_status(); ZEPHIR_RETURN_CALL_FUNCTION("array_intersect_key", NULL, 8, &collection, &_1); zephir_check_call_status(); diff --git a/ext/phalcon/support/helper/str/decapitalize.zep.c b/ext/phalcon/support/helper/str/decapitalize.zep.c index 08d81e8a11..3b11e5f3aa 100644 --- a/ext/phalcon/support/helper/str/decapitalize.zep.c +++ b/ext/phalcon/support/helper/str/decapitalize.zep.c @@ -82,7 +82,7 @@ PHP_METHOD(Phalcon_Support_Helper_Str_Decapitalize, __invoke) ZVAL_STR_COPY(&encoding_zv, encoding); } ZVAL_LONG(&_0, 1); - ZEPHIR_CALL_FUNCTION(&substr, "mb_substr", NULL, 310, &text_zv, &_0); + ZEPHIR_CALL_FUNCTION(&substr, "mb_substr", NULL, 309, &text_zv, &_0); zephir_check_call_status(); if (upperRest) { ZEPHIR_CALL_METHOD(&suffix, this_ptr, "toupper", NULL, 0, &substr, &encoding_zv); @@ -92,7 +92,7 @@ PHP_METHOD(Phalcon_Support_Helper_Str_Decapitalize, __invoke) } ZVAL_LONG(&_0, 0); ZVAL_LONG(&_2, 1); - ZEPHIR_CALL_FUNCTION(&_3, "mb_substr", NULL, 310, &text_zv, &_0, &_2); + ZEPHIR_CALL_FUNCTION(&_3, "mb_substr", NULL, 309, &text_zv, &_0, &_2); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_1, this_ptr, "tolower", NULL, 0, &_3, &encoding_zv); zephir_check_call_status(); diff --git a/ext/phalcon/support/helper/str/dirfromfile.zep.c b/ext/phalcon/support/helper/str/dirfromfile.zep.c index 47c432449c..948790d5a9 100644 --- a/ext/phalcon/support/helper/str/dirfromfile.zep.c +++ b/ext/phalcon/support/helper/str/dirfromfile.zep.c @@ -107,7 +107,7 @@ PHP_METHOD(Phalcon_Support_Helper_Str_DirFromFile, toDirFromFile) zephir_check_call_status(); ZVAL_LONG(&_0, 0); ZVAL_LONG(&_1, -2); - ZEPHIR_CALL_FUNCTION(&start, "mb_substr", NULL, 310, &name, &_0, &_1); + ZEPHIR_CALL_FUNCTION(&start, "mb_substr", NULL, 309, &name, &_0, &_1); zephir_check_call_status(); _2 = filesystemSafe == 1; if (_2) { @@ -125,12 +125,12 @@ PHP_METHOD(Phalcon_Support_Helper_Str_DirFromFile, toDirFromFile) if (!zephir_is_true(&start)) { ZVAL_LONG(&_6$$4, 0); ZVAL_LONG(&_7$$4, 1); - ZEPHIR_CALL_FUNCTION(&start, "mb_substr", NULL, 310, &name, &_6$$4, &_7$$4); + ZEPHIR_CALL_FUNCTION(&start, "mb_substr", NULL, 309, &name, &_6$$4, &_7$$4); zephir_check_call_status(); } ZEPHIR_INIT_VAR(&_8); ZVAL_LONG(&_0, 2); - ZEPHIR_CALL_FUNCTION(&_9, "mb_str_split", NULL, 311, &start, &_0); + ZEPHIR_CALL_FUNCTION(&_9, "mb_str_split", NULL, 310, &start, &_0); zephir_check_call_status(); zephir_fast_join_str(&_8, SL("/"), &_9); ZEPHIR_CONCAT_VS(return_value, &_8, "/"); diff --git a/ext/phalcon/tag.zep.c b/ext/phalcon/tag.zep.c index 90ad53d71a..7f21c3014d 100644 --- a/ext/phalcon/tag.zep.c +++ b/ext/phalcon/tag.zep.c @@ -923,7 +923,7 @@ PHP_METHOD(Phalcon_Tag, getTitle) zephir_read_static_property_ce(&_4$$3, phalcon_tag_ce, SL("documentPrependTitle"), PH_NOISY_CC); ZEPHIR_CPY_WRT(&documentPrependTitle, &_4$$3); if (!(ZEPHIR_IS_EMPTY(&documentPrependTitle))) { - ZEPHIR_CALL_FUNCTION(&tmp$$4, "array_reverse", NULL, 274, &documentPrependTitle); + ZEPHIR_CALL_FUNCTION(&tmp$$4, "array_reverse", NULL, 273, &documentPrependTitle); zephir_check_call_status(); if (Z_TYPE_P(&tmp$$4) == IS_STRING) { ZEPHIR_INIT_VAR(&_6$$4); diff --git a/ext/phalcon/time/clock/frozenclock.zep.c b/ext/phalcon/time/clock/frozenclock.zep.c index 78241a64e3..d30bcc25da 100644 --- a/ext/phalcon/time/clock/frozenclock.zep.c +++ b/ext/phalcon/time/clock/frozenclock.zep.c @@ -86,7 +86,7 @@ PHP_METHOD(Phalcon_Time_Clock_FrozenClock, fromSystemTimezone) object_init_ex(&_0, php_date_get_immutable_ce()); ZEPHIR_INIT_VAR(&_1); object_init_ex(&_1, php_date_get_timezone_ce()); - ZEPHIR_CALL_FUNCTION(&_2, "date_default_timezone_get", NULL, 260); + ZEPHIR_CALL_FUNCTION(&_2, "date_default_timezone_get", NULL, 259); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_1, "__construct", NULL, 0, &_2); zephir_check_call_status(); @@ -216,12 +216,12 @@ PHP_METHOD(Phalcon_Time_Clock_FrozenClock, adjust) ZEPHIR_INIT_NVAR(&_7$$6); zephir_create_closure_ex(&_7$$6, NULL, phalcon_103__closure_ce, SL("__invoke")); ZVAL_LONG(&_8$$6, 2); - ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 306, &_7$$6, &_8$$6); + ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 305, &_7$$6, &_8$$6); zephir_check_call_status(); zephir_read_property_cached(&_8$$6, this_ptr, _zephir_prop_0, 1399, PH_NOISY_CC | PH_READONLY); ZEPHIR_CALL_METHOD(&modified, &_8$$6, "modify", NULL, 0, &modifier_zv); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "restore_error_handler", NULL, 307); + ZEPHIR_CALL_FUNCTION(NULL, "restore_error_handler", NULL, 306); zephir_check_call_status(); failed = ZEPHIR_GLOBAL(warning).enable; ZEPHIR_GLOBAL(warning).enable = zend_is_true(&priorWarning); diff --git a/ext/phalcon/time/clock/systemclock.zep.c b/ext/phalcon/time/clock/systemclock.zep.c index b956a323ed..d12983fe47 100644 --- a/ext/phalcon/time/clock/systemclock.zep.c +++ b/ext/phalcon/time/clock/systemclock.zep.c @@ -80,11 +80,11 @@ PHP_METHOD(Phalcon_Time_Clock_SystemClock, fromSystemTimezone) object_init_ex(return_value, phalcon_time_clock_systemclock_ce); ZEPHIR_INIT_VAR(&_0); object_init_ex(&_0, php_date_get_timezone_ce()); - ZEPHIR_CALL_FUNCTION(&_1, "date_default_timezone_get", NULL, 260); + ZEPHIR_CALL_FUNCTION(&_1, "date_default_timezone_get", NULL, 259); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 0, &_1); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 261, &_0); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 260, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -110,7 +110,7 @@ PHP_METHOD(Phalcon_Time_Clock_SystemClock, fromUTC) ZVAL_STRING(&_1, "UTC"); ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 0, &_1); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 261, &_0); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 260, &_0); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/traits/php/apcutrait.zep.c b/ext/phalcon/traits/php/apcutrait.zep.c index 398ca93922..49c9efc8ad 100644 --- a/ext/phalcon/traits/php/apcutrait.zep.c +++ b/ext/phalcon/traits/php/apcutrait.zep.c @@ -65,7 +65,7 @@ PHP_METHOD(Phalcon_Traits_Php_ApcuTrait, phpApcuDec) } else { } ZVAL_LONG(&_0, step); - ZEPHIR_RETURN_CALL_FUNCTION("apcu_dec", NULL, 284, key, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("apcu_dec", NULL, 283, key, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -90,7 +90,7 @@ PHP_METHOD(Phalcon_Traits_Php_ApcuTrait, phpApcuDelete) ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &key); - ZEPHIR_RETURN_CALL_FUNCTION("apcu_delete", NULL, 285, key); + ZEPHIR_RETURN_CALL_FUNCTION("apcu_delete", NULL, 284, key); zephir_check_call_status(); RETURN_MM(); } @@ -115,7 +115,7 @@ PHP_METHOD(Phalcon_Traits_Php_ApcuTrait, phpApcuExists) ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &key); - ZEPHIR_RETURN_CALL_FUNCTION("apcu_exists", NULL, 286, key); + ZEPHIR_RETURN_CALL_FUNCTION("apcu_exists", NULL, 285, key); zephir_check_call_status(); RETURN_MM(); } @@ -140,7 +140,7 @@ PHP_METHOD(Phalcon_Traits_Php_ApcuTrait, phpApcuFetch) ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &key); - ZEPHIR_RETURN_CALL_FUNCTION("apcu_fetch", NULL, 287, key); + ZEPHIR_RETURN_CALL_FUNCTION("apcu_fetch", NULL, 286, key); zephir_check_call_status(); RETURN_MM(); } @@ -174,7 +174,7 @@ PHP_METHOD(Phalcon_Traits_Php_ApcuTrait, phpApcuInc) } else { } ZVAL_LONG(&_0, step); - ZEPHIR_RETURN_CALL_FUNCTION("apcu_inc", NULL, 288, key, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("apcu_inc", NULL, 287, key, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -239,7 +239,7 @@ PHP_METHOD(Phalcon_Traits_Php_ApcuTrait, phpApcuStore) } else { } ZVAL_LONG(&_0, ttl); - ZEPHIR_RETURN_CALL_FUNCTION("apcu_store", NULL, 289, key, payload, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("apcu_store", NULL, 288, key, payload, &_0); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/traits/php/igbinarytrait.zep.c b/ext/phalcon/traits/php/igbinarytrait.zep.c index 4cb65cf5c2..5955d4b9d9 100644 --- a/ext/phalcon/traits/php/igbinarytrait.zep.c +++ b/ext/phalcon/traits/php/igbinarytrait.zep.c @@ -55,7 +55,7 @@ PHP_METHOD(Phalcon_Traits_Php_IgbinaryTrait, phpIgbinarySerialize) ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &value); - ZEPHIR_RETURN_CALL_FUNCTION("igbinary_serialize", NULL, 312, value); + ZEPHIR_RETURN_CALL_FUNCTION("igbinary_serialize", NULL, 311, value); zephir_check_call_status(); RETURN_MM(); } @@ -80,7 +80,7 @@ PHP_METHOD(Phalcon_Traits_Php_IgbinaryTrait, phpIgbinaryUnserialize) ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &value); - ZEPHIR_RETURN_CALL_FUNCTION("igbinary_unserialize", NULL, 313, value); + ZEPHIR_RETURN_CALL_FUNCTION("igbinary_unserialize", NULL, 312, value); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/traits/php/infotrait.zep.c b/ext/phalcon/traits/php/infotrait.zep.c index b265e6b06f..94e52dfac3 100644 --- a/ext/phalcon/traits/php/infotrait.zep.c +++ b/ext/phalcon/traits/php/infotrait.zep.c @@ -59,7 +59,7 @@ PHP_METHOD(Phalcon_Traits_Php_InfoTrait, phpExtensionLoaded) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_memory_observe(&name_zv); ZVAL_STR_COPY(&name_zv, name); - ZEPHIR_RETURN_CALL_FUNCTION("extension_loaded", NULL, 474, &name_zv); + ZEPHIR_RETURN_CALL_FUNCTION("extension_loaded", NULL, 473, &name_zv); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/traits/php/initrait.zep.c b/ext/phalcon/traits/php/initrait.zep.c index 2f6aba9d3e..95c52daaa2 100644 --- a/ext/phalcon/traits/php/initrait.zep.c +++ b/ext/phalcon/traits/php/initrait.zep.c @@ -72,7 +72,7 @@ PHP_METHOD(Phalcon_Traits_Php_IniTrait, phpIniGet) zephir_memory_observe(&defaultValue_zv); ZVAL_STR_COPY(&defaultValue_zv, defaultValue); } - ZEPHIR_CALL_FUNCTION(&value, "ini_get", NULL, 470, &input_zv); + ZEPHIR_CALL_FUNCTION(&value, "ini_get", NULL, 469, &input_zv); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&value)) { RETURN_MM_STR(zend_string_copy(defaultValue)); @@ -119,7 +119,7 @@ PHP_METHOD(Phalcon_Traits_Php_IniTrait, phpIniGetBool) } else { } result = 0; - ZEPHIR_CALL_FUNCTION(&value, "ini_get", NULL, 470, &input_zv); + ZEPHIR_CALL_FUNCTION(&value, "ini_get", NULL, 469, &input_zv); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&value)) { RETURN_MM_BOOL(defaultValue); @@ -179,7 +179,7 @@ PHP_METHOD(Phalcon_Traits_Php_IniTrait, phpIniGetInt) defaultValue = 0; } else { } - ZEPHIR_CALL_FUNCTION(&value, "ini_get", NULL, 470, &input_zv); + ZEPHIR_CALL_FUNCTION(&value, "ini_get", NULL, 469, &input_zv); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&value)) { RETURN_MM_LONG(defaultValue); @@ -235,7 +235,7 @@ PHP_METHOD(Phalcon_Traits_Php_IniTrait, phpParseIniFile) } ZVAL_BOOL(&_0, (processSections ? 1 : 0)); ZVAL_LONG(&_1, scannerMode); - ZEPHIR_RETURN_CALL_FUNCTION("parse_ini_file", NULL, 471, &filename_zv, &_0, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("parse_ini_file", NULL, 470, &filename_zv, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/traits/php/yamltrait.zep.c b/ext/phalcon/traits/php/yamltrait.zep.c index 5e6870d4be..b7c6c44611 100644 --- a/ext/phalcon/traits/php/yamltrait.zep.c +++ b/ext/phalcon/traits/php/yamltrait.zep.c @@ -89,7 +89,7 @@ PHP_METHOD(Phalcon_Traits_Php_YamlTrait, phpYamlParseFile) ZVAL_NULL(&ndocs); ZVAL_LONG(&_0, pos); ZEPHIR_MAKE_REF(&ndocs); - ZEPHIR_RETURN_CALL_FUNCTION("yaml_parse_file", NULL, 475, &filename_zv, &_0, &ndocs, &callbacks); + ZEPHIR_RETURN_CALL_FUNCTION("yaml_parse_file", NULL, 474, &filename_zv, &_0, &ndocs, &callbacks); ZEPHIR_UNREF(&ndocs); zephir_check_call_status(); RETURN_MM(); diff --git a/ext/phalcon/traits/support/helper/str/dirfromfiletrait.zep.c b/ext/phalcon/traits/support/helper/str/dirfromfiletrait.zep.c index 49b25126de..b047b0305a 100644 --- a/ext/phalcon/traits/support/helper/str/dirfromfiletrait.zep.c +++ b/ext/phalcon/traits/support/helper/str/dirfromfiletrait.zep.c @@ -86,7 +86,7 @@ PHP_METHOD(Phalcon_Traits_Support_Helper_Str_DirFromFileTrait, toDirFromFile) zephir_check_call_status(); ZVAL_LONG(&_0, 0); ZVAL_LONG(&_1, -2); - ZEPHIR_CALL_FUNCTION(&start, "mb_substr", NULL, 310, &name, &_0, &_1); + ZEPHIR_CALL_FUNCTION(&start, "mb_substr", NULL, 309, &name, &_0, &_1); zephir_check_call_status(); _2 = filesystemSafe == 1; if (_2) { @@ -104,12 +104,12 @@ PHP_METHOD(Phalcon_Traits_Support_Helper_Str_DirFromFileTrait, toDirFromFile) if (!zephir_is_true(&start)) { ZVAL_LONG(&_6$$4, 0); ZVAL_LONG(&_7$$4, 1); - ZEPHIR_CALL_FUNCTION(&start, "mb_substr", NULL, 310, &name, &_6$$4, &_7$$4); + ZEPHIR_CALL_FUNCTION(&start, "mb_substr", NULL, 309, &name, &_6$$4, &_7$$4); zephir_check_call_status(); } ZEPHIR_INIT_VAR(&_8); ZVAL_LONG(&_0, 2); - ZEPHIR_CALL_FUNCTION(&_9, "mb_str_split", NULL, 311, &start, &_0); + ZEPHIR_CALL_FUNCTION(&_9, "mb_str_split", NULL, 310, &start, &_0); zephir_check_call_status(); zephir_fast_join_str(&_8, SL("/"), &_9); ZEPHIR_CONCAT_VS(return_value, &_8, "/"); diff --git a/ext/phalcon/translate/adapter/gettext.zep.c b/ext/phalcon/translate/adapter/gettext.zep.c index 9c9ea90c6e..c1fd5b4ea0 100644 --- a/ext/phalcon/translate/adapter/gettext.zep.c +++ b/ext/phalcon/translate/adapter/gettext.zep.c @@ -701,7 +701,7 @@ PHP_METHOD(Phalcon_Translate_Adapter_Gettext, phpExtensionLoaded) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_memory_observe(&name_zv); ZVAL_STR_COPY(&name_zv, name); - ZEPHIR_RETURN_CALL_FUNCTION("extension_loaded", NULL, 474, &name_zv); + ZEPHIR_RETURN_CALL_FUNCTION("extension_loaded", NULL, 473, &name_zv); zephir_check_call_status(); RETURN_MM(); } diff --git a/phalcon/Di/Di.zep b/phalcon/Di/Di.zep index 351ec339c2..fdc0f679cf 100644 --- a/phalcon/Di/Di.zep +++ b/phalcon/Di/Di.zep @@ -220,8 +220,8 @@ class Di implements DiInterface if fetch service, this->services[name] { let isShared = service->isShared(); - if isShared && isset this->sharedInstances[name] { - return this->sharedInstances[name]; + if isShared && (fetch instance, this->sharedInstances[name]) && instance !== null { + return instance; } } @@ -361,17 +361,22 @@ class Di implements DiInterface */ public function getShared(string name, parameters = null) -> var { + var instance; + /** * Resolve the alias, if any */ let name = this->resolveAlias(name); - if (!isset(this->sharedInstances[name])) { - // Store the instance in the shared instances cache. - let this->sharedInstances[name] = this->get(name, parameters); + if (fetch instance, this->sharedInstances[name]) && instance !== null { + return instance; } - return this->sharedInstances[name]; + // Store the instance in the shared instances cache. + let instance = this->get(name, parameters), + this->sharedInstances[name] = instance; + + return instance; } /** diff --git a/phalcon/Di/FactoryDefault.zep b/phalcon/Di/FactoryDefault.zep index 6a8e857878..b932142c91 100644 --- a/phalcon/Di/FactoryDefault.zep +++ b/phalcon/Di/FactoryDefault.zep @@ -15,7 +15,7 @@ use Phalcon\Assets\Manager as AssetsManager; use Phalcon\Encryption\Crypt; use Phalcon\Encryption\Security; use Phalcon\Events\Manager as EventsManager; -use Phalcon\Filter\FilterFactory; +use Phalcon\Filter\Filter; use Phalcon\Flash\Direct; use Phalcon\Flash\Session; use Phalcon\Html\Escaper; @@ -46,12 +46,8 @@ class FactoryDefault extends \Phalcon\Di\Di */ public function __construct() { - var filter; - parent::__construct(); - let filter = new FilterFactory(); - let this->services = [ "annotations" : new Service(AnnotationsMemory::class, true), "assets" : new Service( @@ -73,7 +69,18 @@ class FactoryDefault extends \Phalcon\Di\Di "eventsManager" : new Service(EventsManager::class, true), "flash" : new Service(Direct::class, true), "flashSession" : new Service(Session::class, true), - "filter" : new Service(filter->newInstance(), true), + "filter" : new Service( + [ + "className" : Filter::class, + "arguments" : [ + [ + "type" : "parameter", + "value" : Filter::getDefaultMapper() + ] + ] + ], + true + ), "helper" : new Service(HelperFactory::class, true), "settings" : new Service(Settings::class, true), "modelsManager" : new Service(ModelManager::class, true), @@ -98,31 +105,5 @@ class FactoryDefault extends \Phalcon\Di\Di "transactionManager" : new Service(TransactionManager::class, true), "url" : new Service(Url::class, true) ]; - -// this->setShared( -// "assets", -// [ -// "className" : "Phalcon\\Assets\\Manager", -// "arguments" : [ -// [ -// "type" : "service", -// "name" : "tag" -// ] -// ] -// ] -// ); -// -// this->setShared( -// "tag", -// [ -// "className" : "Phalcon\\Html\\TagFactory", -// "arguments" : [ -// [ -// "type" : "service", -// "name" : "escaper" -// ] -// ] -// ] -// ); } } diff --git a/phalcon/Di/FactoryDefault/Cli.zep b/phalcon/Di/FactoryDefault/Cli.zep index 5b4d65f5bd..e31fdec615 100644 --- a/phalcon/Di/FactoryDefault/Cli.zep +++ b/phalcon/Di/FactoryDefault/Cli.zep @@ -17,7 +17,7 @@ use Phalcon\Di\FactoryDefault; use Phalcon\Di\Service; use Phalcon\Encryption\Security; use Phalcon\Events\Manager as EventsManager; -use Phalcon\Filter\FilterFactory; +use Phalcon\Filter\Filter; use Phalcon\Html\Escaper; use Phalcon\Html\TagFactory; use Phalcon\Mvc\Model\Manager as ModelManager; @@ -42,18 +42,25 @@ class Cli extends FactoryDefault */ public function __construct() { - var filter; - parent::__construct(); - let filter = new FilterFactory(); - let this->services = [ "annotations": new Service(AnnotationsMemory::class, true), "dispatcher": new Service(Dispatcher::class, true), "escaper": new Service(Escaper::class, true), "eventsManager": new Service(EventsManager::class, true), - "filter": new Service(filter->newInstance(), true), + "filter": new Service( + [ + "className" : Filter::class, + "arguments" : [ + [ + "type" : "parameter", + "value" : Filter::getDefaultMapper() + ] + ] + ], + true + ), "helper": new Service(HelperFactory::class, true), "settings": new Service(Settings::class, true), "modelsManager": new Service(ModelManager::class, true), diff --git a/phalcon/Filter/Filter.zep b/phalcon/Filter/Filter.zep index ef89f8d1f7..3b942a1054 100644 --- a/phalcon/Filter/Filter.zep +++ b/phalcon/Filter/Filter.zep @@ -372,10 +372,10 @@ class Filter implements FilterInterface */ protected function init(array mapper) -> void { - var name, service; + let this->mapper = array_replace(this->mapper, mapper); - for name, service in mapper { - this->set(name, service); + if !empty this->services { + let this->services = array_diff_key(this->services, mapper); } } diff --git a/tests/benchmarks/Di/DiBench.php b/tests/benchmarks/Di/DiBench.php index 19ad36916a..95a1a95131 100644 --- a/tests/benchmarks/Di/DiBench.php +++ b/tests/benchmarks/Di/DiBench.php @@ -67,4 +67,14 @@ public function benchGetShared(): void throw new RuntimeException('Di::get() returned an unexpected value'); } } + + /** + * A shared service through getShared(): the method that the apps use (Injectable::__get()). + */ + public function benchGetSharedMethod(): void + { + if (!$this->container->getShared('escaper') instanceof Escaper) { + throw new RuntimeException('Di::getShared() returned an unexpected value'); + } + } } diff --git a/tests/benchmarks/README.md b/tests/benchmarks/README.md index 3828888419..733d714050 100644 --- a/tests/benchmarks/README.md +++ b/tests/benchmarks/README.md @@ -88,23 +88,23 @@ docker exec cphalcon-bench-8.4 callgrind_annotate --auto=no --inclusive=yes /srv One subject for each component entry point that the reference apps run (selected with the coverage data). -| Class | Subjects | -|------------------------------|------------------------------------------------------------| -| `Container\ContainerBench` | `benchGet` | -| `Db\PdoBench` | `benchFetchAll`, `benchFetchOneBound` | -| `Di\DiBench` | `benchFactoryDefault`, `benchGetNew`, `benchGetShared` | -| `Events\ManagerBench` | `benchFire`, `benchFireNoListener` | -| `Filter\FilterBench` | `benchSanitize` | -| `Html\EscaperBench` | `benchHtml` | -| `Http\ResponseBench` | `benchSend`, `benchSetJsonContent` | -| `Mvc\DispatcherBench` | `benchDispatch` | -| `Mvc\ModelBench` | `benchFind`, `benchFindFirst`, `benchSave`, `benchToArray` | -| `Mvc\QueryBench` | `benchParseCold`, `benchParseWarm` | -| `Mvc\RouterBench` | `benchDefineAndHandle`, `benchHandle` | -| `Mvc\ViewBench` | `benchPartial`, `benchRender` | -| `Mvc\VoltBench` | `benchCompileString` | -| `Support\CollectionBench` | `benchGet` | -| `Support\JsonBench` | `benchEncode` | +| Class | Subjects | +|------------------------------|--------------------------------------------------------------------------------| +| `Container\ContainerBench` | `benchGet` | +| `Db\PdoBench` | `benchFetchAll`, `benchFetchOneBound` | +| `Di\DiBench` | `benchFactoryDefault`, `benchGetNew`, `benchGetShared`, `benchGetSharedMethod` | +| `Events\ManagerBench` | `benchFire`, `benchFireNoListener` | +| `Filter\FilterBench` | `benchSanitize` | +| `Html\EscaperBench` | `benchHtml` | +| `Http\ResponseBench` | `benchSend`, `benchSetJsonContent` | +| `Mvc\DispatcherBench` | `benchDispatch` | +| `Mvc\ModelBench` | `benchFind`, `benchFindFirst`, `benchSave`, `benchToArray` | +| `Mvc\QueryBench` | `benchParseCold`, `benchParseWarm` | +| `Mvc\RouterBench` | `benchDefineAndHandle`, `benchHandle` | +| `Mvc\ViewBench` | `benchPartial`, `benchRender` | +| `Mvc\VoltBench` | `benchCompileString` | +| `Support\CollectionBench` | `benchGet` | +| `Support\JsonBench` | `benchEncode` | - The subjects use the fixtures of the reference apps (`Apps\Mvc\Fixture`, `Apps\Rest\Fixture`). - `benchParseCold` uses a new PHQL string for each call, so both PHQL caches miss. The caches grow during diff --git a/tests/support/Filter/InitFilter.php b/tests/support/Filter/InitFilter.php new file mode 100644 index 0000000000..8fef669583 --- /dev/null +++ b/tests/support/Filter/InitFilter.php @@ -0,0 +1,30 @@ + + * + * For the full copyright and license information, please view the LICENSE.txt + * file that was distributed with this source code. + */ + +declare(strict_types=1); + +namespace Phalcon\Tests\Support\Filter; + +use Phalcon\Filter\Filter; + +/** + * Gives access to the protected init() method + */ +final class InitFilter extends Filter +{ + /** + * @param array $mapper + */ + public function reinit(array $mapper): void + { + $this->init($mapper); + } +} diff --git a/tests/unit/Di/FactoryDefault/Cli/ConstructTest.php b/tests/unit/Di/FactoryDefault/Cli/ConstructTest.php index 93928e57c1..3e4b48f3c2 100644 --- a/tests/unit/Di/FactoryDefault/Cli/ConstructTest.php +++ b/tests/unit/Di/FactoryDefault/Cli/ConstructTest.php @@ -14,6 +14,7 @@ namespace Phalcon\Tests\Unit\Di\FactoryDefault\Cli; use Phalcon\Di\FactoryDefault\Cli; +use Phalcon\Filter\Filter; use Phalcon\Talon\PHPUnit\AbstractUnitTestCase; use Phalcon\Tests\Unit\Di\Fake\CliTrait; use PHPUnit\Framework\Attributes\DataProvider; @@ -36,6 +37,46 @@ public function testDiFactoryDefaultCliConstruct(): void $this->assertEquals($expected, $actual); } + /** + * @author Phalcon Team + * @since 2026-09-29 + */ + public function testDiFactoryDefaultCliConstructFilterHasDefaultMapper(): void + { + $container = new Cli(); + $filter = $container->getShared('filter'); + + $this->assertInstanceOf(Filter::class, $filter); + $this->assertSame($filter, $container->getShared('filter')); + + foreach (array_keys(Filter::getDefaultMapper()) as $name) { + $this->assertTrue($filter->has($name)); + } + + $this->assertSame('hello', $filter->sanitize(' hello ', 'trim')); + } + + /** + * @author Phalcon Team + * @since 2026-09-29 + */ + public function testDiFactoryDefaultCliConstructFilterIsLazy(): void + { + $container = new Cli(); + + $expected = [ + 'className' => Filter::class, + 'arguments' => [ + [ + 'type' => 'parameter', + 'value' => Filter::getDefaultMapper(), + ], + ], + ]; + $actual = $container->getService('filter')->getDefinition(); + $this->assertSame($expected, $actual); + } + /** * @author Phalcon Team * @since 2019-09-09 diff --git a/tests/unit/Di/FactoryDefault/ConstructTest.php b/tests/unit/Di/FactoryDefault/ConstructTest.php index 7e833359c7..06f61e9bef 100644 --- a/tests/unit/Di/FactoryDefault/ConstructTest.php +++ b/tests/unit/Di/FactoryDefault/ConstructTest.php @@ -151,6 +151,46 @@ public function testDiFactoryDefaultConstruct(): void $this->assertSame($expected, $actual); } + /** + * @author Phalcon Team + * @since 2026-09-29 + */ + public function testDiFactoryDefaultConstructFilterHasDefaultMapper(): void + { + $container = new FactoryDefault(); + $filter = $container->getShared('filter'); + + $this->assertInstanceOf(Filter::class, $filter); + $this->assertSame($filter, $container->getShared('filter')); + + foreach (array_keys(Filter::getDefaultMapper()) as $name) { + $this->assertTrue($filter->has($name)); + } + + $this->assertSame('hello', $filter->sanitize(' hello ', 'trim')); + } + + /** + * @author Phalcon Team + * @since 2026-09-29 + */ + public function testDiFactoryDefaultConstructFilterIsLazy(): void + { + $container = new FactoryDefault(); + + $expected = [ + 'className' => Filter::class, + 'arguments' => [ + [ + 'type' => 'parameter', + 'value' => Filter::getDefaultMapper(), + ], + ], + ]; + $actual = $container->getService('filter')->getDefinition(); + $this->assertSame($expected, $actual); + } + /** * @author Phalcon Team * @since 2018-11-13 diff --git a/tests/unit/Di/GetSetSharedTest.php b/tests/unit/Di/GetSetSharedTest.php index f8205de526..0434fb4a74 100644 --- a/tests/unit/Di/GetSetSharedTest.php +++ b/tests/unit/Di/GetSetSharedTest.php @@ -105,4 +105,42 @@ public function testDiGetShared(): void $actual = spl_object_hash($objectTwo); $this->assertSame($expected, $actual); } + + /** + * @author Phalcon Team + * @since 2026-09-29 + */ + public function testDiGetSharedMethodNullResolvesAgain(): void + { + $container = new Di(); + $count = 0; + + $container->setShared( + 'nullService', + function () use (&$count) { + $count++; + + return null; + } + ); + + $this->assertNull($container->getShared('nullService')); + $this->assertNull($container->getShared('nullService')); + $this->assertSame(2, $count); + } + + /** + * @author Phalcon Team + * @since 2026-09-29 + */ + public function testDiGetSharedMethodServiceNotShared(): void + { + $container = new Di(); + $container->set('escaper', Escaper::class); + + $first = $container->getShared('escaper'); + + $this->assertSame($first, $container->getShared('escaper')); + $this->assertNotSame($first, $container->get('escaper')); + } } diff --git a/tests/unit/Di/GetTest.php b/tests/unit/Di/GetTest.php index ff7b3c73f5..cb3e15660b 100644 --- a/tests/unit/Di/GetTest.php +++ b/tests/unit/Di/GetTest.php @@ -129,4 +129,27 @@ public function testDiGetShared(): void $actual = spl_object_hash($actual); $this->assertSame($expected, $actual); } + + /** + * @author Phalcon Team + * @since 2026-09-29 + */ + public function testDiGetSharedNullResolvesAgain(): void + { + $container = new Di(); + $count = 0; + + $container->setShared( + 'nullService', + function () use (&$count) { + $count++; + + return null; + } + ); + + $this->assertNull($container->get('nullService')); + $this->assertNull($container->get('nullService')); + $this->assertSame(2, $count); + } } diff --git a/tests/unit/Filter/Filter/InitTest.php b/tests/unit/Filter/Filter/InitTest.php new file mode 100644 index 0000000000..b3df658dbd --- /dev/null +++ b/tests/unit/Filter/Filter/InitTest.php @@ -0,0 +1,80 @@ + + * + * For the full copyright and license information, please view the + * LICENSE.txt file that was distributed with this source code. + */ + +declare(strict_types=1); + +namespace Phalcon\Tests\Unit\Filter\Filter; + +use Phalcon\Filter\Filter; +use Phalcon\Filter\Sanitize\Trim; +use Phalcon\Filter\Sanitize\Upper; +use Phalcon\Talon\PHPUnit\AbstractUnitTestCase; +use Phalcon\Tests\Support\Filter\InitFilter; +use Phalcon\Tests\Support\Service\HelloService; + +final class InitTest extends AbstractUnitTestCase +{ + /** + * @author Phalcon Team + * @since 2026-09-29 + */ + public function testFilterFilterInitKeepsNumericKeys(): void + { + $locator = new Filter(['1' => Trim::class]); + + $this->assertTrue($locator->has('1')); + $this->assertFalse($locator->has('0')); + } + + /** + * @author Phalcon Team + * @since 2026-09-29 + */ + public function testFilterFilterInitKeepsOtherInstances(): void + { + $locator = new InitFilter(['helloFilter' => HelloService::class]); + $first = $locator->get('helloFilter'); + + $locator->reinit(['upper' => Upper::class]); + + $this->assertSame($first, $locator->get('helloFilter')); + } + + /** + * @author Phalcon Team + * @since 2026-09-29 + */ + public function testFilterFilterInitMergesServices(): void + { + $locator = new InitFilter(['trim' => Trim::class]); + + $locator->reinit(['upper' => Upper::class]); + + $this->assertTrue($locator->has('trim')); + $this->assertTrue($locator->has('upper')); + } + + /** + * @author Phalcon Team + * @since 2026-09-29 + */ + public function testFilterFilterInitReplacesServiceAndClearsInstance(): void + { + $locator = new InitFilter(['helloFilter' => HelloService::class]); + $first = $locator->get('helloFilter'); + + $locator->reinit(['helloFilter' => Trim::class]); + $second = $locator->get('helloFilter'); + + $this->assertInstanceOf(HelloService::class, $first); + $this->assertInstanceOf(Trim::class, $second); + } +}