Merge branch '2.1.x'

.travis.yml

@@ -1,14 +1,13 @@
-# Opt into fully virtualized infrastructure
-sudo: required
-
 language: php
+sudo: required
+dist: precise
 
 matrix:
   include:
     - php: 5.4
       env: DB=none;NOTESTS=1
     - php: 5.4
-      env: DB=mysqli
+      env: DB=mysqli # MyISAM
     - php: 5.4
       env: DB=mysql
     - php: 5.4
@@ -17,18 +16,23 @@ matrix:
       env: DB=postgres
     - php: 5.4
       env: DB=sqlite3
+    - php: 5.4
+      env: DB=mysqli;SLOWTESTS=1
     - php: 5.5
       env: DB=mysqli
     - php: 5.6
       env: DB=mysqli
-    - php: hhvm
-      env: DB=mysqli
     - php: 7.0
       env: DB=mysqli
     - php: 7.1
       env: DB=mysqli
+    - php: nightly
+      env: DB=mysqli
+    - php: hhvm
+      env: DB=mysqli
   allow_failures:
     - php: hhvm
+    - php: nightly
   fast_finish: true
 
 env:

build.xml

@@ -109,7 +109,7 @@
 						<exec dir="${build-directory}/logs" command="touch phploc.csv" />
 					</else>
 				</if>
-				<exec dir="${build-directory}/../phpbb/phpBB/ext/board3" command="php portal/phploc.phar --exclude=vendor --exclude=travis --log-csv ../../../../build/logs/phploc.csv --progress portal/" passthru="true" />
+				<exec dir="${build-directory}/../phpbb/phpBB/ext/board3" command="php portal/phploc.phar --exclude=vendor --exclude=travis --log-csv ../../../../build/logs/phploc.csv portal/" passthru="true" />
 				<exec dir="${build-directory}/../phpbb/phpBB/ext/board3/portal" command="rm phploc.phar" passthru="true" />
 			</else>
 		</if>

language/de/modules/portal_announcements_module.php

@@ -33,7 +33,7 @@ if (empty($lang) || !is_array($lang))
 // in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
 $lang = array_merge($lang, array(
 	'LATEST_ANNOUNCEMENTS'			=> 'Letzte Bekanntmachung',
-	'GLOBAL_ANNOUNCEMENTS'			=> 'Global Bekanntmachungen',
+	'GLOBAL_ANNOUNCEMENTS'			=> 'Globale Bekanntmachungen',
 	'GLOBAL_ANNOUNCEMENT'			=> 'Globale Bekanntmachung',
 	'VIEW_LATEST_ANNOUNCEMENT' 		=> '1 Bekanntmachung',
 	'VIEW_LATEST_ANNOUNCEMENTS'	 	=> '%d Bekanntmachungen',

styles/prosilver/template/portal/modules/poll_center.html

@@ -3,6 +3,7 @@
 	<div id="viewpoll" class="panel bg1 portal-no-margin">
 		<div class="inner">
 		<!-- BEGIN poll -->
+			<!-- IF not poll.S_FIRST_ROW --><hr class="dashed" /><!-- ENDIF -->
 			<!-- IF poll.S_CAN_VOTE --><form method="post" action="{poll.S_POLL_ACTION}"><!-- ENDIF -->
 				<div class="content">
 					<h2>{poll.POLL_QUESTION}</h2>

styles/prosilver/template/portal/modules/poll_side.html

@@ -2,6 +2,7 @@
 	<!-- IF S_HAS_POLL -->
 		<div id="viewpoll" class="inner">
 		<!-- BEGIN poll_side -->
+			<!-- IF not poll_side.S_FIRST_ROW --><hr class="dashed" /><!-- ENDIF -->
 			<!-- IF poll_side.S_CAN_VOTE --><form method="post" action="{poll_side.S_POLL_ACTION}"><!-- ENDIF -->
 				<div class="content">
 					<h2>{poll_side.POLL_QUESTION}</h2>

tests/testframework/ui_test_case.php

@@ -0,0 +1,18 @@
+<?php
+/**
+ *
+ * @package Board3 Portal Testing
+ * @copyright (c) Board3 Group ( www.board3.de )
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+ *
+ */
+
+namespace board3\portal\tests\testframework;
+
+abstract class ui_test_case extends \phpbb_ui_test_case
+{
+	static protected function setup_extensions()
+	{
+		return array('board3/portal');
+	}
+}

tests/ui/portal_visit_ui_test.php

@@ -0,0 +1,29 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2013 Board3 Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @group ui
+*/
+class phpbb_ui_portal_visit_ui_test extends \board3\portal\tests\testframework\ui_test_case
+{
+	public function setUp()
+	{
+		parent::setUp();
+
+		$this->purge_cache();
+
+		$this->login();
+		$this->admin_login();
+	}
+
+	public function test_vanilla_board()
+	{
+		$this->visit('app.php/portal');
+	}
+}

tests/unit/includes/modules_helper_test.php

@@ -35,6 +35,12 @@ class board3_includes_modules_helper_test extends \board3\portal\tests\testframe
 		$request = new \phpbb_mock_request(array('foo' => array('bar')));
 		$controller_helper = new \board3\portal\tests\mock\controller_helper($phpbb_root_path, $phpEx);
 		$controller_helper->add_route('board3_portal_controller', 'portal');
+		$phpbb_container = new \phpbb_mock_container_builder();
+		$phpbb_dispatcher = $this->getMock('\phpbb\event\dispatcher', array('trigger_event'), array($phpbb_container));
+		$phpbb_dispatcher->expects($this->any())
+			->method('trigger_event')
+			->with($this->anything())
+			->will($this->returnArgument(1));
 
 		$this->modules_helper = new \board3\portal\includes\modules_helper($auth, $this->config, $controller_helper, $request);
 		$phpbb_dispatcher = new \phpbb_mock_event_dispatcher();