Merge branch 'master' into duplicate

# Conflicts:
#	event/listener.php

Author: iMattPro

README.md

@@ -1,6 +1,6 @@
 # phpBB Ideas
 
-phpBB Ideas is an ideas centre for phpBB 3.2. It is based on [WordPress ideas](http://wordpress.org/extend/ideas/), and allows users to suggest and vote on "ideas" that would help improve and enhance phpBB.
+The official Ideas Centre used at [phpBB.com](https://www.phpbb.com/ideas/). This phpBB extension allows community members to suggest and vote on ideas that can help to improve and enhance phpBB software.
 
 [![Build Status](https://travis-ci.org/phpbb/ideas.svg?branch=master)](https://travis-ci.org/phpbb/ideas)
 
@@ -23,4 +23,4 @@ Support is not available for phpBB Ideas however you may email `website [at] php
 Note: This extension is currently under development and is not recommended for use on any live forum.
 
 ## License
-[GNU General Public License v2](http://opensource.org/licenses/GPL-2.0)
+[GNU General Public License v2](license.txt)

acp/ideas_module.php

@@ -12,6 +12,12 @@
 
 class ideas_module
 {
+	/** @var string */
+	public $page_title;
+
+	/** @var string */
+	public $tpl_name;
+
 	/** @var string */
 	public $u_action;
 

composer.json

@@ -1,7 +1,7 @@
 {
 	"name": "phpbb/ideas",
 	"type": "phpbb-extension",
-	"description": "phpBB Ideas centre for phpBB 3.2.",
+	"description": "phpBB Ideas centre",
 	"homepage": "https://www.phpbb.com",
 	"version": "2.2.2-dev",
 	"license": "GPL-2.0-only",

event/listener.php

@@ -128,7 +128,7 @@ public function clean_message($event)
 
 			// This freakish looking regex pattern should
 			// remove the old ideas link-backs from the message.
-			$message = preg_replace('/(<br[^>]*>\\n?)\\1-{10}\\1\\1.*]/s', '', $message);
+			$message = preg_replace('/(<br[^>]*>\\n?)?\\1?-{10}\\1?\\1?.*]/s', '', $message);
 
 			$post_row['MESSAGE'] = $message;
 			$event['post_row'] = $post_row;
@@ -228,15 +228,12 @@ public function show_idea($event)
 			'IDEA_POINTS'		=> $points,
 			'IDEA_STATUS_ID'	=> $idea['idea_status'],
 			'IDEA_STATUS_NAME'	=> $this->ideas->get_status_from_id($idea['idea_status']),
-			'IDEA_STATUS_LINK'	=> $this->helper->route('phpbb_ideas_list_controller', array('status' => $idea['idea_status'])),
 
 			'IDEA_DUPLICATE'	=> $idea['duplicate_id'] ? $this->ideas->get_title($idea['duplicate_id']) : '',
 			'IDEA_RFC'			=> $idea['rfc_link'],
 			'IDEA_TICKET'		=> $idea['ticket_id'],
 			'IDEA_IMPLEMENTED'	=> $idea['implemented_version'],
 
-			'U_IDEA_DUPLICATE'	=> $this->link_helper->get_idea_link((int) $idea['duplicate_id']),
-
 			'S_IS_MOD'			=> $mod,
 			'S_CAN_EDIT'		=> $mod || $own,
 			'S_CAN_VOTE'		=> $can_vote,
@@ -253,6 +250,8 @@ public function show_idea($event)
 			'U_EDIT_TICKET'		=> $this->link_helper->get_idea_link($idea['idea_id'], 'ticket', true),
 			'U_REMOVE_VOTE'		=> $this->link_helper->get_idea_link($idea['idea_id'], 'removevote', true),
 			'U_IDEA_VOTE'		=> $this->link_helper->get_idea_link($idea['idea_id'], 'vote', true),
+			'U_IDEA_DUPLICATE'	=> $this->link_helper->get_idea_link($idea['duplicate_id']),
+			'U_IDEA_STATUS_LINK'=> $this->helper->route('phpbb_ideas_list_controller', array('status' => $idea['idea_status'])),
 			'U_TITLE_LIVESEARCH'=> $this->helper->route('phpbb_ideas_livesearch_controller'),
 		));
 

license.txt

@@ -1,12 +1,12 @@
-GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                          675 Mass Ave, Cambridge, MA 02139, USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-			    Preamble
+                            Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
@@ -56,7 +56,7 @@ patent must be licensed for everyone's free use or not licensed at all.
   The precise terms and conditions for copying, distribution and
 modification follow.
 
-		    GNU GENERAL PUBLIC LICENSE
+                    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License applies to any program or other work which contains
@@ -255,7 +255,7 @@ make exceptions for this.  Our decision will be guided by the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
 
-			    NO WARRANTY
+                            NO WARRANTY
 
   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@@ -277,4 +277,63 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.

styles/prosilver/template/idea_body.html

@@ -47,9 +47,9 @@
 				</div>
 			</dd>
 			<dt class="idealabel">{{ lang('STATUS') ~ lang('COLON') }}</dt>
-			<dd class="status-dropdown-container dropdown-container">
+			<dd class="status-dropdown-container dropdown-container dropdown-{S_CONTENT_FLOW_END}">
 				<span class="status-badge status-{{ IDEA_STATUS_ID }}">
-					<a href="{{ IDEA_STATUS_LINK }}" id="status-link"><i class="icon fa-fw {{ ideas_status_icon(IDEA_STATUS_ID) }}"></i>{{ IDEA_STATUS_NAME }}</a>
+					<a href="{{ U_IDEA_STATUS_LINK }}" id="status-link"><i class="icon fa-fw {{ ideas_status_icon(IDEA_STATUS_ID) }}"></i>{{ IDEA_STATUS_NAME }}</a>
 					{% if STATUS_ARY %}
 						<a href="#" class="dropdown-trigger"><i class="icon fa-fw fa-caret-down"></i></a>
 					{% endif %}

styles/prosilver/theme/ideas.css

@@ -213,7 +213,7 @@ dd.topics {
 }
 
 .idea-panel {
-	line-height: 1.48em;
+	line-height: 16px;
 	width: 100%;
 }
 

tests/controller/index_controller_test.php

@@ -58,10 +58,10 @@ public function controller_exception_test_data()
 	 * Basic controller exception test
 	 *
 	 * @dataProvider controller_exception_test_data
-	 * @expectedException \phpbb\exception\http_exception
 	 */
 	public function test_controller_exception($forum)
 	{
+		$this->expectException(\phpbb\exception\http_exception::class);
 		$this->config['ideas_forum_id'] = $forum;
 
 		/** @var \phpbb\ideas\controller\index_controller $controller */

tests/controller/list_controller_test.php

@@ -189,10 +189,10 @@ public function controller_exception_test_data()
 	 * Basic controller exception test
 	 *
 	 * @dataProvider controller_exception_test_data
-	 * @expectedException \phpbb\exception\http_exception
 	 */
 	public function test_controller_exception($forum)
 	{
+		$this->expectException(\phpbb\exception\http_exception::class);
 		$this->config['ideas_forum_id'] = $forum;
 
 		/** @var \phpbb\ideas\controller\list_controller $controller */

tests/functional/ideas_test.php

@@ -44,8 +44,8 @@ public function test_new_idea()
 		$this->assertContains($this->lang('IDEAS'), $crawler->filter('#nav-breadcrumbs')->text());
 		$this->assertContains($idea['title'], $crawler->filter('h2')->text());
 		$this->assertContains($idea['message'], $crawler->filter('.content')->text());
-		$this->assertContains('1', $crawler->filter('.rating > .vote-up')->text());
-		$this->assertContains('0', $crawler->filter('.rating > .vote-down')->text());
+		$this->assertStringContainsString('1', $crawler->filter('.rating > .vote-up')->text());
+		$this->assertStringContainsString('0', $crawler->filter('.rating > .vote-down')->text());
 	}
 
 	/**
@@ -131,7 +131,7 @@ public function create_idea($title, $message)
 
 		// Submit and verify success
 		$crawler = self::submit($form);
-		$this->assertContains($data['title'], $crawler->filter('h2')->text());
+		$this->assertStringContainsString($data['title'], $crawler->filter('h2')->text());
 
 		// Get the new idea's ID and add it to the data array
 		$url = $crawler->selectLink($this->lang('REMOVE_VOTE'))->link()->getUri();