Skip to content

Commit 2404222

Browse files
committed
feat: fix CI/CD errors.
1 parent b955f07 commit 2404222

5 files changed

Lines changed: 218 additions & 6 deletions

File tree

ext/zend_test/test.c

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,11 @@ static zend_class_entry *zend_test_gen_stub_flag_compatibility_test;
5858
static zend_class_entry *zend_attribute_test_class;
5959
static zend_class_entry *zend_test_trait;
6060
static zend_class_entry *zend_test_trait_for_internal_class;
61+
static zend_class_entry *zend_test_trait_for_internal_class2;
62+
static zend_class_entry *zend_test_trait_with_union_prop;
6163
static zend_class_entry *zend_test_class_with_trait;
64+
static zend_class_entry *zend_test_class_with_multiple_traits;
65+
static zend_class_entry *zend_test_class_with_union_type_trait;
6266
static zend_class_entry *zend_test_not_a_trait_for_internal_traits;
6367
static zend_class_entry *zend_test_internal_traits_driver;
6468
static zend_class_entry *zend_test_attribute;
@@ -1244,6 +1248,12 @@ static ZEND_METHOD(_ZendTestTraitForInternalClass, traitMethod)
12441248
RETURN_LONG(789);
12451249
}
12461250

1251+
static ZEND_METHOD(_ZendTestTraitForInternalClass2, traitMethod2)
1252+
{
1253+
ZEND_PARSE_PARAMETERS_NONE();
1254+
RETURN_LONG(101);
1255+
}
1256+
12471257
static ZEND_FUNCTION(zend_test_use_internal_traits_zero)
12481258
{
12491259
ZEND_PARSE_PARAMETERS_NONE();
@@ -1561,7 +1571,11 @@ PHP_MINIT_FUNCTION(zend_test)
15611571

15621572
zend_test_trait = register_class__ZendTestTrait();
15631573
zend_test_trait_for_internal_class = register_class__ZendTestTraitForInternalClass();
1574+
zend_test_trait_for_internal_class2 = register_class__ZendTestTraitForInternalClass2();
1575+
zend_test_trait_with_union_prop = register_class__ZendTestTraitWithUnionProp();
15641576
zend_test_class_with_trait = register_class__ZendTestClassWithTrait(zend_test_trait_for_internal_class);
1577+
zend_test_class_with_multiple_traits = register_class__ZendTestClassWithMultipleTraits(zend_test_trait_for_internal_class, zend_test_trait_for_internal_class2);
1578+
zend_test_class_with_union_type_trait = register_class__ZendTestClassWithUnionTypeTrait(zend_test_trait_with_union_prop);
15651579
zend_test_not_a_trait_for_internal_traits = register_class__ZendTestNotATraitForInternalTraits();
15661580
zend_test_internal_traits_driver = register_class__ZendTestInternalTraitsDriver();
15671581

ext/zend_test/test.stub.php

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,37 @@ trait _ZendTestTraitForInternalClass
4545
public function traitMethod(): int {}
4646
}
4747

48+
trait _ZendTestTraitForInternalClass2
49+
{
50+
/** @var int */
51+
public const ZEND_TRAIT_CONST2 = 321;
52+
53+
public static int $staticTraitProp = 999;
54+
55+
public function traitMethod2(): int {}
56+
}
57+
58+
trait _ZendTestTraitWithUnionProp
59+
{
60+
public int|string $unionProp = 42;
61+
}
62+
4863
class _ZendTestClassWithTrait
4964
{
5065
use _ZendTestTraitForInternalClass;
5166
}
5267

68+
class _ZendTestClassWithMultipleTraits
69+
{
70+
use _ZendTestTraitForInternalClass;
71+
use _ZendTestTraitForInternalClass2;
72+
}
73+
74+
class _ZendTestClassWithUnionTypeTrait
75+
{
76+
use _ZendTestTraitWithUnionProp;
77+
}
78+
5379
class _ZendTestNotATraitForInternalTraits {}
5480

5581
class _ZendTestInternalTraitsDriver {}

ext/zend_test/test_arginfo.h

Lines changed: 87 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ext/zend_test/test_decl.h

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ext/zend_test/test_legacy_arginfo.h

Lines changed: 87 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)