Merge pull request #28 from nickv-phpbb/add-3.2-support

Add support for phpBB 3.2

Author: nickvergessen

src/Phpbb/TranslationValidator/Command/ValidateCommand.php

@@ -25,7 +25,7 @@ protected function configure()
 			->setName('validate')
 			->setDescription('Run the validator on your language pack.')
 			->addArgument('origin-iso', InputArgument::REQUIRED, 'The ISO of the language to validate')
-			->addOption('phpbb-version', null, InputOption::VALUE_OPTIONAL, 'The phpBB Version to validate against (3.0|3.1)', '3.0')
+			->addOption('phpbb-version', null, InputOption::VALUE_OPTIONAL, 'The phpBB Version to validate against (3.0|3.1|3.2)', '3.1')
 			->addOption('source-iso', null, InputOption::VALUE_OPTIONAL, 'The ISO of the language to validate against', 'en')
 			->addOption('package-dir', null, InputOption::VALUE_OPTIONAL, 'The path to the directory with the language packages', null)
 			->addOption('language-dir', null, InputOption::VALUE_OPTIONAL, 'The path to the directory with the language folders', null)
@@ -50,9 +50,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
 		$debug = $input->getOption('debug');
 		$displayNotices = $input->getOption('display-notices');
 
-		if (!in_array($phpbbVersion, array('3.0', '3.1')))
+		if (!in_array($phpbbVersion, array('3.0', '3.1', '3.2')))
 		{
-			throw new \RuntimeException('Invalid phpbb-version, allowed versions: 3.0 and 3.1');
+			throw new \RuntimeException('Invalid phpbb-version, allowed versions: 3.0, 3.1 and 3.2');
 		}
 
 		$output = new Output($output, $debug);

src/Phpbb/TranslationValidator/Validator/FileListValidator.php

@@ -83,7 +83,7 @@ public function setSource($sourceIso, $sourcePath, $sourceLanguagePath)
 	/**
 	 * Set phpBB Version
 	 *
-	 * @param string $phpbbVersion	The phpBB Version to validate against (3.0|3.1)
+	 * @param string $phpbbVersion	The phpBB Version to validate against (3.0|3.1|3.2)
 	 * @return $this
 	 */
 	public function setPhpbbVersion($phpbbVersion)
@@ -191,6 +191,10 @@ public function validate()
 					{
 						$level = Output::NOTICE;
 					}
+					else if ($this->phpbbVersion === '3.2' && strpos($origin_file, 'styles/subsilver2/') === 0)
+					{
+						$level = Output::FATAL;
+					}
 					else
 					{
 						$level = (substr($origin_file, -3) !== '.md') ? Output::FATAL : Output::ERROR;

src/Phpbb/TranslationValidator/Validator/FileValidator.php

@@ -86,7 +86,7 @@ public function setSource($sourceIso, $sourcePath, $sourceLanguagePath)
 	/**
 	 * Set phpBB Version
 	 *
-	 * @param string $phpbbVersion	The phpBB Version to validate against (3.0|3.1)
+	 * @param string $phpbbVersion	The phpBB Version to validate against (3.0|3.1|3.2)
 	 * @return $this
 	 */
 	public function setPhpbbVersion($phpbbVersion)
@@ -171,7 +171,7 @@ public function validate($sourceFile, $originFile)
 		{
 			$this->validateIsoFile($originFile);
 		}
-		else if ($this->phpbbVersion == '3.1' && substr($originFile, -4) === '.css')
+		else if ($this->phpbbVersion !== '3.0' && substr($originFile, -4) === '.css')
 		{
 			$this->validateUtf8withoutbom($originFile);
 			$this->validateCSSFile($sourceFile, $originFile);
@@ -338,7 +338,7 @@ public function validateEmail($sourceFile, $originFile)
 		// Check for new liens at the end of the file
 		if (end($originContent) !== '')
 		{
-			$level = ($this->phpbbVersion == '3.1') ? Output::FATAL : Output::NOTICE;
+			$level = ($this->phpbbVersion !== '3.0') ? Output::FATAL : Output::NOTICE;
 			$this->output->addMessage($level, 'Missing new line at the end of the file', $originFile);
 		}
 	}
@@ -582,7 +582,7 @@ public function validateUtf8withoutbom($originFile)
 	 */
 	public function validateNoPhpClosingTag($originFile)
 	{
-		if ($this->phpbbVersion == '3.0')
+		if ($this->phpbbVersion === '3.0')
 		{
 			return;
 		}

src/Phpbb/TranslationValidator/Validator/LangKeyValidator.php

@@ -96,7 +96,7 @@ public function setSource($sourceIso, $sourcePath, $sourceLanguagePath)
 	/**
 	 * Set phpBB Version
 	 *
-	 * @param string $phpbbVersion	The phpBB Version to validate against (3.0|3.1)
+	 * @param string $phpbbVersion	The phpBB Version to validate against (3.0|3.1|3.2)
 	 * @return $this
 	 */
 	public function setPhpbbVersion($phpbbVersion)
@@ -575,7 +575,7 @@ public function validateString($file, $key, $against_language, $validate_languag
 			{
 				$level = Output::FATAL;
 				// phpBB 3.0 Plural workarounds
-				if ($this->phpbbVersion == '3.0' && abs($against_integers - $validate_integers) === 1 &&
+				if ($this->phpbbVersion === '3.0' && abs($against_integers - $validate_integers) === 1 &&
 					($this->originLanguagePath . 'common.php' === $file && $key === 'VIEW_ONLINE_TIME')
 				)
 				{

src/Phpbb/TranslationValidator/Validator/ValidatorRunner.php

@@ -97,7 +97,7 @@ public function setSource($sourceIso, $sourcePath, $sourceLanguagePath)
 	/**
 	 * Set phpBB Version
 	 *
-	 * @param string $phpbbVersion	The phpBB Version to validate against (3.0|3.1)
+	 * @param string $phpbbVersion	The phpBB Version to validate against (3.0|3.1|3.2)
 	 * @return $this
 	 */
 	public function setPhpbbVersion($phpbbVersion)