1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00

Merge branch 'ticket/15392' into ticket/15392-master

This commit is contained in:
Marc Alexander
2021-03-04 17:04:17 +01:00
211 changed files with 395 additions and 396 deletions

View File

@@ -15,7 +15,7 @@ use Symfony\Component\Config\FileLocator;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
require_once dirname(__FILE__) . '/base.php';
require_once __DIR__ . '/base.php';
class notification_method_email_test extends phpbb_tests_notification_base
{
@@ -24,7 +24,7 @@ class notification_method_email_test extends phpbb_tests_notification_base
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/email_notification.type.post.xml');
return $this->createXMLDataSet(__DIR__ . '/fixtures/email_notification.type.post.xml');
}
protected function get_notification_methods()
@@ -260,7 +260,7 @@ class notification_method_email_test extends phpbb_tests_notification_base
'post_username' => '',
'forum_name' => '',
],
$post_data);
$notification_options = [
'item_id' => $post_data['post_id'],