Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for 8.1.0beta2 #54

Merged
merged 3 commits into from
Aug 4, 2021
Merged

Fix for 8.1.0beta2 #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1383c25
don't track these
remicollet Aug 4, 2021
c5c97dc
fix proto for 8.1.0beta2
remicollet Aug 4, 2021
9fc3134
add stub to pecl archive
remicollet Aug 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
*.lo
*.swp
.deps
*.dep
.libs
Makefile
Makefile.fragments
Expand All @@ -14,16 +15,19 @@ build
config.guess
config.h
config.h.in
config.h.in~
config.log
config.nice
config.status
config.sub
configure
configure.in
configure.ac
include
install-sh
libtool
ltmain.sh
ltmain.sh.backup
missing
mkinstalldirs
modules
Expand Down
215 changes: 0 additions & 215 deletions configure.ac
View file
Open in desktop

This file was deleted.

8 changes: 7 additions & 1 deletion metadata_collection.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,15 @@
#include "php_simple_kafka_client_int.h"
#include "ext/spl/spl_iterators.h"
#include "Zend/zend_interfaces.h"
#include "metadata_collection_arginfo.h"
#include "Zend/zend_exceptions.h"

#if PHP_VERSION_ID < 80100
#define ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(name, return_reference, required_num_args, type, allow_null) \
ZEND_BEGIN_ARG_INFO_EX(name, return_reference, required_num_args, allow_null)
#endif

#include "metadata_collection_arginfo.h"

typedef struct _object_intern {
zval zmetadata;
const void *items;
Expand Down
8 changes: 4 additions & 4 deletions metadata_collection.stub.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ public function count(): int {}

public function rewind(): void {}

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

public function key(): int {}

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

public function valid(): bool {}
}
7 changes: 4 additions & 3 deletions metadata_collection_arginfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
/* This is a generated file, edit the .stub.php file instead.
* Stub hash: 925cbd1dcf14595ae437c111d3f99f767a665006 */
* Stub hash: c130cfc464b41b677ecde96328b3417797b5176d */

ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_SimpleKafkaClient_Metadata_Collection_count, 0, 0, IS_LONG, 0)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_SimpleKafkaClient_Metadata_Collection_rewind, 0, 0, IS_VOID, 0)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SimpleKafkaClient_Metadata_Collection_current, 0, 0, 0)
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_SimpleKafkaClient_Metadata_Collection_current, 0, 0, IS_MIXED, 0)
ZEND_END_ARG_INFO()

#define arginfo_class_SimpleKafkaClient_Metadata_Collection_key arginfo_class_SimpleKafkaClient_Metadata_Collection_count

#define arginfo_class_SimpleKafkaClient_Metadata_Collection_next arginfo_class_SimpleKafkaClient_Metadata_Collection_current
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_SimpleKafkaClient_Metadata_Collection_next, 0, 0, IS_VOID, 0)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_SimpleKafkaClient_Metadata_Collection_valid, 0, 0, _IS_BOOL, 0)
ZEND_END_ARG_INFO()
Expand Down
14 changes: 14 additions & 0 deletions package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,34 +38,48 @@
<file role="src" name="config.w32"/>
<file role="src" name="configuration.c"/>
<file role="src" name="configuration_arginfo.h"/>
<file role="src" name="configuration.stub.php"/>
<file role="src" name="consumer.c"/>
<file role="src" name="consumer_arginfo.h"/>
<file role="src" name="consumer.stub.php"/>
<file role="src" name="functions.c"/>
<file role="src" name="functions_arginfo.h"/>
<file role="src" name="functions.stub.php"/>
<file role="src" name="simple_kafka_client.c"/>
<file role="src" name="simple_kafka_client_arginfo.h"/>
<file role="src" name="simple_kafka_client.stub.php"/>
<file role="src" name="kafka_exception.c"/>
<file role="src" name="kafka_exception_arginfo.h"/>
<file role="src" name="kafka_exception.stub.php"/>
<file role="src" name="message.c"/>
<file role="src" name="message_arginfo.h"/>
<file role="src" name="message.stub.php"/>
<file role="src" name="metadata.c"/>
<file role="src" name="metadata_arginfo.h"/>
<file role="src" name="metadata.stub.php"/>
<file role="src" name="metadata_broker.c"/>
<file role="src" name="metadata_broker_arginfo.h"/>
<file role="src" name="metadata_broker.stub.php"/>
<file role="src" name="metadata_collection.c"/>
<file role="src" name="metadata_collection_arginfo.h"/>
<file role="src" name="metadata_collection.stub.php"/>
<file role="src" name="metadata_partition.c"/>
<file role="src" name="metadata_partition_arginfo.h"/>
<file role="src" name="metadata_partition.stub.php"/>
<file role="src" name="metadata_topic.c"/>
<file role="src" name="metadata_topic_arginfo.h"/>
<file role="src" name="metadata_topic.stub.php"/>
<file role="src" name="php_simple_kafka_client_int.h"/>
<file role="src" name="producer.c"/>
<file role="src" name="producer_arginfo.h"/>
<file role="src" name="producer.stub.php"/>
<file role="src" name="simple_kafka_client.c"/>
<file role="src" name="topic.c"/>
<file role="src" name="topic_arginfo.h"/>
<file role="src" name="topic.stub.php"/>
<file role="src" name="topic_partition.c"/>
<file role="src" name="topic_partition_arginfo.h"/>
<file role="src" name="topic_partition.stub.php"/>
<dir name="tests">
<file role="test" name="allow_null_payload.phpt"/>
<file role="test" name="allow_null_payload_and_key.phpt"/>
Expand Down