Skip to content
This repository was archived by the owner on Sep 3, 2025. It is now read-only.

Conversation

@d-r-p
Copy link

@d-r-p d-r-p commented Jun 11, 2018

JIRA Ticket: https://jira.duraspace.org/browse/ISLANDORA-2248

What does this Pull Request do?

Avoid

PHP Strict standards:  Declaration of _XMLDocument::loadHTMLFile() should be compatible with DOMDocument::loadHTMLFile($source, $options = NULL) in xml/XMLDocument.inc on line 252

in PHP 5.4+ (note that this error has been observed also in TravisCI's build step).

What's new?

Update signature of _XMLDocument::loadHTMLFile() to account for optional $options argument introduced in PHP 5.4 (see JIRA ticket for more background).

How should this be tested?

Execute

php -l -d error_reporting=-1 xml/XMLDocument.inc

inside the PHP Lib module directory (/var/www/drupal/sites/all/modules/php_lib on standard vagrant VM). Before this PR, you would see the aforementioned error, after this PR, you should see

No syntax errors detected in xml/XMLDocument.inc

Alternatively, check that this PR passes TravisCI (check logs!).

Additional Notes:

  • Does this change require documentation to be updated? no
  • Does this change add any new dependencies? no
  • Does this change require any other modifications to be made to the repository (ie. Regeneration activity, etc.)? no
  • Could this change impact execution of existing code? no

Interested parties

@DiegoPino @Islandora/7-x-1-x-committers

Update signature of `_XMLDocument::loadHTMLFile()` to account for
optional `$options` argument introduced in PHP 5.4.
@DiegoPino
Copy link

@d-r-p cool. since we are still on time here, would you mind making a release pull too? Only if you can. @willtp87 i'm also ok, good to merge in 20 hours or so or whenever you feel is Ok. Thanks guys

@rosiel rosiel merged commit 28ec509 into Islandora:7.x Jun 14, 2018
rosiel added a commit that referenced this pull request Jun 14, 2018
ISLANDORA-2248: Prevent PHP Strict standards issue - 7.x-1.11 Release Pull for #51
@d-r-p d-r-p deleted the 7.x-ISLANDORA-2248 branch June 14, 2018 18:34
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants