Merge pull request #17519 from phalcon/CP-17435-acl-alignment

CP-17435 acl alignment

Author: niden

ext/config.m4

@@ -570,6 +570,7 @@ if test "$PHP_PHALCON" = "yes"; then
 	phalcon/container/resolver/resolver.zep.c
 	phalcon/contracts/adr/adrtypes.zep.c
 	phalcon/contracts/adr/action.zep.c
+	phalcon/contracts/acl/acltypes.zep.c
 	phalcon/contracts/application/applicationtypes.zep.c
 	phalcon/contracts/auth/authremember.zep.c
 	phalcon/contracts/auth/remembertoken.zep.c

ext/config.w32

@@ -128,7 +128,7 @@ if (PHP_PHALCON != "no") {
 	ADD_SOURCES(configure_module_dirname + "/phalcon/cache", "cacheinterface.zep.c abstractcache.zep.c adapterfactory.zep.c cache.zep.c cachefactory.zep.c", "phalcon");
 	ADD_SOURCES(configure_module_dirname + "/phalcon/cli", "taskinterface.zep.c dispatcherinterface.zep.c routerinterface.zep.c task.zep.c console.zep.c dispatcher.zep.c router.zep.c", "phalcon");
 	ADD_SOURCES(configure_module_dirname + "/phalcon/contracts/adr/responder/formatter", "formatter.zep.c", "phalcon");
-	ADD_SOURCES(configure_module_dirname + "/phalcon/contracts/acl", "component.zep.c role.zep.c componentaware.zep.c roleaware.zep.c", "phalcon");
+	ADD_SOURCES(configure_module_dirname + "/phalcon/contracts/acl", "component.zep.c role.zep.c componentaware.zep.c roleaware.zep.c acltypes.zep.c", "phalcon");
 	ADD_SOURCES(configure_module_dirname + "/phalcon/contracts/cli", "dispatcher.zep.c clitypes.zep.c", "phalcon");
 	ADD_SOURCES(configure_module_dirname + "/phalcon/contracts/encryption/crypt", "crypt.zep.c", "phalcon");
 	ADD_SOURCES(configure_module_dirname + "/phalcon/contracts/encryption/security", "cryptoutils.zep.c csrfprotection.zep.c passwordsecurity.zep.c security.zep.c", "phalcon");

ext/phalcon.c

@@ -236,6 +236,7 @@ zend_class_entry *phalcon_acl_traits_itemtrait_ce;
 zend_class_entry *phalcon_assets_traits_attributestrait_ce;
 zend_class_entry *phalcon_assets_traits_sourcetargettrait_ce;
 zend_class_entry *phalcon_auth_adapter_config_traits_modelconfigtrait_ce;
+zend_class_entry *phalcon_contracts_acl_acltypes_ce;
 zend_class_entry *phalcon_contracts_adr_action_ce;
 zend_class_entry *phalcon_contracts_adr_adrtypes_ce;
 zend_class_entry *phalcon_contracts_application_applicationtypes_ce;
@@ -1837,6 +1838,7 @@ static PHP_MINIT_FUNCTION(phalcon)
 	ZEPHIR_INIT(Phalcon_Auth_Adapter_Config_Traits_ModelConfigTrait);
 	ZEPHIR_INIT(Phalcon_Contracts_ADR_ADRTypes);
 	ZEPHIR_INIT(Phalcon_Contracts_ADR_Action);
+	ZEPHIR_INIT(Phalcon_Contracts_Acl_AclTypes);
 	ZEPHIR_INIT(Phalcon_Contracts_Application_ApplicationTypes);
 	ZEPHIR_INIT(Phalcon_Contracts_Auth_AuthRemember);
 	ZEPHIR_INIT(Phalcon_Contracts_Auth_RememberToken);

ext/phalcon.h

@@ -565,6 +565,7 @@
 #include "phalcon/container/resolver/resolver.zep.h"
 #include "phalcon/contracts/adr/adrtypes.zep.h"
 #include "phalcon/contracts/adr/action.zep.h"
+#include "phalcon/contracts/acl/acltypes.zep.h"
 #include "phalcon/contracts/application/applicationtypes.zep.h"
 #include "phalcon/contracts/auth/authremember.zep.h"
 #include "phalcon/contracts/auth/remembertoken.zep.h"