aboutsummaryrefslogtreecommitdiffstats
path: root/tests/extension/ext
diff options
context:
space:
mode:
authorCesar G <prototech91@gmail.com>2013-12-12 04:29:48 -0800
committerCesar G <prototech91@gmail.com>2013-12-12 10:52:51 -0800
commit31234b26d892bb4d98c9bc869d340a8ccf3cfe88 (patch)
tree435d11d23051c7a6eb086380e795927464c96f2b /tests/extension/ext
parent4d65727accb097641f72e8bf24c5a194873affc7 (diff)
downloadforums-31234b26d892bb4d98c9bc869d340a8ccf3cfe88.tar
forums-31234b26d892bb4d98c9bc869d340a8ccf3cfe88.tar.gz
forums-31234b26d892bb4d98c9bc869d340a8ccf3cfe88.tar.bz2
forums-31234b26d892bb4d98c9bc869d340a8ccf3cfe88.tar.xz
forums-31234b26d892bb4d98c9bc869d340a8ccf3cfe88.zip
[ticket/12009] Move valid extensions in tests to correct dir structure.
PHPBB3-12009
Diffstat (limited to 'tests/extension/ext')
-rw-r--r--tests/extension/ext/vendor/moo/composer.json2
-rw-r--r--tests/extension/ext/vendor2/bar/acp/a_info.php (renamed from tests/extension/ext/barfoo/acp/a_info.php)6
-rw-r--r--tests/extension/ext/vendor2/bar/acp/a_module.php (renamed from tests/extension/ext/barfoo/acp/a_module.php)2
-rw-r--r--tests/extension/ext/vendor2/bar/composer.json21
-rw-r--r--tests/extension/ext/vendor2/bar/ext.php (renamed from tests/extension/ext/bar/ext.php)2
-rw-r--r--tests/extension/ext/vendor2/foo/a_class.php (renamed from tests/extension/ext/foo/a_class.php)2
-rw-r--r--tests/extension/ext/vendor2/foo/acp/a_info.php (renamed from tests/extension/ext/foo/acp/a_info.php)4
-rw-r--r--tests/extension/ext/vendor2/foo/acp/a_module.php (renamed from tests/extension/ext/foo/mcp/a_module.php)2
-rw-r--r--tests/extension/ext/vendor2/foo/acp/fail_info.php (renamed from tests/extension/ext/foo/acp/fail_info.php)4
-rw-r--r--tests/extension/ext/vendor2/foo/acp/fail_module.php (renamed from tests/extension/ext/foo/acp/fail_module.php)2
-rw-r--r--tests/extension/ext/vendor2/foo/b_class.php (renamed from tests/extension/ext/foo/b_class.php)2
-rw-r--r--tests/extension/ext/vendor2/foo/composer.json (renamed from tests/extension/ext/foo/composer.json)2
-rw-r--r--tests/extension/ext/vendor2/foo/ext.php (renamed from tests/extension/ext/foo/ext.php)2
-rw-r--r--tests/extension/ext/vendor2/foo/mcp/a_info.php (renamed from tests/extension/ext/foo/mcp/a_info.php)4
-rw-r--r--tests/extension/ext/vendor2/foo/mcp/a_module.php (renamed from tests/extension/ext/foo/acp/a_module.php)2
-rw-r--r--tests/extension/ext/vendor2/foo/sub/type/alternative.php (renamed from tests/extension/ext/foo/sub/type/alternative.php)0
-rw-r--r--tests/extension/ext/vendor2/foo/type/alternative.php (renamed from tests/extension/ext/foo/type/alternative.php)0
-rw-r--r--tests/extension/ext/vendor2/foo/type/dummy/empty.txt (renamed from tests/extension/ext/foo/type/dummy/empty.txt)0
-rw-r--r--tests/extension/ext/vendor2/foo/typewrong/error.php (renamed from tests/extension/ext/foo/typewrong/error.php)0
-rw-r--r--tests/extension/ext/vendor3/bar/ext.php26
-rw-r--r--tests/extension/ext/vendor3/bar/my/hidden_class.php (renamed from tests/extension/ext/bar/my/hidden_class.php)2
-rw-r--r--tests/extension/ext/vendor3/bar/styles/prosilver/template/foobar_body.html (renamed from tests/extension/ext/bar/styles/prosilver/template/foobar_body.html)0
22 files changed, 67 insertions, 20 deletions
diff --git a/tests/extension/ext/vendor/moo/composer.json b/tests/extension/ext/vendor/moo/composer.json
index 4dc36963b3..901cb7f17a 100644
--- a/tests/extension/ext/vendor/moo/composer.json
+++ b/tests/extension/ext/vendor/moo/composer.json
@@ -1,5 +1,5 @@
{
- "name": "moo/example",
+ "name": "vendor/moo",
"type": "phpbb-extension",
"description": "An example/sample extension to be used for testing purposes in phpBB Development.",
"version": "1.0.0",
diff --git a/tests/extension/ext/barfoo/acp/a_info.php b/tests/extension/ext/vendor2/bar/acp/a_info.php
index ea07189f7a..8132df587f 100644
--- a/tests/extension/ext/barfoo/acp/a_info.php
+++ b/tests/extension/ext/vendor2/bar/acp/a_info.php
@@ -1,14 +1,14 @@
<?php
-namespace barfoo\acp;
+namespace vendor2\bar\acp;
class a_info
{
public function module()
{
return array(
- 'filename' => 'barfoo\\acp\\a_module',
- 'title' => 'Barfoo',
+ 'filename' => 'vendor2\\bar\\acp\\a_module',
+ 'title' => 'Bar',
'version' => '3.1.0-dev',
'modes' => array(
'config' => array('title' => 'Config', 'auth' => '', 'cat' => array('ACP_MODS')),
diff --git a/tests/extension/ext/barfoo/acp/a_module.php b/tests/extension/ext/vendor2/bar/acp/a_module.php
index 0ae8775013..3a3d105790 100644
--- a/tests/extension/ext/barfoo/acp/a_module.php
+++ b/tests/extension/ext/vendor2/bar/acp/a_module.php
@@ -1,6 +1,6 @@
<?php
-namespace barfoo\acp;
+namespace vendor2\bar\acp;
class a_module
{
diff --git a/tests/extension/ext/vendor2/bar/composer.json b/tests/extension/ext/vendor2/bar/composer.json
new file mode 100644
index 0000000000..5d60ec031e
--- /dev/null
+++ b/tests/extension/ext/vendor2/bar/composer.json
@@ -0,0 +1,21 @@
+{
+ "name": "vendor2/bar",
+ "type": "phpbb-extension",
+ "description": "An example/sample extension to be used for testing purposes in phpBB Development.",
+ "version": "1.0.0",
+ "time": "2012-02-15 01:01:01",
+ "licence": "GPL-2.0",
+ "authors": [{
+ "name": "John Smith",
+ "email": "email@phpbb.com",
+ "homepage": "http://phpbb.com",
+ "role": "N/A"
+ }],
+ "require": {
+ "php": ">=5.3",
+ "phpbb/phpbb": "3.1.*@dev"
+ },
+ "extra": {
+ "display-name": "phpBB Bar Extension"
+ }
+}
diff --git a/tests/extension/ext/bar/ext.php b/tests/extension/ext/vendor2/bar/ext.php
index 22ff5e8077..f94ab9ad81 100644
--- a/tests/extension/ext/bar/ext.php
+++ b/tests/extension/ext/vendor2/bar/ext.php
@@ -1,6 +1,6 @@
<?php
-namespace bar;
+namespace vendor2\bar;
class ext extends \phpbb\extension\base
{
diff --git a/tests/extension/ext/foo/a_class.php b/tests/extension/ext/vendor2/foo/a_class.php
index 9db45a697f..06278c0e0c 100644
--- a/tests/extension/ext/foo/a_class.php
+++ b/tests/extension/ext/vendor2/foo/a_class.php
@@ -1,6 +1,6 @@
<?php
-namespace foo;
+namespace vendor2\foo;
class a_class
{
diff --git a/tests/extension/ext/foo/acp/a_info.php b/tests/extension/ext/vendor2/foo/acp/a_info.php
index 3b7d8cdd42..27e67c1556 100644
--- a/tests/extension/ext/foo/acp/a_info.php
+++ b/tests/extension/ext/vendor2/foo/acp/a_info.php
@@ -1,13 +1,13 @@
<?php
-namespace foo\acp;
+namespace vendor2\foo\acp;
class a_info
{
public function module()
{
return array(
- 'filename' => 'foo\\acp\\a_module',
+ 'filename' => 'vendor2\\foo\\acp\\a_module',
'title' => 'Foobar',
'version' => '3.1.0-dev',
'modes' => array(
diff --git a/tests/extension/ext/foo/mcp/a_module.php b/tests/extension/ext/vendor2/foo/acp/a_module.php
index ca397e7004..78d91af2fe 100644
--- a/tests/extension/ext/foo/mcp/a_module.php
+++ b/tests/extension/ext/vendor2/foo/acp/a_module.php
@@ -1,6 +1,6 @@
<?php
-namespace foo\mcp;
+namespace vendor2\foo\acp;
class a_module
{
diff --git a/tests/extension/ext/foo/acp/fail_info.php b/tests/extension/ext/vendor2/foo/acp/fail_info.php
index 01d29fc5eb..d9b4353957 100644
--- a/tests/extension/ext/foo/acp/fail_info.php
+++ b/tests/extension/ext/vendor2/foo/acp/fail_info.php
@@ -1,6 +1,6 @@
<?php
-namespace foo\acp;
+namespace vendor2\foo\acp;
/*
* Due to the mismatch between the class name and the file name, this module
@@ -11,7 +11,7 @@ class foo_info
public function module()
{
return array(
- 'filename' => 'foo\acp\fail_module',
+ 'filename' => 'vendor2\foo\acp\fail_module',
'title' => 'Foobar',
'version' => '3.1.0-dev',
'modes' => array(
diff --git a/tests/extension/ext/foo/acp/fail_module.php b/tests/extension/ext/vendor2/foo/acp/fail_module.php
index 8070929d3c..c8a5eae745 100644
--- a/tests/extension/ext/foo/acp/fail_module.php
+++ b/tests/extension/ext/vendor2/foo/acp/fail_module.php
@@ -1,6 +1,6 @@
<?php
-namespace foo\acp;
+namespace vendor2\foo\acp;
/*
* Due to the mismatch between the class name and the file name of the module
diff --git a/tests/extension/ext/foo/b_class.php b/tests/extension/ext/vendor2/foo/b_class.php
index bb2a77c05e..3d0f193908 100644
--- a/tests/extension/ext/foo/b_class.php
+++ b/tests/extension/ext/vendor2/foo/b_class.php
@@ -1,6 +1,6 @@
<?php
-namespace foo;
+namespace vendor2\foo;
class b_class
{
diff --git a/tests/extension/ext/foo/composer.json b/tests/extension/ext/vendor2/foo/composer.json
index 5367eaf593..8821d9d50e 100644
--- a/tests/extension/ext/foo/composer.json
+++ b/tests/extension/ext/vendor2/foo/composer.json
@@ -1,5 +1,5 @@
{
- "name": "foo/example",
+ "name": "vendor2/foo",
"type": "phpbb-extension",
"description": "An example/sample extension to be used for testing purposes in phpBB Development.",
"version": "1.0.0",
diff --git a/tests/extension/ext/foo/ext.php b/tests/extension/ext/vendor2/foo/ext.php
index ac6098f2f1..15480fe92a 100644
--- a/tests/extension/ext/foo/ext.php
+++ b/tests/extension/ext/vendor2/foo/ext.php
@@ -1,6 +1,6 @@
<?php
-namespace foo;
+namespace vendor2\foo;
class ext extends \phpbb\extension\base
{
diff --git a/tests/extension/ext/foo/mcp/a_info.php b/tests/extension/ext/vendor2/foo/mcp/a_info.php
index 9a896ce808..b5599fde65 100644
--- a/tests/extension/ext/foo/mcp/a_info.php
+++ b/tests/extension/ext/vendor2/foo/mcp/a_info.php
@@ -1,13 +1,13 @@
<?php
-namespace foo\mcp;
+namespace vendor2\foo\mcp;
class a_info
{
public function module()
{
return array(
- 'filename' => 'foo\\mcp\\a_module',
+ 'filename' => 'vendor2\\foo\\mcp\\a_module',
'title' => 'Foobar',
'version' => '3.1.0-dev',
'modes' => array(
diff --git a/tests/extension/ext/foo/acp/a_module.php b/tests/extension/ext/vendor2/foo/mcp/a_module.php
index 7aa2351ab3..fe29783827 100644
--- a/tests/extension/ext/foo/acp/a_module.php
+++ b/tests/extension/ext/vendor2/foo/mcp/a_module.php
@@ -1,6 +1,6 @@
<?php
-namespace foo\acp;
+namespace vendor2\foo\mcp;
class a_module
{
diff --git a/tests/extension/ext/foo/sub/type/alternative.php b/tests/extension/ext/vendor2/foo/sub/type/alternative.php
index 1eaf794609..1eaf794609 100644
--- a/tests/extension/ext/foo/sub/type/alternative.php
+++ b/tests/extension/ext/vendor2/foo/sub/type/alternative.php
diff --git a/tests/extension/ext/foo/type/alternative.php b/tests/extension/ext/vendor2/foo/type/alternative.php
index 8f753491ef..8f753491ef 100644
--- a/tests/extension/ext/foo/type/alternative.php
+++ b/tests/extension/ext/vendor2/foo/type/alternative.php
diff --git a/tests/extension/ext/foo/type/dummy/empty.txt b/tests/extension/ext/vendor2/foo/type/dummy/empty.txt
index e69de29bb2..e69de29bb2 100644
--- a/tests/extension/ext/foo/type/dummy/empty.txt
+++ b/tests/extension/ext/vendor2/foo/type/dummy/empty.txt
diff --git a/tests/extension/ext/foo/typewrong/error.php b/tests/extension/ext/vendor2/foo/typewrong/error.php
index 5020926043..5020926043 100644
--- a/tests/extension/ext/foo/typewrong/error.php
+++ b/tests/extension/ext/vendor2/foo/typewrong/error.php
diff --git a/tests/extension/ext/vendor3/bar/ext.php b/tests/extension/ext/vendor3/bar/ext.php
new file mode 100644
index 0000000000..37a5e92059
--- /dev/null
+++ b/tests/extension/ext/vendor3/bar/ext.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace vendor3\bar;
+
+class 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/bar/my/hidden_class.php b/tests/extension/ext/vendor3/bar/my/hidden_class.php
index 504c1873dc..38eb59aadf 100644
--- a/tests/extension/ext/bar/my/hidden_class.php
+++ b/tests/extension/ext/vendor3/bar/my/hidden_class.php
@@ -1,6 +1,6 @@
<?php
-namespace bar\my;
+namespace vendor3\bar\my;
class hidden_class
{
diff --git a/tests/extension/ext/bar/styles/prosilver/template/foobar_body.html b/tests/extension/ext/vendor3/bar/styles/prosilver/template/foobar_body.html
index 00c2a84a18..00c2a84a18 100644
--- a/tests/extension/ext/bar/styles/prosilver/template/foobar_body.html
+++ b/tests/extension/ext/vendor3/bar/styles/prosilver/template/foobar_body.html