Skip to content

updates for php7.4 and php8.0 #212

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.

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

Merged
merged 7 commits into from
Mar 5, 2020
Merged

updates for php7.4 and php8.0 #212

merged 7 commits into from
Mar 5, 2020

Conversation

zebastian
Copy link
Contributor

  • removed now unused references to TSRMLS_*
    These flags were mostly already removed from the
    php7 codebase but some instances were still present.
    With php8 these produce compile errors.
  • fix tests for php8 and php7.4
    New TypeErrors now get handled correctly in the test cases.
  • fix memory corruption in zmq.c
    The conflicting line causes memory leaks on other php
    version and causes a segfault on php8 and php7.4
    The error was provocable with test case
    021-callbackwarning.phpt. After removing of the line
    valgrind showed no memory leak, so this line was probably
    redundant. Also if you compare with zmqsocket constructor
    this line is also not present.

zebastian and others added 7 commits March 5, 2020 22:09
The code is autogenerated by the *.gsl scripts. In order to
minimize the c code now parts of the gsl code generation is
moved to new makro definitions in zmq_sockopts_makros.h

This reduces the overall lines of the file and makes it more
readable for future additions of flags.
- fixed unstable tests
- add pthreads for php7.2
- travisci enabled php7.4 and php8.0
- removed now unused references to TSRMLS_*
  These flags were mostly already removed from the
  php7 codebase but some instances were still present.
  With php8 these produce compile errors.
- fix tests for php8 and php7.4
  New TypeErrors now get handled correctly in the test cases.
- fix memory corruption in zmq.c
  The conflicting line causes memory leaks on other php
  version and causes a segfault on php8 and php7.4
  The error was provocable with test case
  021-callbackwarning.phpt. After removing of the line
  valgrind showed no memory leak, so this line was probably
  redundant. Also if you compare with zmqsocket constructor
  this line is also not present.
@bluca
Copy link
Member

bluca commented Mar 5, 2020

Please do a rebase instead of a recusrive merge. Something like:

git remote add upstream https://github.com/zeromq/php-zmq.git
git fetch upstream
git rebase --onto upstream/master d711685
git push -f

@bluca bluca merged commit 4ad1b33 into zeromq:master Mar 5, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants