From fbf5911ac54c83d439121e90032afca0ec2a7fc4 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 13 Nov 2013 17:38:58 +0100
Subject: [ticket/12016] Update functional tests to use service for event
 listeners

PHPBB3-12016
---
 tests/functional/fixtures/ext/foo/bar/config/services.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

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

diff --git a/tests/functional/fixtures/ext/foo/bar/config/services.yml b/tests/functional/fixtures/ext/foo/bar/config/services.yml
index 3bca4c6567..64e1163408 100644
--- a/tests/functional/fixtures/ext/foo/bar/config/services.yml
+++ b/tests/functional/fixtures/ext/foo/bar/config/services.yml
@@ -4,3 +4,12 @@ services:
         arguments:
             - @controller.helper
             - @template
+    foo_bar.listener.permission:
+        class: foo\bar\event\permission
+        tags:
+            - { name: event.listener }
+    foo_bar.listener.user_setup:
+        class: foo\bar\event\user_setup
+        tags:
+            - { name: event.listener }
+
-- 
cgit v1.2.1


From 009a1303f59628417573b47b162690b057594953 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 14 Nov 2013 00:14:04 +0100
Subject: [ticket/12017] Remove IN_PHPBB defined check

PHPBB3-12017
---
 tests/functional/fixtures/ext/foo/bar/event/permission.php | 9 ---------
 tests/functional/fixtures/ext/foo/bar/event/user_setup.php | 9 ---------
 2 files changed, 18 deletions(-)

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

diff --git a/tests/functional/fixtures/ext/foo/bar/event/permission.php b/tests/functional/fixtures/ext/foo/bar/event/permission.php
index 92e24074ad..9b319dd35f 100644
--- a/tests/functional/fixtures/ext/foo/bar/event/permission.php
+++ b/tests/functional/fixtures/ext/foo/bar/event/permission.php
@@ -10,15 +10,6 @@
 
 namespace foo\bar\event;
 
-/**
-* @ignore
-*/
-
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
 /**
 * Event listener
 */
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 1409f97470..8fa7ac97da 100644
--- a/tests/functional/fixtures/ext/foo/bar/event/user_setup.php
+++ b/tests/functional/fixtures/ext/foo/bar/event/user_setup.php
@@ -10,15 +10,6 @@
 
 namespace foo\bar\event;
 
-/**
-* @ignore
-*/
-
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
 /**
 * Event listener
 */
-- 
cgit v1.2.1


From 1e73e0c9544d2601127b7179fdbd0724370e8b04 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 14 Nov 2013 00:15:23 +0100
Subject: [ticket/12017] Fix phpbb requirement in composer.json

PHPBB3-12017
---
 tests/functional/fixtures/ext/foo/bar/composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/tests/functional/fixtures/ext/foo/bar/composer.json b/tests/functional/fixtures/ext/foo/bar/composer.json
index cb9dbc9514..e3e5fc21cd 100644
--- a/tests/functional/fixtures/ext/foo/bar/composer.json
+++ b/tests/functional/fixtures/ext/foo/bar/composer.json
@@ -14,7 +14,7 @@
 	}],
 	"require": {
 		"php": ">=5.3",
-		"phpbb": "3.1.*@dev"
+		"phpbb/phpbb": "3.1.*@dev"
 	},
 	"extra": {
 		"display-name": "phpBB 3.1 Extension Testing"
-- 
cgit v1.2.1


From 9fbeae3e0ca373f98a6102266f2bb75653e5211a Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 3 Dec 2013 17:57:34 +0100
Subject: [ticket/12026] Add functional test for ucp extension module

PHPBB3-12026
---
 .../foo/bar/styles/prosilver/template/foobar.html  |  3 +++
 .../fixtures/ext/foo/bar/ucp/main_info.php         | 26 ++++++++++++++++++++++
 .../fixtures/ext/foo/bar/ucp/main_module.php       | 22 ++++++++++++++++++
 3 files changed, 51 insertions(+)
 create mode 100644 tests/functional/fixtures/ext/foo/bar/styles/prosilver/template/foobar.html
 create mode 100644 tests/functional/fixtures/ext/foo/bar/ucp/main_info.php
 create mode 100644 tests/functional/fixtures/ext/foo/bar/ucp/main_module.php

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

diff --git a/tests/functional/fixtures/ext/foo/bar/styles/prosilver/template/foobar.html b/tests/functional/fixtures/ext/foo/bar/styles/prosilver/template/foobar.html
new file mode 100644
index 0000000000..cbded623f4
--- /dev/null
+++ b/tests/functional/fixtures/ext/foo/bar/styles/prosilver/template/foobar.html
@@ -0,0 +1,3 @@
+<!-- INCLUDE overall_header.html -->
+<div id="content">UCP Extension Template Test Passed!</div>
+<!-- INCLUDE overall_footer.html -->
diff --git a/tests/functional/fixtures/ext/foo/bar/ucp/main_info.php b/tests/functional/fixtures/ext/foo/bar/ucp/main_info.php
new file mode 100644
index 0000000000..2ba37f3050
--- /dev/null
+++ b/tests/functional/fixtures/ext/foo/bar/ucp/main_info.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+*
+* @package testing
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+namespace foo\bar\ucp;
+
+class main_info
+{
+	function module()
+	{
+		return array(
+			'filename'	=> '\foo\bar\ucp\main_module',
+			'title'		=> 'ACP_FOOBAR_TITLE',
+			'version'	=> '1.0.0',
+			'modes'		=> array(
+				'mode'		=> array('title' => 'ACP_FOOBAR_MODE', 'auth' => '', 'cat' => array('ACP_FOOBAR_TITLE')),
+			),
+		);
+	}
+}
diff --git a/tests/functional/fixtures/ext/foo/bar/ucp/main_module.php b/tests/functional/fixtures/ext/foo/bar/ucp/main_module.php
new file mode 100644
index 0000000000..cd3dacc9db
--- /dev/null
+++ b/tests/functional/fixtures/ext/foo/bar/ucp/main_module.php
@@ -0,0 +1,22 @@
+<?php
+
+/**
+*
+* @package testing
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+namespace foo\bar\ucp;
+
+class main_module
+{
+	var $u_action;
+
+	function main($id, $mode)
+	{
+		$this->tpl_name = 'foobar';
+		$this->page_title = 'Bertie';
+	}
+}
-- 
cgit v1.2.1