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.

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 PHP 7.3 deprecations in lib/ directory (Part 1). #2875

Merged
merged 4 commits into from Oct 31, 2019
Merged

Fix PHP 7.3 deprecations in lib/ directory (Part 1). #2875

merged 4 commits into from Oct 31, 2019

Conversation

syntaxseed
Copy link
Contributor

@syntaxseed syntaxseed commented Oct 3, 2019

Have begun fixing PHP 7.3->7.4 deprecations for the project. Began with lib/ directory.

Fixed:

  • Curly brace syntax for accessing array elements and string offsets has been deprecated in PHP 7.4.
  • Passing the $glue and $pieces parameters in reverse order to join has been deprecated since PHP 7.4; $glue should be the first parameter and $pieces the second.

I will continue this work in future PRs. Just making sure this is wanted. :)

Using PHPCS:

phpcs --standard=PHPCompatibility --extensions=php,inc,lib --runtime-set testVersion 7.3- . 

@syntaxseed syntaxseed changed the title Fix PHP 7.3 deprecations in lib/ directory. Fix PHP 7.3 deprecations in lib/ directory (Part 1). Oct 3, 2019
@phy25
Copy link
Collaborator

phy25 commented Oct 3, 2019

My apologies but I have done something here:
https://github.com/splitbrain/dokuwiki/tree/fix-tests-php74

Not opening a new PR for this yet because we are waiting for #2850 (and after this get merged a lot of PRs needs to be rebased in order to get the tests working).

@splitbrain splitbrain added this to In progress in PSR-2 Finishing via automation Oct 10, 2019
@splitbrain splitbrain moved this from In progress to Triage in PSR-2 Finishing Oct 10, 2019
@splitbrain
Copy link
Collaborator

@phy25 I'm unsure about the status here. Does your branch replace this PR? I'd be happy to have this (or something based on this) merged.

@syntaxseed
Copy link
Contributor Author

syntaxseed commented Oct 17, 2019

I can rebase if needed.

Was planning to do more along these lines, if it's ok.

@phy25
Copy link
Collaborator

phy25 commented Oct 18, 2019

My branch, notably 439cabd, is a superset of this one. I guess we can merge this one first and I can rebase mine.

@syntaxseed
Copy link
Contributor Author

@phy25 sounds good!

@phy25 phy25 moved this from Triage to Needs Work in PSR-2 Finishing Oct 20, 2019
@phy25
Copy link
Collaborator

phy25 commented Oct 20, 2019

I finally have some time to look into this. This (and mine) needs to be worked again from the beginning because of massive conflicts.

I will keep this open and delete my commits regarding this.

@syntaxseed
Copy link
Contributor Author

@phy25 Ok so want me to rebase this and start again?

@phy25
Copy link
Collaborator

phy25 commented Oct 21, 2019

@syntaxseed Yes you are welcome to do so.

@syntaxseed
Copy link
Contributor Author

Please bear with me as this is my first large rebase on a forked project. I think I have rebased successfully onto the latest from master and updated my PR.

Copy link
Collaborator

@phy25 phy25 left a comment

Choose a reason for hiding this comment

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

LGTM.

lib/plugins/info/syntax.php Show resolved Hide resolved
@splitbrain splitbrain merged commit 1fd2aeb into dokuwiki:master Oct 31, 2019
PSR-2 Finishing automation moved this from Needs Work to Done Oct 31, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Development

Successfully merging this pull request may close these issues.

None yet

3 participants