From 7f76c9f9c7d9014f313f150a9596bec030f39915 Mon Sep 17 00:00:00 2001
From: rechosen <rechosen@gmail.com>
Date: Fri, 9 Aug 2013 11:33:24 +0200
Subject: [ticket/11777] Rename the extension template listener subdirectory to
 'event/'

Per suggestion of EXreaction and nickvergessen, do not look for extension
template event listeners in styles/[style]/template/events/ but in
styles/[style]/template/event/ (without the trailing 's') to match the way
phpBB looks for php template event listeners.

PHPBB3-11777
---
 phpBB/phpbb/template/twig/node/event.php                    | 13 +++++++------
 .../ext/kappa/styles/all/template/event/test.html           |  1 +
 .../ext/kappa/styles/all/template/events/test.html          |  1 -
 .../ext/kappa/styles/silver/template/event/test.html        |  1 +
 .../ext/kappa/styles/silver/template/events/test.html       |  1 -
 .../kappa/styles/silver_inherit/template/event/test.html    |  1 +
 .../kappa/styles/silver_inherit/template/events/test.html   |  1 -
 .../ext/omega/styles/all/template/event/test.html           |  1 +
 .../ext/omega/styles/all/template/events/test.html          |  1 -
 .../ext/omega/styles/silver/template/event/test.html        |  1 +
 .../ext/omega/styles/silver/template/event/two.html         |  1 +
 .../ext/omega/styles/silver/template/events/test.html       |  1 -
 .../ext/omega/styles/silver/template/events/two.html        |  1 -
 .../ext/zeta/styles/all/template/event/test.html            |  1 +
 .../ext/zeta/styles/all/template/events/test.html           |  1 -
 .../styles/all/template/event/event_variable_spacing.html   |  6 ++++++
 .../ext/trivial/styles/all/template/event/universal.html    |  1 +
 .../styles/all/template/events/event_variable_spacing.html  |  6 ------
 .../ext/trivial/styles/all/template/events/universal.html   |  1 -
 .../ext/trivial/styles/silver/template/event/simple.html    |  1 +
 .../ext/trivial/styles/silver/template/events/simple.html   |  1 -
 21 files changed, 22 insertions(+), 21 deletions(-)
 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/events/test.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/events/test.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/events/test.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/events/test.html
 create mode 100644 tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/event/test.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/events/test.html
 delete mode 100644 tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/events/two.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/events/test.html
 create mode 100644 tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/event_variable_spacing.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/events/event_variable_spacing.html
 delete mode 100644 tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/events/universal.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/events/simple.html

diff --git a/phpBB/phpbb/template/twig/node/event.php b/phpBB/phpbb/template/twig/node/event.php
index 30a9963a77..c94e5fdf20 100644
--- a/phpBB/phpbb/template/twig/node/event.php
+++ b/phpBB/phpbb/template/twig/node/event.php
@@ -19,9 +19,10 @@ if (!defined('IN_PHPBB'))
 class phpbb_template_twig_node_event extends Twig_Node
 {
 	/** 
-	 * The subdirectory in which all template event files must be placed
+	 * The subdirectory in which all template listener files must be placed
+	 * @var string
 	 */
-	const TEMPLATE_EVENTS_SUBDIRECTORY = 'events/';
+	protected $listener_directory = 'event/';
 
 	/** @var Twig_Environment */
 	protected $environment;
@@ -42,7 +43,7 @@ class phpbb_template_twig_node_event extends Twig_Node
 	{
 		$compiler->addDebugInfo($this);
 
-		$location = $this->getNode('expr')->getAttribute('name');
+		$location = $this->listener_directory . $this->getNode('expr')->getAttribute('name');
 
 		foreach ($this->environment->get_phpbb_extensions() as $ext_namespace => $ext_path)
 		{
@@ -55,19 +56,19 @@ class phpbb_template_twig_node_event extends Twig_Node
 				//  slower, but makes developing extensions easier (no need to
 				//  purge the cache when a new event template file is added)
 		        $compiler
-		            ->write("if (\$this->env->getLoader()->exists('@{$ext_namespace}/" . self::TEMPLATE_EVENTS_SUBDIRECTORY . "{$location}.html')) {\n")
+		            ->write("if (\$this->env->getLoader()->exists('@{$ext_namespace}/{$location}.html')) {\n")
 		            ->indent()
 		        ;
 			}
 
-			if (defined('DEBUG') || $this->environment->getLoader()->exists('@' . $ext_namespace . '/' . self::TEMPLATE_EVENTS_SUBDIRECTORY . $location . '.html'))
+			if (defined('DEBUG') || $this->environment->getLoader()->exists('@' . $ext_namespace . '/' . $location . '.html'))
 			{
 				$compiler
 					->write("\$previous_look_up_order = \$this->env->getNamespaceLookUpOrder();\n")
 
 					// We set the namespace lookup order to be this extension first, then the main path
 					->write("\$this->env->setNamespaceLookUpOrder(array('{$ext_namespace}', '__main__'));\n")
-					->write("\$this->env->loadTemplate('@{$ext_namespace}/" . self::TEMPLATE_EVENTS_SUBDIRECTORY . "{$location}.html')->display(\$context);\n")
+					->write("\$this->env->loadTemplate('@{$ext_namespace}/{$location}.html')->display(\$context);\n")
 					->write("\$this->env->setNamespaceLookUpOrder(\$previous_look_up_order);\n")
 				;
 			}
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/events/test.html b/tests/template/datasets/event_inheritance/ext/kappa/styles/all/template/events/test.html
deleted file mode 100644
index 3eb906a09e..0000000000
--- a/tests/template/datasets/event_inheritance/ext/kappa/styles/all/template/events/test.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/events/test.html b/tests/template/datasets/event_inheritance/ext/kappa/styles/silver/template/events/test.html
deleted file mode 100644
index 3b65d80a6d..0000000000
--- a/tests/template/datasets/event_inheritance/ext/kappa/styles/silver/template/events/test.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/events/test.html b/tests/template/datasets/event_inheritance/ext/kappa/styles/silver_inherit/template/events/test.html
deleted file mode 100644
index 26826d59e3..0000000000
--- a/tests/template/datasets/event_inheritance/ext/kappa/styles/silver_inherit/template/events/test.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/events/test.html b/tests/template/datasets/event_inheritance/ext/omega/styles/all/template/events/test.html
deleted file mode 100644
index 003d193dc3..0000000000
--- a/tests/template/datasets/event_inheritance/ext/omega/styles/all/template/events/test.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/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/events/test.html b/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/events/test.html
deleted file mode 100644
index 6bf06f5457..0000000000
--- a/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/events/test.html
+++ /dev/null
@@ -1 +0,0 @@
-Omega test event in silver
diff --git a/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/events/two.html b/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/events/two.html
deleted file mode 100644
index 7f8058f4e4..0000000000
--- a/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/events/two.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/events/test.html b/tests/template/datasets/event_inheritance/ext/zeta/styles/all/template/events/test.html
deleted file mode 100644
index 5fc7e5ac12..0000000000
--- a/tests/template/datasets/event_inheritance/ext/zeta/styles/all/template/events/test.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/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/events/event_variable_spacing.html b/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/events/event_variable_spacing.html
deleted file mode 100644
index 028f8aa0d1..0000000000
--- a/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/events/event_variable_spacing.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/events/universal.html b/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/events/universal.html
deleted file mode 100644
index f2c5762ade..0000000000
--- a/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/events/universal.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/events/simple.html b/tests/template/datasets/ext_trivial/ext/trivial/styles/silver/template/events/simple.html
deleted file mode 100644
index fe32a1ed3f..0000000000
--- a/tests/template/datasets/ext_trivial/ext/trivial/styles/silver/template/events/simple.html
+++ /dev/null
@@ -1 +0,0 @@
-Simple in trivial extension.
-- 
cgit v1.2.1