aboutsummaryrefslogtreecommitdiffstats
path: root/tests/controller/controller_test.php
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2013-09-19 18:29:08 +0200
committerNils Adermann <naderman@naderman.de>2013-09-19 18:29:08 +0200
commitfe36375a36ec4f816eb07b41630b6c9fa7ff12c8 (patch)
tree96e1122b07586d8802601fcfeea7d45b398b5e08 /tests/controller/controller_test.php
parentf205c4fad4c3a82cc4a47beb7f9a8025669a3acb (diff)
downloadforums-fe36375a36ec4f816eb07b41630b6c9fa7ff12c8.tar
forums-fe36375a36ec4f816eb07b41630b6c9fa7ff12c8.tar.gz
forums-fe36375a36ec4f816eb07b41630b6c9fa7ff12c8.tar.bz2
forums-fe36375a36ec4f816eb07b41630b6c9fa7ff12c8.tar.xz
forums-fe36375a36ec4f816eb07b41630b6c9fa7ff12c8.zip
[ticket/11700] Fix extension loading with namespaces
class loader now expects all classes to be prefixed with a backslash when resolving paths PHPBB3-11700
Diffstat (limited to 'tests/controller/controller_test.php')
-rw-r--r--tests/controller/controller_test.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/controller/controller_test.php b/tests/controller/controller_test.php
index 9445ea53d4..10fced05a2 100644
--- a/tests/controller/controller_test.php
+++ b/tests/controller/controller_test.php
@@ -53,11 +53,11 @@ class phpbb_controller_controller_test extends phpbb_test_case
// Autoloading classes within the tests folder does not work
// so I'll include them manually.
- if (!class_exists('phpbb_ext_foo_controller'))
+ if (!class_exists('foo\\controller'))
{
include(__DIR__.'/ext/foo/controller.php');
}
- if (!class_exists('phpbb_controller_foo'))
+ if (!class_exists('phpbb\\controller\\foo'))
{
include(__DIR__.'/phpbb/controller/foo.php');
}
@@ -66,11 +66,11 @@ class phpbb_controller_controller_test extends phpbb_test_case
$symfony_request = new Request();
$symfony_request->attributes->set('_controller', 'foo.controller:handle');
- $this->assertEquals($resolver->getController($symfony_request), array(new phpbb_ext_foo_controller, 'handle'));
+ $this->assertEquals($resolver->getController($symfony_request), array(new foo\controller, 'handle'));
$symfony_request = new Request();
$symfony_request->attributes->set('_controller', 'core_foo.controller:bar');
- $this->assertEquals($resolver->getController($symfony_request), array(new phpbb_controller_foo, 'bar'));
+ $this->assertEquals($resolver->getController($symfony_request), array(new phpbb\controller\foo, 'bar'));
}
}