gravityview / GravityView

future/lib/class-gamajo-template-loader.php

Spacing +7 added lines, -7 removed lines

@@ -131,11 +131,11 @@ 
 		public function set_template_data( $data, $var_name = 'data' ) {
 			global $wp_query;
 
-			$wp_query->query_vars[ $var_name ] = (object) $data;
+			$wp_query->query_vars[ $var_name ] = (object)$data;
 
 			// Add $var_name to custom variable store if not default value.
 			if ( 'data' !== $var_name ) {
-				$this->template_data_var_names[] = $var_name;
+				$this->template_data_var_names[ ] = $var_name;
 			}
 
 			return $this;
@@ -178,9 +178,9 @@ 
 		protected function get_template_file_names( $slug, $name ) {
 			$templates = array();
 			if ( isset( $name ) ) {
-				$templates[] = $slug . '-' . $name . '.php';
+				$templates[ ] = $slug . '-' . $name . '.php';
 			}
-			$templates[] = $slug . '.php';
+			$templates[ ] = $slug . '.php';
 
 			/**
 			 * Allow template choices to be filtered.
@@ -226,7 +226,7 @@ 
 				$located = false;
 
 				// Remove empty entries.
-				$template_names = array_filter( (array) $template_names );
+				$template_names = array_filter( (array)$template_names );
 				$template_paths = $this->get_template_paths();
 
 				// Try to find a template file.
@@ -246,7 +246,7 @@ 
 				}
 
 				// The templates weren't found; don't look this up again.
-				if( ! $located ) {
+				if ( ! $located ) {
 					$template_path_cache[ $this->filter_prefix ][ $cache_key ] = false;
 				}
 			}
@@ -285,7 +285,7 @@ 
 
 			// Only add this conditionally, so non-child themes don't redundantly check active theme twice.
 			if ( get_stylesheet_directory() !== get_template_directory() ) {
-				$file_paths[1] = trailingslashit( get_stylesheet_directory() ) . $theme_directory;
+				$file_paths[ 1 ] = trailingslashit( get_stylesheet_directory() ) . $theme_directory;
 			}
 
 			/**

includes/extensions/lightbox/fancybox/class-gravityview-lightbox-provider-fancybox.php

Spacing +17 added lines, -17 removed lines

@@ -108,17 +108,17 @@ 
 	 */
 	public function allowed_atts( $atts = array() ) {
 
-		$atts['data-fancybox']         = null;
-		$atts['data-fancybox-trigger'] = null;
-		$atts['data-fancybox-index']   = null;
-		$atts['data-src']              = null;
-		$atts['data-type']             = null;
-		$atts['data-width']            = null;
-		$atts['data-height']           = null;
-		$atts['data-srcset']           = null;
-		$atts['data-caption']          = null;
-		$atts['data-options']          = null;
-		$atts['data-filter']           = null;
+		$atts[ 'data-fancybox' ]         = null;
+		$atts[ 'data-fancybox-trigger' ] = null;
+		$atts[ 'data-fancybox-index' ]   = null;
+		$atts[ 'data-src' ]              = null;
+		$atts[ 'data-type' ]             = null;
+		$atts[ 'data-width' ]            = null;
+		$atts[ 'data-height' ]           = null;
+		$atts[ 'data-srcset' ]           = null;
+		$atts[ 'data-caption' ]          = null;
+		$atts[ 'data-options' ]          = null;
+		$atts[ 'data-filter' ]           = null;
 
 		return $atts;
 	}
@@ -133,23 +133,23 @@ 
 		}
 
 		// Prevent empty content from getting added to the lightbox gallery
-		if ( is_array( $additional_details ) && empty( $additional_details['file_path'] ) ) {
+		if ( is_array( $additional_details ) && empty( $additional_details[ 'file_path' ] ) ) {
 			return $link_atts;
 		}
 
 		// Prevent empty content from getting added to the lightbox gallery
-		if ( is_array( $additional_details ) && ! empty( $additional_details['disable_lightbox'] ) ) {
+		if ( is_array( $additional_details ) && ! empty( $additional_details[ 'disable_lightbox' ] ) ) {
 			return $link_atts;
 		}
 
-		$link_atts['class'] = \GV\Utils::get( $link_atts, 'class' ) . ' gravityview-fancybox';
+		$link_atts[ 'class' ] = \GV\Utils::get( $link_atts, 'class' ) . ' gravityview-fancybox';
 
-		$link_atts['class'] = gravityview_sanitize_html_class( $link_atts['class'] );
+		$link_atts[ 'class' ] = gravityview_sanitize_html_class( $link_atts[ 'class' ] );
 
 		if ( $context && ! empty( $context->field->field ) ) {
 			if ( $context->field->field->multipleFiles ) {
 				$entry = $context->entry->as_entry();
-				$link_atts['data-fancybox'] = 'gallery-' . sprintf( "%s-%s-%s", $entry['form_id'], $context->field->ID, $context->entry->get_slug() );
+				$link_atts[ 'data-fancybox' ] = 'gallery-' . sprintf( "%s-%s-%s", $entry[ 'form_id' ], $context->field->ID, $context->entry->get_slug() );
 			}
 		}
 
@@ -160,7 +160,7 @@ 
 		 * @see https://fancyapps.com/docs/ui/fancybox#media-types
 		 */
 		if ( false !== strpos( $file_path, 'gv-iframe' ) ) {
-			$link_atts['data-type'] = 'pdf';
+			$link_atts[ 'data-type' ] = 'pdf';
 		}
 
 		return $link_atts;

vendor/gettext/languages/src/Language.php

Indentation +376 added lines, -376 removed lines

@@ -9,403 +9,403 @@
  */
 class Language
 {
-    /**
-     * The language ID.
-     *
-     * @var string
-     */
-    public $id;
+	/**
+	 * The language ID.
+	 *
+	 * @var string
+	 */
+	public $id;
 
-    /**
-     * The language name.
-     *
-     * @var string
-     */
-    public $name;
+	/**
+	 * The language name.
+	 *
+	 * @var string
+	 */
+	public $name;
 
-    /**
-     * If this language is deprecated: the gettext code of the new language.
-     *
-     * @var string|null
-     */
-    public $supersededBy;
+	/**
+	 * If this language is deprecated: the gettext code of the new language.
+	 *
+	 * @var string|null
+	 */
+	public $supersededBy;
 
-    /**
-     * The script name.
-     *
-     * @var string|null
-     */
-    public $script;
+	/**
+	 * The script name.
+	 *
+	 * @var string|null
+	 */
+	public $script;
 
-    /**
-     * The territory name.
-     *
-     * @var string|null
-     */
-    public $territory;
+	/**
+	 * The territory name.
+	 *
+	 * @var string|null
+	 */
+	public $territory;
 
-    /**
-     * The name of the base language.
-     *
-     * @var string|null
-     */
-    public $baseLanguage;
+	/**
+	 * The name of the base language.
+	 *
+	 * @var string|null
+	 */
+	public $baseLanguage;
 
-    /**
-     * The list of categories.
-     *
-     * @var \Gettext\Languages\Category[]
-     */
-    public $categories;
+	/**
+	 * The list of categories.
+	 *
+	 * @var \Gettext\Languages\Category[]
+	 */
+	public $categories;
 
-    /**
-     * The gettext formula to decide which category should be applied.
-     *
-     * @var string
-     */
-    public $formula;
+	/**
+	 * The gettext formula to decide which category should be applied.
+	 *
+	 * @var string
+	 */
+	public $formula;
 
-    /**
-     * Initialize the instance and parse the language code.
-     *
-     * @param array $info The result of CldrData::getLanguageInfo()
-     *
-     * @throws \Exception throws an Exception if $fullId is not valid
-     */
-    private function __construct($info)
-    {
-        $this->id = $info['id'];
-        $this->name = $info['name'];
-        $this->supersededBy = isset($info['supersededBy']) ? $info['supersededBy'] : null;
-        $this->script = isset($info['script']) ? $info['script'] : null;
-        $this->territory = isset($info['territory']) ? $info['territory'] : null;
-        $this->baseLanguage = isset($info['baseLanguage']) ? $info['baseLanguage'] : null;
-        // Let's build the category list
-        $this->categories = array();
-        foreach ($info['categories'] as $cldrCategoryId => $cldrFormulaAndExamples) {
-            $category = new Category($cldrCategoryId, $cldrFormulaAndExamples);
-            foreach ($this->categories as $c) {
-                if ($category->id === $c->id) {
-                    throw new Exception("The category '{$category->id}' is specified more than once");
-                }
-            }
-            $this->categories[] = $category;
-        }
-        if (empty($this->categories)) {
-            throw new Exception("The language '{$info['id']}' does not have any plural category");
-        }
-        // Let's sort the categories from 'zero' to 'other'
-        usort($this->categories, function (Category $category1, Category $category2) {
-            return array_search($category1->id, CldrData::$categories) - array_search($category2->id, CldrData::$categories);
-        });
-        // The 'other' category should always be there
-        if ($this->categories[count($this->categories) - 1]->id !== CldrData::OTHER_CATEGORY) {
-            throw new Exception("The language '{$info['id']}' does not have the '" . CldrData::OTHER_CATEGORY . "' plural category");
-        }
-        $this->checkAlwaysTrueCategories();
-        $this->checkAlwaysFalseCategories();
-        $this->checkAllCategoriesWithExamples();
-        $this->formula = $this->buildFormula();
-    }
+	/**
+	 * Initialize the instance and parse the language code.
+	 *
+	 * @param array $info The result of CldrData::getLanguageInfo()
+	 *
+	 * @throws \Exception throws an Exception if $fullId is not valid
+	 */
+	private function __construct($info)
+	{
+		$this->id = $info['id'];
+		$this->name = $info['name'];
+		$this->supersededBy = isset($info['supersededBy']) ? $info['supersededBy'] : null;
+		$this->script = isset($info['script']) ? $info['script'] : null;
+		$this->territory = isset($info['territory']) ? $info['territory'] : null;
+		$this->baseLanguage = isset($info['baseLanguage']) ? $info['baseLanguage'] : null;
+		// Let's build the category list
+		$this->categories = array();
+		foreach ($info['categories'] as $cldrCategoryId => $cldrFormulaAndExamples) {
+			$category = new Category($cldrCategoryId, $cldrFormulaAndExamples);
+			foreach ($this->categories as $c) {
+				if ($category->id === $c->id) {
+					throw new Exception("The category '{$category->id}' is specified more than once");
+				}
+			}
+			$this->categories[] = $category;
+		}
+		if (empty($this->categories)) {
+			throw new Exception("The language '{$info['id']}' does not have any plural category");
+		}
+		// Let's sort the categories from 'zero' to 'other'
+		usort($this->categories, function (Category $category1, Category $category2) {
+			return array_search($category1->id, CldrData::$categories) - array_search($category2->id, CldrData::$categories);
+		});
+		// The 'other' category should always be there
+		if ($this->categories[count($this->categories) - 1]->id !== CldrData::OTHER_CATEGORY) {
+			throw new Exception("The language '{$info['id']}' does not have the '" . CldrData::OTHER_CATEGORY . "' plural category");
+		}
+		$this->checkAlwaysTrueCategories();
+		$this->checkAlwaysFalseCategories();
+		$this->checkAllCategoriesWithExamples();
+		$this->formula = $this->buildFormula();
+	}
 
-    /**
-     * Return a list of all languages available.
-     *
-     * @throws \Exception
-     *
-     * @return \Gettext\Languages\Language[]
-     */
-    public static function getAll()
-    {
-        $result = array();
-        foreach (array_keys(CldrData::getLanguageNames()) as $cldrLanguageId) {
-            $result[] = new self(CldrData::getLanguageInfo($cldrLanguageId));
-        }
+	/**
+	 * Return a list of all languages available.
+	 *
+	 * @throws \Exception
+	 *
+	 * @return \Gettext\Languages\Language[]
+	 */
+	public static function getAll()
+	{
+		$result = array();
+		foreach (array_keys(CldrData::getLanguageNames()) as $cldrLanguageId) {
+			$result[] = new self(CldrData::getLanguageInfo($cldrLanguageId));
+		}
 
-        return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * Return a Language instance given the language id.
-     *
-     * @param string $id
-     *
-     * @return \Gettext\Languages\Language|null
-     */
-    public static function getById($id)
-    {
-        $result = null;
-        $info = CldrData::getLanguageInfo($id);
-        if (isset($info)) {
-            $result = new self($info);
-        }
+	/**
+	 * Return a Language instance given the language id.
+	 *
+	 * @param string $id
+	 *
+	 * @return \Gettext\Languages\Language|null
+	 */
+	public static function getById($id)
+	{
+		$result = null;
+		$info = CldrData::getLanguageInfo($id);
+		if (isset($info)) {
+			$result = new self($info);
+		}
 
-        return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * Returns a clone of this instance with all the strings to US-ASCII.
-     *
-     * @return \Gettext\Languages\Language
-     */
-    public function getUSAsciiClone()
-    {
-        $clone = clone $this;
-        self::asciifier($clone->name);
-        self::asciifier($clone->formula);
-        $clone->categories = array();
-        foreach ($this->categories as $category) {
-            $categoryClone = clone $category;
-            self::asciifier($categoryClone->examples);
-            $clone->categories[] = $categoryClone;
-        }
+	/**
+	 * Returns a clone of this instance with all the strings to US-ASCII.
+	 *
+	 * @return \Gettext\Languages\Language
+	 */
+	public function getUSAsciiClone()
+	{
+		$clone = clone $this;
+		self::asciifier($clone->name);
+		self::asciifier($clone->formula);
+		$clone->categories = array();
+		foreach ($this->categories as $category) {
+			$categoryClone = clone $category;
+			self::asciifier($categoryClone->examples);
+			$clone->categories[] = $categoryClone;
+		}
 
-        return $clone;
-    }
+		return $clone;
+	}
 
-    /**
-     * Build the formula starting from the currently defined categories.
-     *
-     * @param bool $withoutParenthesis TRUE to build a formula in standard gettext format, FALSE (default) to build a PHP-compatible formula
-     *
-     * @return string
-     */
-    public function buildFormula($withoutParenthesis = false)
-    {
-        $numCategories = count($this->categories);
-        switch ($numCategories) {
-            case 1:
-                // Just one category
-                return '0';
-            case 2:
-                return self::reduceFormula(self::reverseFormula($this->categories[0]->formula));
-            default:
-                $formula = (string) ($numCategories - 1);
-                for ($i = $numCategories - 2; $i >= 0; $i--) {
-                    $f = self::reduceFormula($this->categories[$i]->formula);
-                    if (!$withoutParenthesis && !preg_match('/^\([^()]+\)$/', $f)) {
-                        $f = "({$f})";
-                    }
-                    $formula = "{$f} ? {$i} : {$formula}";
-                    if (!$withoutParenthesis && $i > 0) {
-                        $formula = "({$formula})";
-                    }
-                }
+	/**
+	 * Build the formula starting from the currently defined categories.
+	 *
+	 * @param bool $withoutParenthesis TRUE to build a formula in standard gettext format, FALSE (default) to build a PHP-compatible formula
+	 *
+	 * @return string
+	 */
+	public function buildFormula($withoutParenthesis = false)
+	{
+		$numCategories = count($this->categories);
+		switch ($numCategories) {
+			case 1:
+				// Just one category
+				return '0';
+			case 2:
+				return self::reduceFormula(self::reverseFormula($this->categories[0]->formula));
+			default:
+				$formula = (string) ($numCategories - 1);
+				for ($i = $numCategories - 2; $i >= 0; $i--) {
+					$f = self::reduceFormula($this->categories[$i]->formula);
+					if (!$withoutParenthesis && !preg_match('/^\([^()]+\)$/', $f)) {
+						$f = "({$f})";
+					}
+					$formula = "{$f} ? {$i} : {$formula}";
+					if (!$withoutParenthesis && $i > 0) {
+						$formula = "({$formula})";
+					}
+				}
 
-                return $formula;
-        }
-    }
+				return $formula;
+		}
+	}
 
-    /**
-     * Let's look for categories that will always occur.
-     * This because with decimals (CLDR) we may have more cases, with integers (gettext) we have just one case.
-     * If we found that (single) category we reduce the categories to that one only.
-     *
-     * @throws \Exception
-     */
-    private function checkAlwaysTrueCategories()
-    {
-        $alwaysTrueCategory = null;
-        foreach ($this->categories as $category) {
-            if ($category->formula === true) {
-                if (!isset($category->examples)) {
-                    throw new Exception("The category '{$category->id}' should always occur, but it does not have examples (so for CLDR it will never occur for integers!)");
-                }
-                $alwaysTrueCategory = $category;
-                break;
-            }
-        }
-        if (isset($alwaysTrueCategory)) {
-            foreach ($this->categories as $category) {
-                if (($category !== $alwaysTrueCategory) && isset($category->examples)) {
-                    throw new Exception("The category '{$category->id}' should never occur, but it has some examples (so for CLDR it will occur!)");
-                }
-            }
-            $alwaysTrueCategory->id = CldrData::OTHER_CATEGORY;
-            $alwaysTrueCategory->formula = null;
-            $this->categories = array($alwaysTrueCategory);
-        }
-    }
+	/**
+	 * Let's look for categories that will always occur.
+	 * This because with decimals (CLDR) we may have more cases, with integers (gettext) we have just one case.
+	 * If we found that (single) category we reduce the categories to that one only.
+	 *
+	 * @throws \Exception
+	 */
+	private function checkAlwaysTrueCategories()
+	{
+		$alwaysTrueCategory = null;
+		foreach ($this->categories as $category) {
+			if ($category->formula === true) {
+				if (!isset($category->examples)) {
+					throw new Exception("The category '{$category->id}' should always occur, but it does not have examples (so for CLDR it will never occur for integers!)");
+				}
+				$alwaysTrueCategory = $category;
+				break;
+			}
+		}
+		if (isset($alwaysTrueCategory)) {
+			foreach ($this->categories as $category) {
+				if (($category !== $alwaysTrueCategory) && isset($category->examples)) {
+					throw new Exception("The category '{$category->id}' should never occur, but it has some examples (so for CLDR it will occur!)");
+				}
+			}
+			$alwaysTrueCategory->id = CldrData::OTHER_CATEGORY;
+			$alwaysTrueCategory->formula = null;
+			$this->categories = array($alwaysTrueCategory);
+		}
+	}
 
-    /**
-     * Let's look for categories that will never occur.
-     * This because with decimals (CLDR) we may have more cases, with integers (gettext) we have some less cases.
-     * If we found those categories we strip them out.
-     *
-     * @throws \Exception
-     */
-    private function checkAlwaysFalseCategories()
-    {
-        $filtered = array();
-        foreach ($this->categories as $category) {
-            if ($category->formula === false) {
-                if (isset($category->examples)) {
-                    throw new Exception("The category '{$category->id}' should never occur, but it has examples (so for CLDR it may occur!)");
-                }
-            } else {
-                $filtered[] = $category;
-            }
-        }
-        $this->categories = $filtered;
-    }
+	/**
+	 * Let's look for categories that will never occur.
+	 * This because with decimals (CLDR) we may have more cases, with integers (gettext) we have some less cases.
+	 * If we found those categories we strip them out.
+	 *
+	 * @throws \Exception
+	 */
+	private function checkAlwaysFalseCategories()
+	{
+		$filtered = array();
+		foreach ($this->categories as $category) {
+			if ($category->formula === false) {
+				if (isset($category->examples)) {
+					throw new Exception("The category '{$category->id}' should never occur, but it has examples (so for CLDR it may occur!)");
+				}
+			} else {
+				$filtered[] = $category;
+			}
+		}
+		$this->categories = $filtered;
+	}
 
-    /**
-     * Let's look for categories that don't have examples.
-     * This because with decimals (CLDR) we may have more cases, with integers (gettext) we have some less cases.
-     * If we found those categories, we check that they never occur and we strip them out.
-     *
-     * @throws \Exception
-     */
-    private function checkAllCategoriesWithExamples()
-    {
-        $allCategoriesIds = array();
-        $goodCategories = array();
-        $badCategories = array();
-        $badCategoriesIds = array();
-        foreach ($this->categories as $category) {
-            $allCategoriesIds[] = $category->id;
-            if (isset($category->examples)) {
-                $goodCategories[] = $category;
-            } else {
-                $badCategories[] = $category;
-                $badCategoriesIds[] = $category->id;
-            }
-        }
-        if (empty($badCategories)) {
-            return;
-        }
-        $removeCategoriesWithoutExamples = false;
-        switch (implode(',', $badCategoriesIds) . '@' . implode(',', $allCategoriesIds)) {
-            case CldrData::OTHER_CATEGORY . '@one,few,many,' . CldrData::OTHER_CATEGORY:
-                switch ($this->buildFormula()) {
-                    case '(n % 10 == 1 && n % 100 != 11) ? 0 : ((n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14)) ? 1 : ((n % 10 == 0 || n % 10 >= 5 && n % 10 <= 9 || n % 100 >= 11 && n % 100 <= 14) ? 2 : 3))':
-                        // Numbers ending with 0                 => case 2 ('many')
-                        // Numbers ending with 1 but not with 11 => case 0 ('one')
-                        // Numbers ending with 11                => case 2 ('many')
-                        // Numbers ending with 2 but not with 12 => case 1 ('few')
-                        // Numbers ending with 12                => case 2 ('many')
-                        // Numbers ending with 3 but not with 13 => case 1 ('few')
-                        // Numbers ending with 13                => case 2 ('many')
-                        // Numbers ending with 4 but not with 14 => case 1 ('few')
-                        // Numbers ending with 14                => case 2 ('many')
-                        // Numbers ending with 5                 => case 2 ('many')
-                        // Numbers ending with 6                 => case 2 ('many')
-                        // Numbers ending with 7                 => case 2 ('many')
-                        // Numbers ending with 8                 => case 2 ('many')
-                        // Numbers ending with 9                 => case 2 ('many')
-                        // => the 'other' case never occurs: use 'other' for 'many'
-                        $removeCategoriesWithoutExamples = true;
-                        break;
-                    case '(n == 1) ? 0 : ((n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14)) ? 1 : ((n != 1 && (n % 10 == 0 || n % 10 == 1) || n % 10 >= 5 && n % 10 <= 9 || n % 100 >= 12 && n % 100 <= 14) ? 2 : 3))':
-                        // Numbers ending with 0                  => case 2 ('many')
-                        // Numbers ending with 1 but not number 1 => case 2 ('many')
-                        // Number 1                               => case 0 ('one')
-                        // Numbers ending with 2 but not with 12  => case 1 ('few')
-                        // Numbers ending with 12                 => case 2 ('many')
-                        // Numbers ending with 3 but not with 13  => case 1 ('few')
-                        // Numbers ending with 13                 => case 2 ('many')
-                        // Numbers ending with 4 but not with 14  => case 1 ('few')
-                        // Numbers ending with 14                 => case 2 ('many')
-                        // Numbers ending with 5                  => case 2 ('many')
-                        // Numbers ending with 6                  => case 2 ('many')
-                        // Numbers ending with 7                  => case 2 ('many')
-                        // Numbers ending with 8                  => case 2 ('many')
-                        // Numbers ending with 9                  => case 2 ('many')
-                        // => the 'other' case never occurs: use 'other' for 'many'
-                        $removeCategoriesWithoutExamples = true;
-                        break;
-                }
-        }
-        if (!$removeCategoriesWithoutExamples) {
-            throw new Exception("Unhandled case of plural categories without examples '" . implode(', ', $badCategoriesIds) . "' out of '" . implode(', ', $allCategoriesIds) . "'");
-        }
-        if ($badCategories[count($badCategories) - 1]->id === CldrData::OTHER_CATEGORY) {
-            // We're removing the 'other' cagory: let's change the last good category to 'other'
-            $lastGood = $goodCategories[count($goodCategories) - 1];
-            $lastGood->id = CldrData::OTHER_CATEGORY;
-            $lastGood->formula = null;
-        }
-        $this->categories = $goodCategories;
-    }
+	/**
+	 * Let's look for categories that don't have examples.
+	 * This because with decimals (CLDR) we may have more cases, with integers (gettext) we have some less cases.
+	 * If we found those categories, we check that they never occur and we strip them out.
+	 *
+	 * @throws \Exception
+	 */
+	private function checkAllCategoriesWithExamples()
+	{
+		$allCategoriesIds = array();
+		$goodCategories = array();
+		$badCategories = array();
+		$badCategoriesIds = array();
+		foreach ($this->categories as $category) {
+			$allCategoriesIds[] = $category->id;
+			if (isset($category->examples)) {
+				$goodCategories[] = $category;
+			} else {
+				$badCategories[] = $category;
+				$badCategoriesIds[] = $category->id;
+			}
+		}
+		if (empty($badCategories)) {
+			return;
+		}
+		$removeCategoriesWithoutExamples = false;
+		switch (implode(',', $badCategoriesIds) . '@' . implode(',', $allCategoriesIds)) {
+			case CldrData::OTHER_CATEGORY . '@one,few,many,' . CldrData::OTHER_CATEGORY:
+				switch ($this->buildFormula()) {
+					case '(n % 10 == 1 && n % 100 != 11) ? 0 : ((n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14)) ? 1 : ((n % 10 == 0 || n % 10 >= 5 && n % 10 <= 9 || n % 100 >= 11 && n % 100 <= 14) ? 2 : 3))':
+						// Numbers ending with 0                 => case 2 ('many')
+						// Numbers ending with 1 but not with 11 => case 0 ('one')
+						// Numbers ending with 11                => case 2 ('many')
+						// Numbers ending with 2 but not with 12 => case 1 ('few')
+						// Numbers ending with 12                => case 2 ('many')
+						// Numbers ending with 3 but not with 13 => case 1 ('few')
+						// Numbers ending with 13                => case 2 ('many')
+						// Numbers ending with 4 but not with 14 => case 1 ('few')
+						// Numbers ending with 14                => case 2 ('many')
+						// Numbers ending with 5                 => case 2 ('many')
+						// Numbers ending with 6                 => case 2 ('many')
+						// Numbers ending with 7                 => case 2 ('many')
+						// Numbers ending with 8                 => case 2 ('many')
+						// Numbers ending with 9                 => case 2 ('many')
+						// => the 'other' case never occurs: use 'other' for 'many'
+						$removeCategoriesWithoutExamples = true;
+						break;
+					case '(n == 1) ? 0 : ((n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14)) ? 1 : ((n != 1 && (n % 10 == 0 || n % 10 == 1) || n % 10 >= 5 && n % 10 <= 9 || n % 100 >= 12 && n % 100 <= 14) ? 2 : 3))':
+						// Numbers ending with 0                  => case 2 ('many')
+						// Numbers ending with 1 but not number 1 => case 2 ('many')
+						// Number 1                               => case 0 ('one')
+						// Numbers ending with 2 but not with 12  => case 1 ('few')
+						// Numbers ending with 12                 => case 2 ('many')
+						// Numbers ending with 3 but not with 13  => case 1 ('few')
+						// Numbers ending with 13                 => case 2 ('many')
+						// Numbers ending with 4 but not with 14  => case 1 ('few')
+						// Numbers ending with 14                 => case 2 ('many')
+						// Numbers ending with 5                  => case 2 ('many')
+						// Numbers ending with 6                  => case 2 ('many')
+						// Numbers ending with 7                  => case 2 ('many')
+						// Numbers ending with 8                  => case 2 ('many')
+						// Numbers ending with 9                  => case 2 ('many')
+						// => the 'other' case never occurs: use 'other' for 'many'
+						$removeCategoriesWithoutExamples = true;
+						break;
+				}
+		}
+		if (!$removeCategoriesWithoutExamples) {
+			throw new Exception("Unhandled case of plural categories without examples '" . implode(', ', $badCategoriesIds) . "' out of '" . implode(', ', $allCategoriesIds) . "'");
+		}
+		if ($badCategories[count($badCategories) - 1]->id === CldrData::OTHER_CATEGORY) {
+			// We're removing the 'other' cagory: let's change the last good category to 'other'
+			$lastGood = $goodCategories[count($goodCategories) - 1];
+			$lastGood->id = CldrData::OTHER_CATEGORY;
+			$lastGood->formula = null;
+		}
+		$this->categories = $goodCategories;
+	}
 
-    /**
-     * Reverse a formula.
-     *
-     * @param string $formula
-     *
-     * @throws \Exception
-     *
-     * @return string
-     */
-    private static function reverseFormula($formula)
-    {
-        if (preg_match('/^n( % \d+)? == \d+(\.\.\d+|,\d+)*?$/', $formula)) {
-            return str_replace(' == ', ' != ', $formula);
-        }
-        if (preg_match('/^n( % \d+)? != \d+(\.\.\d+|,\d+)*?$/', $formula)) {
-            return str_replace(' != ', ' == ', $formula);
-        }
-        if (preg_match('/^\(?n == \d+ \|\| n == \d+\)?$/', $formula)) {
-            return trim(str_replace(array(' == ', ' || '), array(' != ', ' && '), $formula), '()');
-        }
-        $m = null;
-        if (preg_match('/^(n(?: % \d+)?) == (\d+) && (n(?: % \d+)?) != (\d+)$/', $formula, $m)) {
-            return "{$m[1]} != {$m[2]} || {$m[3]} == {$m[4]}";
-        }
-        switch ($formula) {
-            case '(n == 1 || n == 2 || n == 3) || n % 10 != 4 && n % 10 != 6 && n % 10 != 9':
-                return 'n != 1 && n != 2 && n != 3 && (n % 10 == 4 || n % 10 == 6 || n % 10 == 9)';
-            case '(n == 0 || n == 1) || n >= 11 && n <= 99':
-                return 'n >= 2 && (n < 11 || n > 99)';
-        }
-        throw new Exception("Unable to reverse the formula '{$formula}'");
-    }
+	/**
+	 * Reverse a formula.
+	 *
+	 * @param string $formula
+	 *
+	 * @throws \Exception
+	 *
+	 * @return string
+	 */
+	private static function reverseFormula($formula)
+	{
+		if (preg_match('/^n( % \d+)? == \d+(\.\.\d+|,\d+)*?$/', $formula)) {
+			return str_replace(' == ', ' != ', $formula);
+		}
+		if (preg_match('/^n( % \d+)? != \d+(\.\.\d+|,\d+)*?$/', $formula)) {
+			return str_replace(' != ', ' == ', $formula);
+		}
+		if (preg_match('/^\(?n == \d+ \|\| n == \d+\)?$/', $formula)) {
+			return trim(str_replace(array(' == ', ' || '), array(' != ', ' && '), $formula), '()');
+		}
+		$m = null;
+		if (preg_match('/^(n(?: % \d+)?) == (\d+) && (n(?: % \d+)?) != (\d+)$/', $formula, $m)) {
+			return "{$m[1]} != {$m[2]} || {$m[3]} == {$m[4]}";
+		}
+		switch ($formula) {
+			case '(n == 1 || n == 2 || n == 3) || n % 10 != 4 && n % 10 != 6 && n % 10 != 9':
+				return 'n != 1 && n != 2 && n != 3 && (n % 10 == 4 || n % 10 == 6 || n % 10 == 9)';
+			case '(n == 0 || n == 1) || n >= 11 && n <= 99':
+				return 'n >= 2 && (n < 11 || n > 99)';
+		}
+		throw new Exception("Unable to reverse the formula '{$formula}'");
+	}
 
-    /**
-     * Reduce some excessively complex formulas.
-     *
-     * @param string $formula
-     *
-     * @return string
-     */
-    private static function reduceFormula($formula)
-    {
-        $map = array(
-            'n != 0 && n != 1' => 'n > 1',
-            '(n == 0 || n == 1) && n != 0' => 'n == 1',
-        );
+	/**
+	 * Reduce some excessively complex formulas.
+	 *
+	 * @param string $formula
+	 *
+	 * @return string
+	 */
+	private static function reduceFormula($formula)
+	{
+		$map = array(
+			'n != 0 && n != 1' => 'n > 1',
+			'(n == 0 || n == 1) && n != 0' => 'n == 1',
+		);
 
-        return isset($map[$formula]) ? $map[$formula] : $formula;
-    }
+		return isset($map[$formula]) ? $map[$formula] : $formula;
+	}
 
-    /**
-     * Take one variable and, if it's a string, we transliterate it to US-ASCII.
-     *
-     * @param mixed $value the variable to work on
-     *
-     * @throws \Exception
-     */
-    private static function asciifier(&$value)
-    {
-        if (is_string($value) && $value !== '') {
-            // Avoid converting from 'Ÿ' to '"Y', let's prefer 'Y'
-            $value = strtr($value, array(
-                'À' => 'A', 'Á' => 'A', 'Â' => 'A', 'Ã' => 'A', 'Ä' => 'A', 'Å' => 'A',
-                'È' => 'E', 'É' => 'E', 'Ê' => 'E', 'Ë' => 'E',
-                'Ì' => 'I', 'Í' => 'I', 'Î' => 'I', 'Ï' => 'I',
-                'Ñ' => 'N',
-                'Ò' => 'O', 'Ó' => 'O', 'Ô' => 'O', 'Õ' => 'O', 'Ö' => 'O',
-                'Ù' => 'U', 'Ú' => 'U', 'Û' => 'U', 'Ü' => 'U',
-                'Ÿ' => 'Y', 'Ý' => 'Y',
-                'à' => 'a', 'á' => 'a', 'â' => 'a', 'ã' => 'a', 'ä' => 'a', 'å' => 'a',
-                'è' => 'e', 'é' => 'e', 'ê' => 'e', 'ë' => 'e',
-                'ì' => 'i', 'í' => 'i', 'î' => 'i', 'ï' => 'i',
-                'ñ' => 'n', 'ò' => 'o', 'ó' => 'o', 'ô' => 'o', 'õ' => 'o', 'ö' => 'o',
-                'ù' => 'u', 'ú' => 'u', 'û' => 'u', 'ü' => 'u',
-                'ý' => 'y', 'ÿ' => 'y',
-                '…' => '...',
-                'ʼ' => "'", '’' => "'",
-            ));
-        }
-    }
+	/**
+	 * Take one variable and, if it's a string, we transliterate it to US-ASCII.
+	 *
+	 * @param mixed $value the variable to work on
+	 *
+	 * @throws \Exception
+	 */
+	private static function asciifier(&$value)
+	{
+		if (is_string($value) && $value !== '') {
+			// Avoid converting from 'Ÿ' to '"Y', let's prefer 'Y'
+			$value = strtr($value, array(
+				'À' => 'A', 'Á' => 'A', 'Â' => 'A', 'Ã' => 'A', 'Ä' => 'A', 'Å' => 'A',
+				'È' => 'E', 'É' => 'E', 'Ê' => 'E', 'Ë' => 'E',
+				'Ì' => 'I', 'Í' => 'I', 'Î' => 'I', 'Ï' => 'I',
+				'Ñ' => 'N',
+				'Ò' => 'O', 'Ó' => 'O', 'Ô' => 'O', 'Õ' => 'O', 'Ö' => 'O',
+				'Ù' => 'U', 'Ú' => 'U', 'Û' => 'U', 'Ü' => 'U',
+				'Ÿ' => 'Y', 'Ý' => 'Y',
+				'à' => 'a', 'á' => 'a', 'â' => 'a', 'ã' => 'a', 'ä' => 'a', 'å' => 'a',
+				'è' => 'e', 'é' => 'e', 'ê' => 'e', 'ë' => 'e',
+				'ì' => 'i', 'í' => 'i', 'î' => 'i', 'ï' => 'i',
+				'ñ' => 'n', 'ò' => 'o', 'ó' => 'o', 'ô' => 'o', 'õ' => 'o', 'ö' => 'o',
+				'ù' => 'u', 'ú' => 'u', 'û' => 'u', 'ü' => 'u',
+				'ý' => 'y', 'ÿ' => 'y',
+				'…' => '...',
+				'ʼ' => "'", '’' => "'",
+			));
+		}
+	}
 }

Spacing +83 added lines, -83 removed lines

@@ -72,35 +72,35 @@ 
      *
      * @throws \Exception throws an Exception if $fullId is not valid
      */
-    private function __construct($info)
+    private function __construct( $info )
     {
-        $this->id = $info['id'];
-        $this->name = $info['name'];
-        $this->supersededBy = isset($info['supersededBy']) ? $info['supersededBy'] : null;
-        $this->script = isset($info['script']) ? $info['script'] : null;
-        $this->territory = isset($info['territory']) ? $info['territory'] : null;
-        $this->baseLanguage = isset($info['baseLanguage']) ? $info['baseLanguage'] : null;
+        $this->id = $info[ 'id' ];
+        $this->name = $info[ 'name' ];
+        $this->supersededBy = isset( $info[ 'supersededBy' ] ) ? $info[ 'supersededBy' ] : null;
+        $this->script = isset( $info[ 'script' ] ) ? $info[ 'script' ] : null;
+        $this->territory = isset( $info[ 'territory' ] ) ? $info[ 'territory' ] : null;
+        $this->baseLanguage = isset( $info[ 'baseLanguage' ] ) ? $info[ 'baseLanguage' ] : null;
         // Let's build the category list
         $this->categories = array();
-        foreach ($info['categories'] as $cldrCategoryId => $cldrFormulaAndExamples) {
-            $category = new Category($cldrCategoryId, $cldrFormulaAndExamples);
-            foreach ($this->categories as $c) {
-                if ($category->id === $c->id) {
-                    throw new Exception("The category '{$category->id}' is specified more than once");
+        foreach ( $info[ 'categories' ] as $cldrCategoryId => $cldrFormulaAndExamples ) {
+            $category = new Category( $cldrCategoryId, $cldrFormulaAndExamples );
+            foreach ( $this->categories as $c ) {
+                if ( $category->id === $c->id ) {
+                    throw new Exception( "The category '{$category->id}' is specified more than once" );
                 }
             }
-            $this->categories[] = $category;
+            $this->categories[ ] = $category;
         }
-        if (empty($this->categories)) {
-            throw new Exception("The language '{$info['id']}' does not have any plural category");
+        if ( empty( $this->categories ) ) {
+            throw new Exception( "The language '{$info[ 'id' ]}' does not have any plural category" );
         }
         // Let's sort the categories from 'zero' to 'other'
-        usort($this->categories, function (Category $category1, Category $category2) {
-            return array_search($category1->id, CldrData::$categories) - array_search($category2->id, CldrData::$categories);
+        usort( $this->categories, function( Category $category1, Category $category2 ) {
+            return array_search( $category1->id, CldrData::$categories ) - array_search( $category2->id, CldrData::$categories );
         });
         // The 'other' category should always be there
-        if ($this->categories[count($this->categories) - 1]->id !== CldrData::OTHER_CATEGORY) {
-            throw new Exception("The language '{$info['id']}' does not have the '" . CldrData::OTHER_CATEGORY . "' plural category");
+        if ( $this->categories[ count( $this->categories ) - 1 ]->id !== CldrData::OTHER_CATEGORY ) {
+            throw new Exception( "The language '{$info[ 'id' ]}' does not have the '" . CldrData::OTHER_CATEGORY . "' plural category" );
         }
         $this->checkAlwaysTrueCategories();
         $this->checkAlwaysFalseCategories();
@@ -118,8 +118,8 @@ 
     public static function getAll()
     {
         $result = array();
-        foreach (array_keys(CldrData::getLanguageNames()) as $cldrLanguageId) {
-            $result[] = new self(CldrData::getLanguageInfo($cldrLanguageId));
+        foreach ( array_keys( CldrData::getLanguageNames() ) as $cldrLanguageId ) {
+            $result[ ] = new self( CldrData::getLanguageInfo( $cldrLanguageId ) );
         }
 
         return $result;
@@ -132,12 +132,12 @@ 
      *
      * @return \Gettext\Languages\Language|null
      */
-    public static function getById($id)
+    public static function getById( $id )
     {
         $result = null;
-        $info = CldrData::getLanguageInfo($id);
-        if (isset($info)) {
-            $result = new self($info);
+        $info = CldrData::getLanguageInfo( $id );
+        if ( isset( $info ) ) {
+            $result = new self( $info );
         }
 
         return $result;
@@ -151,13 +151,13 @@ 
     public function getUSAsciiClone()
     {
         $clone = clone $this;
-        self::asciifier($clone->name);
-        self::asciifier($clone->formula);
+        self::asciifier( $clone->name );
+        self::asciifier( $clone->formula );
         $clone->categories = array();
-        foreach ($this->categories as $category) {
+        foreach ( $this->categories as $category ) {
             $categoryClone = clone $category;
-            self::asciifier($categoryClone->examples);
-            $clone->categories[] = $categoryClone;
+            self::asciifier( $categoryClone->examples );
+            $clone->categories[ ] = $categoryClone;
         }
 
         return $clone;
@@ -170,24 +170,24 @@ 
      *
      * @return string
      */
-    public function buildFormula($withoutParenthesis = false)
+    public function buildFormula( $withoutParenthesis = false )
     {
-        $numCategories = count($this->categories);
-        switch ($numCategories) {
+        $numCategories = count( $this->categories );
+        switch ( $numCategories ) {
             case 1:
                 // Just one category
                 return '0';
             case 2:
-                return self::reduceFormula(self::reverseFormula($this->categories[0]->formula));
+                return self::reduceFormula( self::reverseFormula( $this->categories[ 0 ]->formula ) );
             default:
-                $formula = (string) ($numCategories - 1);
-                for ($i = $numCategories - 2; $i >= 0; $i--) {
-                    $f = self::reduceFormula($this->categories[$i]->formula);
-                    if (!$withoutParenthesis && !preg_match('/^\([^()]+\)$/', $f)) {
+                $formula = (string)( $numCategories - 1 );
+                for ( $i = $numCategories - 2; $i >= 0; $i-- ) {
+                    $f = self::reduceFormula( $this->categories[ $i ]->formula );
+                    if ( ! $withoutParenthesis && ! preg_match( '/^\([^()]+\)$/', $f ) ) {
                         $f = "({$f})";
                     }
                     $formula = "{$f} ? {$i} : {$formula}";
-                    if (!$withoutParenthesis && $i > 0) {
+                    if ( ! $withoutParenthesis && $i > 0 ) {
                         $formula = "({$formula})";
                     }
                 }
@@ -206,24 +206,24 @@ 
     private function checkAlwaysTrueCategories()
     {
         $alwaysTrueCategory = null;
-        foreach ($this->categories as $category) {
-            if ($category->formula === true) {
-                if (!isset($category->examples)) {
-                    throw new Exception("The category '{$category->id}' should always occur, but it does not have examples (so for CLDR it will never occur for integers!)");
+        foreach ( $this->categories as $category ) {
+            if ( $category->formula === true ) {
+                if ( ! isset( $category->examples ) ) {
+                    throw new Exception( "The category '{$category->id}' should always occur, but it does not have examples (so for CLDR it will never occur for integers!)" );
                 }
                 $alwaysTrueCategory = $category;
                 break;
             }
         }
-        if (isset($alwaysTrueCategory)) {
-            foreach ($this->categories as $category) {
-                if (($category !== $alwaysTrueCategory) && isset($category->examples)) {
-                    throw new Exception("The category '{$category->id}' should never occur, but it has some examples (so for CLDR it will occur!)");
+        if ( isset( $alwaysTrueCategory ) ) {
+            foreach ( $this->categories as $category ) {
+                if ( ( $category !== $alwaysTrueCategory ) && isset( $category->examples ) ) {
+                    throw new Exception( "The category '{$category->id}' should never occur, but it has some examples (so for CLDR it will occur!)" );
                 }
             }
             $alwaysTrueCategory->id = CldrData::OTHER_CATEGORY;
             $alwaysTrueCategory->formula = null;
-            $this->categories = array($alwaysTrueCategory);
+            $this->categories = array( $alwaysTrueCategory );
         }
     }
 
@@ -237,13 +237,13 @@ 
     private function checkAlwaysFalseCategories()
     {
         $filtered = array();
-        foreach ($this->categories as $category) {
-            if ($category->formula === false) {
-                if (isset($category->examples)) {
-                    throw new Exception("The category '{$category->id}' should never occur, but it has examples (so for CLDR it may occur!)");
+        foreach ( $this->categories as $category ) {
+            if ( $category->formula === false ) {
+                if ( isset( $category->examples ) ) {
+                    throw new Exception( "The category '{$category->id}' should never occur, but it has examples (so for CLDR it may occur!)" );
                 }
             } else {
-                $filtered[] = $category;
+                $filtered[ ] = $category;
             }
         }
         $this->categories = $filtered;
@@ -262,22 +262,22 @@ 
         $goodCategories = array();
         $badCategories = array();
         $badCategoriesIds = array();
-        foreach ($this->categories as $category) {
-            $allCategoriesIds[] = $category->id;
-            if (isset($category->examples)) {
-                $goodCategories[] = $category;
+        foreach ( $this->categories as $category ) {
+            $allCategoriesIds[ ] = $category->id;
+            if ( isset( $category->examples ) ) {
+                $goodCategories[ ] = $category;
             } else {
-                $badCategories[] = $category;
-                $badCategoriesIds[] = $category->id;
+                $badCategories[ ] = $category;
+                $badCategoriesIds[ ] = $category->id;
             }
         }
-        if (empty($badCategories)) {
+        if ( empty( $badCategories ) ) {
             return;
         }
         $removeCategoriesWithoutExamples = false;
-        switch (implode(',', $badCategoriesIds) . '@' . implode(',', $allCategoriesIds)) {
+        switch ( implode( ',', $badCategoriesIds ) . '@' . implode( ',', $allCategoriesIds ) ) {
             case CldrData::OTHER_CATEGORY . '@one,few,many,' . CldrData::OTHER_CATEGORY:
-                switch ($this->buildFormula()) {
+                switch ( $this->buildFormula() ) {
                     case '(n % 10 == 1 && n % 100 != 11) ? 0 : ((n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14)) ? 1 : ((n % 10 == 0 || n % 10 >= 5 && n % 10 <= 9 || n % 100 >= 11 && n % 100 <= 14) ? 2 : 3))':
                         // Numbers ending with 0                 => case 2 ('many')
                         // Numbers ending with 1 but not with 11 => case 0 ('one')
@@ -316,12 +316,12 @@ 
                         break;
                 }
         }
-        if (!$removeCategoriesWithoutExamples) {
-            throw new Exception("Unhandled case of plural categories without examples '" . implode(', ', $badCategoriesIds) . "' out of '" . implode(', ', $allCategoriesIds) . "'");
+        if ( ! $removeCategoriesWithoutExamples ) {
+            throw new Exception( "Unhandled case of plural categories without examples '" . implode( ', ', $badCategoriesIds ) . "' out of '" . implode( ', ', $allCategoriesIds ) . "'" );
         }
-        if ($badCategories[count($badCategories) - 1]->id === CldrData::OTHER_CATEGORY) {
+        if ( $badCategories[ count( $badCategories ) - 1 ]->id === CldrData::OTHER_CATEGORY ) {
             // We're removing the 'other' cagory: let's change the last good category to 'other'
-            $lastGood = $goodCategories[count($goodCategories) - 1];
+            $lastGood = $goodCategories[ count( $goodCategories ) - 1 ];
             $lastGood->id = CldrData::OTHER_CATEGORY;
             $lastGood->formula = null;
         }
@@ -337,28 +337,28 @@ 
      *
      * @return string
      */
-    private static function reverseFormula($formula)
+    private static function reverseFormula( $formula )
     {
-        if (preg_match('/^n( % \d+)? == \d+(\.\.\d+|,\d+)*?$/', $formula)) {
-            return str_replace(' == ', ' != ', $formula);
+        if ( preg_match( '/^n( % \d+)? == \d+(\.\.\d+|,\d+)*?$/', $formula ) ) {
+            return str_replace( ' == ', ' != ', $formula );
         }
-        if (preg_match('/^n( % \d+)? != \d+(\.\.\d+|,\d+)*?$/', $formula)) {
-            return str_replace(' != ', ' == ', $formula);
+        if ( preg_match( '/^n( % \d+)? != \d+(\.\.\d+|,\d+)*?$/', $formula ) ) {
+            return str_replace( ' != ', ' == ', $formula );
         }
-        if (preg_match('/^\(?n == \d+ \|\| n == \d+\)?$/', $formula)) {
-            return trim(str_replace(array(' == ', ' || '), array(' != ', ' && '), $formula), '()');
+        if ( preg_match( '/^\(?n == \d+ \|\| n == \d+\)?$/', $formula ) ) {
+            return trim( str_replace( array( ' == ', ' || ' ), array( ' != ', ' && ' ), $formula ), '()' );
         }
         $m = null;
-        if (preg_match('/^(n(?: % \d+)?) == (\d+) && (n(?: % \d+)?) != (\d+)$/', $formula, $m)) {
-            return "{$m[1]} != {$m[2]} || {$m[3]} == {$m[4]}";
+        if ( preg_match( '/^(n(?: % \d+)?) == (\d+) && (n(?: % \d+)?) != (\d+)$/', $formula, $m ) ) {
+            return "{$m[ 1 ]} != {$m[ 2 ]} || {$m[ 3 ]} == {$m[ 4 ]}";
         }
-        switch ($formula) {
+        switch ( $formula ) {
             case '(n == 1 || n == 2 || n == 3) || n % 10 != 4 && n % 10 != 6 && n % 10 != 9':
                 return 'n != 1 && n != 2 && n != 3 && (n % 10 == 4 || n % 10 == 6 || n % 10 == 9)';
             case '(n == 0 || n == 1) || n >= 11 && n <= 99':
                 return 'n >= 2 && (n < 11 || n > 99)';
         }
-        throw new Exception("Unable to reverse the formula '{$formula}'");
+        throw new Exception( "Unable to reverse the formula '{$formula}'" );
     }
 
     /**
@@ -368,14 +368,14 @@ 
      *
      * @return string
      */
-    private static function reduceFormula($formula)
+    private static function reduceFormula( $formula )
     {
         $map = array(
             'n != 0 && n != 1' => 'n > 1',
             '(n == 0 || n == 1) && n != 0' => 'n == 1',
         );
 
-        return isset($map[$formula]) ? $map[$formula] : $formula;
+        return isset( $map[ $formula ] ) ? $map[ $formula ] : $formula;
     }
 
     /**
@@ -385,11 +385,11 @@ 
      *
      * @throws \Exception
      */
-    private static function asciifier(&$value)
+    private static function asciifier( &$value )
     {
-        if (is_string($value) && $value !== '') {
+        if ( is_string( $value ) && $value !== '' ) {
             // Avoid converting from 'Ÿ' to '"Y', let's prefer 'Y'
-            $value = strtr($value, array(
+            $value = strtr( $value, array(
                 'À' => 'A', 'Á' => 'A', 'Â' => 'A', 'Ã' => 'A', 'Ä' => 'A', 'Å' => 'A',
                 'È' => 'E', 'É' => 'E', 'Ê' => 'E', 'Ë' => 'E',
                 'Ì' => 'I', 'Í' => 'I', 'Î' => 'I', 'Ï' => 'I',
@@ -405,7 +405,7 @@ 
                 'ý' => 'y', 'ÿ' => 'y',
                 '…' => '...',
                 'ʼ' => "'", '’' => "'",
-            ));
+            ) );
         }
     }
 }

Braces +12 added lines, -24 removed lines

@@ -7,8 +7,7 @@ 
 /**
  * Main class to convert the plural rules of a language from CLDR to gettext.
  */
-class Language
-{
+class Language {
     /**
      * The language ID.
      *
@@ -72,8 +71,7 @@ 
      *
      * @throws \Exception throws an Exception if $fullId is not valid
      */
-    private function __construct($info)
-    {
+    private function __construct($info) {
         $this->id = $info['id'];
         $this->name = $info['name'];
         $this->supersededBy = isset($info['supersededBy']) ? $info['supersededBy'] : null;
@@ -115,8 +113,7 @@ 
      *
      * @return \Gettext\Languages\Language[]
      */
-    public static function getAll()
-    {
+    public static function getAll() {
         $result = array();
         foreach (array_keys(CldrData::getLanguageNames()) as $cldrLanguageId) {
             $result[] = new self(CldrData::getLanguageInfo($cldrLanguageId));
@@ -132,8 +129,7 @@ 
      *
      * @return \Gettext\Languages\Language|null
      */
-    public static function getById($id)
-    {
+    public static function getById($id) {
         $result = null;
         $info = CldrData::getLanguageInfo($id);
         if (isset($info)) {
@@ -148,8 +144,7 @@ 
      *
      * @return \Gettext\Languages\Language
      */
-    public function getUSAsciiClone()
-    {
+    public function getUSAsciiClone() {
         $clone = clone $this;
         self::asciifier($clone->name);
         self::asciifier($clone->formula);
@@ -170,8 +165,7 @@ 
      *
      * @return string
      */
-    public function buildFormula($withoutParenthesis = false)
-    {
+    public function buildFormula($withoutParenthesis = false) {
         $numCategories = count($this->categories);
         switch ($numCategories) {
             case 1:
@@ -203,8 +197,7 @@ 
      *
      * @throws \Exception
      */
-    private function checkAlwaysTrueCategories()
-    {
+    private function checkAlwaysTrueCategories() {
         $alwaysTrueCategory = null;
         foreach ($this->categories as $category) {
             if ($category->formula === true) {
@@ -234,8 +227,7 @@ 
      *
      * @throws \Exception
      */
-    private function checkAlwaysFalseCategories()
-    {
+    private function checkAlwaysFalseCategories() {
         $filtered = array();
         foreach ($this->categories as $category) {
             if ($category->formula === false) {
@@ -256,8 +248,7 @@ 
      *
      * @throws \Exception
      */
-    private function checkAllCategoriesWithExamples()
-    {
+    private function checkAllCategoriesWithExamples() {
         $allCategoriesIds = array();
         $goodCategories = array();
         $badCategories = array();
@@ -337,8 +328,7 @@ 
      *
      * @return string
      */
-    private static function reverseFormula($formula)
-    {
+    private static function reverseFormula($formula) {
         if (preg_match('/^n( % \d+)? == \d+(\.\.\d+|,\d+)*?$/', $formula)) {
             return str_replace(' == ', ' != ', $formula);
         }
@@ -368,8 +358,7 @@ 
      *
      * @return string
      */
-    private static function reduceFormula($formula)
-    {
+    private static function reduceFormula($formula) {
         $map = array(
             'n != 0 && n != 1' => 'n > 1',
             '(n == 0 || n == 1) && n != 0' => 'n == 1',
@@ -385,8 +374,7 @@ 
      *
      * @throws \Exception
      */
-    private static function asciifier(&$value)
-    {
+    private static function asciifier(&$value) {
         if (is_string($value) && $value !== '') {
             // Avoid converting from 'Ÿ' to '"Y', let's prefer 'Y'
             $value = strtr($value, array(

vendor/gettext/languages/src/CldrData.php

Spacing +104 added lines, -104 removed lines

@@ -21,7 +21,7 @@ 
      *
      * @var string[]
      */
-    public static $categories = array('zero', 'one', 'two', 'few', 'many', self::OTHER_CATEGORY);
+    public static $categories = array( 'zero', 'one', 'two', 'few', 'many', self::OTHER_CATEGORY );
 
     /**
      * The loaded CLDR data.
@@ -44,7 +44,7 @@ 
      */
     public static function getLanguageNames()
     {
-        return self::getData('languages');
+        return self::getData( 'languages' );
     }
 
     /**
@@ -56,7 +56,7 @@ 
      */
     public static function getTerritoryNames()
     {
-        return self::getData('territories');
+        return self::getData( 'territories' );
     }
 
     /**
@@ -68,9 +68,9 @@ 
      *
      * @return string[]
      */
-    public static function getScriptNames($standAlone)
+    public static function getScriptNames( $standAlone )
     {
-        return self::getData($standAlone ? 'standAloneScripts' : 'scripts');
+        return self::getData( $standAlone ? 'standAloneScripts' : 'scripts' );
     }
 
     /**
@@ -90,7 +90,7 @@ 
      */
     public static function getPlurals()
     {
-        return self::getData('plurals');
+        return self::getData( 'plurals' );
     }
 
     /**
@@ -100,7 +100,7 @@ 
      */
     public static function getSupersededLanguages()
     {
-        return self::getData('supersededLanguages');
+        return self::getData( 'supersededLanguages' );
     }
 
     /**
@@ -110,54 +110,54 @@ 
      *
      * @return array|null Returns an array with the keys 'id' (normalized), 'name', 'supersededBy' (optional), 'territory' (optional), 'script' (optional), 'baseLanguage' (optional), 'categories'. If $id is not valid returns null.
      */
-    public static function getLanguageInfo($id)
+    public static function getLanguageInfo( $id )
     {
         $result = null;
         $matches = array();
-        if (preg_match('/^([a-z]{2,3})(?:[_\-]([a-z]{4}))?(?:[_\-]([a-z]{2}|[0-9]{3}))?(?:$|-)/i', $id, $matches)) {
-            $languageId = strtolower($matches[1]);
-            $scriptId = (isset($matches[2]) && ($matches[2] !== '')) ? ucfirst(strtolower($matches[2])) : null;
-            $territoryId = (isset($matches[3]) && ($matches[3] !== '')) ? strtoupper($matches[3]) : null;
+        if ( preg_match( '/^([a-z]{2,3})(?:[_\-]([a-z]{4}))?(?:[_\-]([a-z]{2}|[0-9]{3}))?(?:$|-)/i', $id, $matches ) ) {
+            $languageId = strtolower( $matches[ 1 ] );
+            $scriptId = ( isset( $matches[ 2 ] ) && ( $matches[ 2 ] !== '' ) ) ? ucfirst( strtolower( $matches[ 2 ] ) ) : null;
+            $territoryId = ( isset( $matches[ 3 ] ) && ( $matches[ 3 ] !== '' ) ) ? strtoupper( $matches[ 3 ] ) : null;
             $normalizedId = $languageId;
-            if (isset($scriptId)) {
+            if ( isset( $scriptId ) ) {
                 $normalizedId .= '_' . $scriptId;
             }
-            if (isset($territoryId)) {
+            if ( isset( $territoryId ) ) {
                 $normalizedId .= '_' . $territoryId;
             }
             // Structure precedence: see Likely Subtags - http://www.unicode.org/reports/tr35/tr35-31/tr35.html#Likely_Subtags
             $variants = array();
             $variantsWithScript = array();
             $variantsWithTerritory = array();
-            if (isset($scriptId) && isset($territoryId)) {
-                $variantsWithTerritory[] = $variantsWithScript[] = $variants[] = "{$languageId}_{$scriptId}_{$territoryId}";
+            if ( isset( $scriptId ) && isset( $territoryId ) ) {
+                $variantsWithTerritory[ ] = $variantsWithScript[ ] = $variants[ ] = "{$languageId}_{$scriptId}_{$territoryId}";
             }
-            if (isset($scriptId)) {
-                $variantsWithScript[] = $variants[] = "{$languageId}_{$scriptId}";
+            if ( isset( $scriptId ) ) {
+                $variantsWithScript[ ] = $variants[ ] = "{$languageId}_{$scriptId}";
             }
-            if (isset($territoryId)) {
-                $variantsWithTerritory[] = $variants[] = "{$languageId}_{$territoryId}";
+            if ( isset( $territoryId ) ) {
+                $variantsWithTerritory[ ] = $variants[ ] = "{$languageId}_{$territoryId}";
             }
-            $variants[] = $languageId;
+            $variants[ ] = $languageId;
             $allGood = true;
             $scriptName = null;
             $scriptStandAloneName = null;
-            if (isset($scriptId)) {
-                $scriptNames = self::getScriptNames(false);
-                if (isset($scriptNames[$scriptId])) {
-                    $scriptName = $scriptNames[$scriptId];
-                    $scriptStandAloneNames = self::getScriptNames(true);
-                    $scriptStandAloneName = $scriptStandAloneNames[$scriptId];
+            if ( isset( $scriptId ) ) {
+                $scriptNames = self::getScriptNames( false );
+                if ( isset( $scriptNames[ $scriptId ] ) ) {
+                    $scriptName = $scriptNames[ $scriptId ];
+                    $scriptStandAloneNames = self::getScriptNames( true );
+                    $scriptStandAloneName = $scriptStandAloneNames[ $scriptId ];
                 } else {
                     $allGood = false;
                 }
             }
             $territoryName = null;
-            if (isset($territoryId)) {
+            if ( isset( $territoryId ) ) {
                 $territoryNames = self::getTerritoryNames();
-                if (isset($territoryNames[$territoryId])) {
-                    if ($territoryId !== '001') {
-                        $territoryName = $territoryNames[$territoryId];
+                if ( isset( $territoryNames[ $territoryId ] ) ) {
+                    if ( $territoryId !== '001' ) {
+                        $territoryName = $territoryNames[ $territoryId ];
                     }
                 } else {
                     $allGood = false;
@@ -165,63 +165,63 @@ 
             }
             $languageName = null;
             $languageNames = self::getLanguageNames();
-            foreach ($variants as $variant) {
-                if (isset($languageNames[$variant])) {
-                    $languageName = $languageNames[$variant];
-                    if (isset($scriptName) && (!in_array($variant, $variantsWithScript))) {
+            foreach ( $variants as $variant ) {
+                if ( isset( $languageNames[ $variant ] ) ) {
+                    $languageName = $languageNames[ $variant ];
+                    if ( isset( $scriptName ) && ( ! in_array( $variant, $variantsWithScript ) ) ) {
                         $languageName = $scriptName . ' ' . $languageName;
                     }
-                    if (isset($territoryName) && (!in_array($variant, $variantsWithTerritory))) {
-                        $languageName .= ' (' . $territoryNames[$territoryId] . ')';
+                    if ( isset( $territoryName ) && ( ! in_array( $variant, $variantsWithTerritory ) ) ) {
+                        $languageName .= ' (' . $territoryNames[ $territoryId ] . ')';
                     }
                     break;
                 }
             }
-            if (!isset($languageName)) {
+            if ( ! isset( $languageName ) ) {
                 $allGood = false;
             }
             $baseLanguage = null;
-            if (isset($scriptId) || isset($territoryId)) {
-                if (isset($languageNames[$languageId]) && ($languageNames[$languageId] !== $languageName)) {
-                    $baseLanguage = $languageNames[$languageId];
+            if ( isset( $scriptId ) || isset( $territoryId ) ) {
+                if ( isset( $languageNames[ $languageId ] ) && ( $languageNames[ $languageId ] !== $languageName ) ) {
+                    $baseLanguage = $languageNames[ $languageId ];
                 }
             }
             $plural = null;
             $plurals = self::getPlurals();
-            foreach ($variants as $variant) {
-                if (isset($plurals[$variant])) {
-                    $plural = $plurals[$variant];
+            foreach ( $variants as $variant ) {
+                if ( isset( $plurals[ $variant ] ) ) {
+                    $plural = $plurals[ $variant ];
                     break;
                 }
             }
-            if (!isset($plural)) {
+            if ( ! isset( $plural ) ) {
                 $allGood = false;
             }
             $supersededBy = null;
             $supersededBys = self::getSupersededLanguages();
-            foreach ($variants as $variant) {
-                if (isset($supersededBys[$variant])) {
-                    $supersededBy = $supersededBys[$variant];
+            foreach ( $variants as $variant ) {
+                if ( isset( $supersededBys[ $variant ] ) ) {
+                    $supersededBy = $supersededBys[ $variant ];
                     break;
                 }
             }
-            if ($allGood) {
+            if ( $allGood ) {
                 $result = array();
-                $result['id'] = $normalizedId;
-                $result['name'] = $languageName;
-                if (isset($supersededBy)) {
-                    $result['supersededBy'] = $supersededBy;
+                $result[ 'id' ] = $normalizedId;
+                $result[ 'name' ] = $languageName;
+                if ( isset( $supersededBy ) ) {
+                    $result[ 'supersededBy' ] = $supersededBy;
                 }
-                if (isset($scriptStandAloneName)) {
-                    $result['script'] = $scriptStandAloneName;
+                if ( isset( $scriptStandAloneName ) ) {
+                    $result[ 'script' ] = $scriptStandAloneName;
                 }
-                if (isset($territoryName)) {
-                    $result['territory'] = $territoryName;
+                if ( isset( $territoryName ) ) {
+                    $result[ 'territory' ] = $territoryName;
                 }
-                if (isset($baseLanguage)) {
-                    $result['baseLanguage'] = $baseLanguage;
+                if ( isset( $baseLanguage ) ) {
+                    $result[ 'baseLanguage' ] = $baseLanguage;
                 }
-                $result['categories'] = $plural;
+                $result[ 'categories' ] = $plural;
             }
         }
 
@@ -235,21 +235,21 @@ 
      *
      * @return array
      */
-    private static function getData($key)
+    private static function getData( $key )
     {
-        if (!isset(self::$data)) {
-            $fixKeys = function ($list, &$standAlone = null) {
+        if ( ! isset( self::$data ) ) {
+            $fixKeys = function( $list, &$standAlone = null ) {
                 $result = array();
                 $standAlone = array();
                 $match = null;
-                foreach ($list as $key => $value) {
+                foreach ( $list as $key => $value ) {
                     $variant = '';
-                    if (preg_match('/^(.+)-alt-(short|variant|stand-alone|long|menu)$/', $key, $match)) {
-                        $key = $match[1];
-                        $variant = $match[2];
+                    if ( preg_match( '/^(.+)-alt-(short|variant|stand-alone|long|menu)$/', $key, $match ) ) {
+                        $key = $match[ 1 ];
+                        $variant = $match[ 2 ];
                     }
-                    $key = str_replace('-', '_', $key);
-                    switch ($key) {
+                    $key = str_replace( '-', '_', $key );
+                    switch ( $key ) {
                         case 'root': // Language: Root
                         case 'und': // Language: Unknown Language
                         case 'zxx': // Language: No linguistic content
@@ -262,12 +262,12 @@ 
                         case 'Zzzz': // Script: Unknown Script
                             break;
                         default:
-                            switch ($variant) {
+                            switch ( $variant ) {
                                 case 'stand-alone':
-                                    $standAlone[$key] = $value;
+                                    $standAlone[ $key ] = $value;
                                     break;
                                 case '':
-                                    $result[$key] = $value;
+                                    $result[ $key ] = $value;
                                     break;
                             }
                             break;
@@ -277,26 +277,26 @@ 
                 return $result;
             };
             $data = array();
-            $json = json_decode(file_get_contents(__DIR__ . '/cldr-data/main/en-US/languages.json'), true);
-            $data['languages'] = $fixKeys($json['main']['en-US']['localeDisplayNames']['languages']);
-            $json = json_decode(file_get_contents(__DIR__ . '/cldr-data/main/en-US/territories.json'), true);
-            $data['territories'] = $fixKeys($json['main']['en-US']['localeDisplayNames']['territories']);
-            $json = json_decode(file_get_contents(__DIR__ . '/cldr-data/supplemental/plurals.json'), true);
-            $data['plurals'] = $fixKeys($json['supplemental']['plurals-type-cardinal']);
-            $json = json_decode(file_get_contents(__DIR__ . '/cldr-data/main/en-US/scripts.json'), true);
-            $data['scripts'] = $fixKeys($json['main']['en-US']['localeDisplayNames']['scripts'], $data['standAloneScripts']);
-            $data['standAloneScripts'] = array_merge($data['scripts'], $data['standAloneScripts']);
-            $data['scripts'] = array_merge($data['standAloneScripts'], $data['scripts']);
-            $data['supersededLanguages'] = array();
+            $json = json_decode( file_get_contents( __DIR__ . '/cldr-data/main/en-US/languages.json' ), true );
+            $data[ 'languages' ] = $fixKeys( $json[ 'main' ][ 'en-US' ][ 'localeDisplayNames' ][ 'languages' ] );
+            $json = json_decode( file_get_contents( __DIR__ . '/cldr-data/main/en-US/territories.json' ), true );
+            $data[ 'territories' ] = $fixKeys( $json[ 'main' ][ 'en-US' ][ 'localeDisplayNames' ][ 'territories' ] );
+            $json = json_decode( file_get_contents( __DIR__ . '/cldr-data/supplemental/plurals.json' ), true );
+            $data[ 'plurals' ] = $fixKeys( $json[ 'supplemental' ][ 'plurals-type-cardinal' ] );
+            $json = json_decode( file_get_contents( __DIR__ . '/cldr-data/main/en-US/scripts.json' ), true );
+            $data[ 'scripts' ] = $fixKeys( $json[ 'main' ][ 'en-US' ][ 'localeDisplayNames' ][ 'scripts' ], $data[ 'standAloneScripts' ] );
+            $data[ 'standAloneScripts' ] = array_merge( $data[ 'scripts' ], $data[ 'standAloneScripts' ] );
+            $data[ 'scripts' ] = array_merge( $data[ 'standAloneScripts' ], $data[ 'scripts' ] );
+            $data[ 'supersededLanguages' ] = array();
             // Remove the languages for which we don't have plurals
             $m = null;
-            foreach (array_keys(array_diff_key($data['languages'], $data['plurals'])) as $missingPlural) {
-                if (preg_match('/^([a-z]{2,3})_/', $missingPlural, $m)) {
-                    if (!isset($data['plurals'][$m[1]])) {
-                        unset($data['languages'][$missingPlural]);
+            foreach ( array_keys( array_diff_key( $data[ 'languages' ], $data[ 'plurals' ] ) ) as $missingPlural ) {
+                if ( preg_match( '/^([a-z]{2,3})_/', $missingPlural, $m ) ) {
+                    if ( ! isset( $data[ 'plurals' ][ $m[ 1 ] ] ) ) {
+                        unset( $data[ 'languages' ][ $missingPlural ] );
                     }
                 } else {
-                    unset($data['languages'][$missingPlural]);
+                    unset( $data[ 'languages' ][ $missingPlural ] );
                 }
             }
             // Fix the languages for which we have plurals
@@ -313,30 +313,30 @@ 
                 'nah' => 'Nahuatl',
                 'smi' => 'Sami',
             );
-            foreach (array_keys(array_diff_key($data['plurals'], $data['languages'])) as $missingLanguage) {
-                if (isset($formerCodes[$missingLanguage]) && isset($data['languages'][$formerCodes[$missingLanguage]])) {
-                    $data['languages'][$missingLanguage] = $data['languages'][$formerCodes[$missingLanguage]];
-                    $data['supersededLanguages'][$missingLanguage] = $formerCodes[$missingLanguage];
+            foreach ( array_keys( array_diff_key( $data[ 'plurals' ], $data[ 'languages' ] ) ) as $missingLanguage ) {
+                if ( isset( $formerCodes[ $missingLanguage ] ) && isset( $data[ 'languages' ][ $formerCodes[ $missingLanguage ] ] ) ) {
+                    $data[ 'languages' ][ $missingLanguage ] = $data[ 'languages' ][ $formerCodes[ $missingLanguage ] ];
+                    $data[ 'supersededLanguages' ][ $missingLanguage ] = $formerCodes[ $missingLanguage ];
                 } else {
-                    if (isset($knownMissingLanguages[$missingLanguage])) {
-                        $data['languages'][$missingLanguage] = $knownMissingLanguages[$missingLanguage];
+                    if ( isset( $knownMissingLanguages[ $missingLanguage ] ) ) {
+                        $data[ 'languages' ][ $missingLanguage ] = $knownMissingLanguages[ $missingLanguage ];
                     } else {
-                        throw new Exception("We have the plural rule for the language '{$missingLanguage}' but we don't have its language name");
+                        throw new Exception( "We have the plural rule for the language '{$missingLanguage}' but we don't have its language name" );
                     }
                 }
             }
-            ksort($data['languages'], SORT_STRING);
-            ksort($data['territories'], SORT_STRING);
-            ksort($data['plurals'], SORT_STRING);
-            ksort($data['scripts'], SORT_STRING);
-            ksort($data['standAloneScripts'], SORT_STRING);
-            ksort($data['supersededLanguages'], SORT_STRING);
+            ksort( $data[ 'languages' ], SORT_STRING );
+            ksort( $data[ 'territories' ], SORT_STRING );
+            ksort( $data[ 'plurals' ], SORT_STRING );
+            ksort( $data[ 'scripts' ], SORT_STRING );
+            ksort( $data[ 'standAloneScripts' ], SORT_STRING );
+            ksort( $data[ 'supersededLanguages' ], SORT_STRING );
             self::$data = $data;
         }
-        if (!isset(self::$data[$key])) {
-            throw new Exception("Invalid CLDR data key: '{$key}'");
+        if ( ! isset( self::$data[ $key ] ) ) {
+            throw new Exception( "Invalid CLDR data key: '{$key}'" );
         }
 
-        return self::$data[$key];
+        return self::$data[ $key ];
     }
 }

Braces +8 added lines, -16 removed lines

@@ -7,8 +7,7 @@ 
 /**
  * Holds the CLDR data.
  */
-class CldrData
-{
+class CldrData {
     /**
      * Super-special plural category: this should always be present for any language.
      *
@@ -42,8 +41,7 @@ 
      *
      * @return string[]
      */
-    public static function getLanguageNames()
-    {
+    public static function getLanguageNames() {
         return self::getData('languages');
     }
 
@@ -54,8 +52,7 @@ 
      *
      * @return string[]
      */
-    public static function getTerritoryNames()
-    {
+    public static function getTerritoryNames() {
         return self::getData('territories');
     }
 
@@ -68,8 +65,7 @@ 
      *
      * @return string[]
      */
-    public static function getScriptNames($standAlone)
-    {
+    public static function getScriptNames($standAlone) {
         return self::getData($standAlone ? 'standAloneScripts' : 'scripts');
     }
 
@@ -88,8 +84,7 @@ 
      *
      * @return array
      */
-    public static function getPlurals()
-    {
+    public static function getPlurals() {
         return self::getData('plurals');
     }
 
@@ -98,8 +93,7 @@ 
      *
      * @return array keys are the former language codes, values are the new language/locale codes
      */
-    public static function getSupersededLanguages()
-    {
+    public static function getSupersededLanguages() {
         return self::getData('supersededLanguages');
     }
 
@@ -110,8 +104,7 @@ 
      *
      * @return array|null Returns an array with the keys 'id' (normalized), 'name', 'supersededBy' (optional), 'territory' (optional), 'script' (optional), 'baseLanguage' (optional), 'categories'. If $id is not valid returns null.
      */
-    public static function getLanguageInfo($id)
-    {
+    public static function getLanguageInfo($id) {
         $result = null;
         $matches = array();
         if (preg_match('/^([a-z]{2,3})(?:[_\-]([a-z]{4}))?(?:[_\-]([a-z]{2}|[0-9]{3}))?(?:$|-)/i', $id, $matches)) {
@@ -235,8 +228,7 @@ 
      *
      * @return array
      */
-    private static function getData($key)
-    {
+    private static function getData($key) {
         if (!isset(self::$data)) {
             $fixKeys = function ($list, &$standAlone = null) {
                 $result = array();

Indentation +313 added lines, -313 removed lines

@@ -15,330 +15,330 @@
  */
 class CldrData
 {
-    /**
-     * Super-special plural category: this should always be present for any language.
-     *
-     * @var string
-     */
-    const OTHER_CATEGORY = 'other';
+	/**
+	 * Super-special plural category: this should always be present for any language.
+	 *
+	 * @var string
+	 */
+	const OTHER_CATEGORY = 'other';
 
-    /**
-     * The list of the plural categories, sorted from 'zero' to 'other'.
-     *
-     * @var string[]
-     */
-    public static $categories = array('zero', 'one', 'two', 'few', 'many', self::OTHER_CATEGORY);
+	/**
+	 * The list of the plural categories, sorted from 'zero' to 'other'.
+	 *
+	 * @var string[]
+	 */
+	public static $categories = array('zero', 'one', 'two', 'few', 'many', self::OTHER_CATEGORY);
 
-    /**
-     * The loaded CLDR data.
-     *
-     * @var array
-     */
-    private static $data;
+	/**
+	 * The loaded CLDR data.
+	 *
+	 * @var array
+	 */
+	private static $data;
 
-    /**
-     * @var array
-     */
-    private static $plurals;
+	/**
+	 * @var array
+	 */
+	private static $plurals;
 
-    /**
-     * Returns a dictionary containing the language names.
-     * The keys are the language identifiers.
-     * The values are the language names in US English.
-     *
-     * @return string[]
-     */
-    public static function getLanguageNames()
-    {
-        return self::getData('languages');
-    }
+	/**
+	 * Returns a dictionary containing the language names.
+	 * The keys are the language identifiers.
+	 * The values are the language names in US English.
+	 *
+	 * @return string[]
+	 */
+	public static function getLanguageNames()
+	{
+		return self::getData('languages');
+	}
 
-    /**
-     * Return a dictionary containing the territory names (in US English).
-     * The keys are the territory identifiers.
-     * The values are the territory names in US English.
-     *
-     * @return string[]
-     */
-    public static function getTerritoryNames()
-    {
-        return self::getData('territories');
-    }
+	/**
+	 * Return a dictionary containing the territory names (in US English).
+	 * The keys are the territory identifiers.
+	 * The values are the territory names in US English.
+	 *
+	 * @return string[]
+	 */
+	public static function getTerritoryNames()
+	{
+		return self::getData('territories');
+	}
 
-    /**
-     * Return a dictionary containing the script names (in US English).
-     * The keys are the script identifiers.
-     * The values are the script names in US English.
-     *
-     * @param bool $standAlone set to true to retrieve the stand-alone script names, false otherwise
-     *
-     * @return string[]
-     */
-    public static function getScriptNames($standAlone)
-    {
-        return self::getData($standAlone ? 'standAloneScripts' : 'scripts');
-    }
+	/**
+	 * Return a dictionary containing the script names (in US English).
+	 * The keys are the script identifiers.
+	 * The values are the script names in US English.
+	 *
+	 * @param bool $standAlone set to true to retrieve the stand-alone script names, false otherwise
+	 *
+	 * @return string[]
+	 */
+	public static function getScriptNames($standAlone)
+	{
+		return self::getData($standAlone ? 'standAloneScripts' : 'scripts');
+	}
 
-    /**
-     * A dictionary containing the plural rules.
-     * The keys are the language identifiers.
-     * The values are arrays whose keys are the CLDR category names and the values are the CLDR category definition.
-     *
-     * @example The English key-value pair is somethink like this:
-     * <code><pre>
-     * "en": {
-     *     "pluralRule-count-one": "i = 1 and v = 0 @integer 1",
-     *     "pluralRule-count-other": " @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, … @decimal 0.0~1.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
-     * }
-     * </pre></code>
-     *
-     * @return array
-     */
-    public static function getPlurals()
-    {
-        return self::getData('plurals');
-    }
+	/**
+	 * A dictionary containing the plural rules.
+	 * The keys are the language identifiers.
+	 * The values are arrays whose keys are the CLDR category names and the values are the CLDR category definition.
+	 *
+	 * @example The English key-value pair is somethink like this:
+	 * <code><pre>
+	 * "en": {
+	 *     "pluralRule-count-one": "i = 1 and v = 0 @integer 1",
+	 *     "pluralRule-count-other": " @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, … @decimal 0.0~1.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
+	 * }
+	 * </pre></code>
+	 *
+	 * @return array
+	 */
+	public static function getPlurals()
+	{
+		return self::getData('plurals');
+	}
 
-    /**
-     * Return a list of superseded language codes.
-     *
-     * @return array keys are the former language codes, values are the new language/locale codes
-     */
-    public static function getSupersededLanguages()
-    {
-        return self::getData('supersededLanguages');
-    }
+	/**
+	 * Return a list of superseded language codes.
+	 *
+	 * @return array keys are the former language codes, values are the new language/locale codes
+	 */
+	public static function getSupersededLanguages()
+	{
+		return self::getData('supersededLanguages');
+	}
 
-    /**
-     * Retrieve the name of a language, as well as if a language code is deprecated in favor of another language code.
-     *
-     * @param string $id the language identifier
-     *
-     * @return array|null Returns an array with the keys 'id' (normalized), 'name', 'supersededBy' (optional), 'territory' (optional), 'script' (optional), 'baseLanguage' (optional), 'categories'. If $id is not valid returns null.
-     */
-    public static function getLanguageInfo($id)
-    {
-        $result = null;
-        $matches = array();
-        if (preg_match('/^([a-z]{2,3})(?:[_\-]([a-z]{4}))?(?:[_\-]([a-z]{2}|[0-9]{3}))?(?:$|-)/i', $id, $matches)) {
-            $languageId = strtolower($matches[1]);
-            $scriptId = (isset($matches[2]) && ($matches[2] !== '')) ? ucfirst(strtolower($matches[2])) : null;
-            $territoryId = (isset($matches[3]) && ($matches[3] !== '')) ? strtoupper($matches[3]) : null;
-            $normalizedId = $languageId;
-            if (isset($scriptId)) {
-                $normalizedId .= '_' . $scriptId;
-            }
-            if (isset($territoryId)) {
-                $normalizedId .= '_' . $territoryId;
-            }
-            // Structure precedence: see Likely Subtags - http://www.unicode.org/reports/tr35/tr35-31/tr35.html#Likely_Subtags
-            $variants = array();
-            $variantsWithScript = array();
-            $variantsWithTerritory = array();
-            if (isset($scriptId) && isset($territoryId)) {
-                $variantsWithTerritory[] = $variantsWithScript[] = $variants[] = "{$languageId}_{$scriptId}_{$territoryId}";
-            }
-            if (isset($scriptId)) {
-                $variantsWithScript[] = $variants[] = "{$languageId}_{$scriptId}";
-            }
-            if (isset($territoryId)) {
-                $variantsWithTerritory[] = $variants[] = "{$languageId}_{$territoryId}";
-            }
-            $variants[] = $languageId;
-            $allGood = true;
-            $scriptName = null;
-            $scriptStandAloneName = null;
-            if (isset($scriptId)) {
-                $scriptNames = self::getScriptNames(false);
-                if (isset($scriptNames[$scriptId])) {
-                    $scriptName = $scriptNames[$scriptId];
-                    $scriptStandAloneNames = self::getScriptNames(true);
-                    $scriptStandAloneName = $scriptStandAloneNames[$scriptId];
-                } else {
-                    $allGood = false;
-                }
-            }
-            $territoryName = null;
-            if (isset($territoryId)) {
-                $territoryNames = self::getTerritoryNames();
-                if (isset($territoryNames[$territoryId])) {
-                    if ($territoryId !== '001') {
-                        $territoryName = $territoryNames[$territoryId];
-                    }
-                } else {
-                    $allGood = false;
-                }
-            }
-            $languageName = null;
-            $languageNames = self::getLanguageNames();
-            foreach ($variants as $variant) {
-                if (isset($languageNames[$variant])) {
-                    $languageName = $languageNames[$variant];
-                    if (isset($scriptName) && (!in_array($variant, $variantsWithScript))) {
-                        $languageName = $scriptName . ' ' . $languageName;
-                    }
-                    if (isset($territoryName) && (!in_array($variant, $variantsWithTerritory))) {
-                        $languageName .= ' (' . $territoryNames[$territoryId] . ')';
-                    }
-                    break;
-                }
-            }
-            if (!isset($languageName)) {
-                $allGood = false;
-            }
-            $baseLanguage = null;
-            if (isset($scriptId) || isset($territoryId)) {
-                if (isset($languageNames[$languageId]) && ($languageNames[$languageId] !== $languageName)) {
-                    $baseLanguage = $languageNames[$languageId];
-                }
-            }
-            $plural = null;
-            $plurals = self::getPlurals();
-            foreach ($variants as $variant) {
-                if (isset($plurals[$variant])) {
-                    $plural = $plurals[$variant];
-                    break;
-                }
-            }
-            if (!isset($plural)) {
-                $allGood = false;
-            }
-            $supersededBy = null;
-            $supersededBys = self::getSupersededLanguages();
-            foreach ($variants as $variant) {
-                if (isset($supersededBys[$variant])) {
-                    $supersededBy = $supersededBys[$variant];
-                    break;
-                }
-            }
-            if ($allGood) {
-                $result = array();
-                $result['id'] = $normalizedId;
-                $result['name'] = $languageName;
-                if (isset($supersededBy)) {
-                    $result['supersededBy'] = $supersededBy;
-                }
-                if (isset($scriptStandAloneName)) {
-                    $result['script'] = $scriptStandAloneName;
-                }
-                if (isset($territoryName)) {
-                    $result['territory'] = $territoryName;
-                }
-                if (isset($baseLanguage)) {
-                    $result['baseLanguage'] = $baseLanguage;
-                }
-                $result['categories'] = $plural;
-            }
-        }
+	/**
+	 * Retrieve the name of a language, as well as if a language code is deprecated in favor of another language code.
+	 *
+	 * @param string $id the language identifier
+	 *
+	 * @return array|null Returns an array with the keys 'id' (normalized), 'name', 'supersededBy' (optional), 'territory' (optional), 'script' (optional), 'baseLanguage' (optional), 'categories'. If $id is not valid returns null.
+	 */
+	public static function getLanguageInfo($id)
+	{
+		$result = null;
+		$matches = array();
+		if (preg_match('/^([a-z]{2,3})(?:[_\-]([a-z]{4}))?(?:[_\-]([a-z]{2}|[0-9]{3}))?(?:$|-)/i', $id, $matches)) {
+			$languageId = strtolower($matches[1]);
+			$scriptId = (isset($matches[2]) && ($matches[2] !== '')) ? ucfirst(strtolower($matches[2])) : null;
+			$territoryId = (isset($matches[3]) && ($matches[3] !== '')) ? strtoupper($matches[3]) : null;
+			$normalizedId = $languageId;
+			if (isset($scriptId)) {
+				$normalizedId .= '_' . $scriptId;
+			}
+			if (isset($territoryId)) {
+				$normalizedId .= '_' . $territoryId;
+			}
+			// Structure precedence: see Likely Subtags - http://www.unicode.org/reports/tr35/tr35-31/tr35.html#Likely_Subtags
+			$variants = array();
+			$variantsWithScript = array();
+			$variantsWithTerritory = array();
+			if (isset($scriptId) && isset($territoryId)) {
+				$variantsWithTerritory[] = $variantsWithScript[] = $variants[] = "{$languageId}_{$scriptId}_{$territoryId}";
+			}
+			if (isset($scriptId)) {
+				$variantsWithScript[] = $variants[] = "{$languageId}_{$scriptId}";
+			}
+			if (isset($territoryId)) {
+				$variantsWithTerritory[] = $variants[] = "{$languageId}_{$territoryId}";
+			}
+			$variants[] = $languageId;
+			$allGood = true;
+			$scriptName = null;
+			$scriptStandAloneName = null;
+			if (isset($scriptId)) {
+				$scriptNames = self::getScriptNames(false);
+				if (isset($scriptNames[$scriptId])) {
+					$scriptName = $scriptNames[$scriptId];
+					$scriptStandAloneNames = self::getScriptNames(true);
+					$scriptStandAloneName = $scriptStandAloneNames[$scriptId];
+				} else {
+					$allGood = false;
+				}
+			}
+			$territoryName = null;
+			if (isset($territoryId)) {
+				$territoryNames = self::getTerritoryNames();
+				if (isset($territoryNames[$territoryId])) {
+					if ($territoryId !== '001') {
+						$territoryName = $territoryNames[$territoryId];
+					}
+				} else {
+					$allGood = false;
+				}
+			}
+			$languageName = null;
+			$languageNames = self::getLanguageNames();
+			foreach ($variants as $variant) {
+				if (isset($languageNames[$variant])) {
+					$languageName = $languageNames[$variant];
+					if (isset($scriptName) && (!in_array($variant, $variantsWithScript))) {
+						$languageName = $scriptName . ' ' . $languageName;
+					}
+					if (isset($territoryName) && (!in_array($variant, $variantsWithTerritory))) {
+						$languageName .= ' (' . $territoryNames[$territoryId] . ')';
+					}
+					break;
+				}
+			}
+			if (!isset($languageName)) {
+				$allGood = false;
+			}
+			$baseLanguage = null;
+			if (isset($scriptId) || isset($territoryId)) {
+				if (isset($languageNames[$languageId]) && ($languageNames[$languageId] !== $languageName)) {
+					$baseLanguage = $languageNames[$languageId];
+				}
+			}
+			$plural = null;
+			$plurals = self::getPlurals();
+			foreach ($variants as $variant) {
+				if (isset($plurals[$variant])) {
+					$plural = $plurals[$variant];
+					break;
+				}
+			}
+			if (!isset($plural)) {
+				$allGood = false;
+			}
+			$supersededBy = null;
+			$supersededBys = self::getSupersededLanguages();
+			foreach ($variants as $variant) {
+				if (isset($supersededBys[$variant])) {
+					$supersededBy = $supersededBys[$variant];
+					break;
+				}
+			}
+			if ($allGood) {
+				$result = array();
+				$result['id'] = $normalizedId;
+				$result['name'] = $languageName;
+				if (isset($supersededBy)) {
+					$result['supersededBy'] = $supersededBy;
+				}
+				if (isset($scriptStandAloneName)) {
+					$result['script'] = $scriptStandAloneName;
+				}
+				if (isset($territoryName)) {
+					$result['territory'] = $territoryName;
+				}
+				if (isset($baseLanguage)) {
+					$result['baseLanguage'] = $baseLanguage;
+				}
+				$result['categories'] = $plural;
+			}
+		}
 
-        return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * Returns the loaded CLDR data.
-     *
-     * @param string $key Can be 'languages', 'territories', 'plurals', 'supersededLanguages', 'scripts', 'standAloneScripts'
-     *
-     * @return array
-     */
-    private static function getData($key)
-    {
-        if (!isset(self::$data)) {
-            $fixKeys = function ($list, &$standAlone = null) {
-                $result = array();
-                $standAlone = array();
-                $match = null;
-                foreach ($list as $key => $value) {
-                    $variant = '';
-                    if (preg_match('/^(.+)-alt-(short|variant|stand-alone|long|menu)$/', $key, $match)) {
-                        $key = $match[1];
-                        $variant = $match[2];
-                    }
-                    $key = str_replace('-', '_', $key);
-                    switch ($key) {
-                        case 'root': // Language: Root
-                        case 'und': // Language: Unknown Language
-                        case 'zxx': // Language: No linguistic content
-                        case 'ZZ': // Territory: Unknown Region
-                        case 'Zinh': // Script: Inherited
-                        case 'Zmth': // Script: Mathematical Notation
-                        case 'Zsym': // Script: Symbols
-                        case 'Zxxx': // Script: Unwritten
-                        case 'Zyyy': // Script: Common
-                        case 'Zzzz': // Script: Unknown Script
-                            break;
-                        default:
-                            switch ($variant) {
-                                case 'stand-alone':
-                                    $standAlone[$key] = $value;
-                                    break;
-                                case '':
-                                    $result[$key] = $value;
-                                    break;
-                            }
-                            break;
-                    }
-                }
+	/**
+	 * Returns the loaded CLDR data.
+	 *
+	 * @param string $key Can be 'languages', 'territories', 'plurals', 'supersededLanguages', 'scripts', 'standAloneScripts'
+	 *
+	 * @return array
+	 */
+	private static function getData($key)
+	{
+		if (!isset(self::$data)) {
+			$fixKeys = function ($list, &$standAlone = null) {
+				$result = array();
+				$standAlone = array();
+				$match = null;
+				foreach ($list as $key => $value) {
+					$variant = '';
+					if (preg_match('/^(.+)-alt-(short|variant|stand-alone|long|menu)$/', $key, $match)) {
+						$key = $match[1];
+						$variant = $match[2];
+					}
+					$key = str_replace('-', '_', $key);
+					switch ($key) {
+						case 'root': // Language: Root
+						case 'und': // Language: Unknown Language
+						case 'zxx': // Language: No linguistic content
+						case 'ZZ': // Territory: Unknown Region
+						case 'Zinh': // Script: Inherited
+						case 'Zmth': // Script: Mathematical Notation
+						case 'Zsym': // Script: Symbols
+						case 'Zxxx': // Script: Unwritten
+						case 'Zyyy': // Script: Common
+						case 'Zzzz': // Script: Unknown Script
+							break;
+						default:
+							switch ($variant) {
+								case 'stand-alone':
+									$standAlone[$key] = $value;
+									break;
+								case '':
+									$result[$key] = $value;
+									break;
+							}
+							break;
+					}
+				}
 
-                return $result;
-            };
-            $data = array();
-            $json = json_decode(file_get_contents(__DIR__ . '/cldr-data/main/en-US/languages.json'), true);
-            $data['languages'] = $fixKeys($json['main']['en-US']['localeDisplayNames']['languages']);
-            $json = json_decode(file_get_contents(__DIR__ . '/cldr-data/main/en-US/territories.json'), true);
-            $data['territories'] = $fixKeys($json['main']['en-US']['localeDisplayNames']['territories']);
-            $json = json_decode(file_get_contents(__DIR__ . '/cldr-data/supplemental/plurals.json'), true);
-            $data['plurals'] = $fixKeys($json['supplemental']['plurals-type-cardinal']);
-            $json = json_decode(file_get_contents(__DIR__ . '/cldr-data/main/en-US/scripts.json'), true);
-            $data['scripts'] = $fixKeys($json['main']['en-US']['localeDisplayNames']['scripts'], $data['standAloneScripts']);
-            $data['standAloneScripts'] = array_merge($data['scripts'], $data['standAloneScripts']);
-            $data['scripts'] = array_merge($data['standAloneScripts'], $data['scripts']);
-            $data['supersededLanguages'] = array();
-            // Remove the languages for which we don't have plurals
-            $m = null;
-            foreach (array_keys(array_diff_key($data['languages'], $data['plurals'])) as $missingPlural) {
-                if (preg_match('/^([a-z]{2,3})_/', $missingPlural, $m)) {
-                    if (!isset($data['plurals'][$m[1]])) {
-                        unset($data['languages'][$missingPlural]);
-                    }
-                } else {
-                    unset($data['languages'][$missingPlural]);
-                }
-            }
-            // Fix the languages for which we have plurals
-            $formerCodes = array(
-                'jw' => 'jv', // former Javanese
-                'mo' => 'ro_MD', // former Moldavian
-            );
-            $knownMissingLanguages = array(
-                'guw' => 'Gun',
-                'nah' => 'Nahuatl',
-                'smi' => 'Sami',
-            );
-            foreach (array_keys(array_diff_key($data['plurals'], $data['languages'])) as $missingLanguage) {
-                if (isset($formerCodes[$missingLanguage]) && isset($data['languages'][$formerCodes[$missingLanguage]])) {
-                    $data['languages'][$missingLanguage] = $data['languages'][$formerCodes[$missingLanguage]];
-                    $data['supersededLanguages'][$missingLanguage] = $formerCodes[$missingLanguage];
-                } else {
-                    if (isset($knownMissingLanguages[$missingLanguage])) {
-                        $data['languages'][$missingLanguage] = $knownMissingLanguages[$missingLanguage];
-                    } else {
-                        throw new Exception("We have the plural rule for the language '{$missingLanguage}' but we don't have its language name");
-                    }
-                }
-            }
-            ksort($data['languages'], SORT_STRING);
-            ksort($data['territories'], SORT_STRING);
-            ksort($data['plurals'], SORT_STRING);
-            ksort($data['scripts'], SORT_STRING);
-            ksort($data['standAloneScripts'], SORT_STRING);
-            ksort($data['supersededLanguages'], SORT_STRING);
-            self::$data = $data;
-        }
-        if (!isset(self::$data[$key])) {
-            throw new Exception("Invalid CLDR data key: '{$key}'");
-        }
+				return $result;
+			};
+			$data = array();
+			$json = json_decode(file_get_contents(__DIR__ . '/cldr-data/main/en-US/languages.json'), true);
+			$data['languages'] = $fixKeys($json['main']['en-US']['localeDisplayNames']['languages']);
+			$json = json_decode(file_get_contents(__DIR__ . '/cldr-data/main/en-US/territories.json'), true);
+			$data['territories'] = $fixKeys($json['main']['en-US']['localeDisplayNames']['territories']);
+			$json = json_decode(file_get_contents(__DIR__ . '/cldr-data/supplemental/plurals.json'), true);
+			$data['plurals'] = $fixKeys($json['supplemental']['plurals-type-cardinal']);
+			$json = json_decode(file_get_contents(__DIR__ . '/cldr-data/main/en-US/scripts.json'), true);
+			$data['scripts'] = $fixKeys($json['main']['en-US']['localeDisplayNames']['scripts'], $data['standAloneScripts']);
+			$data['standAloneScripts'] = array_merge($data['scripts'], $data['standAloneScripts']);
+			$data['scripts'] = array_merge($data['standAloneScripts'], $data['scripts']);
+			$data['supersededLanguages'] = array();
+			// Remove the languages for which we don't have plurals
+			$m = null;
+			foreach (array_keys(array_diff_key($data['languages'], $data['plurals'])) as $missingPlural) {
+				if (preg_match('/^([a-z]{2,3})_/', $missingPlural, $m)) {
+					if (!isset($data['plurals'][$m[1]])) {
+						unset($data['languages'][$missingPlural]);
+					}
+				} else {
+					unset($data['languages'][$missingPlural]);
+				}
+			}
+			// Fix the languages for which we have plurals
+			$formerCodes = array(
+				'jw' => 'jv', // former Javanese
+				'mo' => 'ro_MD', // former Moldavian
+			);
+			$knownMissingLanguages = array(
+				'guw' => 'Gun',
+				'nah' => 'Nahuatl',
+				'smi' => 'Sami',
+			);
+			foreach (array_keys(array_diff_key($data['plurals'], $data['languages'])) as $missingLanguage) {
+				if (isset($formerCodes[$missingLanguage]) && isset($data['languages'][$formerCodes[$missingLanguage]])) {
+					$data['languages'][$missingLanguage] = $data['languages'][$formerCodes[$missingLanguage]];
+					$data['supersededLanguages'][$missingLanguage] = $formerCodes[$missingLanguage];
+				} else {
+					if (isset($knownMissingLanguages[$missingLanguage])) {
+						$data['languages'][$missingLanguage] = $knownMissingLanguages[$missingLanguage];
+					} else {
+						throw new Exception("We have the plural rule for the language '{$missingLanguage}' but we don't have its language name");
+					}
+				}
+			}
+			ksort($data['languages'], SORT_STRING);
+			ksort($data['territories'], SORT_STRING);
+			ksort($data['plurals'], SORT_STRING);
+			ksort($data['scripts'], SORT_STRING);
+			ksort($data['standAloneScripts'], SORT_STRING);
+			ksort($data['supersededLanguages'], SORT_STRING);
+			self::$data = $data;
+		}
+		if (!isset(self::$data[$key])) {
+			throw new Exception("Invalid CLDR data key: '{$key}'");
+		}
 
-        return self::$data[$key];
-    }
+		return self::$data[$key];
+	}
 }

vendor/gettext/languages/src/Exporter/Exporter.php

Indentation +130 added lines, -130 removed lines

@@ -9,145 +9,145 @@
  */
 abstract class Exporter
 {
-    /**
-     * @var array
-     */
-    private static $exporters;
+	/**
+	 * @var array
+	 */
+	private static $exporters;
 
-    /**
-     * Return the list of all the available exporters. Keys are the exporter handles, values are the exporter class names.
-     *
-     * @param bool $onlyForPublicUse if true, internal exporters will be omitted
-     *
-     * @return string[]
-     */
-    final public static function getExporters($onlyForPublicUse = false)
-    {
-        if (!isset(self::$exporters)) {
-            $exporters = array();
-            $m = null;
-            foreach (scandir(__DIR__) as $f) {
-                if (preg_match('/^(\w+)\.php$/', $f, $m)) {
-                    if ($f !== basename(__FILE__)) {
-                        $exporters[strtolower($m[1])] = $m[1];
-                    }
-                }
-            }
-            self::$exporters = $exporters;
-        }
-        if ($onlyForPublicUse) {
-            $result = array();
-            foreach (self::$exporters as $handle => $class) {
-                if (call_user_func(self::getExporterClassName($handle) . '::isForPublicUse') === true) {
-                    $result[$handle] = $class;
-                }
-            }
-        } else {
-            $result = self::$exporters;
-        }
+	/**
+	 * Return the list of all the available exporters. Keys are the exporter handles, values are the exporter class names.
+	 *
+	 * @param bool $onlyForPublicUse if true, internal exporters will be omitted
+	 *
+	 * @return string[]
+	 */
+	final public static function getExporters($onlyForPublicUse = false)
+	{
+		if (!isset(self::$exporters)) {
+			$exporters = array();
+			$m = null;
+			foreach (scandir(__DIR__) as $f) {
+				if (preg_match('/^(\w+)\.php$/', $f, $m)) {
+					if ($f !== basename(__FILE__)) {
+						$exporters[strtolower($m[1])] = $m[1];
+					}
+				}
+			}
+			self::$exporters = $exporters;
+		}
+		if ($onlyForPublicUse) {
+			$result = array();
+			foreach (self::$exporters as $handle => $class) {
+				if (call_user_func(self::getExporterClassName($handle) . '::isForPublicUse') === true) {
+					$result[$handle] = $class;
+				}
+			}
+		} else {
+			$result = self::$exporters;
+		}
 
-        return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * Return the description of a specific exporter.
-     *
-     * @param string $exporterHandle the handle of the exporter
-     *
-     * @throws \Exception throws an Exception if $exporterHandle is not valid
-     *
-     * @return string
-     */
-    final public static function getExporterDescription($exporterHandle)
-    {
-        $exporters = self::getExporters();
-        if (!isset($exporters[$exporterHandle])) {
-            throw new Exception("Invalid exporter handle: '{$exporterHandle}'");
-        }
+	/**
+	 * Return the description of a specific exporter.
+	 *
+	 * @param string $exporterHandle the handle of the exporter
+	 *
+	 * @throws \Exception throws an Exception if $exporterHandle is not valid
+	 *
+	 * @return string
+	 */
+	final public static function getExporterDescription($exporterHandle)
+	{
+		$exporters = self::getExporters();
+		if (!isset($exporters[$exporterHandle])) {
+			throw new Exception("Invalid exporter handle: '{$exporterHandle}'");
+		}
 
-        return call_user_func(self::getExporterClassName($exporterHandle) . '::getDescription');
-    }
+		return call_user_func(self::getExporterClassName($exporterHandle) . '::getDescription');
+	}
 
-    /**
-     * Returns the fully qualified class name of a exporter given its handle.
-     *
-     * @param string $exporterHandle the exporter class handle
-     *
-     * @return string
-     */
-    final public static function getExporterClassName($exporterHandle)
-    {
-        return __NAMESPACE__ . '\\' . ucfirst(strtolower($exporterHandle));
-    }
+	/**
+	 * Returns the fully qualified class name of a exporter given its handle.
+	 *
+	 * @param string $exporterHandle the exporter class handle
+	 *
+	 * @return string
+	 */
+	final public static function getExporterClassName($exporterHandle)
+	{
+		return __NAMESPACE__ . '\\' . ucfirst(strtolower($exporterHandle));
+	}
 
-    /**
-     * Convert a list of Language instances to string.
-     *
-     * @param \Gettext\Languages\Language[] $languages the Language instances to convert
-     * @param array|null $options
-     *
-     * @return string
-     */
-    final public static function toString($languages, $options = null)
-    {
-        if (isset($options) && is_array($options)) {
-            if (isset($options['us-ascii']) && $options['us-ascii']) {
-                $asciiList = array();
-                foreach ($languages as $language) {
-                    $asciiList[] = $language->getUSAsciiClone();
-                }
-                $languages = $asciiList;
-            }
-        }
+	/**
+	 * Convert a list of Language instances to string.
+	 *
+	 * @param \Gettext\Languages\Language[] $languages the Language instances to convert
+	 * @param array|null $options
+	 *
+	 * @return string
+	 */
+	final public static function toString($languages, $options = null)
+	{
+		if (isset($options) && is_array($options)) {
+			if (isset($options['us-ascii']) && $options['us-ascii']) {
+				$asciiList = array();
+				foreach ($languages as $language) {
+					$asciiList[] = $language->getUSAsciiClone();
+				}
+				$languages = $asciiList;
+			}
+		}
 
-        return static::toStringDo($languages);
-    }
+		return static::toStringDo($languages);
+	}
 
-    /**
-     * Save the Language instances to a file.
-     *
-     * @param \Gettext\Languages\Language[] $languages the Language instances to convert
-     * @param array|null $options
-     *
-     * @throws \Exception
-     */
-    final public static function toFile($languages, $filename, $options = null)
-    {
-        $data = self::toString($languages, $options);
-        if (@file_put_contents($filename, $data) === false) {
-            throw new Exception("Error writing data to '{$filename}'");
-        }
-    }
+	/**
+	 * Save the Language instances to a file.
+	 *
+	 * @param \Gettext\Languages\Language[] $languages the Language instances to convert
+	 * @param array|null $options
+	 *
+	 * @throws \Exception
+	 */
+	final public static function toFile($languages, $filename, $options = null)
+	{
+		$data = self::toString($languages, $options);
+		if (@file_put_contents($filename, $data) === false) {
+			throw new Exception("Error writing data to '{$filename}'");
+		}
+	}
 
-    /**
-     * Is this exporter for public use?
-     *
-     * @return bool
-     */
-    public static function isForPublicUse()
-    {
-        return true;
-    }
+	/**
+	 * Is this exporter for public use?
+	 *
+	 * @return bool
+	 */
+	public static function isForPublicUse()
+	{
+		return true;
+	}
 
-    /**
-     * Return a short description of the exporter.
-     *
-     * @return string
-     */
-    public static function getDescription()
-    {
-        throw new Exception(get_called_class() . ' does not implement the method ' . __FUNCTION__);
-    }
+	/**
+	 * Return a short description of the exporter.
+	 *
+	 * @return string
+	 */
+	public static function getDescription()
+	{
+		throw new Exception(get_called_class() . ' does not implement the method ' . __FUNCTION__);
+	}
 
-    /**
-     * Convert a list of Language instances to string.
-     *
-     * @param \Gettext\Languages\Language[] $languages the Language instances to convert
-     *
-     * @return string
-     */
-    protected static function toStringDo($languages)
-    {
-        throw new Exception(get_called_class() . ' does not implement the method ' . __FUNCTION__);
-    }
+	/**
+	 * Convert a list of Language instances to string.
+	 *
+	 * @param \Gettext\Languages\Language[] $languages the Language instances to convert
+	 *
+	 * @return string
+	 */
+	protected static function toStringDo($languages)
+	{
+		throw new Exception(get_called_class() . ' does not implement the method ' . __FUNCTION__);
+	}
 }

Spacing +29 added lines, -29 removed lines

@@ -21,25 +21,25 @@ 
      *
      * @return string[]
      */
-    final public static function getExporters($onlyForPublicUse = false)
+    final public static function getExporters( $onlyForPublicUse = false )
     {
-        if (!isset(self::$exporters)) {
+        if ( ! isset( self::$exporters ) ) {
             $exporters = array();
             $m = null;
-            foreach (scandir(__DIR__) as $f) {
-                if (preg_match('/^(\w+)\.php$/', $f, $m)) {
-                    if ($f !== basename(__FILE__)) {
-                        $exporters[strtolower($m[1])] = $m[1];
+            foreach ( scandir( __DIR__ ) as $f ) {
+                if ( preg_match( '/^(\w+)\.php$/', $f, $m ) ) {
+                    if ( $f !== basename( __FILE__ ) ) {
+                        $exporters[ strtolower( $m[ 1 ] ) ] = $m[ 1 ];
                     }
                 }
             }
             self::$exporters = $exporters;
         }
-        if ($onlyForPublicUse) {
+        if ( $onlyForPublicUse ) {
             $result = array();
-            foreach (self::$exporters as $handle => $class) {
-                if (call_user_func(self::getExporterClassName($handle) . '::isForPublicUse') === true) {
-                    $result[$handle] = $class;
+            foreach ( self::$exporters as $handle => $class ) {
+                if ( call_user_func( self::getExporterClassName( $handle ) . '::isForPublicUse' ) === true ) {
+                    $result[ $handle ] = $class;
                 }
             }
         } else {
@@ -58,14 +58,14 @@ 
      *
      * @return string
      */
-    final public static function getExporterDescription($exporterHandle)
+    final public static function getExporterDescription( $exporterHandle )
     {
         $exporters = self::getExporters();
-        if (!isset($exporters[$exporterHandle])) {
-            throw new Exception("Invalid exporter handle: '{$exporterHandle}'");
+        if ( ! isset( $exporters[ $exporterHandle ] ) ) {
+            throw new Exception( "Invalid exporter handle: '{$exporterHandle}'" );
         }
 
-        return call_user_func(self::getExporterClassName($exporterHandle) . '::getDescription');
+        return call_user_func( self::getExporterClassName( $exporterHandle ) . '::getDescription' );
     }
 
     /**
@@ -75,9 +75,9 @@ 
      *
      * @return string
      */
-    final public static function getExporterClassName($exporterHandle)
+    final public static function getExporterClassName( $exporterHandle )
     {
-        return __NAMESPACE__ . '\\' . ucfirst(strtolower($exporterHandle));
+        return __NAMESPACE__ . '\\' . ucfirst( strtolower( $exporterHandle ) );
     }
 
     /**
@@ -88,19 +88,19 @@ 
      *
      * @return string
      */
-    final public static function toString($languages, $options = null)
+    final public static function toString( $languages, $options = null )
     {
-        if (isset($options) && is_array($options)) {
-            if (isset($options['us-ascii']) && $options['us-ascii']) {
+        if ( isset( $options ) && is_array( $options ) ) {
+            if ( isset( $options[ 'us-ascii' ] ) && $options[ 'us-ascii' ] ) {
                 $asciiList = array();
-                foreach ($languages as $language) {
-                    $asciiList[] = $language->getUSAsciiClone();
+                foreach ( $languages as $language ) {
+                    $asciiList[ ] = $language->getUSAsciiClone();
                 }
                 $languages = $asciiList;
             }
         }
 
-        return static::toStringDo($languages);
+        return static::toStringDo( $languages );
     }
 
     /**
@@ -111,11 +111,11 @@ 
      *
      * @throws \Exception
      */
-    final public static function toFile($languages, $filename, $options = null)
+    final public static function toFile( $languages, $filename, $options = null )
     {
-        $data = self::toString($languages, $options);
-        if (@file_put_contents($filename, $data) === false) {
-            throw new Exception("Error writing data to '{$filename}'");
+        $data = self::toString( $languages, $options );
+        if ( @file_put_contents( $filename, $data ) === false ) {
+            throw new Exception( "Error writing data to '{$filename}'" );
         }
     }
 
@@ -136,7 +136,7 @@ 
      */
     public static function getDescription()
     {
-        throw new Exception(get_called_class() . ' does not implement the method ' . __FUNCTION__);
+        throw new Exception( get_called_class() . ' does not implement the method ' . __FUNCTION__ );
     }
 
     /**
@@ -146,8 +146,8 @@ 
      *
      * @return string
      */
-    protected static function toStringDo($languages)
+    protected static function toStringDo( $languages )
     {
-        throw new Exception(get_called_class() . ' does not implement the method ' . __FUNCTION__);
+        throw new Exception( get_called_class() . ' does not implement the method ' . __FUNCTION__ );
     }
 }

Braces +9 added lines, -18 removed lines

@@ -7,8 +7,7 @@ 
 /**
  * Base class for all the exporters.
  */
-abstract class Exporter
-{
+abstract class Exporter {
     /**
      * @var array
      */
@@ -21,8 +20,7 @@ 
      *
      * @return string[]
      */
-    final public static function getExporters($onlyForPublicUse = false)
-    {
+    final public static function getExporters($onlyForPublicUse = false) {
         if (!isset(self::$exporters)) {
             $exporters = array();
             $m = null;
@@ -58,8 +56,7 @@ 
      *
      * @return string
      */
-    final public static function getExporterDescription($exporterHandle)
-    {
+    final public static function getExporterDescription($exporterHandle) {
         $exporters = self::getExporters();
         if (!isset($exporters[$exporterHandle])) {
             throw new Exception("Invalid exporter handle: '{$exporterHandle}'");
@@ -75,8 +72,7 @@ 
      *
      * @return string
      */
-    final public static function getExporterClassName($exporterHandle)
-    {
+    final public static function getExporterClassName($exporterHandle) {
         return __NAMESPACE__ . '\\' . ucfirst(strtolower($exporterHandle));
     }
 
@@ -88,8 +84,7 @@ 
      *
      * @return string
      */
-    final public static function toString($languages, $options = null)
-    {
+    final public static function toString($languages, $options = null) {
         if (isset($options) && is_array($options)) {
             if (isset($options['us-ascii']) && $options['us-ascii']) {
                 $asciiList = array();
@@ -111,8 +106,7 @@ 
      *
      * @throws \Exception
      */
-    final public static function toFile($languages, $filename, $options = null)
-    {
+    final public static function toFile($languages, $filename, $options = null) {
         $data = self::toString($languages, $options);
         if (@file_put_contents($filename, $data) === false) {
             throw new Exception("Error writing data to '{$filename}'");
@@ -124,8 +118,7 @@ 
      *
      * @return bool
      */
-    public static function isForPublicUse()
-    {
+    public static function isForPublicUse() {
         return true;
     }
 
@@ -134,8 +127,7 @@ 
      *
      * @return string
      */
-    public static function getDescription()
-    {
+    public static function getDescription() {
         throw new Exception(get_called_class() . ' does not implement the method ' . __FUNCTION__);
     }
 
@@ -146,8 +138,7 @@ 
      *
      * @return string
      */
-    protected static function toStringDo($languages)
-    {
+    protected static function toStringDo($languages) {
         throw new Exception(get_called_class() . ' does not implement the method ' . __FUNCTION__);
     }
 }

vendor/gettext/languages/src/Exporter/Html.php

Indentation +58 added lines, -58 removed lines

@@ -4,66 +4,66 @@
 
 class Html extends Exporter
 {
-    /**
-     * {@inheritdoc}
-     *
-     * @see \Gettext\Languages\Exporter\Exporter::getDescription()
-     */
-    public static function getDescription()
-    {
-        return 'Build a HTML table';
-    }
+	/**
+	 * {@inheritdoc}
+	 *
+	 * @see \Gettext\Languages\Exporter\Exporter::getDescription()
+	 */
+	public static function getDescription()
+	{
+		return 'Build a HTML table';
+	}
 
-    /**
-     * {@inheritdoc}
-     *
-     * @see \Gettext\Languages\Exporter\Exporter::toStringDo()
-     */
-    protected static function toStringDo($languages)
-    {
-        return self::buildTable($languages, false);
-    }
+	/**
+	 * {@inheritdoc}
+	 *
+	 * @see \Gettext\Languages\Exporter\Exporter::toStringDo()
+	 */
+	protected static function toStringDo($languages)
+	{
+		return self::buildTable($languages, false);
+	}
 
-    protected static function h($str)
-    {
-        return htmlspecialchars($str, ENT_COMPAT, 'UTF-8');
-    }
+	protected static function h($str)
+	{
+		return htmlspecialchars($str, ENT_COMPAT, 'UTF-8');
+	}
 
-    protected static function buildTable($languages, $forDocs)
-    {
-        $prefix = $forDocs ? '            ' : '';
-        $lines = array();
-        $lines[] = $prefix . '<table' . ($forDocs ? ' class="table table-bordered table-condensed table-striped"' : '') . '>';
-        $lines[] = $prefix . '    <thead>';
-        $lines[] = $prefix . '        <tr>';
-        $lines[] = $prefix . '            <th>Language code</th>';
-        $lines[] = $prefix . '            <th>Language name</th>';
-        $lines[] = $prefix . '            <th># plurals</th>';
-        $lines[] = $prefix . '            <th>Formula</th>';
-        $lines[] = $prefix . '            <th>Plurals</th>';
-        $lines[] = $prefix . '        </tr>';
-        $lines[] = $prefix . '    </thead>';
-        $lines[] = $prefix . '    <tbody>';
-        foreach ($languages as $lc) {
-            $lines[] = $prefix . '        <tr>';
-            $lines[] = $prefix . '            <td>' . $lc->id . '</td>';
-            $name = self::h($lc->name);
-            if (isset($lc->supersededBy)) {
-                $name .= '<br /><small><span>Superseded by</span> ' . $lc->supersededBy . '</small>';
-            }
-            $lines[] = $prefix . '            <td>' . $name . '</td>';
-            $lines[] = $prefix . '            <td>' . count($lc->categories) . '</td>';
-            $lines[] = $prefix . '            <td>' . self::h($lc->formula) . '</td>';
-            $cases = array();
-            foreach ($lc->categories as $c) {
-                $cases[] = '<li><span>' . $c->id . '</span><code>' . self::h($c->examples) . '</code></li>';
-            }
-            $lines[] = $prefix . '            <td><ol' . ($forDocs ? ' class="cases"' : '') . ' start="0">' . implode('', $cases) . '</ol></td>';
-            $lines[] = $prefix . '        </tr>';
-        }
-        $lines[] = $prefix . '    </tbody>';
-        $lines[] = $prefix . '</table>';
+	protected static function buildTable($languages, $forDocs)
+	{
+		$prefix = $forDocs ? '            ' : '';
+		$lines = array();
+		$lines[] = $prefix . '<table' . ($forDocs ? ' class="table table-bordered table-condensed table-striped"' : '') . '>';
+		$lines[] = $prefix . '    <thead>';
+		$lines[] = $prefix . '        <tr>';
+		$lines[] = $prefix . '            <th>Language code</th>';
+		$lines[] = $prefix . '            <th>Language name</th>';
+		$lines[] = $prefix . '            <th># plurals</th>';
+		$lines[] = $prefix . '            <th>Formula</th>';
+		$lines[] = $prefix . '            <th>Plurals</th>';
+		$lines[] = $prefix . '        </tr>';
+		$lines[] = $prefix . '    </thead>';
+		$lines[] = $prefix . '    <tbody>';
+		foreach ($languages as $lc) {
+			$lines[] = $prefix . '        <tr>';
+			$lines[] = $prefix . '            <td>' . $lc->id . '</td>';
+			$name = self::h($lc->name);
+			if (isset($lc->supersededBy)) {
+				$name .= '<br /><small><span>Superseded by</span> ' . $lc->supersededBy . '</small>';
+			}
+			$lines[] = $prefix . '            <td>' . $name . '</td>';
+			$lines[] = $prefix . '            <td>' . count($lc->categories) . '</td>';
+			$lines[] = $prefix . '            <td>' . self::h($lc->formula) . '</td>';
+			$cases = array();
+			foreach ($lc->categories as $c) {
+				$cases[] = '<li><span>' . $c->id . '</span><code>' . self::h($c->examples) . '</code></li>';
+			}
+			$lines[] = $prefix . '            <td><ol' . ($forDocs ? ' class="cases"' : '') . ' start="0">' . implode('', $cases) . '</ol></td>';
+			$lines[] = $prefix . '        </tr>';
+		}
+		$lines[] = $prefix . '    </tbody>';
+		$lines[] = $prefix . '</table>';
 
-        return implode("\n", $lines);
-    }
+		return implode("\n", $lines);
+	}
 }

Spacing +31 added lines, -31 removed lines

@@ -19,51 +19,51 @@
      *
      * @see \Gettext\Languages\Exporter\Exporter::toStringDo()
      */
-    protected static function toStringDo($languages)
+    protected static function toStringDo( $languages )
     {
-        return self::buildTable($languages, false);
+        return self::buildTable( $languages, false );
     }
 
-    protected static function h($str)
+    protected static function h( $str )
     {
-        return htmlspecialchars($str, ENT_COMPAT, 'UTF-8');
+        return htmlspecialchars( $str, ENT_COMPAT, 'UTF-8' );
     }
 
-    protected static function buildTable($languages, $forDocs)
+    protected static function buildTable( $languages, $forDocs )
     {
         $prefix = $forDocs ? '            ' : '';
         $lines = array();
-        $lines[] = $prefix . '<table' . ($forDocs ? ' class="table table-bordered table-condensed table-striped"' : '') . '>';
-        $lines[] = $prefix . '    <thead>';
-        $lines[] = $prefix . '        <tr>';
-        $lines[] = $prefix . '            <th>Language code</th>';
-        $lines[] = $prefix . '            <th>Language name</th>';
-        $lines[] = $prefix . '            <th># plurals</th>';
-        $lines[] = $prefix . '            <th>Formula</th>';
-        $lines[] = $prefix . '            <th>Plurals</th>';
-        $lines[] = $prefix . '        </tr>';
-        $lines[] = $prefix . '    </thead>';
-        $lines[] = $prefix . '    <tbody>';
-        foreach ($languages as $lc) {
-            $lines[] = $prefix . '        <tr>';
-            $lines[] = $prefix . '            <td>' . $lc->id . '</td>';
-            $name = self::h($lc->name);
-            if (isset($lc->supersededBy)) {
+        $lines[ ] = $prefix . '<table' . ( $forDocs ? ' class="table table-bordered table-condensed table-striped"' : '' ) . '>';
+        $lines[ ] = $prefix . '    <thead>';
+        $lines[ ] = $prefix . '        <tr>';
+        $lines[ ] = $prefix . '            <th>Language code</th>';
+        $lines[ ] = $prefix . '            <th>Language name</th>';
+        $lines[ ] = $prefix . '            <th># plurals</th>';
+        $lines[ ] = $prefix . '            <th>Formula</th>';
+        $lines[ ] = $prefix . '            <th>Plurals</th>';
+        $lines[ ] = $prefix . '        </tr>';
+        $lines[ ] = $prefix . '    </thead>';
+        $lines[ ] = $prefix . '    <tbody>';
+        foreach ( $languages as $lc ) {
+            $lines[ ] = $prefix . '        <tr>';
+            $lines[ ] = $prefix . '            <td>' . $lc->id . '</td>';
+            $name = self::h( $lc->name );
+            if ( isset( $lc->supersededBy ) ) {
                 $name .= '<br /><small><span>Superseded by</span> ' . $lc->supersededBy . '</small>';
             }
-            $lines[] = $prefix . '            <td>' . $name . '</td>';
-            $lines[] = $prefix . '            <td>' . count($lc->categories) . '</td>';
-            $lines[] = $prefix . '            <td>' . self::h($lc->formula) . '</td>';
+            $lines[ ] = $prefix . '            <td>' . $name . '</td>';
+            $lines[ ] = $prefix . '            <td>' . count( $lc->categories ) . '</td>';
+            $lines[ ] = $prefix . '            <td>' . self::h( $lc->formula ) . '</td>';
             $cases = array();
-            foreach ($lc->categories as $c) {
-                $cases[] = '<li><span>' . $c->id . '</span><code>' . self::h($c->examples) . '</code></li>';
+            foreach ( $lc->categories as $c ) {
+                $cases[ ] = '<li><span>' . $c->id . '</span><code>' . self::h( $c->examples ) . '</code></li>';
             }
-            $lines[] = $prefix . '            <td><ol' . ($forDocs ? ' class="cases"' : '') . ' start="0">' . implode('', $cases) . '</ol></td>';
-            $lines[] = $prefix . '        </tr>';
+            $lines[ ] = $prefix . '            <td><ol' . ( $forDocs ? ' class="cases"' : '' ) . ' start="0">' . implode( '', $cases ) . '</ol></td>';
+            $lines[ ] = $prefix . '        </tr>';
         }
-        $lines[] = $prefix . '    </tbody>';
-        $lines[] = $prefix . '</table>';
+        $lines[ ] = $prefix . '    </tbody>';
+        $lines[ ] = $prefix . '</table>';
 
-        return implode("\n", $lines);
+        return implode( "\n", $lines );
     }
 }

Braces +5 added lines, -10 removed lines

@@ -2,15 +2,13 @@ 
 
 namespace Gettext\Languages\Exporter;
 
-class Html extends Exporter
-{
+class Html extends Exporter {
     /**
      * {@inheritdoc}
      *
      * @see \Gettext\Languages\Exporter\Exporter::getDescription()
      */
-    public static function getDescription()
-    {
+    public static function getDescription() {
         return 'Build a HTML table';
     }
 
@@ -19,18 +17,15 @@ 
      *
      * @see \Gettext\Languages\Exporter\Exporter::toStringDo()
      */
-    protected static function toStringDo($languages)
-    {
+    protected static function toStringDo($languages) {
         return self::buildTable($languages, false);
     }
 
-    protected static function h($str)
-    {
+    protected static function h($str) {
         return htmlspecialchars($str, ENT_COMPAT, 'UTF-8');
     }
 
-    protected static function buildTable($languages, $forDocs)
-    {
+    protected static function buildTable($languages, $forDocs) {
         $prefix = $forDocs ? '            ' : '';
         $lines = array();
         $lines[] = $prefix . '<table' . ($forDocs ? ' class="table table-bordered table-condensed table-striped"' : '') . '>';

vendor/gettext/languages/src/Exporter/Xml.php

Indentation +47 added lines, -47 removed lines

@@ -4,57 +4,57 @@
 
 class Xml extends Exporter
 {
-    /**
-     * {@inheritdoc}
-     *
-     * @see \Gettext\Languages\Exporter\Exporter::getDescription()
-     */
-    public static function getDescription()
-    {
-        return 'Build an XML file - schema available at http://mlocati.github.io/cldr-to-gettext-plural-rules/GettextLanguages.xsd';
-    }
+	/**
+	 * {@inheritdoc}
+	 *
+	 * @see \Gettext\Languages\Exporter\Exporter::getDescription()
+	 */
+	public static function getDescription()
+	{
+		return 'Build an XML file - schema available at http://mlocati.github.io/cldr-to-gettext-plural-rules/GettextLanguages.xsd';
+	}
 
-    /**
-     * {@inheritdoc}
-     *
-     * @see \Gettext\Languages\Exporter\Exporter::toStringDo()
-     */
-    protected static function toStringDo($languages)
-    {
-        $xml = new \DOMDocument('1.0', 'UTF-8');
-        $xml->loadXML('<languages
+	/**
+	 * {@inheritdoc}
+	 *
+	 * @see \Gettext\Languages\Exporter\Exporter::toStringDo()
+	 */
+	protected static function toStringDo($languages)
+	{
+		$xml = new \DOMDocument('1.0', 'UTF-8');
+		$xml->loadXML('<languages
             xmlns="https://github.com/mlocati/cldr-to-gettext-plural-rules"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="https://github.com/mlocati/cldr-to-gettext-plural-rules http://mlocati.github.io/cldr-to-gettext-plural-rules/GettextLanguages.xsd"
         />');
-        $xLanguages = $xml->firstChild;
-        foreach ($languages as $language) {
-            $xLanguage = $xml->createElement('language');
-            $xLanguage->setAttribute('id', $language->id);
-            $xLanguage->setAttribute('name', $language->name);
-            if (isset($language->supersededBy)) {
-                $xLanguage->setAttribute('supersededBy', $language->supersededBy);
-            }
-            if (isset($language->script)) {
-                $xLanguage->setAttribute('script', $language->script);
-            }
-            if (isset($language->territory)) {
-                $xLanguage->setAttribute('territory', $language->territory);
-            }
-            if (isset($language->baseLanguage)) {
-                $xLanguage->setAttribute('baseLanguage', $language->baseLanguage);
-            }
-            $xLanguage->setAttribute('formula', $language->formula);
-            foreach ($language->categories as $category) {
-                $xCategory = $xml->createElement('category');
-                $xCategory->setAttribute('id', $category->id);
-                $xCategory->setAttribute('examples', $category->examples);
-                $xLanguage->appendChild($xCategory);
-            }
-            $xLanguages->appendChild($xLanguage);
-        }
-        $xml->formatOutput = true;
+		$xLanguages = $xml->firstChild;
+		foreach ($languages as $language) {
+			$xLanguage = $xml->createElement('language');
+			$xLanguage->setAttribute('id', $language->id);
+			$xLanguage->setAttribute('name', $language->name);
+			if (isset($language->supersededBy)) {
+				$xLanguage->setAttribute('supersededBy', $language->supersededBy);
+			}
+			if (isset($language->script)) {
+				$xLanguage->setAttribute('script', $language->script);
+			}
+			if (isset($language->territory)) {
+				$xLanguage->setAttribute('territory', $language->territory);
+			}
+			if (isset($language->baseLanguage)) {
+				$xLanguage->setAttribute('baseLanguage', $language->baseLanguage);
+			}
+			$xLanguage->setAttribute('formula', $language->formula);
+			foreach ($language->categories as $category) {
+				$xCategory = $xml->createElement('category');
+				$xCategory->setAttribute('id', $category->id);
+				$xCategory->setAttribute('examples', $category->examples);
+				$xLanguage->appendChild($xCategory);
+			}
+			$xLanguages->appendChild($xLanguage);
+		}
+		$xml->formatOutput = true;
 
-        return $xml->saveXML();
-    }
+		return $xml->saveXML();
+	}
 }

Spacing +22 added lines, -22 removed lines

@@ -19,39 +19,39 @@
      *
      * @see \Gettext\Languages\Exporter\Exporter::toStringDo()
      */
-    protected static function toStringDo($languages)
+    protected static function toStringDo( $languages )
     {
-        $xml = new \DOMDocument('1.0', 'UTF-8');
-        $xml->loadXML('<languages
+        $xml = new \DOMDocument( '1.0', 'UTF-8' );
+        $xml->loadXML( '<languages
             xmlns="https://github.com/mlocati/cldr-to-gettext-plural-rules"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="https://github.com/mlocati/cldr-to-gettext-plural-rules http://mlocati.github.io/cldr-to-gettext-plural-rules/GettextLanguages.xsd"
         />');
         $xLanguages = $xml->firstChild;
-        foreach ($languages as $language) {
-            $xLanguage = $xml->createElement('language');
-            $xLanguage->setAttribute('id', $language->id);
-            $xLanguage->setAttribute('name', $language->name);
-            if (isset($language->supersededBy)) {
-                $xLanguage->setAttribute('supersededBy', $language->supersededBy);
+        foreach ( $languages as $language ) {
+            $xLanguage = $xml->createElement( 'language' );
+            $xLanguage->setAttribute( 'id', $language->id );
+            $xLanguage->setAttribute( 'name', $language->name );
+            if ( isset( $language->supersededBy ) ) {
+                $xLanguage->setAttribute( 'supersededBy', $language->supersededBy );
             }
-            if (isset($language->script)) {
-                $xLanguage->setAttribute('script', $language->script);
+            if ( isset( $language->script ) ) {
+                $xLanguage->setAttribute( 'script', $language->script );
             }
-            if (isset($language->territory)) {
-                $xLanguage->setAttribute('territory', $language->territory);
+            if ( isset( $language->territory ) ) {
+                $xLanguage->setAttribute( 'territory', $language->territory );
             }
-            if (isset($language->baseLanguage)) {
-                $xLanguage->setAttribute('baseLanguage', $language->baseLanguage);
+            if ( isset( $language->baseLanguage ) ) {
+                $xLanguage->setAttribute( 'baseLanguage', $language->baseLanguage );
             }
-            $xLanguage->setAttribute('formula', $language->formula);
-            foreach ($language->categories as $category) {
-                $xCategory = $xml->createElement('category');
-                $xCategory->setAttribute('id', $category->id);
-                $xCategory->setAttribute('examples', $category->examples);
-                $xLanguage->appendChild($xCategory);
+            $xLanguage->setAttribute( 'formula', $language->formula );
+            foreach ( $language->categories as $category ) {
+                $xCategory = $xml->createElement( 'category' );
+                $xCategory->setAttribute( 'id', $category->id );
+                $xCategory->setAttribute( 'examples', $category->examples );
+                $xLanguage->appendChild( $xCategory );
             }
-            $xLanguages->appendChild($xLanguage);
+            $xLanguages->appendChild( $xLanguage );
         }
         $xml->formatOutput = true;
 

Braces +3 added lines, -6 removed lines

@@ -2,15 +2,13 @@ 
 
 namespace Gettext\Languages\Exporter;
 
-class Xml extends Exporter
-{
+class Xml extends Exporter {
     /**
      * {@inheritdoc}
      *
      * @see \Gettext\Languages\Exporter\Exporter::getDescription()
      */
-    public static function getDescription()
-    {
+    public static function getDescription() {
         return 'Build an XML file - schema available at http://mlocati.github.io/cldr-to-gettext-plural-rules/GettextLanguages.xsd';
     }
 
@@ -19,8 +17,7 @@ 
      *
      * @see \Gettext\Languages\Exporter\Exporter::toStringDo()
      */
-    protected static function toStringDo($languages)
-    {
+    protected static function toStringDo($languages) {
         $xml = new \DOMDocument('1.0', 'UTF-8');
         $xml->loadXML('<languages
             xmlns="https://github.com/mlocati/cldr-to-gettext-plural-rules"

vendor/gettext/languages/src/Exporter/Docs.php

Indentation +30 added lines, -30 removed lines

@@ -4,34 +4,34 @@ 
 
 class Docs extends Html
 {
-    /**
-     * {@inheritdoc}
-     *
-     * @see \Gettext\Languages\Exporter\Exporter::isForPublicUse()
-     */
-    public static function isForPublicUse()
-    {
-        return false;
-    }
+	/**
+	 * {@inheritdoc}
+	 *
+	 * @see \Gettext\Languages\Exporter\Exporter::isForPublicUse()
+	 */
+	public static function isForPublicUse()
+	{
+		return false;
+	}
 
-    /**
-     * {@inheritdoc}
-     *
-     * @see \Gettext\Languages\Exporter\Exporter::getDescription()
-     */
-    public static function getDescription()
-    {
-        return 'Build the page https://php-gettext.github.io/Languages/';
-    }
+	/**
+	 * {@inheritdoc}
+	 *
+	 * @see \Gettext\Languages\Exporter\Exporter::getDescription()
+	 */
+	public static function getDescription()
+	{
+		return 'Build the page https://php-gettext.github.io/Languages/';
+	}
 
-    /**
-     * {@inheritdoc}
-     *
-     * @see \Gettext\Languages\Exporter\Exporter::toStringDo()
-     */
-    protected static function toStringDo($languages)
-    {
-        $result = <<<'EOT'
+	/**
+	 * {@inheritdoc}
+	 *
+	 * @see \Gettext\Languages\Exporter\Exporter::toStringDo()
+	 */
+	protected static function toStringDo($languages)
+	{
+		$result = <<<'EOT'
 <!doctype html>
 <html lang="en">
     <head>
@@ -49,8 +49,8 @@ 
         <div class="container-fluid">
 
 EOT;
-        $result .= static::buildTable($languages, true);
-        $result .= <<<'EOT'
+		$result .= static::buildTable($languages, true);
+		$result .= <<<'EOT'
 
         </div>
         <script src="//code.jquery.com/jquery-1.11.2.min.js"></script>
@@ -59,6 +59,6 @@ 
 </html>
 EOT;
 
-        return $result;
-    }
+		return $result;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -29,7 +29,7 @@ 
      *
      * @see \Gettext\Languages\Exporter\Exporter::toStringDo()
      */
-    protected static function toStringDo($languages)
+    protected static function toStringDo( $languages )
     {
         $result = <<<'EOT'
 <!doctype html>
@@ -49,7 +49,7 @@ 
         <div class="container-fluid">
 
 EOT;
-        $result .= static::buildTable($languages, true);
+        $result .= static::buildTable( $languages, true );
         $result .= <<<'EOT'
 
         </div>

Braces +4 added lines, -8 removed lines

@@ -2,15 +2,13 @@ 
 
 namespace Gettext\Languages\Exporter;
 
-class Docs extends Html
-{
+class Docs extends Html {
     /**
      * {@inheritdoc}
      *
      * @see \Gettext\Languages\Exporter\Exporter::isForPublicUse()
      */
-    public static function isForPublicUse()
-    {
+    public static function isForPublicUse() {
         return false;
     }
 
@@ -19,8 +17,7 @@ 
      *
      * @see \Gettext\Languages\Exporter\Exporter::getDescription()
      */
-    public static function getDescription()
-    {
+    public static function getDescription() {
         return 'Build the page https://php-gettext.github.io/Languages/';
     }
 
@@ -29,8 +26,7 @@ 
      *
      * @see \Gettext\Languages\Exporter\Exporter::toStringDo()
      */
-    protected static function toStringDo($languages)
-    {
+    protected static function toStringDo($languages) {
         $result = <<<'EOT'
 <!doctype html>
 <html lang="en">

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -48,7 +48,7 @@ 
         <a href="https://github.com/php-gettext/Languages" class="hidden-xs"><img style="position: fixed; top: 0; right: 0; border: 0; z-index: 2000" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub"></a>
         <div class="container-fluid">
 
-EOT;
+eot;
         $result .= static::buildTable($languages, true);
         $result .= <<<'EOT'
 
@@ -57,7 +57,7 @@ 
         <script src="script.js"></script>
     </body>
 </html>
-EOT;
+eot;
 
         return $result;
     }

vendor/gettext/languages/src/Exporter/Po.php

Indentation +26 added lines, -26 removed lines

@@ -6,32 +6,32 @@
 
 class Po extends Exporter
 {
-    /**
-     * {@inheritdoc}
-     *
-     * @see \Gettext\Languages\Exporter\Exporter::getDescription()
-     */
-    public static function getDescription()
-    {
-        return 'Build a string to be used for gettext .po files';
-    }
+	/**
+	 * {@inheritdoc}
+	 *
+	 * @see \Gettext\Languages\Exporter\Exporter::getDescription()
+	 */
+	public static function getDescription()
+	{
+		return 'Build a string to be used for gettext .po files';
+	}
 
-    /**
-     * {@inheritdoc}
-     *
-     * @see \Gettext\Languages\Exporter\Exporter::toStringDo()
-     */
-    protected static function toStringDo($languages)
-    {
-        if (count($languages) !== 1) {
-            throw new Exception('The ' . get_called_class() . ' exporter can only export one language');
-        }
-        $language = $languages[0];
-        $lines = array();
-        $lines[] = '"Language: ' . $language->id . '\n"';
-        $lines[] = '"Plural-Forms: nplurals=' . count($language->categories) . '; plural=' . $language->formula . '\n"';
-        $lines[] = '';
+	/**
+	 * {@inheritdoc}
+	 *
+	 * @see \Gettext\Languages\Exporter\Exporter::toStringDo()
+	 */
+	protected static function toStringDo($languages)
+	{
+		if (count($languages) !== 1) {
+			throw new Exception('The ' . get_called_class() . ' exporter can only export one language');
+		}
+		$language = $languages[0];
+		$lines = array();
+		$lines[] = '"Language: ' . $language->id . '\n"';
+		$lines[] = '"Plural-Forms: nplurals=' . count($language->categories) . '; plural=' . $language->formula . '\n"';
+		$lines[] = '';
 
-        return implode("\n", $lines);
-    }
+		return implode("\n", $lines);
+	}
 }

Spacing +8 added lines, -8 removed lines

@@ -21,17 +21,17 @@
      *
      * @see \Gettext\Languages\Exporter\Exporter::toStringDo()
      */
-    protected static function toStringDo($languages)
+    protected static function toStringDo( $languages )
     {
-        if (count($languages) !== 1) {
-            throw new Exception('The ' . get_called_class() . ' exporter can only export one language');
+        if ( count( $languages ) !== 1 ) {
+            throw new Exception( 'The ' . get_called_class() . ' exporter can only export one language' );
         }
-        $language = $languages[0];
+        $language = $languages[ 0 ];
         $lines = array();
-        $lines[] = '"Language: ' . $language->id . '\n"';
-        $lines[] = '"Plural-Forms: nplurals=' . count($language->categories) . '; plural=' . $language->formula . '\n"';
-        $lines[] = '';
+        $lines[ ] = '"Language: ' . $language->id . '\n"';
+        $lines[ ] = '"Plural-Forms: nplurals=' . count( $language->categories ) . '; plural=' . $language->formula . '\n"';
+        $lines[ ] = '';
 
-        return implode("\n", $lines);
+        return implode( "\n", $lines );
     }
 }

Braces +3 added lines, -6 removed lines

@@ -4,15 +4,13 @@ 
 
 use Exception;
 
-class Po extends Exporter
-{
+class Po extends Exporter {
     /**
      * {@inheritdoc}
      *
      * @see \Gettext\Languages\Exporter\Exporter::getDescription()
      */
-    public static function getDescription()
-    {
+    public static function getDescription() {
         return 'Build a string to be used for gettext .po files';
     }
 
@@ -21,8 +19,7 @@ 
      *
      * @see \Gettext\Languages\Exporter\Exporter::toStringDo()
      */
-    protected static function toStringDo($languages)
-    {
+    protected static function toStringDo($languages) {
         if (count($languages) !== 1) {
             throw new Exception('The ' . get_called_class() . ' exporter can only export one language');
         }