From 65d8cd63022d688fe618f128768b78a6214db166 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Tue, 13 Aug 2013 02:14:22 -0700
Subject: [ticket/11784] Remove naming redundancy for event listeners

PHPBB3-11784
---
 .../fixtures/ext/foo/bar/event/permission.php      | 40 ++++++++++++++++++++++
 .../ext/foo/bar/event/permission_listener.php      | 40 ----------------------
 .../ext/kappa/styles/all/template/event/test.html  |  1 +
 .../styles/all/template/event/test_listener.html   |  1 -
 .../kappa/styles/silver/template/event/test.html   |  1 +
 .../silver/template/event/test_listener.html       |  1 -
 .../styles/silver_inherit/template/event/test.html |  1 +
 .../template/event/test_listener.html              |  1 -
 .../ext/omega/styles/all/template/event/test.html  |  1 +
 .../styles/all/template/event/test_listener.html   |  1 -
 .../omega/styles/silver/template/event/test.html   |  1 +
 .../silver/template/event/test_listener.html       |  1 -
 .../omega/styles/silver/template/event/two.html    |  1 +
 .../styles/silver/template/event/two_listener.html |  1 -
 .../ext/zeta/styles/all/template/event/test.html   |  1 +
 .../styles/all/template/event/test_listener.html   |  1 -
 .../all/template/event/event_variable_spacing.html |  6 ++++
 .../event/event_variable_spacing_listener.html     |  6 ----
 .../styles/all/template/event/test_event_loop.html |  1 +
 .../template/event/test_event_loop_listener.html   |  1 -
 .../styles/all/template/event/universal.html       |  1 +
 .../all/template/event/universal_listener.html     |  1 -
 .../styles/silver/template/event/simple.html       |  1 +
 .../silver/template/event/simple_listener.html     |  1 -
 24 files changed, 56 insertions(+), 56 deletions(-)
 create mode 100644 tests/functional/fixtures/ext/foo/bar/event/permission.php
 delete mode 100644 tests/functional/fixtures/ext/foo/bar/event/permission_listener.php
 create mode 100644 tests/template/datasets/event_inheritance/ext/kappa/styles/all/template/event/test.html
 delete mode 100644 tests/template/datasets/event_inheritance/ext/kappa/styles/all/template/event/test_listener.html
 create mode 100644 tests/template/datasets/event_inheritance/ext/kappa/styles/silver/template/event/test.html
 delete mode 100644 tests/template/datasets/event_inheritance/ext/kappa/styles/silver/template/event/test_listener.html
 create mode 100644 tests/template/datasets/event_inheritance/ext/kappa/styles/silver_inherit/template/event/test.html
 delete mode 100644 tests/template/datasets/event_inheritance/ext/kappa/styles/silver_inherit/template/event/test_listener.html
 create mode 100644 tests/template/datasets/event_inheritance/ext/omega/styles/all/template/event/test.html
 delete mode 100644 tests/template/datasets/event_inheritance/ext/omega/styles/all/template/event/test_listener.html
 create mode 100644 tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/event/test.html
 delete mode 100644 tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/event/test_listener.html
 create mode 100644 tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/event/two.html
 delete mode 100644 tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/event/two_listener.html
 create mode 100644 tests/template/datasets/event_inheritance/ext/zeta/styles/all/template/event/test.html
 delete mode 100644 tests/template/datasets/event_inheritance/ext/zeta/styles/all/template/event/test_listener.html
 create mode 100644 tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/event_variable_spacing.html
 delete mode 100644 tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/event_variable_spacing_listener.html
 create mode 100644 tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/test_event_loop.html
 delete mode 100644 tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/test_event_loop_listener.html
 create mode 100644 tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/universal.html
 delete mode 100644 tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/universal_listener.html
 create mode 100644 tests/template/datasets/ext_trivial/ext/trivial/styles/silver/template/event/simple.html
 delete mode 100644 tests/template/datasets/ext_trivial/ext/trivial/styles/silver/template/event/simple_listener.html

(limited to 'tests')

diff --git a/tests/functional/fixtures/ext/foo/bar/event/permission.php b/tests/functional/fixtures/ext/foo/bar/event/permission.php
new file mode 100644
index 0000000000..48688a586a
--- /dev/null
+++ b/tests/functional/fixtures/ext/foo/bar/event/permission.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+*
+* @package testing
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Event listener
+*/
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+class phpbb_ext_foo_bar_event_permission implements EventSubscriberInterface
+{
+	static public function getSubscribedEvents()
+	{
+		return array(
+			'core.permissions'	=> 'add_permissions',
+		);
+	}
+
+	public function add_permissions($event)
+	{
+		$permissions = $event['permissions'];
+		$permissions['u_foo'] = array('lang' => 'ACL_U_FOOBAR', 'cat' => 'post');
+		$event['permissions'] = $permissions;
+	}
+}
diff --git a/tests/functional/fixtures/ext/foo/bar/event/permission_listener.php b/tests/functional/fixtures/ext/foo/bar/event/permission_listener.php
deleted file mode 100644
index 6986755f71..0000000000
--- a/tests/functional/fixtures/ext/foo/bar/event/permission_listener.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/**
-*
-* @package testing
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Event listener
-*/
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-
-class phpbb_ext_foo_bar_event_permission_listener implements EventSubscriberInterface
-{
-	static public function getSubscribedEvents()
-	{
-		return array(
-			'core.permissions'	=> 'add_permissions',
-		);
-	}
-
-	public function add_permissions($event)
-	{
-		$permissions = $event['permissions'];
-		$permissions['u_foo'] = array('lang' => 'ACL_U_FOOBAR', 'cat' => 'post');
-		$event['permissions'] = $permissions;
-	}
-}
diff --git a/tests/template/datasets/event_inheritance/ext/kappa/styles/all/template/event/test.html b/tests/template/datasets/event_inheritance/ext/kappa/styles/all/template/event/test.html
new file mode 100644
index 0000000000..3eb906a09e
--- /dev/null
+++ b/tests/template/datasets/event_inheritance/ext/kappa/styles/all/template/event/test.html
@@ -0,0 +1 @@
+Kappa test event in all
diff --git a/tests/template/datasets/event_inheritance/ext/kappa/styles/all/template/event/test_listener.html b/tests/template/datasets/event_inheritance/ext/kappa/styles/all/template/event/test_listener.html
deleted file mode 100644
index 3eb906a09e..0000000000
--- a/tests/template/datasets/event_inheritance/ext/kappa/styles/all/template/event/test_listener.html
+++ /dev/null
@@ -1 +0,0 @@
-Kappa test event in all
diff --git a/tests/template/datasets/event_inheritance/ext/kappa/styles/silver/template/event/test.html b/tests/template/datasets/event_inheritance/ext/kappa/styles/silver/template/event/test.html
new file mode 100644
index 0000000000..3b65d80a6d
--- /dev/null
+++ b/tests/template/datasets/event_inheritance/ext/kappa/styles/silver/template/event/test.html
@@ -0,0 +1 @@
+Kappa test event in silver
diff --git a/tests/template/datasets/event_inheritance/ext/kappa/styles/silver/template/event/test_listener.html b/tests/template/datasets/event_inheritance/ext/kappa/styles/silver/template/event/test_listener.html
deleted file mode 100644
index 3b65d80a6d..0000000000
--- a/tests/template/datasets/event_inheritance/ext/kappa/styles/silver/template/event/test_listener.html
+++ /dev/null
@@ -1 +0,0 @@
-Kappa test event in silver
diff --git a/tests/template/datasets/event_inheritance/ext/kappa/styles/silver_inherit/template/event/test.html b/tests/template/datasets/event_inheritance/ext/kappa/styles/silver_inherit/template/event/test.html
new file mode 100644
index 0000000000..26826d59e3
--- /dev/null
+++ b/tests/template/datasets/event_inheritance/ext/kappa/styles/silver_inherit/template/event/test.html
@@ -0,0 +1 @@
+Kappa test event in silver_inherit
diff --git a/tests/template/datasets/event_inheritance/ext/kappa/styles/silver_inherit/template/event/test_listener.html b/tests/template/datasets/event_inheritance/ext/kappa/styles/silver_inherit/template/event/test_listener.html
deleted file mode 100644
index 26826d59e3..0000000000
--- a/tests/template/datasets/event_inheritance/ext/kappa/styles/silver_inherit/template/event/test_listener.html
+++ /dev/null
@@ -1 +0,0 @@
-Kappa test event in silver_inherit
diff --git a/tests/template/datasets/event_inheritance/ext/omega/styles/all/template/event/test.html b/tests/template/datasets/event_inheritance/ext/omega/styles/all/template/event/test.html
new file mode 100644
index 0000000000..003d193dc3
--- /dev/null
+++ b/tests/template/datasets/event_inheritance/ext/omega/styles/all/template/event/test.html
@@ -0,0 +1 @@
+Omega test event in all
diff --git a/tests/template/datasets/event_inheritance/ext/omega/styles/all/template/event/test_listener.html b/tests/template/datasets/event_inheritance/ext/omega/styles/all/template/event/test_listener.html
deleted file mode 100644
index 003d193dc3..0000000000
--- a/tests/template/datasets/event_inheritance/ext/omega/styles/all/template/event/test_listener.html
+++ /dev/null
@@ -1 +0,0 @@
-Omega test event in all
diff --git a/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/event/test.html b/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/event/test.html
new file mode 100644
index 0000000000..6bf06f5457
--- /dev/null
+++ b/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/event/test.html
@@ -0,0 +1 @@
+Omega test event in silver
diff --git a/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/event/test_listener.html b/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/event/test_listener.html
deleted file mode 100644
index 6bf06f5457..0000000000
--- a/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/event/test_listener.html
+++ /dev/null
@@ -1 +0,0 @@
-Omega test event in silver
diff --git a/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/event/two.html b/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/event/two.html
new file mode 100644
index 0000000000..7f8058f4e4
--- /dev/null
+++ b/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/event/two.html
@@ -0,0 +1 @@
+two in silver in omega
diff --git a/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/event/two_listener.html b/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/event/two_listener.html
deleted file mode 100644
index 7f8058f4e4..0000000000
--- a/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/event/two_listener.html
+++ /dev/null
@@ -1 +0,0 @@
-two in silver in omega
diff --git a/tests/template/datasets/event_inheritance/ext/zeta/styles/all/template/event/test.html b/tests/template/datasets/event_inheritance/ext/zeta/styles/all/template/event/test.html
new file mode 100644
index 0000000000..5fc7e5ac12
--- /dev/null
+++ b/tests/template/datasets/event_inheritance/ext/zeta/styles/all/template/event/test.html
@@ -0,0 +1 @@
+Zeta test event in all
diff --git a/tests/template/datasets/event_inheritance/ext/zeta/styles/all/template/event/test_listener.html b/tests/template/datasets/event_inheritance/ext/zeta/styles/all/template/event/test_listener.html
deleted file mode 100644
index 5fc7e5ac12..0000000000
--- a/tests/template/datasets/event_inheritance/ext/zeta/styles/all/template/event/test_listener.html
+++ /dev/null
@@ -1 +0,0 @@
-Zeta test event in all
diff --git a/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/event_variable_spacing.html b/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/event_variable_spacing.html
new file mode 100644
index 0000000000..028f8aa0d1
--- /dev/null
+++ b/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/event_variable_spacing.html
@@ -0,0 +1,6 @@
+|{VARIABLE}|
+{VARIABLE}|{VARIABLE}|
+
+|{VARIABLE}
+
+<div class="{VARIABLE}">test</div>
diff --git a/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/event_variable_spacing_listener.html b/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/event_variable_spacing_listener.html
deleted file mode 100644
index 028f8aa0d1..0000000000
--- a/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/event_variable_spacing_listener.html
+++ /dev/null
@@ -1,6 +0,0 @@
-|{VARIABLE}|
-{VARIABLE}|{VARIABLE}|
-
-|{VARIABLE}
-
-<div class="{VARIABLE}">test</div>
diff --git a/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/test_event_loop.html b/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/test_event_loop.html
new file mode 100644
index 0000000000..235e129f85
--- /dev/null
+++ b/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/test_event_loop.html
@@ -0,0 +1 @@
+{event_loop.S_ROW_COUNT}<!-- IF not event_loop.S_LAST_ROW -->|<!-- ENDIF -->
diff --git a/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/test_event_loop_listener.html b/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/test_event_loop_listener.html
deleted file mode 100644
index 235e129f85..0000000000
--- a/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/test_event_loop_listener.html
+++ /dev/null
@@ -1 +0,0 @@
-{event_loop.S_ROW_COUNT}<!-- IF not event_loop.S_LAST_ROW -->|<!-- ENDIF -->
diff --git a/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/universal.html b/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/universal.html
new file mode 100644
index 0000000000..f2c5762ade
--- /dev/null
+++ b/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/universal.html
@@ -0,0 +1 @@
+Universal in trivial extension.
diff --git a/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/universal_listener.html b/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/universal_listener.html
deleted file mode 100644
index f2c5762ade..0000000000
--- a/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/universal_listener.html
+++ /dev/null
@@ -1 +0,0 @@
-Universal in trivial extension.
diff --git a/tests/template/datasets/ext_trivial/ext/trivial/styles/silver/template/event/simple.html b/tests/template/datasets/ext_trivial/ext/trivial/styles/silver/template/event/simple.html
new file mode 100644
index 0000000000..fe32a1ed3f
--- /dev/null
+++ b/tests/template/datasets/ext_trivial/ext/trivial/styles/silver/template/event/simple.html
@@ -0,0 +1 @@
+Simple in trivial extension.
diff --git a/tests/template/datasets/ext_trivial/ext/trivial/styles/silver/template/event/simple_listener.html b/tests/template/datasets/ext_trivial/ext/trivial/styles/silver/template/event/simple_listener.html
deleted file mode 100644
index fe32a1ed3f..0000000000
--- a/tests/template/datasets/ext_trivial/ext/trivial/styles/silver/template/event/simple_listener.html
+++ /dev/null
@@ -1 +0,0 @@
-Simple in trivial extension.
-- 
cgit v1.2.1