Merge branch '3.2.x'

This commit is contained in:
Marc Alexander 2019-03-30 17:58:16 +01:00
commit fa5d2bfe50
No known key found for this signature in database
GPG key ID: 50E0D2423696F995

View file

@ -163,7 +163,7 @@ class phpbb_dbal_migrator_tool_permission_test extends phpbb_database_test_case
$this->assertFalse($this->tool->exists('global_test', true)); $this->assertFalse($this->tool->exists('global_test', true));
} }
public function test_permission_set_data() public function data_test_permission_set()
{ {
return array( return array(
array( array(
@ -188,7 +188,7 @@ class phpbb_dbal_migrator_tool_permission_test extends phpbb_database_test_case
} }
/** /**
* @dataProvider test_permission_set_data * @dataProvider data_test_permission_set
*/ */
public function test_permission_set($group_name, $auth_option, $type, $has_permission) public function test_permission_set($group_name, $auth_option, $type, $has_permission)
{ {