1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-06 08:47:45 +02:00

Merge remote-tracking branch 'remotes/upstream/develop-olympus' into develop

* remotes/upstream/develop-olympus:
  [ticket/11831] getAttribute was replaced with attr
  [ticket/11831] Update fabpot/goutte to 1.0.*

Conflicts:
	phpBB/composer.lock
This commit is contained in:
Nathan Guse
2013-09-13 15:56:28 -05:00
3 changed files with 284 additions and 145 deletions

View File

@@ -925,7 +925,7 @@ class phpbb_functional_test_case extends phpbb_test_case
$hidden_fields = array(
$crawler->filter('[type="hidden"]')->each(function ($node, $i) {
return array('name' => $node->getAttribute('name'), 'value' => $node->getAttribute('value'));
return array('name' => $node->attr('name'), 'value' => $node->attr('value'));
}),
);