summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2024-07-02 15:50:46 +0200
committerRemi Collet <remi@php.net>2024-07-02 15:50:46 +0200
commit96401bf48a87bc7ceb8131dfc90a129306e95c49 (patch)
treec48b83bb4a9ecb0e6d1359218f7d32a7836ead6a
parentca42da5a8b40c8526f7a03269a8b76597c5ccc5e (diff)
Update to 8.2.21 - http://www.php.net/releases/8_2_21.phpv8.2.21
-rw-r--r--failed.txt6
-rw-r--r--php-gh14480.patch99
-rw-r--r--php.spec9
3 files changed, 6 insertions, 108 deletions
diff --git a/failed.txt b/failed.txt
index 501e127..6c53e62 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,8 +1,7 @@
-===== 8.2.20 (2024-05-06)
+===== 8.2.21 (2024-07-04)
$ grep -ar 'Tests failed' /var/lib/mock/*/build.log
-/var/lib/mock/scl82el7x/build.log:Tests failed : 1
/var/lib/mock/scl82el8a/build.log:Tests failed : 0
/var/lib/mock/scl82el8x/build.log:Tests failed : 0
/var/lib/mock/scl82el9a/build.log:Tests failed : 0
@@ -13,9 +12,6 @@ $ grep -ar 'Tests failed' /var/lib/mock/*/build.log
/var/lib/mock/scl82fc40a/build.log:Tests failed : 0
/var/lib/mock/scl82fc40x/build.log:Tests failed : 0
-el7:
- 3 ext/openssl/tests/openssl_error_string_basic.phpt
-
(1) proc_open give erratic test results :(
(2) test issue (fixed upstream)
diff --git a/php-gh14480.patch b/php-gh14480.patch
deleted file mode 100644
index 7920e17..0000000
--- a/php-gh14480.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 86b93bc479477e6c0de6207bfe59c1e276dfdafb Mon Sep 17 00:00:00 2001
-From: Dmitry Stogov <dmitry@zend.com>
-Date: Wed, 5 Jun 2024 23:53:31 +0300
-Subject: [PATCH] Fix GH-14480: Method visibility issue introduced in version
- 8.3.8 (#14484)
-
----
- Zend/tests/gh14480.phpt | 60 +++++++++++++++++++++++++++++++++++++++++
- Zend/zend_inheritance.c | 8 +++---
- 2 files changed, 65 insertions(+), 3 deletions(-)
- create mode 100644 Zend/tests/gh14480.phpt
-
-diff --git a/Zend/tests/gh14480.phpt b/Zend/tests/gh14480.phpt
-new file mode 100644
-index 0000000000000..bab74785b6b23
---- /dev/null
-+++ b/Zend/tests/gh14480.phpt
-@@ -0,0 +1,60 @@
-+--TEST--
-+GH-14480: Method visibility issue
-+--FILE--
-+<?php
-+trait PropertyHelperTrait
-+{
-+ protected function splitPropertyParts(): void
-+ {
-+ echo "OK\n";
-+ }
-+}
-+
-+trait OrmPropertyHelperTrait
-+{
-+ abstract protected function splitPropertyParts(): void;
-+
-+ protected function addJoinsForNestedProperty(): void
-+ {
-+ $this->splitPropertyParts();
-+ }
-+}
-+
-+trait SearchFilterTrait
-+{
-+ use PropertyHelperTrait;
-+}
-+
-+abstract class AbstractFilter
-+{
-+ use OrmPropertyHelperTrait, PropertyHelperTrait;
-+
-+ public function apply(): void
-+ {
-+ $this->filterProperty();
-+ }
-+
-+ abstract protected function filterProperty(): void;
-+}
-+
-+class SearchFilter extends AbstractFilter
-+{
-+ use SearchFilterTrait;
-+ protected function filterProperty(): void
-+ {
-+ $this->addJoinsForNestedProperty();
-+ }
-+}
-+
-+class FilterExtension
-+{
-+ public function applyToCollection(): void
-+ {
-+ (new SearchFilter())->apply();
-+ }
-+}
-+
-+(new FilterExtension)->applyToCollection();
-+?>
-+--EXPECT--
-+OK
-diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c
-index 8c7ea963891bf..2e9bf25b59c48 100644
---- a/Zend/zend_inheritance.c
-+++ b/Zend/zend_inheritance.c
-@@ -1933,11 +1933,13 @@ static void zend_add_trait_method(zend_class_entry *ce, zend_string *name, zend_
- if (check_inheritance) {
- /* Inherited members are overridden by members inserted by traits.
- * Check whether the trait method fulfills the inheritance requirements. */
-+ uint32_t flags = ZEND_INHERITANCE_CHECK_PROTO | ZEND_INHERITANCE_CHECK_VISIBILITY;
-+ if (!(existing_fn->common.scope->ce_flags & ZEND_ACC_TRAIT)) {
-+ flags |= ZEND_INHERITANCE_SET_CHILD_CHANGED |ZEND_INHERITANCE_SET_CHILD_PROTO;
-+ }
- do_inheritance_check_on_method(
- fn, fixup_trait_scope(fn, ce), existing_fn, fixup_trait_scope(existing_fn, ce),
-- ce, NULL,
-- ZEND_INHERITANCE_CHECK_PROTO | ZEND_INHERITANCE_CHECK_VISIBILITY |
-- ZEND_INHERITANCE_SET_CHILD_CHANGED| ZEND_INHERITANCE_SET_CHILD_PROTO);
-+ ce, NULL, flags);
- }
- }
- /* }}} */
diff --git a/php.spec b/php.spec
index ed95922..1f138fb 100644
--- a/php.spec
+++ b/php.spec
@@ -129,13 +129,13 @@
#global gh_date 20220530
%global gh_owner php
%global gh_project php-src
-%global upver 8.2.20
+%global upver 8.2.21
#global rcver RC1
Summary: PHP scripting language for creating dynamic web sites
Name: %{?scl_prefix}php
Version: %{upver}%{?rcver:~%{rcver}}%{?gh_date:.%{gh_date}}
-Release: 2%{?dist}
+Release: 1%{?dist}
# All files licensed under PHP version 3.01, except
# Zend is licensed under Zend
# TSRM is licensed under BSD
@@ -198,7 +198,6 @@ Patch47: php-8.1.0-phpinfo.patch
Patch91: php-7.2.0-oci8conf.patch
# Upstream fixes (100+)
-Patch100: php-gh14480.patch
# Security fixes (200+)
@@ -983,7 +982,6 @@ sed -e 's/php-devel/%{?scl_prefix}php-devel/' -i scripts/phpize.in
%patch -P91 -p1 -b .remi-oci8
# upstream patches
-%patch -P100 -p1 -b .gh14480
# security patches
@@ -1864,6 +1862,9 @@ fi
%changelog
+* Tue Jul 2 2024 Remi Collet <remi@remirepo.net> - 8.2.21-1
+- Update to 8.2.21 - http://www.php.net/releases/8_2_21.php
+
* Fri Jun 7 2024 Remi Collet <remi@remirepo.net> - 8.2.20-2
- Fix GH-14480 Method visibility issue introduced in version 8.2.20