Merge pull request #15768 from niden/T15767-readonly-php-81

renamed support/collection/readonly to support/collection/readonlycol…

CHANGELOG-5.0.md

@@ -74,6 +74,7 @@
 - Removed uncamelize of `realClassName` in `Phalcon\Mvc\Router\Route::getRoutePaths()` if definition is string to make processing same as if array definition [#15067](https://github.com/phalcon/cphalcon/issues/15067) 
 - Changed `Phalcon\Validation::getValue()` behavior to get value from `data` if not found in `entity`. [#14203](https://github.com/phalcon/cphalcon/issues/14203)
 - Changed `Phalcon\Forms\Form::isValid()` signature: added `whitelist` argument. [#14203](https://github.com/phalcon/cphalcon/issues/14203)
+- Changed `Phalcon\Support\Collection\ReadOnly` to `Phalcon\Support\Collection\ReadOnlyCollection` to avoid conflicts with the read-only feature in PHP 8.1 [#15767](https://github.com/phalcon/cphalcon/issues/15767)
 
 ## Added
 - Added more tests in the suite for additional code coverage [#15691](https://github.com/phalcon/cphalcon/issues/15691)

ext/config.m4

@@ -505,7 +505,7 @@ if test "$PHP_PHALCON" = "yes"; then
 	phalcon/storage/serializer/php.zep.c
 	phalcon/storage/serializerfactory.zep.c
 	phalcon/support/collection/exception.zep.c
-	phalcon/support/collection/readonly.zep.c
+	phalcon/support/collection/readonlycollection.zep.c
 	phalcon/support/debug.zep.c
 	phalcon/support/debug/dump.zep.c
 	phalcon/support/debug/exception.zep.c

ext/config.w32

@@ -21,7 +21,7 @@ if (PHP_PHALCON != "no") {
 	ADD_SOURCES(configure_module_dirname + "/phalcon/events", "eventsawareinterface.zep.c abstracteventsaware.zep.c eventinterface.zep.c managerinterface.zep.c event.zep.c exception.zep.c manager.zep.c", "phalcon");
 	ADD_SOURCES(configure_module_dirname + "/phalcon/html/helper/input", "abstractinput.zep.c checkbox.zep.c color.zep.c date.zep.c datetime.zep.c datetimelocal.zep.c email.zep.c file.zep.c hidden.zep.c image.zep.c input.zep.c month.zep.c numeric.zep.c password.zep.c radio.zep.c range.zep.c search.zep.c select.zep.c submit.zep.c tel.zep.c text.zep.c textarea.zep.c time.zep.c url.zep.c week.zep.c", "phalcon");
 	ADD_SOURCES(configure_module_dirname + "/phalcon/factory", "abstractconfigfactory.zep.c abstractfactory.zep.c exception.zep.c", "phalcon");
-	ADD_SOURCES(configure_module_dirname + "/phalcon/support/collection", "collectioninterface.zep.c exception.zep.c readonly.zep.c", "phalcon");
+	ADD_SOURCES(configure_module_dirname + "/phalcon/support/collection", "collectioninterface.zep.c exception.zep.c readonlycollection.zep.c", "phalcon");
 	ADD_SOURCES(configure_module_dirname + "/phalcon/storage/adapter", "adapterinterface.zep.c abstractadapter.zep.c apcu.zep.c libmemcached.zep.c memory.zep.c redis.zep.c stream.zep.c", "phalcon");
 	ADD_SOURCES(configure_module_dirname + "/phalcon/forms/element", "elementinterface.zep.c abstractelement.zep.c 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/support/helper/str", "abstractstr.zep.c camelize.zep.c concat.zep.c countvowels.zep.c decapitalize.zep.c decrement.zep.c dirfromfile.zep.c dirseparator.zep.c dynamic.zep.c endswith.zep.c firstbetween.zep.c friendly.zep.c humanize.zep.c includes.zep.c increment.zep.c interpolate.zep.c isanagram.zep.c islower.zep.c ispalindrome.zep.c isupper.zep.c len.zep.c lower.zep.c prefix.zep.c random.zep.c reduceslashes.zep.c startswith.zep.c suffix.zep.c ucwords.zep.c uncamelize.zep.c underscore.zep.c upper.zep.c", "phalcon");

ext/phalcon.c

@@ -541,7 +541,7 @@ zend_class_entry *phalcon_storage_serializer_none_ce;
 zend_class_entry *phalcon_storage_serializer_php_ce;
 zend_class_entry *phalcon_storage_serializerfactory_ce;
 zend_class_entry *phalcon_support_collection_exception_ce;
-zend_class_entry *phalcon_support_collection_readonly_ce;
+zend_class_entry *phalcon_support_collection_readonlycollection_ce;
 zend_class_entry *phalcon_support_debug_ce;
 zend_class_entry *phalcon_support_debug_dump_ce;
 zend_class_entry *phalcon_support_debug_exception_ce;
@@ -1180,7 +1180,7 @@ static PHP_MINIT_FUNCTION(phalcon)
 	ZEPHIR_INIT(Phalcon_Storage_Serializer_None);
 	ZEPHIR_INIT(Phalcon_Storage_Serializer_Php);
 	ZEPHIR_INIT(Phalcon_Support_Collection_Exception);
-	ZEPHIR_INIT(Phalcon_Support_Collection_ReadOnly);
+	ZEPHIR_INIT(Phalcon_Support_Collection_ReadOnlyCollection);
 	ZEPHIR_INIT(Phalcon_Support_Debug);
 	ZEPHIR_INIT(Phalcon_Support_Debug_Dump);
 	ZEPHIR_INIT(Phalcon_Support_Debug_Exception);

ext/phalcon.h

@@ -500,7 +500,7 @@
 #include "phalcon/storage/serializer/php.zep.h"
 #include "phalcon/storage/serializerfactory.zep.h"
 #include "phalcon/support/collection/exception.zep.h"
-#include "phalcon/support/collection/readonly.zep.h"
+#include "phalcon/support/collection/readonlycollection.zep.h"
 #include "phalcon/support/debug.zep.h"
 #include "phalcon/support/debug/dump.zep.h"
 #include "phalcon/support/debug/exception.zep.h"