Skip to content

Commit

Permalink
T13687 debug hide vars (#13833)
Browse files Browse the repository at this point in the history 
* [4.0.x] - Added unicode flag for email filter

* [#13687] - Added testbed for quick testing using the server

* [#13687] - Set the Utility as static

* [#13687] - Adjusted tests

* [#13687] - Corrected the change to the Utility class

* [#13687] - Updating the changelog

* [#13687] - Added Helper/Arr

* [#13687] - Added tests for Arr

* [#13687] - Corrections to the helper

* [#13687] - Removing mysql 5.7 temporarily

* [#13687] - Trying xenial build

* [#13687] - Updating ext folder

* Revert "[#13687] - Updating ext folder"

This reverts commit f18a967.

* Revert "[#13687] - Trying xenial build"

This reverts commit 07da593.

* [#13687] - Refactored locations for url/utils

* [#13687] - Updated references to url/utils

* [#13687] - Trying the build with mysql5.7 again

* [#13687] - Trying a different installation for mysql 5.7

* [#13687] - Trying to get the installation going of mysql 5.7

* [#13687] - Trying something different

* [#13687] - Trying xenial

* [#13687] - Re-enabling mysql; removing memcached

* [#13687] - Adding again memcached in the setup

* [#13687] - Removing xenial
  • Loading branch information
@niden
niden authored Feb 18, 2019
1 parent c4cd29d commit e427da5
Show file tree
Hide file tree
Showing 111 changed files with 2,455 additions and 1,745 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ sudo: false

language: php
php:
# PHP 7.4 does not ready yet
# PHP 7.4 is not ready yet
# - 'master'
- '7.3'
- '7.2'
Expand All @@ -26,7 +26,7 @@ addons:

matrix:
fast_finish: true
# PHP 7.4 does not ready yet
# PHP 7.4 is not ready yet
# allow_failures:
# - php: 'master'

Expand Down
1 change: 1 addition & 0 deletions CHANGELOG-4.0.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
## Added
- Added `view:afterCompile` and `view:beforeCompile` events for the Volt compiler [#2182](https://github.com/phalcon/cphalcon/pull/2182)
- Added array merge support to `Phalcon\Config::merge`
- Added `setBlacklist` in `Phalcon\Debug` to allow the developer to "blacklist" certain variables from the `$_REQUEST` or `$_SERVER` superglobals being displayed on screen [#13687](https://github.com/phalcon/cphalcon/pull/13687)

## Fixed
- Fixed router and controller parameter inconsistencies (camelize etc.) [#13555](https://github.com/phalcon/cphalcon/issues/13555)
Expand Down
2 changes: 1 addition & 1 deletion build/_resource/config/phalcon_c_priority_files.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
$files = [
'phalcon/annotations/scanner.h',
'phalcon/annotations/annot.h',
'phalcon/mvc/url/utils.h',
'phalcon/mvc/model/orm.h',
'phalcon/mvc/model/query/scanner.h',
'phalcon/mvc/model/query/phql.h',
Expand All @@ -16,6 +15,7 @@
'phalcon/mvc/view/engine/volt/parser.php' . PHP_MAJOR_VERSION . '.inc.h',
'phalcon/annotations/parser.php' . PHP_MAJOR_VERSION . '.h',
'phalcon/annotations/parser.php' . PHP_MAJOR_VERSION . '.inc.h',
'phalcon/url/utils.h',
'kernel/main.h',
'kernel/memory.h',
'kernel/exception.h',
Expand Down
2 changes: 1 addition & 1 deletion build/_resource/config/phalcon_c_skip_files.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

'phalcon/annotations/scanner.h',
'phalcon/annotations/annot.h',
'phalcon/mvc/url/utils.h',
'phalcon/url/utils.h',
'phalcon/mvc/model/orm.h',
'phalcon/mvc/model/query/scanner.h',
'phalcon/mvc/model/query/phql.h',
Expand Down
2 changes: 1 addition & 1 deletion config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"phalcon/mvc/model/query/parser.c",
"phalcon/mvc/view/engine/volt/parser.c",
"phalcon/mvc/view/engine/volt/scanner.c",
"phalcon/mvc/url/utils.c"
"phalcon/url/utils.c"
],
"globals": {
"db.escape_identifiers": {
Expand Down
11 changes: 6 additions & 5 deletions ext/config.m4
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ if test "$PHP_PHALCON" = "yes"; then
phalcon/mvc/model/metadata.zep.c
phalcon/config.zep.c
phalcon/db/adapterinterface.zep.c
phalcon/utility.zep.c
phalcon/annotations/adapterinterface.zep.c
phalcon/db/adapter.zep.c
phalcon/db/dialectinterface.zep.c
Expand Down Expand Up @@ -120,12 +119,12 @@ if test "$PHP_PHALCON" = "yes"; then
phalcon/mvc/router.zep.c
phalcon/mvc/router/groupinterface.zep.c
phalcon/mvc/router/routeinterface.zep.c
phalcon/mvc/urlinterface.zep.c
phalcon/mvc/view/exception.zep.c
phalcon/mvc/viewinterface.zep.c
phalcon/paginator/repositoryinterface.zep.c
phalcon/session/baginterface.zep.c
phalcon/session/managerinterface.zep.c
phalcon/urlinterface.zep.c
phalcon/validation/combinedfieldsvalidator.zep.c
phalcon/validationinterface.zep.c
phalcon/acl.zep.c
Expand Down Expand Up @@ -262,6 +261,8 @@ if test "$PHP_PHALCON" = "yes"; then
phalcon/forms/exception.zep.c
phalcon/forms/form.zep.c
phalcon/forms/manager.zep.c
phalcon/helper/arr.zep.c
phalcon/helper/exception.zep.c
phalcon/html/breadcrumbs.zep.c
phalcon/html/exception.zep.c
phalcon/html/helper/anchor.zep.c
Expand Down Expand Up @@ -353,8 +354,6 @@ if test "$PHP_PHALCON" = "yes"; then
phalcon/mvc/router/exception.zep.c
phalcon/mvc/router/group.zep.c
phalcon/mvc/router/route.zep.c
phalcon/mvc/url.zep.c
phalcon/mvc/url/exception.zep.c
phalcon/mvc/view.zep.c
phalcon/mvc/view/engine/php.zep.c
phalcon/mvc/view/engine/volt.zep.c
Expand Down Expand Up @@ -395,6 +394,8 @@ if test "$PHP_PHALCON" = "yes"; then
phalcon/translate/factory.zep.c
phalcon/translate/interpolator/associativearray.zep.c
phalcon/translate/interpolator/indexedarray.zep.c
phalcon/url.zep.c
phalcon/url/exception.zep.c
phalcon/validation.zep.c
phalcon/validation/exception.zep.c
phalcon/validation/validator/alnum.zep.c
Expand Down Expand Up @@ -453,7 +454,7 @@ if test "$PHP_PHALCON" = "yes"; then
phalcon/mvc/model/query/parser.c
phalcon/mvc/view/engine/volt/parser.c
phalcon/mvc/view/engine/volt/scanner.c
phalcon/mvc/url/utils.c"
phalcon/url/utils.c"
PHP_NEW_EXTENSION(phalcon, $phalcon_sources, $ext_shared,, )
PHP_SUBST(PHALCON_SHARED_LIBADD)

Expand Down
9 changes: 5 additions & 4 deletions ext/config.w32
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ if (PHP_PHALCON != "no") {
ADD_SOURCES(configure_module_dirname + "/phalcon/mvc/model", "orm.c", "phalcon");
ADD_SOURCES(configure_module_dirname + "/phalcon/mvc/model/query", "scanner.c parser.c", "phalcon");
ADD_SOURCES(configure_module_dirname + "/phalcon/mvc/view/engine/volt", "parser.c scanner.c", "phalcon");
ADD_SOURCES(configure_module_dirname + "/phalcon/mvc/url", "utils.c", "phalcon");
ADD_SOURCES(configure_module_dirname + "/phalcon", "exception.zep.c factoryinterface.zep.c factory.zep.c dispatcherinterface.zep.c config.zep.c utility.zep.c diinterface.zep.c flashinterface.zep.c application.zep.c di.zep.c dispatcher.zep.c flash.zep.c cryptinterface.zep.c escaperinterface.zep.c validationinterface.zep.c acl.zep.c container.zep.c crypt.zep.c db.zep.c debug.zep.c escaper.zep.c image.zep.c kernel.zep.c loader.zep.c logger.zep.c plugin.zep.c registry.zep.c security.zep.c tag.zep.c text.zep.c translate.zep.c validation.zep.c version.zep.c 0__closure.zep.c 1__closure.zep.c 2__closure.zep.c 3__closure.zep.c 4__closure.zep.c 5__closure.zep.c 6__closure.zep.c 7__closure.zep.c 8__closure.zep.c 9__closure.zep.c 10__closure.zep.c 11__closure.zep.c 12__closure.zep.c 13__closure.zep.c 14__closure.zep.c 15__closure.zep.c 16__closure.zep.c 17__closure.zep.c 18__closure.zep.c 19__closure.zep.c 20__closure.zep.c 21__closure.zep.c 22__closure.zep.c 23__closure.zep.c 24__closure.zep.c 25__closure.zep.c 26__closure.zep.c 27__closure.zep.c", "phalcon");
ADD_SOURCES(configure_module_dirname + "/phalcon/url", "utils.c", "phalcon");
ADD_SOURCES(configure_module_dirname + "/phalcon", "exception.zep.c factoryinterface.zep.c factory.zep.c dispatcherinterface.zep.c config.zep.c diinterface.zep.c flashinterface.zep.c application.zep.c di.zep.c dispatcher.zep.c flash.zep.c cryptinterface.zep.c escaperinterface.zep.c urlinterface.zep.c validationinterface.zep.c acl.zep.c container.zep.c crypt.zep.c db.zep.c debug.zep.c escaper.zep.c image.zep.c kernel.zep.c loader.zep.c logger.zep.c plugin.zep.c registry.zep.c security.zep.c tag.zep.c text.zep.c translate.zep.c url.zep.c validation.zep.c version.zep.c 0__closure.zep.c 1__closure.zep.c 2__closure.zep.c 3__closure.zep.c 4__closure.zep.c 5__closure.zep.c 6__closure.zep.c 7__closure.zep.c 8__closure.zep.c 9__closure.zep.c 10__closure.zep.c 11__closure.zep.c 12__closure.zep.c 13__closure.zep.c 14__closure.zep.c 15__closure.zep.c 16__closure.zep.c 17__closure.zep.c 18__closure.zep.c 19__closure.zep.c 20__closure.zep.c 21__closure.zep.c 22__closure.zep.c 23__closure.zep.c 24__closure.zep.c 25__closure.zep.c 26__closure.zep.c 27__closure.zep.c", "phalcon");
ADD_SOURCES(configure_module_dirname + "/phalcon/di", "injectionawareinterface.zep.c injectable.zep.c exception.zep.c factorydefault.zep.c serviceinterface.zep.c service.zep.c serviceproviderinterface.zep.c", "phalcon");
ADD_SOURCES(configure_module_dirname + "/phalcon/events", "eventsawareinterface.zep.c eventinterface.zep.c managerinterface.zep.c event.zep.c exception.zep.c manager.zep.c", "phalcon");
ADD_SOURCES(configure_module_dirname + "/phalcon/validation", "validatorinterface.zep.c validator.zep.c combinedfieldsvalidator.zep.c exception.zep.c", "phalcon");
Expand All @@ -27,7 +27,7 @@ if (PHP_PHALCON != "no") {
ADD_SOURCES(configure_module_dirname + "/phalcon/annotations", "adapterinterface.zep.c adapter.zep.c readerinterface.zep.c annotation.zep.c collection.zep.c exception.zep.c factory.zep.c reader.zep.c reflection.zep.c", "phalcon");
ADD_SOURCES(configure_module_dirname + "/phalcon/logger/adapter", "adapterinterface.zep.c abstractadapter.zep.c noop.zep.c stream.zep.c syslog.zep.c", "phalcon");
ADD_SOURCES(configure_module_dirname + "/phalcon/logger/formatter", "formatterinterface.zep.c abstractformatter.zep.c json.zep.c line.zep.c syslog.zep.c", "phalcon");
ADD_SOURCES(configure_module_dirname + "/phalcon/mvc", "entityinterface.zep.c viewbaseinterface.zep.c routerinterface.zep.c collectioninterface.zep.c controllerinterface.zep.c dispatcherinterface.zep.c modelinterface.zep.c router.zep.c urlinterface.zep.c viewinterface.zep.c application.zep.c collection.zep.c controller.zep.c dispatcher.zep.c micro.zep.c model.zep.c moduledefinitioninterface.zep.c url.zep.c view.zep.c", "phalcon");
ADD_SOURCES(configure_module_dirname + "/phalcon/mvc", "entityinterface.zep.c viewbaseinterface.zep.c routerinterface.zep.c collectioninterface.zep.c controllerinterface.zep.c dispatcherinterface.zep.c modelinterface.zep.c router.zep.c viewinterface.zep.c application.zep.c collection.zep.c controller.zep.c dispatcher.zep.c micro.zep.c model.zep.c moduledefinitioninterface.zep.c view.zep.c", "phalcon");
ADD_SOURCES(configure_module_dirname + "/phalcon/paginator", "adapterinterface.zep.c adapter.zep.c repositoryinterface.zep.c exception.zep.c factory.zep.c repository.zep.c", "phalcon");
ADD_SOURCES(configure_module_dirname + "/phalcon/translate", "adapterinterface.zep.c adapter.zep.c interpolatorinterface.zep.c exception.zep.c factory.zep.c", "phalcon");
ADD_SOURCES(configure_module_dirname + "/phalcon/db/adapter", "pdo.zep.c", "phalcon");
Expand Down Expand Up @@ -76,6 +76,7 @@ if (PHP_PHALCON != "no") {
ADD_SOURCES(configure_module_dirname + "/phalcon/filter/sanitize", "absint.zep.c alnum.zep.c alpha.zep.c boolval.zep.c email.zep.c floatval.zep.c intval.zep.c lower.zep.c lowerfirst.zep.c regex.zep.c remove.zep.c replace.zep.c special.zep.c specialfull.zep.c stringval.zep.c striptags.zep.c trim.zep.c upper.zep.c upperfirst.zep.c upperwords.zep.c url.zep.c", "phalcon");
ADD_SOURCES(configure_module_dirname + "/phalcon/flash", "direct.zep.c exception.zep.c session.zep.c", "phalcon");
ADD_SOURCES(configure_module_dirname + "/phalcon/forms/element", "check.zep.c date.zep.c email.zep.c file.zep.c hidden.zep.c numeric.zep.c password.zep.c radio.zep.c select.zep.c submit.zep.c text.zep.c textarea.zep.c", "phalcon");
ADD_SOURCES(configure_module_dirname + "/phalcon/helper", "arr.zep.c exception.zep.c", "phalcon");
ADD_SOURCES(configure_module_dirname + "/phalcon/html", "breadcrumbs.zep.c exception.zep.c tag.zep.c taglocator.zep.c taglocatorfactory.zep.c", "phalcon");
ADD_SOURCES(configure_module_dirname + "/phalcon/http/cookie", "exception.zep.c", "phalcon");
ADD_SOURCES(configure_module_dirname + "/phalcon/image/adapter", "gd.zep.c imagick.zep.c", "phalcon");
Expand All @@ -89,7 +90,6 @@ if (PHP_PHALCON != "no") {
ADD_SOURCES(configure_module_dirname + "/phalcon/mvc/model/binder", "bindableinterface.zep.c", "phalcon");
ADD_SOURCES(configure_module_dirname + "/phalcon/mvc/model/metadata/strategy", "annotations.zep.c introspection.zep.c", "phalcon");
ADD_SOURCES(configure_module_dirname + "/phalcon/mvc/model/resultset", "complex.zep.c simple.zep.c", "phalcon");
ADD_SOURCES(configure_module_dirname + "/phalcon/mvc/url", "exception.zep.c", "phalcon");
ADD_SOURCES(configure_module_dirname + "/phalcon/mvc/view/engine", "php.zep.c volt.zep.c", "phalcon");
ADD_SOURCES(configure_module_dirname + "/phalcon/mvc/view/engine/volt", "compiler.zep.c exception.zep.c", "phalcon");
ADD_SOURCES(configure_module_dirname + "/phalcon/paginator/adapter", "model.zep.c nativearray.zep.c querybuilder.zep.c", "phalcon");
Expand All @@ -99,6 +99,7 @@ if (PHP_PHALCON != "no") {
ADD_SOURCES(configure_module_dirname + "/phalcon/tag", "exception.zep.c select.zep.c", "phalcon");
ADD_SOURCES(configure_module_dirname + "/phalcon/translate/adapter", "csv.zep.c gettext.zep.c nativearray.zep.c", "phalcon");
ADD_SOURCES(configure_module_dirname + "/phalcon/translate/interpolator", "associativearray.zep.c indexedarray.zep.c", "phalcon");
ADD_SOURCES(configure_module_dirname + "/phalcon/url", "exception.zep.c", "phalcon");
ADD_SOURCES(configure_module_dirname + "/phalcon/validation/validator", "alnum.zep.c alpha.zep.c between.zep.c callback.zep.c confirmation.zep.c creditcard.zep.c date.zep.c digit.zep.c email.zep.c exception.zep.c exclusionin.zep.c file.zep.c identical.zep.c inclusionin.zep.c ip.zep.c numericality.zep.c presenceof.zep.c regex.zep.c stringlength.zep.c uniqueness.zep.c url.zep.c", "phalcon");
ADD_FLAG("CFLAGS_PHALCON", "/D ZEPHIR_RELEASE /Oi /Ot /Oy /Ob2 /Gs /GF /Gy /GL");
ADD_FLAG("CFLAGS", "/D ZEPHIR_RELEASE /Oi /Ot /Oy /Ob2 /Gs /GF /Gy /GL");
Expand Down
18 changes: 10 additions & 8 deletions ext/phalcon.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,11 +95,11 @@ zend_class_entry *phalcon_mvc_model_transactioninterface_ce;
zend_class_entry *phalcon_mvc_modelinterface_ce;
zend_class_entry *phalcon_mvc_router_groupinterface_ce;
zend_class_entry *phalcon_mvc_router_routeinterface_ce;
zend_class_entry *phalcon_mvc_urlinterface_ce;
zend_class_entry *phalcon_mvc_viewinterface_ce;
zend_class_entry *phalcon_paginator_repositoryinterface_ce;
zend_class_entry *phalcon_session_baginterface_ce;
zend_class_entry *phalcon_session_managerinterface_ce;
zend_class_entry *phalcon_urlinterface_ce;
zend_class_entry *phalcon_validationinterface_ce;
zend_class_entry *phalcon_acl_componentaware_ce;
zend_class_entry *phalcon_acl_roleaware_ce;
Expand All @@ -120,7 +120,6 @@ zend_class_entry *phalcon_cache_backend_ce;
zend_class_entry *phalcon_html_helper_abstracthelper_ce;
zend_class_entry *phalcon_mvc_model_metadata_ce;
zend_class_entry *phalcon_config_ce;
zend_class_entry *phalcon_utility_ce;
zend_class_entry *phalcon_db_adapter_ce;
zend_class_entry *phalcon_annotations_adapter_ce;
zend_class_entry *phalcon_db_adapter_pdo_ce;
Expand Down Expand Up @@ -310,6 +309,8 @@ zend_class_entry *phalcon_forms_element_textarea_ce;
zend_class_entry *phalcon_forms_exception_ce;
zend_class_entry *phalcon_forms_form_ce;
zend_class_entry *phalcon_forms_manager_ce;
zend_class_entry *phalcon_helper_arr_ce;
zend_class_entry *phalcon_helper_exception_ce;
zend_class_entry *phalcon_html_breadcrumbs_ce;
zend_class_entry *phalcon_html_exception_ce;
zend_class_entry *phalcon_html_helper_anchor_ce;
Expand Down Expand Up @@ -396,8 +397,6 @@ zend_class_entry *phalcon_mvc_router_annotations_ce;
zend_class_entry *phalcon_mvc_router_exception_ce;
zend_class_entry *phalcon_mvc_router_group_ce;
zend_class_entry *phalcon_mvc_router_route_ce;
zend_class_entry *phalcon_mvc_url_ce;
zend_class_entry *phalcon_mvc_url_exception_ce;
zend_class_entry *phalcon_mvc_view_ce;
zend_class_entry *phalcon_mvc_view_engine_php_ce;
zend_class_entry *phalcon_mvc_view_engine_volt_ce;
Expand Down Expand Up @@ -438,6 +437,8 @@ zend_class_entry *phalcon_translate_exception_ce;
zend_class_entry *phalcon_translate_factory_ce;
zend_class_entry *phalcon_translate_interpolator_associativearray_ce;
zend_class_entry *phalcon_translate_interpolator_indexedarray_ce;
zend_class_entry *phalcon_url_ce;
zend_class_entry *phalcon_url_exception_ce;
zend_class_entry *phalcon_validation_ce;
zend_class_entry *phalcon_validation_exception_ce;
zend_class_entry *phalcon_validation_validator_alnum_ce;
Expand Down Expand Up @@ -562,11 +563,11 @@ static PHP_MINIT_FUNCTION(phalcon)
ZEPHIR_INIT(Phalcon_Mvc_Model_Transaction_ManagerInterface);
ZEPHIR_INIT(Phalcon_Mvc_Router_GroupInterface);
ZEPHIR_INIT(Phalcon_Mvc_Router_RouteInterface);
ZEPHIR_INIT(Phalcon_Mvc_UrlInterface);
ZEPHIR_INIT(Phalcon_Mvc_ViewInterface);
ZEPHIR_INIT(Phalcon_Paginator_RepositoryInterface);
ZEPHIR_INIT(Phalcon_Session_BagInterface);
ZEPHIR_INIT(Phalcon_Session_ManagerInterface);
ZEPHIR_INIT(Phalcon_UrlInterface);
ZEPHIR_INIT(Phalcon_ValidationInterface);
ZEPHIR_INIT(Phalcon_Acl_ComponentAware);
ZEPHIR_INIT(Phalcon_Acl_RoleAware);
Expand All @@ -587,7 +588,6 @@ static PHP_MINIT_FUNCTION(phalcon)
ZEPHIR_INIT(Phalcon_Html_Helper_AbstractHelper);
ZEPHIR_INIT(Phalcon_Mvc_Model_MetaData);
ZEPHIR_INIT(Phalcon_Config);
ZEPHIR_INIT(Phalcon_Utility);
ZEPHIR_INIT(Phalcon_Db_Adapter);
ZEPHIR_INIT(Phalcon_Annotations_Adapter);
ZEPHIR_INIT(Phalcon_Db_Adapter_Pdo);
Expand Down Expand Up @@ -749,6 +749,8 @@ static PHP_MINIT_FUNCTION(phalcon)
ZEPHIR_INIT(Phalcon_Forms_Exception);
ZEPHIR_INIT(Phalcon_Forms_Form);
ZEPHIR_INIT(Phalcon_Forms_Manager);
ZEPHIR_INIT(Phalcon_Helper_Arr);
ZEPHIR_INIT(Phalcon_Helper_Exception);
ZEPHIR_INIT(Phalcon_Html_Breadcrumbs);
ZEPHIR_INIT(Phalcon_Html_Exception);
ZEPHIR_INIT(Phalcon_Html_Helper_Anchor);
Expand Down Expand Up @@ -835,8 +837,6 @@ static PHP_MINIT_FUNCTION(phalcon)
ZEPHIR_INIT(Phalcon_Mvc_Router_Exception);
ZEPHIR_INIT(Phalcon_Mvc_Router_Group);
ZEPHIR_INIT(Phalcon_Mvc_Router_Route);
ZEPHIR_INIT(Phalcon_Mvc_Url);
ZEPHIR_INIT(Phalcon_Mvc_Url_Exception);
ZEPHIR_INIT(Phalcon_Mvc_View);
ZEPHIR_INIT(Phalcon_Mvc_View_Engine_Php);
ZEPHIR_INIT(Phalcon_Mvc_View_Engine_Volt);
Expand Down Expand Up @@ -877,6 +877,8 @@ static PHP_MINIT_FUNCTION(phalcon)
ZEPHIR_INIT(Phalcon_Translate_Factory);
ZEPHIR_INIT(Phalcon_Translate_Interpolator_AssociativeArray);
ZEPHIR_INIT(Phalcon_Translate_Interpolator_IndexedArray);
ZEPHIR_INIT(Phalcon_Url);
ZEPHIR_INIT(Phalcon_Url_Exception);
ZEPHIR_INIT(Phalcon_Validation);
ZEPHIR_INIT(Phalcon_Validation_Exception);
ZEPHIR_INIT(Phalcon_Validation_Validator_Alnum);
Expand Down
9 changes: 5 additions & 4 deletions ext/phalcon.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
#include "phalcon/mvc/model/metadata.zep.h"
#include "phalcon/config.zep.h"
#include "phalcon/db/adapterinterface.zep.h"
#include "phalcon/utility.zep.h"
#include "phalcon/annotations/adapterinterface.zep.h"
#include "phalcon/db/adapter.zep.h"
#include "phalcon/db/dialectinterface.zep.h"
Expand Down Expand Up @@ -115,12 +114,12 @@
#include "phalcon/mvc/router.zep.h"
#include "phalcon/mvc/router/groupinterface.zep.h"
#include "phalcon/mvc/router/routeinterface.zep.h"
#include "phalcon/mvc/urlinterface.zep.h"
#include "phalcon/mvc/view/exception.zep.h"
#include "phalcon/mvc/viewinterface.zep.h"
#include "phalcon/paginator/repositoryinterface.zep.h"
#include "phalcon/session/baginterface.zep.h"
#include "phalcon/session/managerinterface.zep.h"
#include "phalcon/urlinterface.zep.h"
#include "phalcon/validation/combinedfieldsvalidator.zep.h"
#include "phalcon/validationinterface.zep.h"
#include "phalcon/acl.zep.h"
Expand Down Expand Up @@ -257,6 +256,8 @@
#include "phalcon/forms/exception.zep.h"
#include "phalcon/forms/form.zep.h"
#include "phalcon/forms/manager.zep.h"
#include "phalcon/helper/arr.zep.h"
#include "phalcon/helper/exception.zep.h"
#include "phalcon/html/breadcrumbs.zep.h"
#include "phalcon/html/exception.zep.h"
#include "phalcon/html/helper/anchor.zep.h"
Expand Down Expand Up @@ -348,8 +349,6 @@
#include "phalcon/mvc/router/exception.zep.h"
#include "phalcon/mvc/router/group.zep.h"
#include "phalcon/mvc/router/route.zep.h"
#include "phalcon/mvc/url.zep.h"
#include "phalcon/mvc/url/exception.zep.h"
#include "phalcon/mvc/view.zep.h"
#include "phalcon/mvc/view/engine/php.zep.h"
#include "phalcon/mvc/view/engine/volt.zep.h"
Expand Down Expand Up @@ -390,6 +389,8 @@
#include "phalcon/translate/factory.zep.h"
#include "phalcon/translate/interpolator/associativearray.zep.h"
#include "phalcon/translate/interpolator/indexedarray.zep.h"
#include "phalcon/url.zep.h"
#include "phalcon/url/exception.zep.h"
#include "phalcon/validation.zep.h"
#include "phalcon/validation/exception.zep.h"
#include "phalcon/validation/validator/alnum.zep.h"
Expand Down
Loading

0 comments on commit e427da5

Please sign in to comment.