Merge branch '3.0'

This commit is contained in:
terrafrost 2021-12-11 10:26:14 -06:00
commit 713fa95292
3 changed files with 29 additions and 16 deletions

View File

@ -1,24 +1,30 @@
language: php language: php
dist: xenial
php:
- 5.6
- 7.0
- 7.1
- 7.2
- 7.3
- 7.4
- 8.0
- 8.1
- nightly
before_install: true
matrix: matrix:
include:
- php: 5.6
dist: xenial
- php: 7.0
dist: xenial
- php: 7.1
dist: xenial
- php: 7.2
dist: xenial
- php: 7.3
dist: xenial
- php: 7.4
dist: xenial
- php: 8.0
dist: bionic
- php: 8.1.0
dist: bionic
- php: nightly
dist: bionic
allow_failures: allow_failures:
- php: nightly - php: nightly
before_install: true
install: install:
- phpenv config-rm xdebug.ini - phpenv config-rm xdebug.ini
- eval `ssh-agent -s` - eval `ssh-agent -s`

View File

@ -152,7 +152,9 @@ abstract class XML
} }
$node = $nodes->item(0); $node = $nodes->item(0);
$ns_name = $node->lookupPrefix($ns); $ns_name = $node->lookupPrefix($ns);
if ($ns_name) {
$node->removeAttributeNS($ns, $ns_name); $node->removeAttributeNS($ns, $ns_name);
}
return $dom->saveXML($node); return $dom->saveXML($node);
} }

View File

@ -578,6 +578,11 @@ abstract class PHP extends Engine
$lhs = new static(); $lhs = new static();
$rhs = new static(); $rhs = new static();
} }
if (static::class != get_class($temp)) {
$temp = new static();
$lhs = new static();
$rhs = new static();
}
$temp_value = &$temp->value; $temp_value = &$temp->value;
$rhs_value = &$rhs->value; $rhs_value = &$rhs->value;