Merge pull request #15944 from niden/T15930-psr-link

T15930 psr link

CHANGELOG-5.0.md

@@ -4,6 +4,7 @@
 - Changed `Phalcon\Session\Bag::__construct()` to accept a `Phalcon\Session\Manager` as the first parameter and `name` as the second one [#15904](https://github.com/phalcon/cphalcon/issues/15904)
 - Changed `Phalcon\Logger\Logger` to no longer depend on PSR interfaces [#15925](https://github.com/phalcon/cphalcon/issues/15925)
 - Changed `Phalcon\Cache\Cache` to no longer depend on PSR interfaces [#15927](https://github.com/phalcon/cphalcon/issues/15927)
+- Changed `Phalcon\Html\Link` to no longer depend on PSR interfaces [#15930](https://github.com/phalcon/cphalcon/issues/15930)
 
 ## Fixed
 - Fixed `Phalcon\Html\Helper\Input\Numeric` to produce correct elements [#15896](https://github.com/phalcon/cphalcon/issues/15896)
@@ -27,6 +28,13 @@
 - Added
   - `Phalcon\Cache\CacheInterface`
   - `Phalcon\Cache\AbstractCache` to be used in the cache class but also the proxy-psr16 repo [#15927](https://github.com/phalcon/cphalcon/issues/15927)
+- Added
+  - EvolvableLinkInterface.zep
+  - `Phalcon\Html\Link\Interfaces\EvolvableLinkProviderInterface`
+  - `Phalcon\Html\Link\Interfaces\LinkInterface`
+  - `Phalcon\Html\Link\Interfaces\LinkProviderInterface`
+  - `Phalcon\Html\Link\AbstractLink`
+  - `Phalcon\Html\Link\AbstractLinkProvider` to be used in the link class but also the proxy-psr13 repo [#15930](https://github.com/phalcon/cphalcon/issues/15930)
 
 # [5.0.0beta3](https://github.com/phalcon/cphalcon/releases/tag/v5.0.0beta3) (2022-02-06)
 

ext/config.m4

@@ -48,6 +48,8 @@ if test "$PHP_PHALCON" = "yes"; then
 	phalcon/db/adapter/abstractadapter.zep.c
 	phalcon/db/dialectinterface.zep.c
 	phalcon/html/helper/abstractseries.zep.c
+	phalcon/html/link/interfaces/linkinterface.zep.c
+	phalcon/html/link/interfaces/linkproviderinterface.zep.c
 	phalcon/http/message/abstractmessage.zep.c
 	phalcon/logger/adapter/adapterinterface.zep.c
 	phalcon/mvc/model/resultsetinterface.zep.c
@@ -92,6 +94,8 @@ if test "$PHP_PHALCON" = "yes"; then
 	phalcon/encryption/security/jwt/token/abstractitem.zep.c
 	phalcon/filter/validation/abstractvalidatorcomposite.zep.c
 	phalcon/flash/abstractflash.zep.c
+	phalcon/html/link/abstractlink.zep.c
+	phalcon/html/link/abstractlinkprovider.zep.c
 	phalcon/http/message/abstractrequest.zep.c
 	phalcon/http/message/responsestatuscodeinterface.zep.c
 	phalcon/image/adapter/abstractadapter.zep.c
@@ -137,6 +141,8 @@ if test "$PHP_PHALCON" = "yes"; then
 	phalcon/html/helper/input/checkbox.zep.c
 	phalcon/html/helper/ol.zep.c
 	phalcon/html/helper/style.zep.c
+	phalcon/html/link/interfaces/evolvablelinkinterface.zep.c
+	phalcon/html/link/interfaces/evolvablelinkproviderinterface.zep.c
 	phalcon/html/link/link.zep.c
 	phalcon/html/link/linkprovider.zep.c
 	phalcon/html/link/serializer/serializerinterface.zep.c
@@ -649,7 +655,7 @@ if test "$PHP_PHALCON" = "yes"; then
 	phalcon/mvc/url/utils.c"
 	PHP_NEW_EXTENSION(phalcon, $phalcon_sources, $ext_shared,, )
 	PHP_ADD_BUILD_DIR([$ext_builddir/kernel/])
-	for dir in "phalcon phalcon/acl phalcon/acl/adapter phalcon/annotations phalcon/annotations/adapter phalcon/application phalcon/assets phalcon/assets/asset phalcon/assets/filters phalcon/assets/inline phalcon/autoload phalcon/cache phalcon/cache/adapter phalcon/cache/exception phalcon/cli phalcon/cli/console phalcon/cli/dispatcher phalcon/cli/router phalcon/config phalcon/config/adapter phalcon/container phalcon/datamapper/pdo phalcon/datamapper/pdo/connection phalcon/datamapper/pdo/exception phalcon/datamapper/pdo/profiler phalcon/datamapper/query phalcon/db phalcon/db/adapter phalcon/db/adapter/pdo phalcon/db/dialect phalcon/db/profiler phalcon/db/result phalcon/di phalcon/di/exception phalcon/di/factorydefault phalcon/di/service phalcon/dispatcher phalcon/domain/payload phalcon/encryption phalcon/encryption/crypt phalcon/encryption/crypt/exception phalcon/encryption/crypt/padding phalcon/encryption/security phalcon/encryption/security/jwt phalcon/encryption/security/jwt/exceptions phalcon/encryption/security/jwt/signer phalcon/encryption/security/jwt/token phalcon/events phalcon/factory phalcon/filter phalcon/filter/sanitize phalcon/filter/validation phalcon/filter/validation/validator phalcon/filter/validation/validator/file phalcon/filter/validation/validator/file/resolution phalcon/filter/validation/validator/file/size phalcon/filter/validation/validator/stringlength phalcon/flash phalcon/forms phalcon/forms/element phalcon/html phalcon/html/attributes phalcon/html/escaper phalcon/html/helper phalcon/html/helper/input phalcon/html/link phalcon/html/link/serializer phalcon/http phalcon/http/cookie phalcon/http/message phalcon/http/message/exception phalcon/http/message/stream phalcon/http/request phalcon/http/response phalcon/http/server phalcon/image phalcon/image/adapter phalcon/logger phalcon/logger/adapter phalcon/logger/formatter phalcon/messages phalcon/mvc phalcon/mvc/application phalcon/mvc/controller phalcon/mvc/dispatcher phalcon/mvc/micro phalcon/mvc/model phalcon/mvc/model/behavior phalcon/mvc/model/binder phalcon/mvc/model/metadata phalcon/mvc/model/metadata/strategy phalcon/mvc/model/query phalcon/mvc/model/resultset phalcon/mvc/model/transaction phalcon/mvc/router phalcon/mvc/url phalcon/mvc/view phalcon/mvc/view/engine phalcon/mvc/view/engine/volt phalcon/paginator phalcon/paginator/adapter phalcon/session phalcon/session/adapter phalcon/storage phalcon/storage/adapter phalcon/storage/serializer phalcon/support phalcon/support/collection phalcon/support/debug phalcon/support/helper phalcon/support/helper/arr phalcon/support/helper/file phalcon/support/helper/json phalcon/support/helper/number phalcon/support/helper/str phalcon/tag phalcon/translate phalcon/translate/adapter phalcon/translate/interpolator"; do
+	for dir in "phalcon phalcon/acl phalcon/acl/adapter phalcon/annotations phalcon/annotations/adapter phalcon/application phalcon/assets phalcon/assets/asset phalcon/assets/filters phalcon/assets/inline phalcon/autoload phalcon/cache phalcon/cache/adapter phalcon/cache/exception phalcon/cli phalcon/cli/console phalcon/cli/dispatcher phalcon/cli/router phalcon/config phalcon/config/adapter phalcon/container phalcon/datamapper/pdo phalcon/datamapper/pdo/connection phalcon/datamapper/pdo/exception phalcon/datamapper/pdo/profiler phalcon/datamapper/query phalcon/db phalcon/db/adapter phalcon/db/adapter/pdo phalcon/db/dialect phalcon/db/profiler phalcon/db/result phalcon/di phalcon/di/exception phalcon/di/factorydefault phalcon/di/service phalcon/dispatcher phalcon/domain/payload phalcon/encryption phalcon/encryption/crypt phalcon/encryption/crypt/exception phalcon/encryption/crypt/padding phalcon/encryption/security phalcon/encryption/security/jwt phalcon/encryption/security/jwt/exceptions phalcon/encryption/security/jwt/signer phalcon/encryption/security/jwt/token phalcon/events phalcon/factory phalcon/filter phalcon/filter/sanitize phalcon/filter/validation phalcon/filter/validation/validator phalcon/filter/validation/validator/file phalcon/filter/validation/validator/file/resolution phalcon/filter/validation/validator/file/size phalcon/filter/validation/validator/stringlength phalcon/flash phalcon/forms phalcon/forms/element phalcon/html phalcon/html/attributes phalcon/html/escaper phalcon/html/helper phalcon/html/helper/input phalcon/html/link phalcon/html/link/interfaces phalcon/html/link/serializer phalcon/http phalcon/http/cookie phalcon/http/message phalcon/http/message/exception phalcon/http/message/stream phalcon/http/request phalcon/http/response phalcon/http/server phalcon/image phalcon/image/adapter phalcon/logger phalcon/logger/adapter phalcon/logger/formatter phalcon/messages phalcon/mvc phalcon/mvc/application phalcon/mvc/controller phalcon/mvc/dispatcher phalcon/mvc/micro phalcon/mvc/model phalcon/mvc/model/behavior phalcon/mvc/model/binder phalcon/mvc/model/metadata phalcon/mvc/model/metadata/strategy phalcon/mvc/model/query phalcon/mvc/model/resultset phalcon/mvc/model/transaction phalcon/mvc/router phalcon/mvc/url phalcon/mvc/view phalcon/mvc/view/engine phalcon/mvc/view/engine/volt phalcon/paginator phalcon/paginator/adapter phalcon/session phalcon/session/adapter phalcon/storage phalcon/storage/adapter phalcon/storage/serializer phalcon/support phalcon/support/collection phalcon/support/debug phalcon/support/helper phalcon/support/helper/arr phalcon/support/helper/file phalcon/support/helper/json phalcon/support/helper/number phalcon/support/helper/str phalcon/tag phalcon/translate phalcon/translate/adapter phalcon/translate/interpolator"; do
 		PHP_ADD_BUILD_DIR([$ext_builddir/$dir])
 	done
 	PHP_SUBST(PHALCON_SHARED_LIBADD)

ext/config.w32

@@ -40,6 +40,7 @@ if (PHP_PHALCON != "no") {
 	ADD_SOURCES(configure_module_dirname + "/phalcon/annotations/adapter", "adapterinterface.zep.c abstractadapter.zep.c apcu.zep.c memory.zep.c stream.zep.c", "phalcon");
 	ADD_SOURCES(configure_module_dirname + "/phalcon/datamapper/pdo/connection", "pdointerface.zep.c connectioninterface.zep.c abstractconnection.zep.c decorated.zep.c", "phalcon");
 	ADD_SOURCES(configure_module_dirname + "/phalcon/db", "dialectinterface.zep.c dialect.zep.c columninterface.zep.c indexinterface.zep.c referenceinterface.zep.c resultinterface.zep.c abstractdb.zep.c column.zep.c enum.zep.c exception.zep.c index.zep.c profiler.zep.c rawvalue.zep.c reference.zep.c", "phalcon");
+	ADD_SOURCES(configure_module_dirname + "/phalcon/html/link/interfaces", "linkinterface.zep.c linkproviderinterface.zep.c evolvablelinkinterface.zep.c evolvablelinkproviderinterface.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/paginator/adapter", "adapterinterface.zep.c abstractadapter.zep.c model.zep.c nativearray.zep.c querybuilder.zep.c", "phalcon");
 	ADD_SOURCES(configure_module_dirname + "/phalcon/translate/adapter", "adapterinterface.zep.c abstractadapter.zep.c csv.zep.c gettext.zep.c nativearray.zep.c", "phalcon");
@@ -56,6 +57,7 @@ if (PHP_PHALCON != "no") {
 	ADD_SOURCES(configure_module_dirname + "/phalcon/datamapper/pdo/exception", "exception.zep.c cannotdisconnect.zep.c connectionnotfound.zep.c", "phalcon");
 	ADD_SOURCES(configure_module_dirname + "/phalcon/domain/payload", "readableinterface.zep.c writeableinterface.zep.c payloadinterface.zep.c payload.zep.c payloadfactory.zep.c status.zep.c", "phalcon");
 	ADD_SOURCES(configure_module_dirname + "/phalcon/encryption/security/jwt/token", "abstractitem.zep.c enum.zep.c item.zep.c parser.zep.c signature.zep.c token.zep.c", "phalcon");
+	ADD_SOURCES(configure_module_dirname + "/phalcon/html/link", "abstractlink.zep.c abstractlinkprovider.zep.c link.zep.c linkprovider.zep.c evolvablelink.zep.c evolvablelinkprovider.zep.c", "phalcon");
 	ADD_SOURCES(configure_module_dirname + "/phalcon/mvc/model/metadata/strategy", "strategyinterface.zep.c annotations.zep.c introspection.zep.c", "phalcon");
 	ADD_SOURCES(configure_module_dirname + "/phalcon/session/adapter", "abstractadapter.zep.c noop.zep.c libmemcached.zep.c redis.zep.c stream.zep.c", "phalcon");
 	ADD_SOURCES(configure_module_dirname + "/phalcon/translate/interpolator", "interpolatorinterface.zep.c associativearray.zep.c indexedarray.zep.c", "phalcon");
@@ -70,7 +72,6 @@ if (PHP_PHALCON != "no") {
 	ADD_SOURCES(configure_module_dirname + "/phalcon/filter", "filterinterface.zep.c exception.zep.c filter.zep.c filterfactory.zep.c validation.zep.c", "phalcon");
 	ADD_SOURCES(configure_module_dirname + "/phalcon/html/attributes", "attributesinterface.zep.c renderinterface.zep.c", "phalcon");
 	ADD_SOURCES(configure_module_dirname + "/phalcon/html/escaper", "escaperinterface.zep.c exception.zep.c", "phalcon");
-	ADD_SOURCES(configure_module_dirname + "/phalcon/html/link", "link.zep.c linkprovider.zep.c evolvablelink.zep.c evolvablelinkprovider.zep.c", "phalcon");
 	ADD_SOURCES(configure_module_dirname + "/phalcon/html/link/serializer", "serializerinterface.zep.c header.zep.c", "phalcon");
 	ADD_SOURCES(configure_module_dirname + "/phalcon/http/cookie", "cookieinterface.zep.c exception.zep.c", "phalcon");
 	ADD_SOURCES(configure_module_dirname + "/phalcon/http/request", "fileinterface.zep.c exception.zep.c file.zep.c", "phalcon");

ext/phalcon.c

@@ -42,6 +42,8 @@ zend_class_entry *phalcon_http_message_requestmethodinterface_ce;
 zend_class_entry *phalcon_annotations_adapter_adapterinterface_ce;
 zend_class_entry *phalcon_datamapper_pdo_connection_pdointerface_ce;
 zend_class_entry *phalcon_db_dialectinterface_ce;
+zend_class_entry *phalcon_html_link_interfaces_linkinterface_ce;
+zend_class_entry *phalcon_html_link_interfaces_linkproviderinterface_ce;
 zend_class_entry *phalcon_logger_adapter_adapterinterface_ce;
 zend_class_entry *phalcon_mvc_model_resultsetinterface_ce;
 zend_class_entry *phalcon_paginator_adapter_adapterinterface_ce;
@@ -89,6 +91,8 @@ zend_class_entry *phalcon_filter_validation_validationinterface_ce;
 zend_class_entry *phalcon_html_attributes_attributesinterface_ce;
 zend_class_entry *phalcon_html_attributes_renderinterface_ce;
 zend_class_entry *phalcon_html_escaper_escaperinterface_ce;
+zend_class_entry *phalcon_html_link_interfaces_evolvablelinkinterface_ce;
+zend_class_entry *phalcon_html_link_interfaces_evolvablelinkproviderinterface_ce;
 zend_class_entry *phalcon_html_link_serializer_serializerinterface_ce;
 zend_class_entry *phalcon_http_cookie_cookieinterface_ce;
 zend_class_entry *phalcon_http_request_fileinterface_ce;
@@ -172,6 +176,8 @@ zend_class_entry *phalcon_dispatcher_exception_ce;
 zend_class_entry *phalcon_encryption_security_jwt_token_abstractitem_ce;
 zend_class_entry *phalcon_filter_validation_abstractvalidatorcomposite_ce;
 zend_class_entry *phalcon_flash_abstractflash_ce;
+zend_class_entry *phalcon_html_link_abstractlink_ce;
+zend_class_entry *phalcon_html_link_abstractlinkprovider_ce;
 zend_class_entry *phalcon_http_message_abstractrequest_ce;
 zend_class_entry *phalcon_image_adapter_abstractadapter_ce;
 zend_class_entry *phalcon_logger_formatter_abstractformatter_ce;
@@ -706,6 +712,8 @@ static PHP_MINIT_FUNCTION(phalcon)
 	ZEPHIR_INIT(Phalcon_Annotations_Adapter_AdapterInterface);
 	ZEPHIR_INIT(Phalcon_DataMapper_Pdo_Connection_PdoInterface);
 	ZEPHIR_INIT(Phalcon_Db_DialectInterface);
+	ZEPHIR_INIT(Phalcon_Html_Link_Interfaces_LinkInterface);
+	ZEPHIR_INIT(Phalcon_Html_Link_Interfaces_LinkProviderInterface);
 	ZEPHIR_INIT(Phalcon_Logger_Adapter_AdapterInterface);
 	ZEPHIR_INIT(Phalcon_Mvc_Model_ResultsetInterface);
 	ZEPHIR_INIT(Phalcon_Paginator_Adapter_AdapterInterface);
@@ -753,6 +761,8 @@ static PHP_MINIT_FUNCTION(phalcon)
 	ZEPHIR_INIT(Phalcon_Html_Attributes_AttributesInterface);
 	ZEPHIR_INIT(Phalcon_Html_Attributes_RenderInterface);
 	ZEPHIR_INIT(Phalcon_Html_Escaper_EscaperInterface);
+	ZEPHIR_INIT(Phalcon_Html_Link_Interfaces_EvolvableLinkInterface);
+	ZEPHIR_INIT(Phalcon_Html_Link_Interfaces_EvolvableLinkProviderInterface);
 	ZEPHIR_INIT(Phalcon_Html_Link_Serializer_SerializerInterface);
 	ZEPHIR_INIT(Phalcon_Http_Cookie_CookieInterface);
 	ZEPHIR_INIT(Phalcon_Http_RequestInterface);
@@ -836,6 +846,8 @@ static PHP_MINIT_FUNCTION(phalcon)
 	ZEPHIR_INIT(Phalcon_Encryption_Security_JWT_Token_AbstractItem);
 	ZEPHIR_INIT(Phalcon_Filter_Validation_AbstractValidatorComposite);
 	ZEPHIR_INIT(Phalcon_Flash_AbstractFlash);
+	ZEPHIR_INIT(Phalcon_Html_Link_AbstractLink);
+	ZEPHIR_INIT(Phalcon_Html_Link_AbstractLinkProvider);
 	ZEPHIR_INIT(Phalcon_Http_Message_AbstractRequest);
 	ZEPHIR_INIT(Phalcon_Image_Adapter_AbstractAdapter);
 	ZEPHIR_INIT(Phalcon_Logger_Formatter_AbstractFormatter);

ext/phalcon.h

@@ -43,6 +43,8 @@
 #include "phalcon/db/adapter/abstractadapter.zep.h"
 #include "phalcon/db/dialectinterface.zep.h"
 #include "phalcon/html/helper/abstractseries.zep.h"
+#include "phalcon/html/link/interfaces/linkinterface.zep.h"
+#include "phalcon/html/link/interfaces/linkproviderinterface.zep.h"
 #include "phalcon/http/message/abstractmessage.zep.h"
 #include "phalcon/logger/adapter/adapterinterface.zep.h"
 #include "phalcon/mvc/model/resultsetinterface.zep.h"
@@ -87,6 +89,8 @@
 #include "phalcon/encryption/security/jwt/token/abstractitem.zep.h"
 #include "phalcon/filter/validation/abstractvalidatorcomposite.zep.h"
 #include "phalcon/flash/abstractflash.zep.h"
+#include "phalcon/html/link/abstractlink.zep.h"
+#include "phalcon/html/link/abstractlinkprovider.zep.h"
 #include "phalcon/http/message/abstractrequest.zep.h"
 #include "phalcon/http/message/responsestatuscodeinterface.zep.h"
 #include "phalcon/image/adapter/abstractadapter.zep.h"
@@ -132,6 +136,8 @@
 #include "phalcon/html/helper/input/checkbox.zep.h"
 #include "phalcon/html/helper/ol.zep.h"
 #include "phalcon/html/helper/style.zep.h"
+#include "phalcon/html/link/interfaces/evolvablelinkinterface.zep.h"
+#include "phalcon/html/link/interfaces/evolvablelinkproviderinterface.zep.h"
 #include "phalcon/html/link/link.zep.h"
 #include "phalcon/html/link/linkprovider.zep.h"
 #include "phalcon/html/link/serializer/serializerinterface.zep.h"