Change plural-rule guessing to composer.json

Author: Crizz0

README.md

@@ -19,11 +19,11 @@ For the easiest results, create a directory called `4.0` in the root of the Tran
     phpbb-translation-validator/4.0/de/
     phpbb-translation-validator/translation.php
 
-The simplest way to validate is to then run this command (the final argument is the language you wish to test and that has already been uploaded to the `3.2` directory; eg. `fr` for French):
+The simplest way to validate is to then run this command (the final argument is the language you wish to test and that has already been uploaded to the `4.0` directory; eg. `fr` for French):
 
      php translation.php validate fr
 
-There are more arguments that can be supplied. For example, suppose you wanted to have your `3.2` directory in a different location, you wanted to explicitly specify phpBB version 3.2 (default validation is against 3.3), you wanted to run in safe mode and you wanted to see all notices displayed - you would run this command:
+There are more arguments that can be supplied. For example, suppose you wanted to have your `4.x` directory in a different location, you wanted to explicitly specify phpBB version 4.x (default validation is against 4.0), you wanted to run in safe mode and you wanted to see all notices displayed - you would run this command:
 
      php translation.php validate fr 
         --package-dir=/path/to/your/4.0 

src/Phpbb/TranslationValidator/Validator/ValidatorRunner.php

@@ -228,36 +228,31 @@ protected function printErrorLevel(Output $output)
 	}
 
 	/**
-	 * Try to find the plural rule for the language
+	 * Try to find the plural rule for the language in composer.json
 	 * @return int
 	 */
-	protected function guessPluralRule()
+	protected function guessPluralRule(): int
 	{
-		$filePath = $this->originPath . '/' . $this->originLanguagePath . 'common.php';
+		// TODO: Check for safeMode and langParser integration here in that function
+        $filePath = $this->originPath . '/' . $this->originLanguagePath . 'composer.json';
 
-		if (file_exists($filePath))
-		{
-			if ($this->safeMode)
-			{
-				$lang = self::langParser($filePath);
-			}
-
-			else
-			{
-				include($filePath);
-			}
-
-			if (!isset($lang['PLURAL_RULE']))
-			{
-				$this->output->writelnIfDebug("<info>No plural rule set, falling back to plural rule #1</info>");
-			}
-		}
+        if (file_exists($filePath))
+        {
+
+            $fileContents = (string) file_get_contents($filePath);
+            $jsonContent = json_decode($fileContents, true);
+
+            if (!isset($jsonContent['extra']['plural-rule']))
+            {
+                $this->output->writelnIfDebug("<info>No plural rule set, falling back to plural rule #1</info>");
+            }
+        }
 		else
 		{
-			$this->output->writelnIfDebug("<info>Could not find common.php, falling back to plural rule #1</info>");
+			$this->output->writelnIfDebug("<info>Could not find composer.json, falling back to plural rule #1</info>");
 		}
 
-		return isset($lang['PLURAL_RULE']) ? $lang['PLURAL_RULE'] : 1;
+		return $jsonContent['extra']['plural-rule'] ?? 1;
 	}
 
 	/**
@@ -278,7 +273,7 @@ public static function arrayParser($file)
 	 * @param string $relativePath
 	 * @return array
 	 */
-	public static function langParser($filePath, $relativePath = '')
+	public static function langParser($filePath, string $relativePath = '')
 	{
 		$lang = [];
 		$parsed = self::arrayParser($relativePath . $filePath);

translation.php

@@ -8,7 +8,7 @@
  *
  */
 
-const TRANSLATION_VALIDATOR_VERSION = '1.6.0';
+const TRANSLATION_VALIDATOR_VERSION = '2.0.0-dev';
 
 require 'vendor/autoload.php';