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

Add NC 21/22 and PHP 8 support #449

Merged
merged 9 commits into from
Jun 11, 2021
Merged

Add NC 21/22 and PHP 8 support #449

merged 9 commits into from
Jun 11, 2021

Conversation

seyfahni
Copy link
Contributor

@seyfahni seyfahni commented Jun 3, 2021 •
edited
Loading

This PR is based on #438, but addresses some additional issues:

  • Cleaned up composer dependencies, so that composer update works with all PHP versions from 7.2 up to 8.0
  • Cleaned up and fixed TravisCI builds (but for travis-ci.com, so the project can migrate)
  • Added files to .nextcloudignore that shouldn't be part of releases
  • Updated non-breaking node.js dependencies (closing some vulnerabilities too)
  • Fixed php-cs findings

Replaces #438.
Fixes #426 and fixes #425.

ChristophWurst
ChristophWurst approved these changes Jun 4, 2021
View reviewed changes
Copy link
Member

@ChristophWurst ChristophWurst left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Top notch pull request. I have no remarks. Awesome work, Niklas!

@seyfahni
Copy link
Contributor Author

seyfahni commented Jun 4, 2021

Thanks! Though I can't fix the missing signoffs for @boppy's commits.

@seyfahni seyfahni mentioned this pull request Jun 4, 2021
Merged
@tetebueno
Copy link

@boppy

@boppy
Copy link
Collaborator

boppy commented Jun 6, 2021

Thanks! Though I can't fix the missing signoffs for @boppy's commits.

Signed, rebased, force-pushed.

boppy and others added 9 commits June 6, 2021 14:48
@boppy
Add NC 21 and PHP 8 Support
a0b5a1a 
Changed Telegram API Class to one not having a Guzzle requirement. Tested with NC 21.0.0 on PHP 8.0.3 (on Alpine Linux Docker Container).

Fixes nextcloud#426 and nextcloud#425

Signed-off-by: Henning Bopp <henning.bopp@gmail.com>
@boppy
Update NC and PHP Version, and Travis Config
3ea906d 
Supporting NC 20-22 / PHP 7.2-8.0
Testing
- NC20 w/ PHP 7.2
- NC21 w/ PHP 7.3, 7.4, 8.0
- NC22 w/ PHP 7.3, 7.4, 8.0, nightly

Signed-off-by: Henning Bopp <henning.bopp@gmail.com>
@seyfahni
Ignore PhpStorm project files.
0f6853e 
Signed-off-by: Niklas Seyfarth <niklas@seyfarth.de>
@seyfahni
Upgrade composer dependencies to work with PHP 8.
459bcd8 
Signed-off-by: Niklas Seyfarth <niklas@seyfarth.de>
@seyfahni
Fix issues found by php-cs.
5d67d63 
Signed-off-by: Niklas Seyfarth <niklas@seyfarth.de>
@seyfahni
Force usage of minimal possible PHP version.
4ae72ae 
Signed-off-by: Niklas Seyfarth <niklas@seyfarth.de>
@seyfahni
Update non-breaking node dependencies.
27eb87c 
Signed-off-by: Niklas Seyfarth <niklas@seyfarth.de>
@seyfahni
Update travis config.
e9c04cb 
- use normal PHP 7.4 instead of snapshot version
- run occ app:check-code only if it is still available in the used NC version
- shorten job configuration by properly defining the job matrix
- fix warnings about missing and deprecated config keys
- reformat file to only use one style (indented lists)
- enabled zip PHP extension to not fail because of dependency installation in some jobs

Signed-off-by: Niklas Seyfarth <niklas@seyfarth.de>
@seyfahni
Ignore php-cs config and PhpStorm project files when packaging with k…
37e25c0 
…rankerl.

Signed-off-by: Niklas Seyfarth <niklas@seyfarth.de>
@seyfahni
Copy link
Contributor Author

seyfahni commented Jun 6, 2021 •
edited
Loading

Signed, rebased, force-pushed.

Thank you very much! Now all checks should pass.

Anyone that saw my previous (deleted) comment: I was super confused that boppy's signoff fix was in a branch inside of this repository and couldn't find it at first.

@boppy
Copy link
Collaborator

boppy commented Jun 6, 2021

Anyone that saw my previous (deleted) comment: I was super confused that boppy's signoff fix was in a branch in side of this repository and couldn't find it at first.

Yes, I also searched for the commit, because it was my first time fixing the signoff as mentioned in github's sign-off info-page. Always nice to encounter new functionality ;)

@boppy boppy mentioned this pull request Jun 6, 2021
Closed
@mhzawadi
Copy link

Hello, any news on a merge for this?
As NC 22 is due soon

@ChristophWurst ChristophWurst merged commit 92e1221 into nextcloud:master Jun 11, 2021
This was referenced Jun 11, 2021
Closed
Closed
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ChristophWurst ChristophWurst ChristophWurst approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

PHP 8 Support Nextcloud 21 incompatibility
5 participants
@seyfahni @tetebueno @boppy @mhzawadi @ChristophWurst