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

Jump to bottom

Dev #145

Merged
merged 26 commits into from
May 18, 2020
Merged

Dev #145

merged 26 commits into from
May 18, 2020

Conversation

Sebbo94BY
Copy link
Collaborator

@Sebbo94BY Sebbo94BY commented Apr 21, 2020 •
edited
Loading

  • Merged master into dev
  • Added Travis CI build status icon to README
  • Travis CI tests now also PHP 7.3 and 7.4
  • Improved composer.json
  • Updated command to run all tests in README
  • Added docker-compose up to README for existing docker container(s)
  • Fixed PHPUnit config issues
  • Replaced required PHP extension "ssh2" (libssh2) with phpseclib
  • PHP 7.4: Replaced deprecated curly braces with square braces
  • Replaced abandoned package satooshi/php-coveralls with php-coveralls/php-coveralls
  • Updated composer packages

Sensznet and others added 17 commits November 27, 2019 06:03
@Sensznet @ronindesign
Icon Download extended function (planetteamspeak#131)
198fb18 
* Update Server.php

Option to Download an icon by name.
This has the benefit that you don't have to change the virtualserver_icon_id to download a specific icon.

* Update Server.php

fixed name was not set for download
@y4roc @ronindesign
Fixing naming error (planetteamspeak#135)
a080d3f
@svenpaulsen
try to fix issue planetteamspeak#136
898d0b5
@svenpaulsen
add -banners option to channellist
b8aee02
@svenpaulsen
remove iconname argument
4de02db 
use transferInitDownload() instead
@svenpaulsen
add -keepfiles argument to snapshot deploy
fd074a3
@svenpaulsen
update changelog
a62f774
@svenpaulsen
set release date for 1.1.34
f1cc4de
@Fjonan
Fixing deprecated curly braces for PHP 7.4+ (planetteamspeak#142)
b14b8c8 
* removed deprecated curly braces from string.php, host.php, crypt.php, char.php
@Fjonan
removed another deprecated curly braces from string.php (planetteamsp…
9e987b6 
…eak#144)

overlooked one more curly braces
Merge branch 'master' into dev
2135207
* Added Travis CI build status icon to README
6fb1527 
* Travis CI tests now also PHP 7.3 and 7.4
* Improved composer.json
* Updated command to run all tests in README
* Added `docker-compose up` to README for existing docker container(s)
* Fixed PHPUnit config issues
Travis CI misses PHP extension ssh2
44a80e4
PHP extension ssh2 is still missing
d7e8b11
PHP extension ssh2 is still missing
743193e
Next attempt to install PHP extension ssh2
3c90132
PHP extension ssh2 still missing
50f071f
@Sebbo94BY
Copy link
Collaborator Author

Mhmmm... Any idea, how we can install the PHP extension ssh2 in Travis CI?

As soon as this is available, the builds should be fine.

@Sebbo94BY Sebbo94BY marked this pull request as ready for review April 21, 2020 22:02
@Sebbo94BY Sebbo94BY mentioned this pull request Apr 21, 2020
Closed
@ronindesign
Copy link
Collaborator

ronindesign commented Apr 23, 2020 •
edited
Loading

I'm ok with merging these changes to the README only on the dev branch.
We'll need to have approval from @svenpaulsen before this get's merged into master though, as the README is basically the front page for the framework and he'll need the final say if he wants Travis CI status displayed there, etc.

EDIT: Just saw you're still working on ssh2 functionality, so I'll hold off merging this until that has been addressed.

@ronindesign
Copy link
Collaborator

RE: ssh2 - looks like there was some workaround for getting ssh2 to work, but possibly (as of late last year) Travis CI has moved to using phpseclib[1]].
It looks like phpseclib would be suitable[2][3] replacement, but I imagine PECL ssh2 extension everyone is more familiar/comfortable with.
So, I think it makes more sense to try and get ssh2 extension to work in Travis CI still, maybe even if we have to compile from source...

Ref:
[1] DivineOmega/php-ssh-connection#2
[2] https://stackoverflow.com/questions/14304234/phpseclib-or-ssh2-pecl-extension
[3] http://phpseclib.sourceforge.net/ssh/compare.html

@Sebbo94BY
Copy link
Collaborator Author

Finally! https://travis-ci.org/github/planetteamspeak/ts3phpframework/builds/688096095

I'm unfortunately not that familiar with the configuration of composer.json, so I don't know how we can solve these dependency issues. Maybe someone else has an idea.

Anyway: Except of those php-cs / coverage issues, the library seems to be fine and working. I've also replaced the deprecated curly braces with square brackets for PHP 7.4 (#148).

Can you merge those changes for now into dev only, that I can test, if this solves the issue #137?

@svenpaulsen can update the README or anything else later as well, before it gets merged into master. :)

@ronindesign
Copy link
Collaborator

Looks great! Thanks for sticking with the ssh issue to get it resolved and for the work on refactoring curly braces to brackets, really appreciate it!

@ronindesign ronindesign merged commit fa52249 into planetteamspeak:dev May 18, 2020
@Sebbo94BY
Copy link
Collaborator Author

Thanks for merging! I'll test and try to fix the issue #137 next. Hopefully this weekend. :)

Sebbo94BY added a commit to Sebbo94BY/ts3phpframework that referenced this pull request Jun 2, 2020
@Sebbo94BY
Merge pull request #1 from planetteamspeak/dev
6bf7e7f 
Dev (planetteamspeak#145)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@Sebbo94BY @ronindesign @MateuszLas421 @Sensznet @y4roc @svenpaulsen @Fjonan