From: Michael Wallner <mike@php.net>
Date: Tue, 21 Dec 2021 07:37:33 +0000 (+0100)
Subject: remove collections, which are pretty low level
X-Git-Tag: v0.1.0~61
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;ds=sidebyside;h=2a37e54dbc0c6cb355bb715565fb108328250f01;p=awesomized%2Fext-ion

remove collections, which are pretty low level
---

diff --git a/ion.c b/ion.c
index 1426172..53b65df 100644
--- a/ion.c
+++ b/ion.c
@@ -1222,8 +1222,6 @@ static ZEND_METHOD(ion_Writer_Options, __construct)
 		Z_PARAM_OPTIONAL
 		//public readonly ?\ion\Catalog $catalog = null,
 		Z_PARAM_OBJ_OF_CLASS_OR_NULL(obj->cat, ce_Catalog)
-		//public readonly ?\ion\Collection $encodingSymbolTable = null,
-		Z_PARAM_OBJ_OF_CLASS_OR_NULL(obj->col, ce_Collection)
 		//public readonly ?\ion\Decimal\Context $decimalContext = null,
 		Z_PARAM_OBJ_OF_CLASS_OR_NULL(obj->dec_ctx, ce_Decimal_Context)
 		//public readonly bool $outputBinary = false,
@@ -1258,9 +1256,6 @@ static ZEND_METHOD(ion_Writer_Options, __construct)
 		update_property_obj(&obj->std, ZEND_STRL("catalog"), obj->cat);
 		obj->opt.pcatalog = php_ion_obj(catalog, obj->cat)->cat;
 	}
-	if (obj->col) {
-		// TODO
-	}
 	if (obj->dec_ctx) {
 		update_property_obj(&obj->std, ZEND_STRL("decimalContext"), obj->dec_ctx);
 		obj->opt.decimal_context = &php_ion_obj(decimal_ctx, obj->dec_ctx)->ctx;
diff --git a/ion.stub.php b/ion.stub.php
index 2e33243..8f4be35 100644
--- a/ion.stub.php
+++ b/ion.stub.php
@@ -404,7 +404,6 @@ class Options {
     public function __construct(
         public readonly ?\ion\Catalog $catalog = null,
         public readonly ?\ion\Decimal\Context $decimalContext = null,
-        ?\ion\Collection $encodingSymbolTable = null,
         public readonly bool $outputBinary = false,
         public readonly bool $compactFloats = false,
         public readonly bool $escapeNonAscii = false,
diff --git a/ion_arginfo.h b/ion_arginfo.h
index 867de8b..0f38dcc 100644
--- a/ion_arginfo.h
+++ b/ion_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 8f4964120dccb00c053325183fda763f64f08b6e */
+ * Stub hash: c45868fbad8a734e7511f0c4e4991d10b5cc4aa7 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_ion_Symbol_Table_PHP, 0, 0, ion\\Symbol\\Table, 0)
 ZEND_END_ARG_INFO()
@@ -363,7 +363,6 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ion_Writer_Options___construct, 0, 0, 0)
 	ZEND_ARG_OBJ_INFO_WITH_DEFAULT_VALUE(0, catalog, ion\\Catalog, 1, "null")
 	ZEND_ARG_OBJ_INFO_WITH_DEFAULT_VALUE(0, decimalContext, ion\\Decimal\\Context, 1, "null")
-	ZEND_ARG_OBJ_INFO_WITH_DEFAULT_VALUE(0, encodingSymbolTable, ion\\Collection, 1, "null")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, outputBinary, _IS_BOOL, 0, "false")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, compactFloats, _IS_BOOL, 0, "false")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, escapeNonAscii, _IS_BOOL, 0, "false")
diff --git a/ion_private.h b/ion_private.h
index 6dc21d4..6743cc6 100644
--- a/ion_private.h
+++ b/ion_private.h
@@ -195,7 +195,6 @@ ZEND_DECLARE_MODULE_GLOBALS(ion);
 
 static zend_class_entry
 	*ce_Catalog,
-	*ce_Collection,
 	*ce_Decimal,
 	*ce_Decimal_Context,
 	*ce_Decimal_Context_Rounding,
@@ -1104,7 +1103,7 @@ php_ion_decl(reader, Reader_Reader, php_ion_reader_dtor(obj));
 
 typedef struct php_ion_writer_options {
 	ION_WRITER_OPTIONS opt;
-	zend_object *cat, *dec_ctx, *col, std;
+	zend_object *cat, *dec_ctx, std;
 } php_ion_writer_options;
 
 php_ion_decl(writer_options, Writer_Options);