3 files changed, 358 insertions, 6 deletions
diff --git a/phpBB/includes/acp/acp_extensions.php b/phpBB/includes/acp/acp_extensions.php
index ef5f78d5bf..5d8104aa22 100644
--- a/phpBB/includes/acp/acp_extensions.php
+++ b/phpBB/includes/acp/acp_extensions.php
@@ -323,10 +323,7 @@ class acp_extensions
 						'UP_TO_DATE_MSG'	=> $this->user->lang(empty($updates_available) ? 'UP_TO_DATE' : 'NOT_UP_TO_DATE', $md_manager->get_metadata('display-name')),
 					));
 
-					foreach ($updates_available as $branch => $version_data)
-					{
-						$template->assign_block_vars('updates_available', $version_data);
-					}
+					$template->assign_block_vars('updates_available', $updates_available);
 				}
 				catch (\RuntimeException $e)
 				{
@@ -565,7 +562,7 @@ class acp_extensions
 	* @param \phpbb\extension\metadata_manager $md_manager The metadata manager for the version to check.
 	* @param bool $force_update Ignores cached data. Defaults to false.
 	* @param bool $force_cache Force the use of the cache. Override $force_update.
-	* @return string
+	* @return array
 	* @throws RuntimeException
 	*/
 	protected function version_check(\phpbb\extension\metadata_manager $md_manager, $force_update = false, $force_cache = false)
@@ -584,7 +581,7 @@ class acp_extensions
 		$version_helper->set_file_location($version_check['host'], $version_check['directory'], $version_check['filename'], isset($version_check['ssl']) ? $version_check['ssl'] : false);
 		$version_helper->force_stability($this->config['extension_force_unstable'] ? 'unstable' : null);
 
-		return $updates = $version_helper->get_suggested_updates($force_update, $force_cache);
+		return $version_helper->get_ext_update_on_branch($force_update, $force_cache);
 	}
 
 	/**
diff --git a/phpBB/phpbb/version_helper.php b/phpBB/phpbb/version_helper.php
index b00f4f1d5f..9dc5a2e7c9 100644
--- a/phpBB/phpbb/version_helper.php
+++ b/phpBB/phpbb/version_helper.php
@@ -244,6 +244,69 @@ class version_helper
 	}
 
 	/**
+	 * Gets the latest extension update for the current phpBB branch the user is on
+	 * Will suggest versions from newer branches when EoL has been reached
+	 * and/or version from newer branch is needed for having all known security
+	 * issues fixed.
+	 *
+	 * @param bool $force_update Ignores cached data. Defaults to false.
+	 * @param bool $force_cache Force the use of the cache. Override $force_update.
+	 * @return array Version info or empty array if there are no updates
+	 * @throws \RuntimeException
+	 */
+	public function get_ext_update_on_branch($force_update = false, $force_cache = false)
+	{
+		$versions = $this->get_versions_matching_stability($force_update, $force_cache);
+
+		$self = $this;
+		$current_version = $this->current_version;
+
+		// Get current phpBB branch from version, e.g.: 3.2
+		preg_match('/^(\d+\.\d+).*$/', $this->config['version'], $matches);
+		$current_branch = $matches[1];
+
+		// Filter out any versions less than the current version
+		$versions = array_filter($versions, function($data) use ($self, $current_version) {
+			return $self->compare($data['current'], $current_version, '>=');
+		});
+
+		// Filter out any phpbb branches less than the current version
+		$branches = array_filter(array_keys($versions), function($branch) use ($self, $current_branch) {
+			return $self->compare($branch, $current_branch, '>=');
+		});
+		if (!empty($branches))
+		{
+			$versions = array_intersect_key($versions, array_flip($branches));
+		}
+		else
+		{
+			// If branches are empty, it means the current phpBB branch is newer than any branch the
+			// extension was validated against. Reverse sort the versions array so we get the newest
+			// validated release available.
+			krsort($versions);
+		}
+
+		// Get the first available version from the previous list.
+		$update_info = array_reduce($versions, function($value, $data) use ($self, $current_version) {
+			if ($value === null && $self->compare($data['current'], $current_version, '>='))
+			{
+				if (!$data['eol'] && (!$data['security'] || $self->compare($data['security'], $data['current'], '<=')))
+				{
+					return $self->compare($data['current'], $current_version, '>') ? $data : array();
+				}
+				else
+				{
+					return null;
+				}
+			}
+
+			return $value;
+		});
+
+		return $update_info === null ? array() : $update_info;
+	}
+
+	/**
 	* Obtains the latest version information
 	*
 	* @param bool $force_update Ignores cached data. Defaults to false.
diff --git a/tests/version/version_test.php b/tests/version/version_test.php
index 54237f2059..0ed0fcb589 100644
--- a/tests/version/version_test.php
+++ b/tests/version/version_test.php
@@ -532,4 +532,296 @@ class phpbb_version_helper_test extends phpbb_test_case
 
 		$this->assertSame($expected, $version_helper->get_update_on_branch());
 	}
+
+	public function get_ext_update_on_branch_data()
+	{
+		return array(
+			// Single branch, check version for current branch
+			array(
+				'3.1.0',
+				'1.0.0',
+				array(
+					'3.1'	=> array(
+						'current'		=> '1.0.1',
+					),
+				),
+				array(
+					'current'		=> '1.0.1',
+				),
+			),
+			array(
+				'3.1.0',
+				'1.0.1',
+				array(
+					'3.1'	=> array(
+						'current'		=> '1.0.1',
+					),
+				),
+				array(),
+			),
+			array(
+				'3.2.0',
+				'1.0.0',
+				array(
+					'3.2'	=> array(
+						'current'		=> '1.1.1',
+					),
+				),
+				array(
+					'current'		=> '1.1.1',
+				),
+			),
+			array(
+				'3.2.0',
+				'1.1.1',
+				array(
+					'3.2'	=> array(
+						'current'		=> '1.1.1',
+					),
+				),
+				array(),
+			),
+			// Single branch, check for newest version when branches don't match up
+			array(
+				'3.1.0',
+				'1.0.0',
+				array(
+					'3.2'	=> array(
+						'current'		=> '1.1.1',
+					),
+				),
+				array(
+					'current'		=> '1.1.1',
+				),
+			),
+			array(
+				'3.1.0',
+				'1.1.1',
+				array(
+					'3.2'	=> array(
+						'current'		=> '1.1.1',
+					),
+				),
+				array(),
+			),
+			array(
+				'3.2.0',
+				'1.0.0',
+				array(
+					'3.1'	=> array(
+						'current'		=> '1.0.1',
+					),
+				),
+				array(
+					'current'		=> '1.0.1',
+				),
+			),
+			array(
+				'3.2.0',
+				'1.0.1',
+				array(
+					'3.1'	=> array(
+						'current'		=> '1.0.1',
+					),
+				),
+				array(),
+			),
+			array(
+				'3.3.0',
+				'1.0.0',
+				array(
+					'3.2'	=> array(
+						'current'		=> '1.1.1',
+					),
+				),
+				array(
+					'current'		=> '1.1.1',
+				),
+			),
+			array(
+				'3.3.0',
+				'1.1.1',
+				array(
+					'3.2'	=> array(
+						'current'		=> '1.1.1',
+					),
+				),
+				array(),
+			),
+			// Multiple branches, check version for current branch
+			array(
+				'3.1.0',
+				'1.0.0',
+				array(
+					'3.1'	=> array(
+						'current'		=> '1.0.1',
+					),
+					'3.2'	=> array(
+						'current'		=> '1.1.1',
+					),
+				),
+				array(
+					'current'		=> '1.0.1',
+				),
+			),
+			array(
+				'3.1.0',
+				'1.0.1',
+				array(
+					'3.1'	=> array(
+						'current'		=> '1.0.1',
+					),
+					'3.2'	=> array(
+						'current'		=> '1.1.1',
+					),
+				),
+				array(),
+			),
+			array(
+				'3.1.0',
+				'1.1.1',
+				array(
+					'3.1'	=> array(
+						'current'		=> '1.0.1',
+					),
+					'3.2'	=> array(
+						'current'		=> '1.1.1',
+					),
+				),
+				array(),
+			),
+			array(
+				'3.2.0',
+				'1.0.0',
+				array(
+					'3.1'	=> array(
+						'current'		=> '1.0.1',
+					),
+					'3.2'	=> array(
+						'current'		=> '1.1.1',
+					),
+				),
+				array(
+					'current'		=> '1.1.1',
+				),
+			),
+			array(
+				'3.2.0',
+				'1.0.1',
+				array(
+					'3.1'	=> array(
+						'current'		=> '1.0.1',
+					),
+					'3.2'	=> array(
+						'current'		=> '1.1.1',
+					),
+				),
+				array(
+					'current'		=> '1.1.1',
+				),
+			),
+			array(
+				'3.2.0',
+				'1.1.1',
+				array(
+					'3.1'	=> array(
+						'current'		=> '1.0.1',
+					),
+					'3.2'	=> array(
+						'current'		=> '1.1.1',
+					),
+				),
+				array(),
+			),
+			// Multiple branches, check for newest version when branches don't match up
+			array(
+				'3.3.0',
+				'1.0.0',
+				array(
+					'3.1'	=> array(
+						'current'		=> '1.0.1',
+					),
+					'3.2'	=> array(
+						'current'		=> '1.1.1',
+					),
+				),
+				array(
+					'current'		=> '1.1.1',
+				),
+			),
+			array(
+				'3.3.0',
+				'1.0.1',
+				array(
+					'3.1'	=> array(
+						'current'		=> '1.0.1',
+					),
+					'3.2'	=> array(
+						'current'		=> '1.1.1',
+					),
+				),
+				array(
+					'current'		=> '1.1.1',
+				),
+			),
+			array(
+				'3.3.0',
+				'1.1.0',
+				array(
+					'3.1'	=> array(
+						'current'		=> '1.0.1',
+					),
+					'3.2'	=> array(
+						'current'		=> '1.1.1',
+					),
+				),
+				array(
+					'current'		=> '1.1.1',
+				),
+			),
+			array(
+				'3.3.0',
+				'1.1.1',
+				array(
+					'3.1'	=> array(
+						'current'		=> '1.0.1',
+					),
+					'3.2'	=> array(
+						'current'		=> '1.1.1',
+					),
+				),
+				array(),
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider get_ext_update_on_branch_data
+	 */
+	public function test_get_ext_update_on_branch($phpbb_version, $ext_version, $versions, $expected)
+	{
+		$version_helper = $this
+			->getMockBuilder('\phpbb\version_helper')
+			->setMethods(array(
+				'get_versions_matching_stability',
+			))
+			->setConstructorArgs(array(
+				$this->cache,
+				new \phpbb\config\config(array(
+					'version'	=> $phpbb_version,
+				)),
+				new \phpbb\file_downloader(),
+				new \phpbb\user('\phpbb\datetime'),
+			))
+			->getMock()
+		;
+
+		$version_helper->expects($this->any())
+			->method('get_versions_matching_stability')
+			->will($this->returnValue($versions));
+
+		$version_helper->set_current_version($ext_version);
+
+		$this->assertSame($expected, $version_helper->get_ext_update_on_branch());
+	}
 }