Merge pull request #34 from Crizz0/validator-update-for-3.2.x

Release 1.3.10
phpbb · Jan 4, 2017 · dee7d51 · dee7d51
2 parents 4a85e75 + 0fca72f
commit dee7d51
Show file tree

Hide file tree

Showing 62 changed files with 32 additions and 10 deletions.
diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
 	"name": "phpbb/translation-validator",
 	"description": "A language package validator for phpBB language packs. Language packs are required to pass the validator when submitted to the language pack database.",
 	"homepage": "https://github.com/phpbb/phpbb-translation-validator",
-	"version": "1.3.9",
+	"version": "1.3.10",
 	"license": "GPL-2.0",
 	"authors": [
 		{

diff --git a/src/Phpbb/TranslationValidator/Tests/FileListValidator/FileListTest.php b/src/Phpbb/TranslationValidator/Tests/FileListValidator/FileListTest.php
@@ -20,8 +20,6 @@ public function setUp()
 		parent::setUp();
 
 		$this->validator = new \Phpbb\TranslationValidator\Validator\FileListValidator($this->getMock('Symfony\Component\Console\Input\InputInterface'), $this->output);
-		$this->validator->setOrigin('origin', dirname(__FILE__) . '/fixtures/origin', 'language/origin/')
-			->setSource('source', dirname(__FILE__) . '/fixtures/source', 'language/source/');
 	}
 
 	public function validateFileListData()
@@ -39,11 +37,10 @@ public function validateFileListData()
 					Output::FATAL . '-Found additional file-subdir/additional.php-',
 					Output::FATAL . '-Found additional file-additional.txt-',
 
-					Output::ERROR . '-Found additional file-language/origin/AUTHORS.md-',
-					Output::ERROR . '-Found additional file-language/origin/CHANGELOG.md-',
-					Output::ERROR . '-Found additional file-language/origin/README.md-',
-					Output::ERROR . '-Found additional file-language/origin/VERSION.md-',
-
+					Output::NOTICE . '-Found additional file-language/origin/AUTHORS.md-',
+					Output::NOTICE . '-Found additional file-language/origin/CHANGELOG.md-',
+					Output::NOTICE . '-Found additional file-language/origin/README.md-',
+					Output::NOTICE . '-Found additional file-language/origin/VERSION.md-',
 					Output::NOTICE . '-Found additional file-language/origin/AUTHORS-',
 					Output::NOTICE . '-Found additional file-language/origin/CHANGELOG-',
 					Output::NOTICE . '-Found additional file-language/origin/README-',
@@ -75,6 +72,28 @@ public function validateFileListData()
 					Output::NOTICE . '-Found additional file-language/origin/index.htm-',
 				),
 			),
+			array(
+				'3.2',
+				array(
+					Output::FATAL . '-Missing required file-missing.php-',
+					Output::FATAL . '-Missing required file-missing.txt-',
+					Output::FATAL . '-Missing required file-subdir/missing.php-',
+					Output::FATAL . '-Missing required file-language/origin/LICENSE-',
+					Output::FATAL . '-Found additional file-additional.php-',
+					Output::FATAL . '-Found additional file-subdir/additional.php-',
+					Output::FATAL . '-Found additional file-additional.txt-',
+					Output::FATAL . '-Found additional file-language/origin/AUTHORS-',
+					Output::FATAL . '-Found additional file-language/origin/CHANGELOG-',
+					Output::FATAL . '-Found additional file-language/origin/README-',
+					Output::FATAL . '-Found additional file-language/origin/VERSION-',
+
+					Output::NOTICE . '-Found additional file-language/origin/AUTHORS.md-',
+					Output::NOTICE . '-Found additional file-language/origin/CHANGELOG.md-',
+					Output::NOTICE . '-Found additional file-language/origin/README.md-',
+					Output::NOTICE . '-Found additional file-language/origin/VERSION.md-',
+					Output::NOTICE . '-Found additional file-language/origin/index.htm-',
+				),
+			),
 		);
 	}
 
@@ -83,6 +102,9 @@ public function validateFileListData()
 	*/
 	public function testValidateFileList($phpbbVersion, $expected)
 	{
+		$this->validator->setOrigin('origin', dirname(__FILE__) . '/fixtures/'. $phpbbVersion . '/origin', 'language/origin/')
+			->setSource('source', dirname(__FILE__) . '/fixtures/'. $phpbbVersion . '/source', 'language/source/');
+
 		$this->validator
 			->setPhpbbVersion($phpbbVersion)
 			->validate();

diff --git a/...tValidator/fixtures/origin/additional.php → ...idator/fixtures/3.0/origin/additional.php b/...tValidator/fixtures/origin/additional.php → ...idator/fixtures/3.0/origin/additional.php
diff --git a/...tValidator/fixtures/origin/additional.txt → ...idator/fixtures/3.0/origin/additional.txt b/...tValidator/fixtures/origin/additional.txt → ...idator/fixtures/3.0/origin/additional.txt
diff --git a/...ileListValidator/fixtures/origin/file.php → ...istValidator/fixtures/3.0/origin/file.php b/...ileListValidator/fixtures/origin/file.php → ...istValidator/fixtures/3.0/origin/file.php
diff --git a/...r/fixtures/origin/language/origin/AUTHORS → ...xtures/3.0/origin/language/origin/AUTHORS b/...r/fixtures/origin/language/origin/AUTHORS → ...xtures/3.0/origin/language/origin/AUTHORS
diff --git a/...ixtures/origin/language/origin/AUTHORS.md → ...res/3.0/origin/language/origin/AUTHORS.md b/...ixtures/origin/language/origin/AUTHORS.md → ...res/3.0/origin/language/origin/AUTHORS.md
diff --git a/...fixtures/origin/language/origin/CHANGELOG → ...ures/3.0/origin/language/origin/CHANGELOG b/...fixtures/origin/language/origin/CHANGELOG → ...ures/3.0/origin/language/origin/CHANGELOG
diff --git a/...tures/origin/language/origin/CHANGELOG.md → ...s/3.0/origin/language/origin/CHANGELOG.md b/...tures/origin/language/origin/CHANGELOG.md → ...s/3.0/origin/language/origin/CHANGELOG.md
diff --git a/...or/fixtures/origin/language/origin/README → ...ixtures/3.0/origin/language/origin/README b/...or/fixtures/origin/language/origin/README → ...ixtures/3.0/origin/language/origin/README
diff --git a/...fixtures/origin/language/origin/README.md → ...ures/3.0/origin/language/origin/README.md b/...fixtures/origin/language/origin/README.md → ...ures/3.0/origin/language/origin/README.md
diff --git a/...r/fixtures/origin/language/origin/VERSION → ...xtures/3.0/origin/language/origin/VERSION b/...r/fixtures/origin/language/origin/VERSION → ...xtures/3.0/origin/language/origin/VERSION
diff --git a/...ixtures/origin/language/origin/VERSION.md → ...res/3.0/origin/language/origin/VERSION.md b/...ixtures/origin/language/origin/VERSION.md → ...res/3.0/origin/language/origin/VERSION.md
diff --git a/...fixtures/origin/language/origin/index.htm → ...ures/3.0/origin/language/origin/index.htm b/...fixtures/origin/language/origin/index.htm → ...ures/3.0/origin/language/origin/index.htm
diff --git a/...tor/fixtures/origin/subdir/additional.php → ...fixtures/3.0/origin/subdir/additional.php b/...tor/fixtures/origin/subdir/additional.php → ...fixtures/3.0/origin/subdir/additional.php
diff --git a/...Validator/fixtures/origin/subdir/file.php → ...dator/fixtures/3.0/origin/subdir/file.php b/...Validator/fixtures/origin/subdir/file.php → ...dator/fixtures/3.0/origin/subdir/file.php
diff --git a/...ileListValidator/fixtures/source/file.php → ...istValidator/fixtures/3.0/source/file.php b/...ileListValidator/fixtures/source/file.php → ...istValidator/fixtures/3.0/source/file.php
diff --git a/...ListValidator/fixtures/source/missing.php → ...Validator/fixtures/3.0/source/missing.php b/...ListValidator/fixtures/source/missing.php → ...Validator/fixtures/3.0/source/missing.php
diff --git a/...ListValidator/fixtures/source/missing.txt → ...Validator/fixtures/3.0/source/missing.txt b/...ListValidator/fixtures/source/missing.txt → ...Validator/fixtures/3.0/source/missing.txt
diff --git a/.../source/styles/subsilver2/nosubsilver.txt → .../source/styles/subsilver2/nosubsilver.txt b/.../source/styles/subsilver2/nosubsilver.txt → .../source/styles/subsilver2/nosubsilver.txt
diff --git a/...Validator/fixtures/source/subdir/file.php → ...dator/fixtures/3.0/source/subdir/file.php b/...Validator/fixtures/source/subdir/file.php → ...dator/fixtures/3.0/source/subdir/file.php
diff --git a/...idator/fixtures/source/subdir/missing.php → ...or/fixtures/3.0/source/subdir/missing.php b/...idator/fixtures/source/subdir/missing.php → ...or/fixtures/3.0/source/subdir/missing.php
diff --git a/src/Phpbb/TranslationValidator/Tests/FileListValidator/fixtures/3.1/origin/additional.php b/src/Phpbb/TranslationValidator/Tests/FileListValidator/fixtures/3.1/origin/additional.php
diff --git a/src/Phpbb/TranslationValidator/Tests/FileListValidator/fixtures/3.1/origin/additional.txt b/src/Phpbb/TranslationValidator/Tests/FileListValidator/fixtures/3.1/origin/additional.txt
diff --git a/src/Phpbb/TranslationValidator/Tests/FileListValidator/fixtures/3.1/origin/file.php b/src/Phpbb/TranslationValidator/Tests/FileListValidator/fixtures/3.1/origin/file.php
diff --git a/.../TranslationValidator/Tests/FileListValidator/fixtures/3.1/origin/language/origin/AUTHORS b/.../TranslationValidator/Tests/FileListValidator/fixtures/3.1/origin/language/origin/AUTHORS
diff --git a/...alidator/Tests/FileListValidator/fixtures/3.1/origin/language/origin/AUTHORS.md b/...alidator/Tests/FileListValidator/fixtures/3.1/origin/language/origin/AUTHORS.md
diff --git a/...ranslationValidator/Tests/FileListValidator/fixtures/3.1/origin/language/origin/CHANGELOG b/...ranslationValidator/Tests/FileListValidator/fixtures/3.1/origin/language/origin/CHANGELOG
diff --git a/...idator/Tests/FileListValidator/fixtures/3.1/origin/language/origin/CHANGELOG.md b/...idator/Tests/FileListValidator/fixtures/3.1/origin/language/origin/CHANGELOG.md
diff --git a/...b/TranslationValidator/Tests/FileListValidator/fixtures/3.1/origin/language/origin/README b/...b/TranslationValidator/Tests/FileListValidator/fixtures/3.1/origin/language/origin/README
diff --git a/...Validator/Tests/FileListValidator/fixtures/3.1/origin/language/origin/README.md b/...Validator/Tests/FileListValidator/fixtures/3.1/origin/language/origin/README.md
diff --git a/.../TranslationValidator/Tests/FileListValidator/fixtures/3.1/origin/language/origin/VERSION b/.../TranslationValidator/Tests/FileListValidator/fixtures/3.1/origin/language/origin/VERSION
diff --git a/...alidator/Tests/FileListValidator/fixtures/3.1/origin/language/origin/VERSION.md b/...alidator/Tests/FileListValidator/fixtures/3.1/origin/language/origin/VERSION.md
diff --git a/...ranslationValidator/Tests/FileListValidator/fixtures/3.1/origin/language/origin/index.htm b/...ranslationValidator/Tests/FileListValidator/fixtures/3.1/origin/language/origin/index.htm
diff --git a/...bb/TranslationValidator/Tests/FileListValidator/fixtures/3.1/origin/subdir/additional.php b/...bb/TranslationValidator/Tests/FileListValidator/fixtures/3.1/origin/subdir/additional.php
diff --git a/src/Phpbb/TranslationValidator/Tests/FileListValidator/fixtures/3.1/origin/subdir/file.php b/src/Phpbb/TranslationValidator/Tests/FileListValidator/fixtures/3.1/origin/subdir/file.php
diff --git a/src/Phpbb/TranslationValidator/Tests/FileListValidator/fixtures/3.1/source/file.php b/src/Phpbb/TranslationValidator/Tests/FileListValidator/fixtures/3.1/source/file.php
diff --git a/src/Phpbb/TranslationValidator/Tests/FileListValidator/fixtures/3.1/source/missing.php b/src/Phpbb/TranslationValidator/Tests/FileListValidator/fixtures/3.1/source/missing.php
diff --git a/src/Phpbb/TranslationValidator/Tests/FileListValidator/fixtures/3.1/source/missing.txt b/src/Phpbb/TranslationValidator/Tests/FileListValidator/fixtures/3.1/source/missing.txt
diff --git a/...onValidator/Tests/FileListValidator/fixtures/3.1/source/styles/subsilver2/nosubsilver.txt b/...onValidator/Tests/FileListValidator/fixtures/3.1/source/styles/subsilver2/nosubsilver.txt
diff --git a/src/Phpbb/TranslationValidator/Tests/FileListValidator/fixtures/3.1/source/subdir/file.php b/src/Phpbb/TranslationValidator/Tests/FileListValidator/fixtures/3.1/source/subdir/file.php
diff --git a/...Phpbb/TranslationValidator/Tests/FileListValidator/fixtures/3.1/source/subdir/missing.php b/...Phpbb/TranslationValidator/Tests/FileListValidator/fixtures/3.1/source/subdir/missing.php
diff --git a/src/Phpbb/TranslationValidator/Tests/FileListValidator/fixtures/3.2/origin/additional.php b/src/Phpbb/TranslationValidator/Tests/FileListValidator/fixtures/3.2/origin/additional.php
diff --git a/src/Phpbb/TranslationValidator/Tests/FileListValidator/fixtures/3.2/origin/additional.txt b/src/Phpbb/TranslationValidator/Tests/FileListValidator/fixtures/3.2/origin/additional.txt
diff --git a/src/Phpbb/TranslationValidator/Tests/FileListValidator/fixtures/3.2/origin/file.php b/src/Phpbb/TranslationValidator/Tests/FileListValidator/fixtures/3.2/origin/file.php
diff --git a/.../TranslationValidator/Tests/FileListValidator/fixtures/3.2/origin/language/origin/AUTHORS b/.../TranslationValidator/Tests/FileListValidator/fixtures/3.2/origin/language/origin/AUTHORS
diff --git a/...alidator/Tests/FileListValidator/fixtures/3.2/origin/language/origin/AUTHORS.md b/...alidator/Tests/FileListValidator/fixtures/3.2/origin/language/origin/AUTHORS.md
diff --git a/...ranslationValidator/Tests/FileListValidator/fixtures/3.2/origin/language/origin/CHANGELOG b/...ranslationValidator/Tests/FileListValidator/fixtures/3.2/origin/language/origin/CHANGELOG
diff --git a/...idator/Tests/FileListValidator/fixtures/3.2/origin/language/origin/CHANGELOG.md b/...idator/Tests/FileListValidator/fixtures/3.2/origin/language/origin/CHANGELOG.md
diff --git a/...b/TranslationValidator/Tests/FileListValidator/fixtures/3.2/origin/language/origin/README b/...b/TranslationValidator/Tests/FileListValidator/fixtures/3.2/origin/language/origin/README
diff --git a/...Validator/Tests/FileListValidator/fixtures/3.2/origin/language/origin/README.md b/...Validator/Tests/FileListValidator/fixtures/3.2/origin/language/origin/README.md
diff --git a/.../TranslationValidator/Tests/FileListValidator/fixtures/3.2/origin/language/origin/VERSION b/.../TranslationValidator/Tests/FileListValidator/fixtures/3.2/origin/language/origin/VERSION
diff --git a/...alidator/Tests/FileListValidator/fixtures/3.2/origin/language/origin/VERSION.md b/...alidator/Tests/FileListValidator/fixtures/3.2/origin/language/origin/VERSION.md
diff --git a/...ranslationValidator/Tests/FileListValidator/fixtures/3.2/origin/language/origin/index.htm b/...ranslationValidator/Tests/FileListValidator/fixtures/3.2/origin/language/origin/index.htm
diff --git a/...bb/TranslationValidator/Tests/FileListValidator/fixtures/3.2/origin/subdir/additional.php b/...bb/TranslationValidator/Tests/FileListValidator/fixtures/3.2/origin/subdir/additional.php
diff --git a/src/Phpbb/TranslationValidator/Tests/FileListValidator/fixtures/3.2/origin/subdir/file.php b/src/Phpbb/TranslationValidator/Tests/FileListValidator/fixtures/3.2/origin/subdir/file.php
diff --git a/src/Phpbb/TranslationValidator/Tests/FileListValidator/fixtures/3.2/source/file.php b/src/Phpbb/TranslationValidator/Tests/FileListValidator/fixtures/3.2/source/file.php
diff --git a/src/Phpbb/TranslationValidator/Tests/FileListValidator/fixtures/3.2/source/missing.php b/src/Phpbb/TranslationValidator/Tests/FileListValidator/fixtures/3.2/source/missing.php
diff --git a/src/Phpbb/TranslationValidator/Tests/FileListValidator/fixtures/3.2/source/missing.txt b/src/Phpbb/TranslationValidator/Tests/FileListValidator/fixtures/3.2/source/missing.txt
diff --git a/src/Phpbb/TranslationValidator/Tests/FileListValidator/fixtures/3.2/source/subdir/file.php b/src/Phpbb/TranslationValidator/Tests/FileListValidator/fixtures/3.2/source/subdir/file.php
diff --git a/...Phpbb/TranslationValidator/Tests/FileListValidator/fixtures/3.2/source/subdir/missing.php b/...Phpbb/TranslationValidator/Tests/FileListValidator/fixtures/3.2/source/subdir/missing.php
diff --git a/src/Phpbb/TranslationValidator/Validator/FileListValidator.php b/src/Phpbb/TranslationValidator/Validator/FileListValidator.php
@@ -167,7 +167,7 @@ public function validate()
 			$testSourceFile = str_replace('/' . $this->originIso . '/', '/' . $this->sourceIso . '/', $origin_file);
 			if (!in_array($testSourceFile, $sourceFiles))
 			{
-				if (in_array($origin_file, array(
+				if (($this->phpbbVersion == '3.0' || $this->phpbbVersion == '3.1') && in_array($origin_file, array(
 					$this->originLanguagePath . 'AUTHORS',
 					$this->originLanguagePath . 'CHANGELOG',
 					$this->originLanguagePath . 'README',
@@ -176,7 +176,7 @@ public function validate()
 				{
 					$this->output->addMessage(Output::NOTICE, 'Found additional file', $origin_file);
 				}
-				else if ($this->phpbbVersion == '3.1' && in_array($origin_file, array(
+				else if (in_array($origin_file, array(
 					$this->originLanguagePath . 'AUTHORS.md',
 					$this->originLanguagePath . 'CHANGELOG.md',
 					$this->originLanguagePath . 'README.md',