[go: nahoru, domu]
Skip to content
This repository has been archived by the owner on Oct 3, 2023. It is now read-only.

Fix compatibility with PHP 8 #270

Merged
merged 42 commits into from
May 31, 2021
Merged

Fix compatibility with PHP 8 #270

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
1e7a25a
Fix compatibility with PHP 8.
MrMage Apr 26, 2021
7bf5d60
Add CI for PHP 8.
MrMage Apr 26, 2021
407a6cd
Also add CI for PHP 7.4.
MrMage Apr 26, 2021
ca2efdc
Try fixing another compiler error.
MrMage Apr 26, 2021
c6f2280
Fix two more flags that have been removed.
MrMage Apr 26, 2021
f747721
Try making an extension test compatible with PHP 7.4.
MrMage Apr 26, 2021
f860754
Solve the PHP 7.4 test compatibility issues the proper way.
MrMage Apr 26, 2021
6083f84
Enable Xdebug coverage in more places.
MrMage Apr 26, 2021
1f8829b
Add support for UUID v4 to fix our integration tests.
MrMage Apr 26, 2021
05fcc64
Add a bunch of arginfo annotations.
MrMage Apr 26, 2021
d38d8b4
More arginfo fixes.
MrMage Apr 26, 2021
3c72422
Remove `call_user_function_ex`.
MrMage Apr 26, 2021
4fb4005
Update a bunch of `zend_read_property` calls.
MrMage Apr 26, 2021
e7f7a52
More Z_OBJ_P fixes.
MrMage Apr 26, 2021
e5e471a
Yet more Z_OBJ_P.
MrMage Apr 26, 2021
2747006
Also update our _php_math_longtobase calls.
MrMage Apr 26, 2021
2b64d6d
Update PHP CodeSniffer.
MrMage Apr 26, 2021
2f55e72
Update PHPUnit.
MrMage Apr 26, 2021
9b16d04
Remove PHP 7 CI; make tests compatible with PHPUnit 9.
MrMage Apr 26, 2021
7f6fb82
Fix a few exceptions; require PHP 8.
MrMage Apr 26, 2021
a2f1c32
More PHPUnit fixes.
MrMage Apr 26, 2021
e66aa54
More compatibility fixes.
MrMage Apr 26, 2021
6d830fc
Fix another PHPUnit method signature.
MrMage Apr 26, 2021
4e90929
More integration test fixes.
MrMage Apr 26, 2021
a814fce
Yet more integration test fixes...
MrMage Apr 26, 2021
99d996b
Remove a reference to phpunit.xml.dist.
MrMage Apr 26, 2021
87f5105
Deja vu...
MrMage Apr 26, 2021
a715b05
Add support for PSR cache 2.0 and 3.0.
MrMage Apr 26, 2021
0c1f50c
Skip the Symfony 4 tests for now.
MrMage Apr 26, 2021
2eaf0e6
Also skip the WordPress integration test.
MrMage Apr 26, 2021
3a2dcf2
Fix a compiler error on macOS.
MrMage Apr 27, 2021
c528164
Try fixing compilation pre-PHP 8.
MrMage May 4, 2021
bfea684
Re-add CI for PHP 7.
MrMage May 4, 2021
8d2ea0d
Update a few composer files.
MrMage May 4, 2021
40dab4c
Two more fixes.
MrMage May 4, 2021
020c210
Also allow PHPUnit 7.
MrMage May 4, 2021
467d646
Use `PHP_MAJOR_VERSION` instead of `PHP_VERSION_ID`.
MrMage May 5, 2021
01914df
Minor macro tweak.
MrMage May 18, 2021
544ce56
Try running integration tests on PHP 7.4 instead.
MrMage May 18, 2021
f1f8b2a
Fix a typo and add integration tests on both 7.4 and 8.0.
MrMage May 18, 2021
28c1a3e
Another WordPress test fix.
MrMage May 18, 2021
024aac7
Remove unnecessary parent setup calls.
MrMage May 26, 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
Prev Previous commit
Next Next commit
More Z_OBJ_P fixes.
  • Loading branch information
@MrMage
MrMage committed Apr 26, 2021
commit e7f7a52833a34e7ad9408919aac4236ff29b9b07
6 changes: 3 additions & 3 deletions ext/opencensus_trace_annotation.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,8 @@ void opencensus_trace_annotation_free(opencensus_trace_annotation_t *annotation)
int opencensus_trace_annotation_to_zval(opencensus_trace_annotation_t *annotation, zval *zv)
{
object_init_ex(zv, opencensus_trace_annotation_ce);
zend_update_property_str(opencensus_trace_annotation_ce, zv, "description", sizeof("description") - 1, annotation->description);
zend_update_property_double(opencensus_trace_annotation_ce, zv, "time", sizeof("time") - 1, annotation->time_event.time);
zend_update_property(opencensus_trace_annotation_ce, zv, "options", sizeof("options") - 1, &annotation->options);
zend_update_property_str(opencensus_trace_annotation_ce, Z_OBJ_P(zv), "description", sizeof("description") - 1, annotation->description);
zend_update_property_double(opencensus_trace_annotation_ce, Z_OBJ_P(zv), "time", sizeof("time") - 1, annotation->time_event.time);
zend_update_property(opencensus_trace_annotation_ce, Z_OBJ_P(zv), "options", sizeof("options") - 1, &annotation->options);
return SUCCESS;
}
6 changes: 3 additions & 3 deletions ext/opencensus_trace_link.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,8 @@ void opencensus_trace_link_free(opencensus_trace_link_t *link)
int opencensus_trace_link_to_zval(opencensus_trace_link_t *link, zval *zv)
{
object_init_ex(zv, opencensus_trace_link_ce);
zend_update_property_str(opencensus_trace_link_ce, zv, "traceId", sizeof("traceId") - 1, link->trace_id);
zend_update_property_str(opencensus_trace_link_ce, zv, "spanId", sizeof("spanId") - 1, link->span_id);
zend_update_property(opencensus_trace_link_ce, zv, "options", sizeof("options") - 1, &link->options);
zend_update_property_str(opencensus_trace_link_ce, Z_OBJ_P(zv), "traceId", sizeof("traceId") - 1, link->trace_id);
zend_update_property_str(opencensus_trace_link_ce, Z_OBJ_P(zv), "spanId", sizeof("spanId") - 1, link->span_id);
zend_update_property(opencensus_trace_link_ce, Z_OBJ_P(zv), "options", sizeof("options") - 1, &link->options);
return SUCCESS;
}
8 changes: 4 additions & 4 deletions ext/opencensus_trace_message_event.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,9 +184,9 @@ void opencensus_trace_message_event_free(opencensus_trace_message_event_t *messa
int opencensus_trace_message_event_to_zval(opencensus_trace_message_event_t *message_event, zval *zv)
{
object_init_ex(zv, opencensus_trace_message_event_ce);
zend_update_property_str(opencensus_trace_message_event_ce, zv, "type", sizeof("type") - 1, message_event->type);
zend_update_property_str(opencensus_trace_message_event_ce, zv, "id", sizeof("id") - 1, message_event->id);
zend_update_property_double(opencensus_trace_message_event_ce, zv, "time", sizeof("time") - 1, message_event->time_event.time);
zend_update_property(opencensus_trace_message_event_ce, zv, "options", sizeof("options") - 1, &message_event->options);
zend_update_property_str(opencensus_trace_message_event_ce, Z_OBJ_P(zv), "type", sizeof("type") - 1, message_event->type);
zend_update_property_str(opencensus_trace_message_event_ce, Z_OBJ_P(zv), "id", sizeof("id") - 1, message_event->id);
zend_update_property_double(opencensus_trace_message_event_ce, Z_OBJ_P(zv), "time", sizeof("time") - 1, message_event->time_event.time);
zend_update_property(opencensus_trace_message_event_ce, Z_OBJ_P(zv), "options", sizeof("options") - 1, &message_event->options);
return SUCCESS;
}