Skip to content

Commit b27868f

Browse files
authored
Fix for 8.1.0beta2 (#54)
* don't track these * fix proto for 8.1.0beta2 * add stub to pecl archive
1 parent 4468f27 commit b27868f

6 files changed

+33
-223
lines changed

.gitignore

+4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
*.lo
33
*.swp
44
.deps
5+
*.dep
56
.libs
67
Makefile
78
Makefile.fragments
@@ -14,16 +15,19 @@ build
1415
config.guess
1516
config.h
1617
config.h.in
18+
config.h.in~
1719
config.log
1820
config.nice
1921
config.status
2022
config.sub
2123
configure
2224
configure.in
25+
configure.ac
2326
include
2427
install-sh
2528
libtool
2629
ltmain.sh
30+
ltmain.sh.backup
2731
missing
2832
mkinstalldirs
2933
modules

configure.ac

-215
This file was deleted.

metadata_collection.c

+7-1
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,15 @@
3939
#include "php_simple_kafka_client_int.h"
4040
#include "ext/spl/spl_iterators.h"
4141
#include "Zend/zend_interfaces.h"
42-
#include "metadata_collection_arginfo.h"
4342
#include "Zend/zend_exceptions.h"
4443

44+
#if PHP_VERSION_ID < 80100
45+
#define ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(name, return_reference, required_num_args, type, allow_null) \
46+
ZEND_BEGIN_ARG_INFO_EX(name, return_reference, required_num_args, allow_null)
47+
#endif
48+
49+
#include "metadata_collection_arginfo.h"
50+
4551
typedef struct _object_intern {
4652
zval zmetadata;
4753
const void *items;

metadata_collection.stub.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ public function count(): int {}
1010

1111
public function rewind(): void {}
1212

13-
/** @return mixed */
14-
public function current() {}
13+
/** @tentative-return-type */
14+
public function current(): mixed {}
1515

1616
public function key(): int {}
1717

18-
/** @return mixed */
19-
public function next() {}
18+
/** @tentative-return-type */
19+
public function next(): void {}
2020

2121
public function valid(): bool {}
2222
}

metadata_collection_arginfo.h

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: 925cbd1dcf14595ae437c111d3f99f767a665006 */
2+
* Stub hash: c130cfc464b41b677ecde96328b3417797b5176d */
33

44
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_SimpleKafkaClient_Metadata_Collection_count, 0, 0, IS_LONG, 0)
55
ZEND_END_ARG_INFO()
66

77
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_SimpleKafkaClient_Metadata_Collection_rewind, 0, 0, IS_VOID, 0)
88
ZEND_END_ARG_INFO()
99

10-
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SimpleKafkaClient_Metadata_Collection_current, 0, 0, 0)
10+
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_SimpleKafkaClient_Metadata_Collection_current, 0, 0, IS_MIXED, 0)
1111
ZEND_END_ARG_INFO()
1212

1313
#define arginfo_class_SimpleKafkaClient_Metadata_Collection_key arginfo_class_SimpleKafkaClient_Metadata_Collection_count
1414

15-
#define arginfo_class_SimpleKafkaClient_Metadata_Collection_next arginfo_class_SimpleKafkaClient_Metadata_Collection_current
15+
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_SimpleKafkaClient_Metadata_Collection_next, 0, 0, IS_VOID, 0)
16+
ZEND_END_ARG_INFO()
1617

1718
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_SimpleKafkaClient_Metadata_Collection_valid, 0, 0, _IS_BOOL, 0)
1819
ZEND_END_ARG_INFO()

package.xml

+14
Original file line numberDiff line numberDiff line change
@@ -38,34 +38,48 @@
3838
<file role="src" name="config.w32"/>
3939
<file role="src" name="configuration.c"/>
4040
<file role="src" name="configuration_arginfo.h"/>
41+
<file role="src" name="configuration.stub.php"/>
4142
<file role="src" name="consumer.c"/>
4243
<file role="src" name="consumer_arginfo.h"/>
44+
<file role="src" name="consumer.stub.php"/>
4345
<file role="src" name="functions.c"/>
4446
<file role="src" name="functions_arginfo.h"/>
47+
<file role="src" name="functions.stub.php"/>
4548
<file role="src" name="simple_kafka_client.c"/>
4649
<file role="src" name="simple_kafka_client_arginfo.h"/>
50+
<file role="src" name="simple_kafka_client.stub.php"/>
4751
<file role="src" name="kafka_exception.c"/>
4852
<file role="src" name="kafka_exception_arginfo.h"/>
53+
<file role="src" name="kafka_exception.stub.php"/>
4954
<file role="src" name="message.c"/>
5055
<file role="src" name="message_arginfo.h"/>
56+
<file role="src" name="message.stub.php"/>
5157
<file role="src" name="metadata.c"/>
5258
<file role="src" name="metadata_arginfo.h"/>
59+
<file role="src" name="metadata.stub.php"/>
5360
<file role="src" name="metadata_broker.c"/>
5461
<file role="src" name="metadata_broker_arginfo.h"/>
62+
<file role="src" name="metadata_broker.stub.php"/>
5563
<file role="src" name="metadata_collection.c"/>
5664
<file role="src" name="metadata_collection_arginfo.h"/>
65+
<file role="src" name="metadata_collection.stub.php"/>
5766
<file role="src" name="metadata_partition.c"/>
5867
<file role="src" name="metadata_partition_arginfo.h"/>
68+
<file role="src" name="metadata_partition.stub.php"/>
5969
<file role="src" name="metadata_topic.c"/>
6070
<file role="src" name="metadata_topic_arginfo.h"/>
71+
<file role="src" name="metadata_topic.stub.php"/>
6172
<file role="src" name="php_simple_kafka_client_int.h"/>
6273
<file role="src" name="producer.c"/>
6374
<file role="src" name="producer_arginfo.h"/>
75+
<file role="src" name="producer.stub.php"/>
6476
<file role="src" name="simple_kafka_client.c"/>
6577
<file role="src" name="topic.c"/>
6678
<file role="src" name="topic_arginfo.h"/>
79+
<file role="src" name="topic.stub.php"/>
6780
<file role="src" name="topic_partition.c"/>
6881
<file role="src" name="topic_partition_arginfo.h"/>
82+
<file role="src" name="topic_partition.stub.php"/>
6983
<dir name="tests">
7084
<file role="test" name="allow_null_payload.phpt"/>
7185
<file role="test" name="allow_null_payload_and_key.phpt"/>

0 commit comments

Comments
 (0)