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: [feature/extension-manager] Add prefix to extension meta data /
install classes
PHPBB3-10323
---
tests/extension/ext/bar/bar.php | 24 ------------------------
tests/extension/ext/bar/ext.php | 24 ++++++++++++++++++++++++
tests/extension/ext/foo/ext.php | 5 +++++
tests/extension/ext/foo/foo.php | 5 -----
tests/extension/ext/moo/ext.php | 13 +++++++++++++
tests/extension/ext/moo/moo.php | 13 -------------
tests/extension/manager_test.php | 12 ++++++------
7 files changed, 48 insertions(+), 48 deletions(-)
delete mode 100644 tests/extension/ext/bar/bar.php
create mode 100644 tests/extension/ext/bar/ext.php
create mode 100644 tests/extension/ext/foo/ext.php
delete mode 100644 tests/extension/ext/foo/foo.php
create mode 100644 tests/extension/ext/moo/ext.php
delete mode 100644 tests/extension/ext/moo/moo.php
(limited to 'tests/extension')
diff --git a/tests/extension/ext/bar/bar.php b/tests/extension/ext/bar/bar.php
deleted file mode 100644
index c25f815649..0000000000
--- a/tests/extension/ext/bar/bar.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-class phpbb_ext_bar extends phpbb_extension_base
-{
- static public $state;
-
- public function enable_step($old_state)
- {
- // run 4 steps, then quit
- if ($old_state === 4)
- {
- return false;
- }
-
- if ($old_state === false)
- {
- $old_state = 0;
- }
-
- self::$state = ++$old_state;
-
- return self::$state;
- }
-}
diff --git a/tests/extension/ext/bar/ext.php b/tests/extension/ext/bar/ext.php
new file mode 100644
index 0000000000..5585edf9ac
--- /dev/null
+++ b/tests/extension/ext/bar/ext.php
@@ -0,0 +1,24 @@
+<?php
+
+class phpbb_ext_bar_ext extends phpbb_extension_base
+{
+ static public $state;
+
+ public function enable_step($old_state)
+ {
+ // run 4 steps, then quit
+ if ($old_state === 4)
+ {
+ return false;
+ }
+
+ if ($old_state === false)
+ {
+ $old_state = 0;
+ }
+
+ self::$state = ++$old_state;
+
+ return self::$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/ext.php b/tests/extension/ext/moo/ext.php
new file mode 100644
index 0000000000..8b534380f2
--- /dev/null
+++ b/tests/extension/ext/moo/ext.php
@@ -0,0 +1,13 @@
+<?php
+
+class phpbb_ext_moo_ext extends phpbb_extension_base
+{
+ static public $purged;
+
+ public function purge_step($old_state)
+ {
+ self::$purged = true;
+
+ return false;
+ }
+}
diff --git a/tests/extension/ext/moo/moo.php b/tests/extension/ext/moo/moo.php
deleted file mode 100644
index 7e621abbb5..0000000000
--- a/tests/extension/ext/moo/moo.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-class phpbb_ext_moo extends phpbb_extension_base
-{
- static public $purged;
-
- public function purge_step($old_state)
- {
- self::$purged = true;
-
- return false;
- }
-}
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()
--
cgit v1.2.1