[PHP] Replace substr(PHP_OS) calls with PHP_OS_FAMILY in PHP 7.2
#6978
Conversation
|
The following accounts have interacted with this PR and/or linked issues. I will continue to update these lists as activity occurs. You can also manually ask me to refresh this list by adding the Core Committers: Use this line as a base for the props when committing in SVN: To understand the WordPress project's expectations around crediting contributors, please review the Contributor Attribution page in the Core Handbook. |
Test using WordPress PlaygroundThe changes in this pull request can previewed and tested using a WordPress Playground instance. WordPress Playground is an experimental project that creates a full WordPress instance entirely within the browser. Some things to be aware of
For more details about these limitations and more, check out the Limitations page in the WordPress Playground documentation. |
src/wp-admin/includes/class-ftp.php
Outdated
| if(strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') $this->OS_local=FTP_OS_Windows; | ||
| elseif(strtoupper(substr(PHP_OS, 0, 3)) === 'MAC') $this->OS_local=FTP_OS_Mac; | ||
| if ( PHP_OS_FAMILY === 'Windows' ) { | ||
| $this->OS_local = FTP_OS_Windows; | ||
| } elseif ( PHP_OS_FAMILY === 'Darwin' ) { | ||
| $this->OS_local = FTP_OS_Mac; | ||
| } |
There was a problem hiding this comment.
I'm not sure about this change. The class-ftp.php file is regarded as part of an external dependency, so should generally not be touched unless to update the package.
Having said that, the external dependency is, AFAICS, no longer actively maintained... 🤷🏻♀️
Pro-tip: When in doubt about whether something is an external dependency or not, you can always check via the phpcs.xml.dist file, as external dependencies don't have to comply with the WP Coding Standards.
There was a problem hiding this comment.
Pro-tip: When in doubt about whether something is an external dependency or not, you can always check via the phpcs.xml.dist file, as external dependencies don't have to comply with the WP Coding Standards.
TIL, thank you!
I will remove this and push again.
Ayesh
force-pushed
the
php72-PHP_OS_FAMILY
branch
from
3b2a4d0
to
6e04c8e
Compare
|
Thanks for the PR! Merged in r58684. |
Trac ticket: https://core.trac.wordpress.org/ticket/61574
Follow-up to #6969, and responding to a comment in @jrfnl's #6975
This Pull Request is for code review only. Please keep all other discussion in the Trac ticket. Do not merge this Pull Request. See GitHub Pull Requests for Code Review in the Core Handbook for more details.