Update to Drupal 8.0.1. For more information, see https://www.drupal.org/node/2627402

This commit is contained in:
Pantheon Automation 2015-12-02 11:38:43 -08:00 committed by Greg Anderson
parent 013aaaf2ff
commit 1a0e9d9fac
153 changed files with 1268 additions and 670 deletions

View file

@ -220,23 +220,23 @@ trait AssertContentTrait {
* placeholders in the query. The values may be either strings or numeric
* values.
*
* @return array
* The return value of the xpath search. For details on the xpath string
* format and return values see the SimpleXML documentation,
* http://php.net/manual/function.simplexml-element-xpath.php.
* @return \SimpleXMLElement[]|bool
* The return value of the xpath search or FALSE on failure. For details on
* the xpath string format and return values see the SimpleXML
* documentation.
*
* @see http://php.net/manual/function.simplexml-element-xpath.php
*/
protected function xpath($xpath, array $arguments = array()) {
protected function xpath($xpath, array $arguments = []) {
if ($this->parse()) {
$xpath = $this->buildXPathQuery($xpath, $arguments);
$result = $this->elements->xpath($xpath);
// Some combinations of PHP / libxml versions return an empty array
// instead of the documented FALSE. Forcefully convert any falsish values
// to an empty array to allow foreach(...) constructions.
return $result ? $result : array();
}
else {
return FALSE;
return $result ?: [];
}
return FALSE;
}
/**