Repair tests for 4.0 in FileListValidator

Author: Crizz0

src/Phpbb/TranslationValidator/Command/DownloadCommand.php

@@ -31,9 +31,8 @@ protected function configure()
 			->setName('download')
 			->setDescription('If you are missing important files, this tool can automatically download them for you.')
 			->addOption('files', null, InputOption::VALUE_REQUIRED, 'Which files do you want to download?', 'phpbb-extensions/viglink')
-			->addOption('phpbb-version', null, InputOption::VALUE_OPTIONAL, 'The phpBB version you use to validate against', '3.3');
+			->addOption('phpbb-version', null, InputOption::VALUE_OPTIONAL, 'The phpBB version you use to validate against', '4.0');
 	}
-
 	protected function execute(InputInterface $input, OutputInterface $output)
 	{
 		$files = $input->getOption('files');

src/Phpbb/TranslationValidator/Validator/FileListValidator.php

@@ -194,10 +194,6 @@ public function validate()
 					{
 						$level = Output::NOTICE;
 					}
-					else if ($this->phpbbVersion === '3.2' && strpos($origin_file, 'styles/subsilver2/') === 0)
-					{
-						$level = Output::FATAL;
-					}
 					else if (in_array(substr($origin_file, -4), array('.gif', '.png')) && $this->direction === 'rtl')
 					{
 						$level = Output::WARNING;

src/Phpbb/TranslationValidator/Validator/LangKeyValidator.php

@@ -619,10 +619,7 @@ public function validateHtml($file, $key, $sourceString, $originString)
 			'SUPPORT_BODY',
 			'UPDATE_INSTALLATION_EXPLAIN',
 			'OVERVIEW_BODY',
-		)) || ($this->phpbbVersion == '3.2' && ($this->originLanguagePath . 'ucp.php' === $file && in_array($key, array( //Check for 3.2
-			'TERMS_OF_USE_CONTENT',
-			'PRIVACY_POLICY',
-		)))))
+		)))
 		{
 			$sourceString = '<p>' . $sourceString . '</p>';
 			$originString = '<p>' . $originString . '</p>';
@@ -729,11 +726,6 @@ public function validateHtml($file, $key, $sourceString, $originString)
 					}
 				}
 
-				if ($this->originLanguagePath . 'ucp.php' === $file && in_array($key, array('TERMS_OF_USE_CONTENT', 'PRIVACY_POLICY')) && ($this->phpbbVersion != '3.2'))
-				{
-					$level = Output::ERROR;
-				}
-
 				$this->output->addMessage($level, 'String is using additional html: ' . $possibleHtml, $file, $key);
 			}
 		}

tests/FileListValidator/FileListTest.php

@@ -26,7 +26,7 @@ public function validateFileListData()
 	{
 		return array(
 			array(
-				'3.2',
+				'4.0',
 				array(
 					Output::FATAL . '-Missing required file-missing.php-',
 					Output::FATAL . '-Missing required file-missing.txt-',