Skip to content

Feature/php 8 and 8.1 CI #237

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

Merged
merged 3 commits into from
Sep 25, 2022
Merged

Feature/php 8 and 8.1 CI #237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6360120
Add 8 and 8.1 to CI branches
Lewiscowles1986 Jun 27, 2022
c42bc26
Overcome empty document error for PHP8+
Lewiscowles1986 Jun 27, 2022
ade21a7
Attempt 2 at Empty Document Default for PHP 8+
Lewiscowles1986 Jun 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:

strategy:
matrix:
php: ['5.6', '7.3', '7.4']
php: ['5.6', '7.3', '7.4', '8.0', '8.1']

runs-on: ubuntu-latest

Expand Down
7 changes: 6 additions & 1 deletion Mf2/Parser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,8 +364,13 @@ class Parser {
* @param boolean $jsonMode Whether or not to use a stdClass instance for an empty `rels` dictionary. This breaks PHP looping over rels, but allows the output to be correctly serialized as JSON.
*/
public function __construct($input, $url = null, $jsonMode = false) {
$emptyDocDefault = '<html><body></body></html>';
libxml_use_internal_errors(true);
if (is_string($input)) {
if (empty($input)) {
$input = $emptyDocDefault;
}

if (class_exists('Masterminds\\HTML5')) {
$doc = new \Masterminds\HTML5(array('disable_html_ns' => true));
$doc = $doc->loadHTML($input);
Expand All @@ -377,7 +382,7 @@ public function __construct($input, $url = null, $jsonMode = false) {
$doc = clone $input;
} else {
$doc = new DOMDocument();
@$doc->loadHTML('');
@$doc->loadHTML($emptyDocDefault);
}

// Create an XPath object and allow some PHP functions to be used within XPath queries.
Expand Down