From fe36375a36ec4f816eb07b41630b6c9fa7ff12c8 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Thu, 19 Sep 2013 18:29:08 +0200
Subject: [ticket/11700] Fix extension loading with namespaces

class loader now expects all classes to be prefixed with a backslash
when resolving paths

PHPBB3-11700
---
 tests/functional/fixtures/ext/foo/bar/acp/main_info.php         | 6 ++++--
 tests/functional/fixtures/ext/foo/bar/acp/main_module.php       | 4 +++-
 tests/functional/fixtures/ext/foo/bar/config/services.yml       | 2 +-
 tests/functional/fixtures/ext/foo/bar/controller/controller.php | 5 ++++-
 tests/functional/fixtures/ext/foo/bar/event/permission.php      | 4 +++-
 tests/functional/fixtures/ext/foo/bar/event/user_setup.php      | 4 +++-
 tests/functional/fixtures/ext/foo/bar/ext.php                   | 4 +++-
 7 files changed, 21 insertions(+), 8 deletions(-)

(limited to 'tests/functional/fixtures/ext/foo/bar')

diff --git a/tests/functional/fixtures/ext/foo/bar/acp/main_info.php b/tests/functional/fixtures/ext/foo/bar/acp/main_info.php
index 21e38b09b5..2ad6d08503 100644
--- a/tests/functional/fixtures/ext/foo/bar/acp/main_info.php
+++ b/tests/functional/fixtures/ext/foo/bar/acp/main_info.php
@@ -8,6 +8,8 @@
 *
 */
 
+namespace foo\bar\acp;
+
 /**
 * @ignore
 */
@@ -16,12 +18,12 @@ if (!defined('IN_PHPBB'))
 	exit;
 }
 
-class phpbb_ext_foo_bar_acp_main_info
+class main_info
 {
 	function module()
 	{
 		return array(
-			'filename'	=> 'phpbb_ext_foo_bar_acp_main_module',
+			'filename'	=> 'foo\bar\acp\main_module',
 			'title'		=> 'ACP_FOOBAR_TITLE',
 			'version'	=> '1.0.0',
 			'modes'		=> array(
diff --git a/tests/functional/fixtures/ext/foo/bar/acp/main_module.php b/tests/functional/fixtures/ext/foo/bar/acp/main_module.php
index c4ab69fb38..c59b3c6820 100644
--- a/tests/functional/fixtures/ext/foo/bar/acp/main_module.php
+++ b/tests/functional/fixtures/ext/foo/bar/acp/main_module.php
@@ -8,6 +8,8 @@
 *
 */
 
+namespace foo\bar\acp;
+
 /**
 * @ignore
 */
@@ -16,7 +18,7 @@ if (!defined('IN_PHPBB'))
 	exit;
 }
 
-class phpbb_ext_foo_bar_acp_main_module
+class main_module
 {
 	var $u_action;
 
diff --git a/tests/functional/fixtures/ext/foo/bar/config/services.yml b/tests/functional/fixtures/ext/foo/bar/config/services.yml
index 33ced55af9..3bca4c6567 100644
--- a/tests/functional/fixtures/ext/foo/bar/config/services.yml
+++ b/tests/functional/fixtures/ext/foo/bar/config/services.yml
@@ -1,6 +1,6 @@
 services:
     foo_bar.controller:
-        class: phpbb_ext_foo_bar_controller
+        class: foo\bar\controller\controller
         arguments:
             - @controller.helper
             - @template
diff --git a/tests/functional/fixtures/ext/foo/bar/controller/controller.php b/tests/functional/fixtures/ext/foo/bar/controller/controller.php
index 41b2be350b..259d548299 100644
--- a/tests/functional/fixtures/ext/foo/bar/controller/controller.php
+++ b/tests/functional/fixtures/ext/foo/bar/controller/controller.php
@@ -1,7 +1,10 @@
 <?php
+
+namespace foo\bar\controller;
+
 use Symfony\Component\HttpFoundation\Response;
 
-class phpbb_ext_foo_bar_controller
+class controller
 {
 	protected $template;
 
diff --git a/tests/functional/fixtures/ext/foo/bar/event/permission.php b/tests/functional/fixtures/ext/foo/bar/event/permission.php
index 48688a586a..92e24074ad 100644
--- a/tests/functional/fixtures/ext/foo/bar/event/permission.php
+++ b/tests/functional/fixtures/ext/foo/bar/event/permission.php
@@ -8,6 +8,8 @@
 *
 */
 
+namespace foo\bar\event;
+
 /**
 * @ignore
 */
@@ -22,7 +24,7 @@ if (!defined('IN_PHPBB'))
 */
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
-class phpbb_ext_foo_bar_event_permission implements EventSubscriberInterface
+class permission implements EventSubscriberInterface
 {
 	static public function getSubscribedEvents()
 	{
diff --git a/tests/functional/fixtures/ext/foo/bar/event/user_setup.php b/tests/functional/fixtures/ext/foo/bar/event/user_setup.php
index 3d2d0c5325..1409f97470 100644
--- a/tests/functional/fixtures/ext/foo/bar/event/user_setup.php
+++ b/tests/functional/fixtures/ext/foo/bar/event/user_setup.php
@@ -8,6 +8,8 @@
 *
 */
 
+namespace foo\bar\event;
+
 /**
 * @ignore
 */
@@ -22,7 +24,7 @@ if (!defined('IN_PHPBB'))
 */
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
-class phpbb_ext_foo_bar_event_user_setup implements EventSubscriberInterface
+class user_setup implements EventSubscriberInterface
 {
 	static public function getSubscribedEvents()
 	{
diff --git a/tests/functional/fixtures/ext/foo/bar/ext.php b/tests/functional/fixtures/ext/foo/bar/ext.php
index b839cef36c..1288edd5ec 100644
--- a/tests/functional/fixtures/ext/foo/bar/ext.php
+++ b/tests/functional/fixtures/ext/foo/bar/ext.php
@@ -1,6 +1,8 @@
 <?php
 
-class phpbb_ext_foo_bar_ext extends \phpbb\extension\base
+namespace foo\bar;
+
+class ext extends \phpbb\extension\base
 {
 
 }
-- 
cgit v1.2.1