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

Drop HHVM support #164

Merged
merged 2 commits into from
Mar 10, 2019
Merged

Drop HHVM support #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
707c2ff
drop hhvm support
goetas Mar 10, 2019
d9f7f01
test on php 7.3
goetas Mar 10, 2019
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 .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ matrix:
- php: 7.1
env: CS_FIXER=1
- php: 7.2
- php: 7.3
env: BENCHMARK=1
- php: hhvm
fast_finish: true

cache:
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ HTML5 provides the following features.
- Event-based (SAX-like) parser
- A DOM tree builder
- Interoperability with [QueryPath](https://github.com/technosophos/querypath)
- Runs on **PHP** 5.3.0 or newer and **HHVM** 3.2 or newer
- Runs on **PHP** 5.3.0 or newer

[![Build Status](https://travis-ci.org/Masterminds/html5-php.png?branch=master)](https://travis-ci.org/Masterminds/html5-php)
[![Latest Stable Version](https://poser.pugx.org/masterminds/html5/v/stable.png)](https://packagist.org/packages/masterminds/html5)
Expand Down
12 changes: 1 addition & 11 deletions src/HTML5/Parser/DOMTreeBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,11 +391,6 @@ public function startTag($name, $attributes = array(), $selfClosing = false)
// to avoid spl_object_hash collisions whe have to avoid garbage collection of $ele storing it into $pushes
// see https://bugs.php.net/bug.php?id=67459
$this->pushes[spl_object_hash($ele)] = array($pushes, $ele);

// SEE https://github.com/facebook/hhvm/issues/2962
if (defined('HHVM_VERSION')) {
$ele->setAttribute('html5-php-fake-id-attribute', spl_object_hash($ele));
}
}

foreach ($attributes as $aName => $aVal) {
Expand Down Expand Up @@ -509,12 +504,7 @@ public function endTag($name)
$lname = Elements::normalizeSvgElement($lname);
}

// See https://github.com/facebook/hhvm/issues/2962
if (defined('HHVM_VERSION') && ($cid = $this->current->getAttribute('html5-php-fake-id-attribute'))) {
$this->current->removeAttribute('html5-php-fake-id-attribute');
} else {
$cid = spl_object_hash($this->current);
}
$cid = spl_object_hash($this->current);

// XXX: HTML has no parent. What do we do, though,
// if this element appears in the wrong place?
Expand Down
4 changes: 1 addition & 3 deletions src/HTML5/Serializer/OutputRules.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,9 +167,7 @@ public function __construct($output, $options = array())

$this->outputMode = static::IM_IN_HTML;
$this->out = $output;

// If HHVM, see https://github.com/facebook/hhvm/issues/2727
$this->hasHTML5 = defined('ENT_HTML5') && !defined('HHVM_VERSION');
$this->hasHTML5 = defined('ENT_HTML5');
}

public function addRule(array $rule)
Expand Down