Merge branch 'develop' of https://github.com/phpbb/phpbb into ticket/11997

Conflicts:
	tests/functional/fixtures/ext/foo/bar/config/services.yml

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"

tests/functional/fixtures/ext/foo/bar/config/services.yml

@@ -6,3 +6,12 @@ services:
             - @template
             - %core.root_path%
             - %core.php_ext%
+
+    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 }

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
 */

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
 */

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 -->

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')),
+			),
+		);
+	}
+}

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';
+	}
+}