From 232f71dae43df9794184961431aca81d0e4652da Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Mon, 4 May 2015 10:11:28 +0200
Subject: [ticket/13782] Rename null log to dummy for PHP7 compatibility

PHPBB3-13782
---
 phpBB/phpbb/log/dummy.php                 | 81 +++++++++++++++++++++++++++++++
 phpBB/phpbb/log/null.php                  | 81 -------------------------------
 tests/console/cache/purge_test.php        |  2 +-
 tests/notification/group_request_test.php |  2 +-
 4 files changed, 83 insertions(+), 83 deletions(-)
 create mode 100644 phpBB/phpbb/log/dummy.php
 delete mode 100644 phpBB/phpbb/log/null.php

diff --git a/phpBB/phpbb/log/dummy.php b/phpBB/phpbb/log/dummy.php
new file mode 100644
index 0000000000..5c2d145e15
--- /dev/null
+++ b/phpBB/phpbb/log/dummy.php
@@ -0,0 +1,81 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+namespace phpbb\log;
+
+/**
+* Dummy logger
+*/
+class dummy implements log_interface
+{
+	/**
+	* {@inheritdoc}
+	*/
+	public function is_enabled($type = '')
+	{
+		return false;
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function disable($type = '')
+	{
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function enable($type = '')
+	{
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function add($mode, $user_id, $log_ip, $log_operation, $log_time = false, $additional_data = array())
+	{
+		return false;
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function delete($mode, $conditions = array())
+	{
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function get_logs($mode, $count_logs = true, $limit = 0, $offset = 0, $forum_id = 0, $topic_id = 0, $user_id = 0, $log_time = 0, $sort_by = 'l.log_time DESC', $keywords = '')
+	{
+		return array();
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function get_log_count()
+	{
+		return 0;
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function get_valid_offset()
+	{
+		return 0;
+	}
+}
diff --git a/phpBB/phpbb/log/null.php b/phpBB/phpbb/log/null.php
deleted file mode 100644
index baa78895ea..0000000000
--- a/phpBB/phpbb/log/null.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-/**
-*
-* This file is part of the phpBB Forum Software package.
-*
-* @copyright (c) phpBB Limited <https://www.phpbb.com>
-* @license GNU General Public License, version 2 (GPL-2.0)
-*
-* For full copyright and license information, please see
-* the docs/CREDITS.txt file.
-*
-*/
-
-namespace phpbb\log;
-
-/**
-* Null logger
-*/
-class null implements log_interface
-{
-	/**
-	* {@inheritdoc}
-	*/
-	public function is_enabled($type = '')
-	{
-		return false;
-	}
-
-	/**
-	* {@inheritdoc}
-	*/
-	public function disable($type = '')
-	{
-	}
-
-	/**
-	* {@inheritdoc}
-	*/
-	public function enable($type = '')
-	{
-	}
-
-	/**
-	* {@inheritdoc}
-	*/
-	public function add($mode, $user_id, $log_ip, $log_operation, $log_time = false, $additional_data = array())
-	{
-		return false;
-	}
-
-	/**
-	* {@inheritdoc}
-	*/
-	public function delete($mode, $conditions = array())
-	{
-	}
-
-	/**
-	* {@inheritdoc}
-	*/
-	public function get_logs($mode, $count_logs = true, $limit = 0, $offset = 0, $forum_id = 0, $topic_id = 0, $user_id = 0, $log_time = 0, $sort_by = 'l.log_time DESC', $keywords = '')
-	{
-		return array();
-	}
-
-	/**
-	* {@inheritdoc}
-	*/
-	public function get_log_count()
-	{
-		return 0;
-	}
-
-	/**
-	* {@inheritdoc}
-	*/
-	public function get_valid_offset()
-	{
-		return 0;
-	}
-}
diff --git a/tests/console/cache/purge_test.php b/tests/console/cache/purge_test.php
index 172fb0ecf3..6c92660580 100644
--- a/tests/console/cache/purge_test.php
+++ b/tests/console/cache/purge_test.php
@@ -91,7 +91,7 @@ class phpbb_console_command_cache_purge_test extends phpbb_test_case
 	public function get_command_tester()
 	{
 		$application = new Application();
-		$application->add(new purge($this->user, $this->cache, $this->db, $this->getMock('\phpbb\auth\auth'), new \phpbb\log\null(), $this->config));
+		$application->add(new purge($this->user, $this->cache, $this->db, $this->getMock('\phpbb\auth\auth'), new \phpbb\log\dummy(), $this->config));
 
 		$command = $application->find('cache:purge');
 		$this->command_name = $command->getName();
diff --git a/tests/notification/group_request_test.php b/tests/notification/group_request_test.php
index 6a56a38c45..a24808fbbd 100644
--- a/tests/notification/group_request_test.php
+++ b/tests/notification/group_request_test.php
@@ -50,7 +50,7 @@ class phpbb_notification_group_request_test extends phpbb_tests_notification_bas
 			$this->cache->get_driver()
 		));
 		$phpbb_dispatcher = new phpbb_mock_event_dispatcher;
-		$phpbb_log = new \phpbb\log\null();
+		$phpbb_log = new \phpbb\log\dummy();
 		$this->get_test_case_helpers()->set_s9e_services();
 
 		// Now on to the actual test
-- 
cgit v1.2.1