summaryrefslogtreecommitdiff
path: root/Zend
diff options
context:
space:
mode:
authorMáté Kocsis <kocsismate@woohoolabs.com>2021-03-06 00:56:47 +0100
committerMáté Kocsis <kocsismate@woohoolabs.com>2021-03-06 00:56:47 +0100
commit495bf5cdd07e1835440ae81c3ae3dc39a3beaaf0 (patch)
treea4544af48ece6c89d682585f1e04efbaf6cf6b60 /Zend
parent16c2afb8b9c20f4fc306e9221b10b48693bea840 (diff)
parent0f8312342f3b0a639cd583b53ccdea56019d2685 (diff)
downloadphp-git-495bf5cdd07e1835440ae81c3ae3dc39a3beaaf0.tar.gz
Merge branch 'PHP-8.0'
Diffstat (limited to 'Zend')
-rw-r--r--Zend/tests/attributes/021_attribute_flags_type_is_validated.phpt2
-rw-r--r--Zend/zend_attributes.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/Zend/tests/attributes/021_attribute_flags_type_is_validated.phpt b/Zend/tests/attributes/021_attribute_flags_type_is_validated.phpt
index 7c1bfd2da7..01ab29c5ef 100644
--- a/Zend/tests/attributes/021_attribute_flags_type_is_validated.phpt
+++ b/Zend/tests/attributes/021_attribute_flags_type_is_validated.phpt
@@ -8,4 +8,4 @@ class A1 { }
?>
--EXPECTF--
-Fatal error: Attribute::__construct(): Argument #1 ($flags) must must be of type int, string given in %s
+Fatal error: Attribute::__construct(): Argument #1 ($flags) must be of type int, string given in %s
diff --git a/Zend/zend_attributes.c b/Zend/zend_attributes.c
index 7d9cb617f5..2823d3bafb 100644
--- a/Zend/zend_attributes.c
+++ b/Zend/zend_attributes.c
@@ -42,7 +42,7 @@ void validate_attribute(zend_attribute *attr, uint32_t target, zend_class_entry
if (Z_TYPE(flags) != IS_LONG) {
zend_error_noreturn(E_ERROR,
- "Attribute::__construct(): Argument #1 ($flags) must must be of type int, %s given",
+ "Attribute::__construct(): Argument #1 ($flags) must be of type int, %s given",
zend_zval_type_name(&flags)
);
}