From 7030578bbe9e11c18b5becaf8b06e670e3c2e3cd Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 14 Jul 2013 01:32:34 -0400
Subject: [ticket/11698] Moving all autoloadable files to phpbb/
PHPBB3-11698
---
tests/class_loader/class_loader_test.php | 10 +++++-----
tests/class_loader/includes/class_name.php | 6 ------
tests/class_loader/includes/dir.php | 6 ------
tests/class_loader/includes/dir/class_name.php | 6 ------
tests/class_loader/includes/dir/subdir/class_name.php | 6 ------
tests/class_loader/includes/dir2/dir2.php | 6 ------
tests/class_loader/phpbb/class_name.php | 6 ++++++
tests/class_loader/phpbb/dir.php | 6 ++++++
tests/class_loader/phpbb/dir/class_name.php | 6 ++++++
tests/class_loader/phpbb/dir/subdir/class_name.php | 6 ++++++
tests/class_loader/phpbb/dir2/dir2.php | 6 ++++++
11 files changed, 35 insertions(+), 35 deletions(-)
delete mode 100644 tests/class_loader/includes/class_name.php
delete mode 100644 tests/class_loader/includes/dir.php
delete mode 100644 tests/class_loader/includes/dir/class_name.php
delete mode 100644 tests/class_loader/includes/dir/subdir/class_name.php
delete mode 100644 tests/class_loader/includes/dir2/dir2.php
create mode 100644 tests/class_loader/phpbb/class_name.php
create mode 100644 tests/class_loader/phpbb/dir.php
create mode 100644 tests/class_loader/phpbb/dir/class_name.php
create mode 100644 tests/class_loader/phpbb/dir/subdir/class_name.php
create mode 100644 tests/class_loader/phpbb/dir2/dir2.php
(limited to 'tests/class_loader')
diff --git a/tests/class_loader/class_loader_test.php b/tests/class_loader/class_loader_test.php
index bf27c7c217..2b55c1ff8d 100644
--- a/tests/class_loader/class_loader_test.php
+++ b/tests/class_loader/class_loader_test.php
@@ -30,9 +30,9 @@ class phpbb_class_loader_test extends PHPUnit_Framework_TestCase
public function test_resolve_path()
{
$prefix = dirname(__FILE__) . '/';
- $class_loader = new phpbb_class_loader('phpbb_', $prefix . 'includes/');
+ $class_loader = new phpbb_class_loader('phpbb_', $prefix . 'phpbb/');
- $prefix .= 'includes/';
+ $prefix .= 'phpbb/';
$this->assertEquals(
'',
@@ -71,10 +71,10 @@ class phpbb_class_loader_test extends PHPUnit_Framework_TestCase
$cache = new phpbb_mock_cache($cache_map);
$prefix = dirname(__FILE__) . '/';
- $class_loader = new phpbb_class_loader('phpbb_', $prefix . 'includes/', 'php', $cache);
- $class_loader_ext = new phpbb_class_loader('phpbb_ext_', $prefix . 'includes/', 'php', $cache);
+ $class_loader = new phpbb_class_loader('phpbb_', $prefix . 'phpbb/', 'php', $cache);
+ $class_loader_ext = new phpbb_class_loader('phpbb_ext_', $prefix . 'phpbb/', 'php', $cache);
- $prefix .= 'includes/';
+ $prefix .= 'phpbb/';
$this->assertEquals(
$prefix . 'dir/class_name.php',
diff --git a/tests/class_loader/includes/class_name.php b/tests/class_loader/includes/class_name.php
deleted file mode 100644
index e941173cdd..0000000000
--- a/tests/class_loader/includes/class_name.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-class phpbb_class_name
-{
-}
-
diff --git a/tests/class_loader/includes/dir.php b/tests/class_loader/includes/dir.php
deleted file mode 100644
index 1c8930d8e7..0000000000
--- a/tests/class_loader/includes/dir.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-class phpbb_dir
-{
-}
-
diff --git a/tests/class_loader/includes/dir/class_name.php b/tests/class_loader/includes/dir/class_name.php
deleted file mode 100644
index 0675aa8fc5..0000000000
--- a/tests/class_loader/includes/dir/class_name.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-class phpbb_dir_class_name
-{
-}
-
diff --git a/tests/class_loader/includes/dir/subdir/class_name.php b/tests/class_loader/includes/dir/subdir/class_name.php
deleted file mode 100644
index 7321a609cc..0000000000
--- a/tests/class_loader/includes/dir/subdir/class_name.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-class phpbb_dir_subdir_class_name
-{
-}
-
diff --git a/tests/class_loader/includes/dir2/dir2.php b/tests/class_loader/includes/dir2/dir2.php
deleted file mode 100644
index 01cf4086ff..0000000000
--- a/tests/class_loader/includes/dir2/dir2.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-class phpbb_dir2
-{
-}
-
diff --git a/tests/class_loader/phpbb/class_name.php b/tests/class_loader/phpbb/class_name.php
new file mode 100644
index 0000000000..e941173cdd
--- /dev/null
+++ b/tests/class_loader/phpbb/class_name.php
@@ -0,0 +1,6 @@
+<?php
+
+class phpbb_class_name
+{
+}
+
diff --git a/tests/class_loader/phpbb/dir.php b/tests/class_loader/phpbb/dir.php
new file mode 100644
index 0000000000..1c8930d8e7
--- /dev/null
+++ b/tests/class_loader/phpbb/dir.php
@@ -0,0 +1,6 @@
+<?php
+
+class phpbb_dir
+{
+}
+
diff --git a/tests/class_loader/phpbb/dir/class_name.php b/tests/class_loader/phpbb/dir/class_name.php
new file mode 100644
index 0000000000..0675aa8fc5
--- /dev/null
+++ b/tests/class_loader/phpbb/dir/class_name.php
@@ -0,0 +1,6 @@
+<?php
+
+class phpbb_dir_class_name
+{
+}
+
diff --git a/tests/class_loader/phpbb/dir/subdir/class_name.php b/tests/class_loader/phpbb/dir/subdir/class_name.php
new file mode 100644
index 0000000000..7321a609cc
--- /dev/null
+++ b/tests/class_loader/phpbb/dir/subdir/class_name.php
@@ -0,0 +1,6 @@
+<?php
+
+class phpbb_dir_subdir_class_name
+{
+}
+
diff --git a/tests/class_loader/phpbb/dir2/dir2.php b/tests/class_loader/phpbb/dir2/dir2.php
new file mode 100644
index 0000000000..01cf4086ff
--- /dev/null
+++ b/tests/class_loader/phpbb/dir2/dir2.php
@@ -0,0 +1,6 @@
+<?php
+
+class phpbb_dir2
+{
+}
+
--
cgit v1.2.1