From f53892c838dfa3638a47b60b394a948db4873466 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Fri, 14 Oct 2011 00:52:36 +0200
Subject: [PATCH] [feature/extension-manager] Add prefix to extension meta data
 / install classes

PHPBB3-10323
---
 phpBB/includes/extension/manager.php         |  2 +-
 tests/extension/ext/bar/{bar.php => ext.php} |  2 +-
 tests/extension/ext/foo/ext.php              |  5 +++++
 tests/extension/ext/foo/foo.php              |  5 -----
 tests/extension/ext/moo/{moo.php => ext.php} |  2 +-
 tests/extension/manager_test.php             | 12 ++++++------
 6 files changed, 14 insertions(+), 14 deletions(-)
 rename tests/extension/ext/bar/{bar.php => ext.php} (83%)
 create mode 100644 tests/extension/ext/foo/ext.php
 delete mode 100644 tests/extension/ext/foo/foo.php
 rename tests/extension/ext/moo/{moo.php => ext.php} (69%)

diff --git a/phpBB/includes/extension/manager.php b/phpBB/includes/extension/manager.php
index 0b3189df96..07e98735f8 100644
--- a/phpBB/includes/extension/manager.php
+++ b/phpBB/includes/extension/manager.php
@@ -106,7 +106,7 @@ class phpbb_extension_manager
 	*/
 	public function get_extension($name)
 	{
-		$extension_class_name = 'phpbb_ext_' . $name;
+		$extension_class_name = 'phpbb_ext_' . $name . '_ext';
 
 		if (class_exists($extension_class_name))
 		{
diff --git a/tests/extension/ext/bar/bar.php b/tests/extension/ext/bar/ext.php
similarity index 83%
rename from tests/extension/ext/bar/bar.php
rename to tests/extension/ext/bar/ext.php
index c25f815649..5585edf9ac 100644
--- a/tests/extension/ext/bar/bar.php
+++ b/tests/extension/ext/bar/ext.php
@@ -1,6 +1,6 @@
 <?php
 
-class phpbb_ext_bar extends phpbb_extension_base
+class phpbb_ext_bar_ext extends phpbb_extension_base
 {
 	static public $state;
 
diff --git a/tests/extension/ext/foo/ext.php b/tests/extension/ext/foo/ext.php
new file mode 100644
index 0000000000..2968a64a97
--- /dev/null
+++ b/tests/extension/ext/foo/ext.php
@@ -0,0 +1,5 @@
+<?php
+
+class phpbb_ext_foo_ext extends phpbb_extension_base
+{
+}
diff --git a/tests/extension/ext/foo/foo.php b/tests/extension/ext/foo/foo.php
deleted file mode 100644
index bbf01606ce..0000000000
--- a/tests/extension/ext/foo/foo.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-class phpbb_ext_foo extends phpbb_extension_base
-{
-}
diff --git a/tests/extension/ext/moo/moo.php b/tests/extension/ext/moo/ext.php
similarity index 69%
rename from tests/extension/ext/moo/moo.php
rename to tests/extension/ext/moo/ext.php
index 7e621abbb5..8b534380f2 100644
--- a/tests/extension/ext/moo/moo.php
+++ b/tests/extension/ext/moo/ext.php
@@ -1,6 +1,6 @@
 <?php
 
-class phpbb_ext_moo extends phpbb_extension_base
+class phpbb_ext_moo_ext extends phpbb_extension_base
 {
 	static public $purged;
 
diff --git a/tests/extension/manager_test.php b/tests/extension/manager_test.php
index 52be88330a..4c49366d20 100644
--- a/tests/extension/manager_test.php
+++ b/tests/extension/manager_test.php
@@ -8,8 +8,8 @@
 */
 
 require_once dirname(__FILE__) . '/../mock/cache.php';
-require_once dirname(__FILE__) . '/ext/bar/bar.php';
-require_once dirname(__FILE__) . '/ext/moo/moo.php';
+require_once dirname(__FILE__) . '/ext/bar/ext.php';
+require_once dirname(__FILE__) . '/ext/moo/ext.php';
 
 class phpbb_extension_manager_test extends phpbb_database_test_case
 {
@@ -51,14 +51,14 @@ class phpbb_extension_manager_test extends phpbb_database_test_case
 
 	public function test_enable()
 	{
-		phpbb_ext_bar::$state = 0;
+		phpbb_ext_bar_ext::$state = 0;
 
 		$this->assertEquals(array('foo'), array_keys($this->extension_manager->all_enabled()));
 		$this->extension_manager->enable('bar');
 		$this->assertEquals(array('bar', 'foo'), array_keys($this->extension_manager->all_enabled()));
 		$this->assertEquals(array('bar', 'foo', 'moo'), array_keys($this->extension_manager->all_configured()));
 
-		$this->assertEquals(4, phpbb_ext_bar::$state);
+		$this->assertEquals(4, phpbb_ext_bar_ext::$state);
 	}
 
 	public function test_disable()
@@ -71,7 +71,7 @@ class phpbb_extension_manager_test extends phpbb_database_test_case
 
 	public function test_purge()
 	{
-		phpbb_ext_moo::$purged = false;
+		phpbb_ext_moo_ext::$purged = false;
 
 		$this->assertEquals(array('foo'), array_keys($this->extension_manager->all_enabled()));
 		$this->assertEquals(array('foo', 'moo'), array_keys($this->extension_manager->all_configured()));
@@ -79,7 +79,7 @@ class phpbb_extension_manager_test extends phpbb_database_test_case
 		$this->assertEquals(array('foo'), array_keys($this->extension_manager->all_enabled()));
 		$this->assertEquals(array('foo'), array_keys($this->extension_manager->all_configured()));
 
-		$this->assertTrue(phpbb_ext_moo::$purged);
+		$this->assertTrue(phpbb_ext_moo_ext::$purged);
 	}
 
 	public function test_enabled_no_cache()