Fix version check for phpBB 3.2.0

includes/compatibility/v_3_2_x.php

@@ -196,11 +196,92 @@ public function output_metadata_to_template($metadata)
 		}
 	}
 
+	/**
+	 * Gets the latest extension update for the current extension 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 \phpbb\version_helper $version_helper  Version helper object.
+	 * @param string                $current_version Current version of the extension.
+	 * @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
+	 */
+	protected function get_ext_update_on_branch($version_helper, $current_version, $force_update = false, $force_cache = false)
+	{
+		$versions = $version_helper->get_versions_matching_stability($force_update, $force_cache);
+
+		// Get current branch from version, e.g.: 3.2
+		preg_match('/^(\d+\.\d+).*$/', objects::$config['version'], $matches);
+		$current_branch = $matches[1];
+
+		// Filter out any versions less than the current version
+		$versions = array_filter($versions, function($data) use ($version_helper, $current_version) {
+			return $version_helper->compare($data['current'], $current_version, '>=');
+		});
+
+		// Filter out any phpbb branches less than the current version
+		$branches = array_filter(array_keys($versions), function($branch) use ($version_helper, $current_branch) {
+			return $version_helper->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 ($version_helper, $current_version) {
+			if ($value === null && $version_helper->compare($data['current'], $current_version, '>='))
+			{
+				if (!$data['eol'] && (!$data['security'] || $version_helper->compare($data['security'], $data['current'], '<=')))
+				{
+					return $version_helper->compare($data['current'], $current_version, '>') ? $data : array();
+				}
+				else
+				{
+					return null;
+				}
+			}
+
+			return $value;
+		});
+
+		return $update_info === null ? array() : $update_info;
+	}
+
 	/**
 	 * {@inheritdoc}
 	 */
 	public function version_check(\phpbb\extension\metadata_manager $md_manager, $force_update = false, $force_cache = false, $stability = null)
 	{
-		return objects::$phpbb_extension_manager->version_check($md_manager, $force_update, $force_cache, $stability);
+		if (phpbb_version_compare(objects::$config['version'], '3.2.0', '>'))
+		{
+			return objects::$phpbb_extension_manager->version_check($md_manager, $force_update, $force_cache, $stability);
+		}
+
+		$meta = $md_manager->get_metadata('all');
+
+		if (!isset($meta['extra']['version-check']))
+		{
+			throw new \phpbb\exception\runtime_exception('NO_VERSIONCHECK');
+		}
+
+		$version_check = $meta['extra']['version-check'];
+
+		$version_helper = new \phpbb\version_helper(objects::$cache, objects::$config, new \phpbb\file_downloader());
+		$version_helper->set_current_version($meta['version']);
+		$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($stability);
+
+		return $this->get_ext_update_on_branch($version_helper, $meta['version'], $force_update, $force_cache);
 	}
 }