mirror of
https://github.com/phpseclib/phpseclib.git
synced 2024-11-15 01:44:06 +00:00
Merge branch '3.0'
This commit is contained in:
commit
713fa95292
36
.travis.yml
36
.travis.yml
@ -1,24 +1,30 @@
|
||||
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:
|
||||
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:
|
||||
- php: nightly
|
||||
|
||||
before_install: true
|
||||
|
||||
install:
|
||||
- phpenv config-rm xdebug.ini
|
||||
- eval `ssh-agent -s`
|
||||
|
@ -152,7 +152,9 @@ abstract class XML
|
||||
}
|
||||
$node = $nodes->item(0);
|
||||
$ns_name = $node->lookupPrefix($ns);
|
||||
$node->removeAttributeNS($ns, $ns_name);
|
||||
if ($ns_name) {
|
||||
$node->removeAttributeNS($ns, $ns_name);
|
||||
}
|
||||
return $dom->saveXML($node);
|
||||
}
|
||||
|
||||
|
@ -578,6 +578,11 @@ abstract class PHP extends Engine
|
||||
$lhs = new static();
|
||||
$rhs = new static();
|
||||
}
|
||||
if (static::class != get_class($temp)) {
|
||||
$temp = new static();
|
||||
$lhs = new static();
|
||||
$rhs = new static();
|
||||
}
|
||||
$temp_value = &$temp->value;
|
||||
$rhs_value = &$rhs->value;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user