Try removing unused code again and improve tests

Author: iMattPro

helper/packager.php

@@ -116,16 +116,14 @@ public function create_extension($data)
 		$filesystem->remove($this->root_path . 'store/tmp-ext');
 		$filesystem->mkdir($ext_path);
 
-		$phpbb_31 = (bool) preg_match('/^\D*3\.1.*$/', $data['requirements']['phpbb_version_min']);
-
 		$template = $this->get_template_engine();
 		$template->set_custom_style('skeletonextension', $this->root_path . 'ext/phpbb/skeleton/skeleton');
 		$template->assign_vars([
 			'COMPONENT'    => $data['components'],
 			'EXTENSION'    => $data['extension'],
 			'REQUIREMENTS' => $data['requirements'],
 			'AUTHORS'      => $data['authors'],
-			'LANGUAGE'     => $this->get_language_version_data($phpbb_31),
+			'LANGUAGE'     => $this->get_language_version_data($data),
 		]);
 
 		$component_data = $this->get_component_dialog_values();
@@ -239,12 +237,18 @@ protected function get_template_engine()
 	 * Get an array of language class and methods depending on 3.1 or 3.2
 	 * compatibility, for use in the skeleton twig templates.
 	 *
-	 * @param bool $phpbb_31 Is phpBB 3.1 support requested?
+	 * @param array $data Extension data
 	 *
 	 * @return array An array of language data
 	 */
-	protected function get_language_version_data($phpbb_31)
+	protected function get_language_version_data($data)
 	{
+		$phpbb_31 = false;
+		if (isset($data['requirements']['phpbb_version_min']))
+		{
+			$phpbb_31 = (bool) preg_match('/^\D*3\.1.*$/', $data['requirements']['phpbb_version_min']);
+		}
+
 		return [
 			'class'		=> $phpbb_31 ? '\phpbb\user' : '\phpbb\language\language',
 			'object'	=> $phpbb_31 ? 'user' : 'language',

tests/helper/packager_test.php

@@ -132,12 +132,66 @@ public function test_create_zip_creates_zip_file()
 		// Clean up or further assertions here
 	}
 
-	public function test_get_language_version_data_returns_expected()
+	/**
+	 * @dataProvider provide_language_version_data
+	 */
+	public function test_get_language_version_data_returns_expected($phpbb_version, $expected)
 	{
-		$data_31 = $this->invokeMethod($this->packager, 'get_language_version_data', [true]);
-		$data_32 = $this->invokeMethod($this->packager, 'get_language_version_data', [false]);
-		$this->assertArrayHasKey('class', $data_31);
-		$this->assertArrayHasKey('class', $data_32);
+		$data = [
+			'requirements' => [
+				'phpbb_version_min' => $phpbb_version
+			]
+		];
+
+		$result = $this->invokeMethod($this->packager, 'get_language_version_data', [$data]);
+
+		$this->assertSame($expected['class'], $result['class']);
+		$this->assertSame($expected['object'], $result['object']);
+		$this->assertSame($expected['function'], $result['function']);
+		$this->assertSame($expected['indent']['class'], $result['indent']['class']);
+		$this->assertSame($expected['indent']['object'], $result['indent']['object']);
+	}
+
+	public function provide_language_version_data()
+	{
+		return [
+			'3.1 version' => [
+				'3.1.0',
+				[
+					'class' => '\phpbb\user',
+					'object' => 'user',
+					'function' => 'add_lang_ext',
+					'indent' => [
+						'class' => "\t\t\t",
+						'object' => "\t"
+					]
+				]
+			],
+			'3.2 version' => [
+				'3.2.0',
+				[
+					'class' => '\phpbb\language\language',
+					'object' => 'language',
+					'function' => 'add_lang',
+					'indent' => [
+						'class' => '',
+						'object' => ''
+					]
+				]
+			],
+			'null version' => [
+				null,
+				[
+					'class' => '\phpbb\language\language',
+					'object' => 'language',
+					'function' => 'add_lang',
+					'indent' => [
+						'class' => '',
+						'object' => ''
+					]
+				]
+			]
+		];
 	}
 
 	public function test_get_template_engine_returns_twig_instance()