<pre style='margin:0'>
Ryan Carsten Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/dec1dcb4d40afde719c20330292bec87812ddb39">https://github.com/macports/macports-ports/commit/dec1dcb4d40afde719c20330292bec87812ddb39</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new dec1dcb4d40 php-yaf: Add php82-yaf subport
</span>dec1dcb4d40 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit dec1dcb4d40afde719c20330292bec87812ddb39
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Sun Feb 11 03:40:41 2024 -0600
<span style='display:block; white-space:pre;color:#404040;'> php-yaf: Add php82-yaf subport
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/69023
</span>---
php/php-yaf/Portfile | 8 ++++--
php/php-yaf/files/php82.patch | 64 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 70 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/php/php-yaf/Portfile b/php/php-yaf/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e5b7264fb3e..665869b75b1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/php/php-yaf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/php/php-yaf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,8 +8,7 @@ categories-append net devel
</span> maintainers {ryandesign @ryandesign} openmaintainer
license PHP-3.01
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Not yet PHP 8.2 compatible: https://github.com/laruence/yaf/pull/579
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2
</span> php.pecl yes
if {[vercmp ${php.branch} >= 7.0]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,6 +17,11 @@ if {[vercmp ${php.branch} >= 7.0]} {
</span> checksums rmd160 46eeee612279e1ec8be78220d59d7ad0a8d30f30 \
sha256 cbbe7f2abbd2bb93074c6749c40fe4b660846361c0d9e258eee2b4005f8ac620 \
size 133872
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${php.branch} >= 8.2]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ php82.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> } else {
version 2.3.5
revision 0
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/php/php-yaf/files/php82.patch b/php/php-yaf/files/php82.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..65a4313e90f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/php/php-yaf/files/php82.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,64 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix PHP 8.2 compatibility
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/laruence/yaf/pull/579/commits/e1557c8f219651550633567054af9c3298524c7e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- requests/yaf_request_simple.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ requests/yaf_request_simple.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -140,6 +140,9 @@ YAF_STARTUP_FUNCTION(request_simple){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ zend_class_entry ce;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ YAF_INIT_CLASS_ENTRY(ce, "Yaf_Request_Simple", "Yaf\\Request\\Simple", yaf_request_simple_methods);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ yaf_request_simple_ce = zend_register_internal_class_ex(&ce, yaf_request_ce);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if PHP_VERSION_ID >= 80200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ yaf_request_simple_ce->ce_flags |= ZEND_ACC_ALLOW_DYNAMIC_PROPERTIES;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return SUCCESS;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tests/031.phpt.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tests/031.phpt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -36,7 +36,7 @@ Array
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ array (
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ '_default' =>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Yaf_Route_Map::__set_state(array(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ %saf_Route_Map::__set_state(array(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'ctl_prefer:protected' => true,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'delimiter:protected' => '##',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tests/issue231.phpt.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tests/issue231.phpt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -34,7 +34,7 @@ Yaf_Request_Http Object
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-Yaf_Request_Http::__set_state(array(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++%saf_Request_Http::__set_state(array(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'method' => 'POST',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'module' => NULL,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'controller' => NULL,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- views/yaf_view_simple.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ views/yaf_view_simple.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -388,8 +388,10 @@ static int yaf_view_simple_eval(yaf_view_t *view, zend_string *tpl, zval * vars,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ZVAL_STR(&phtml, strpprintf(0, "?>%s", ZSTR_VAL(tpl)));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if PHP_VERSION_ID < 80000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ op_array = zend_compile_string(&phtml, eval_desc);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif PHP_VERSION_ID < 80200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ op_array = zend_compile_string(Z_STR(phtml), eval_desc);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ op_array = zend_compile_string(Z_STR(phtml), eval_desc, ZEND_COMPILE_POSITION_AFTER_OPEN_TAG);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ zval_dtor(&phtml);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ efree(eval_desc);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- yaf_application.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ yaf_application.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1053,8 +1053,10 @@ YAF_STARTUP_FUNCTION(application) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ yaf_application_ce->ce_flags |= ZEND_ACC_FINAL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ yaf_application_ce->serialize = zend_class_serialize_deny;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ yaf_application_ce->unserialize = zend_class_unserialize_deny;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif PHP_VERSION_ID < 80200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ yaf_application_ce->ce_flags |= ZEND_ACC_FINAL | ZEND_ACC_NOT_SERIALIZABLE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ yaf_application_ce->ce_flags |= ZEND_ACC_FINAL | ZEND_ACC_NOT_SERIALIZABLE | ZEND_ACC_ALLOW_DYNAMIC_PROPERTIES;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ memcpy(&yaf_application_obj_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
</span></pre><pre style='margin:0'>
</pre>