Chech submission branch too if writing comp-installers

Author: iMattPro

contribution/extension/type.php

@@ -280,7 +280,7 @@ protected function repack(package $package, \titania_contribution $contrib, \tit
 
 		$ext_name = $data['name'];
 		$data['type'] = 'phpbb-extension';
-		$data = $this->update_phpbb_requirement($data);
+		$data = $this->update_phpbb_requirement($data, $revision);
 		$data = $this->set_version_check($data, $contrib);
 
 		$data = json_encode(
@@ -352,9 +352,10 @@ protected function set_version_check(array $data, \titania_contribution $contrib
 	 * Updates phpBB requirements in composer.json
 	 *
 	 * @param array $data composer.json data
+	 * @param \titania_revision $revision
 	 * @return array Returns $data array with phpBB requirement updated
 	 */
-	protected function update_phpbb_requirement(array $data)
+	protected function update_phpbb_requirement(array $data, \titania_revision $revision)
 	{
 		if (!isset($data['require']['phpbb/phpbb']))
 		{
@@ -374,7 +375,7 @@ protected function update_phpbb_requirement(array $data)
 		if (!isset($data['require']['composer/installers']))
 		{
 			$installers_version = '~1.0';
-			if (isset($data['require']['phpbb/phpbb']) && $this->requires_phpbb_4_or_higher($data['require']['phpbb/phpbb']))
+			if ($this->is_phpbb_4_branch($revision) || (isset($data['require']['phpbb/phpbb']) && $this->requires_phpbb_4($data['require']['phpbb/phpbb'])))
 			{
 				$installers_version = '^1.0 || ^2.0';
 			}
@@ -401,7 +402,7 @@ protected function is_stable_version($version)
 	 * @param string $constraint Version constraint
 	 * @return bool True if constraint requires phpBB 4.0.0+
 	 */
-	protected function requires_phpbb_4_or_higher($constraint)
+	protected function requires_phpbb_4($constraint)
 	{
 		try
 		{
@@ -418,6 +419,17 @@ protected function requires_phpbb_4_or_higher($constraint)
 		}
 	}
 
+	/**
+	 * Check if revision is submitted to phpBB 4.0+ branch
+	 *
+	 * @param \titania_revision $revision
+	 * @return bool True if submitted to phpBB 4.0+ branch
+	 */
+	protected function is_phpbb_4_branch(\titania_revision $revision)
+	{
+		return max(array_column($revision->phpbb_versions, 'phpbb_version_branch')) >= 40;
+	}
+
 	/**
 	 * Get prevalidator
 	 *