gravityview / GravityView

vendor/gettext/gettext/src/Utils/HeadersExtractorTrait.php

Indentation +50 added lines, -50 removed lines

@@ -9,59 +9,59 @@
  */
 trait HeadersExtractorTrait
 {
-    /**
-     * Add the headers found to the translations instance.
-     *
-     * @param string       $headers
-     * @param Translations $translations
-     *
-     * @return array
-     */
-    protected static function extractHeaders($headers, Translations $translations)
-    {
-        $headers = explode("\n", $headers);
-        $currentHeader = null;
+	/**
+	 * Add the headers found to the translations instance.
+	 *
+	 * @param string       $headers
+	 * @param Translations $translations
+	 *
+	 * @return array
+	 */
+	protected static function extractHeaders($headers, Translations $translations)
+	{
+		$headers = explode("\n", $headers);
+		$currentHeader = null;
 
-        foreach ($headers as $line) {
-            $line = static::convertString($line);
+		foreach ($headers as $line) {
+			$line = static::convertString($line);
 
-            if ($line === '') {
-                continue;
-            }
+			if ($line === '') {
+				continue;
+			}
 
-            if (static::isHeaderDefinition($line)) {
-                $header = array_map('trim', explode(':', $line, 2));
-                $currentHeader = $header[0];
-                $translations->setHeader($currentHeader, $header[1]);
-            } else {
-                $entry = $translations->getHeader($currentHeader);
-                $translations->setHeader($currentHeader, $entry.$line);
-            }
-        }
-    }
+			if (static::isHeaderDefinition($line)) {
+				$header = array_map('trim', explode(':', $line, 2));
+				$currentHeader = $header[0];
+				$translations->setHeader($currentHeader, $header[1]);
+			} else {
+				$entry = $translations->getHeader($currentHeader);
+				$translations->setHeader($currentHeader, $entry.$line);
+			}
+		}
+	}
 
-    /**
-     * Checks if it is a header definition line. Useful for distguishing between header definitions
-     * and possible continuations of a header entry.
-     *
-     * @param string $line Line to parse
-     *
-     * @return bool
-     */
-    protected static function isHeaderDefinition($line)
-    {
-        return (bool) preg_match('/^[\w-]+:/', $line);
-    }
+	/**
+	 * Checks if it is a header definition line. Useful for distguishing between header definitions
+	 * and possible continuations of a header entry.
+	 *
+	 * @param string $line Line to parse
+	 *
+	 * @return bool
+	 */
+	protected static function isHeaderDefinition($line)
+	{
+		return (bool) preg_match('/^[\w-]+:/', $line);
+	}
 
-    /**
-     * Normalize a string.
-     *
-     * @param string $value
-     *
-     * @return string
-     */
-    public static function convertString($value)
-    {
-        return $value;
-    }
+	/**
+	 * Normalize a string.
+	 *
+	 * @param string $value
+	 *
+	 * @return string
+	 */
+	public static function convertString($value)
+	{
+		return $value;
+	}
 }

Spacing +14 added lines, -14 removed lines

@@ -17,25 +17,25 @@ 
      *
      * @return array
      */
-    protected static function extractHeaders($headers, Translations $translations)
+    protected static function extractHeaders( $headers, Translations $translations )
     {
-        $headers = explode("\n", $headers);
+        $headers = explode( "\n", $headers );
         $currentHeader = null;
 
-        foreach ($headers as $line) {
-            $line = static::convertString($line);
+        foreach ( $headers as $line ) {
+            $line = static::convertString( $line );
 
-            if ($line === '') {
+            if ( $line === '' ) {
                 continue;
             }
 
-            if (static::isHeaderDefinition($line)) {
-                $header = array_map('trim', explode(':', $line, 2));
-                $currentHeader = $header[0];
-                $translations->setHeader($currentHeader, $header[1]);
+            if ( static::isHeaderDefinition( $line ) ) {
+                $header = array_map( 'trim', explode( ':', $line, 2 ) );
+                $currentHeader = $header[ 0 ];
+                $translations->setHeader( $currentHeader, $header[ 1 ] );
             } else {
-                $entry = $translations->getHeader($currentHeader);
-                $translations->setHeader($currentHeader, $entry.$line);
+                $entry = $translations->getHeader( $currentHeader );
+                $translations->setHeader( $currentHeader, $entry . $line );
             }
         }
     }
@@ -48,9 +48,9 @@ 
      *
      * @return bool
      */
-    protected static function isHeaderDefinition($line)
+    protected static function isHeaderDefinition( $line )
     {
-        return (bool) preg_match('/^[\w-]+:/', $line);
+        return (bool)preg_match( '/^[\w-]+:/', $line );
     }
 
     /**
@@ -60,7 +60,7 @@ 
      *
      * @return string
      */
-    public static function convertString($value)
+    public static function convertString( $value )
     {
         return $value;
     }

Braces +4 added lines, -8 removed lines

@@ -7,8 +7,7 @@ 
 /**
  * Trait to provide the functionality of extracting headers.
  */
-trait HeadersExtractorTrait
-{
+trait HeadersExtractorTrait {
     /**
      * Add the headers found to the translations instance.
      *
@@ -17,8 +16,7 @@ 
      *
      * @return array
      */
-    protected static function extractHeaders($headers, Translations $translations)
-    {
+    protected static function extractHeaders($headers, Translations $translations) {
         $headers = explode("\n", $headers);
         $currentHeader = null;
 
@@ -48,8 +46,7 @@ 
      *
      * @return bool
      */
-    protected static function isHeaderDefinition($line)
-    {
+    protected static function isHeaderDefinition($line) {
         return (bool) preg_match('/^[\w-]+:/', $line);
     }
 
@@ -60,8 +57,7 @@ 
      *
      * @return string
      */
-    public static function convertString($value)
-    {
+    public static function convertString($value) {
         return $value;
     }
 }

vendor/gettext/gettext/src/Utils/ParsedComment.php

Indentation +130 added lines, -130 removed lines

@@ -7,134 +7,134 @@
  */
 class ParsedComment
 {
-    /**
-     * The comment itself.
-     *
-     * @var string
-     */
-    protected $comment;
-
-    /**
-     * The line where the comment starts.
-     *
-     * @var int
-     */
-    protected $firstLine;
-
-    /**
-     * The line where the comment ends.
-     *
-     * @var int
-     */
-    protected $lastLine;
-
-    /**
-     * Initializes the instance.
-     *
-     * @param string $comment The comment itself.
-     * @param int    $firstLine The line where the comment starts.
-     * @param int    $lastLine The line where the comment ends.
-     */
-    public function __construct($comment, $firstLine, $lastLine)
-    {
-        $this->comment = $comment;
-        $this->firstLine = $firstLine;
-        $this->lastLine = $lastLine;
-    }
-
-    /**
-     * Create new object from raw comment data.
-     *
-     * @param string $value The PHP comment string.
-     * @param int $line The line where the comment starts.
-     *
-     * @return static The parsed comment.
-     */
-    public static function create($value, $line)
-    {
-        $lastLine = $line + substr_count($value, "\n");
-
-        $lines = array_map(function ($line) {
-            if ('' === trim($line)) {
-                return null;
-            }
-
-            $line = ltrim($line, "#*/ \t");
-            $line = rtrim($line, "#*/ \t");
-
-            return trim($line);
-        }, explode("\n", $value));
-
-        // Remove empty lines.
-        $lines = array_filter($lines);
-        $value = implode(' ', $lines);
-
-        return new static($value, $line, $lastLine);
-    }
-
-    /**
-     * Return the line where the comment starts.
-     *
-     * @return int Line number.
-     */
-    public function getFirstLine()
-    {
-        return $this->firstLine;
-    }
-
-    /**
-     * Return the line where the comment ends.
-     *
-     * @return int Line number.
-     */
-    public function getLastLine()
-    {
-        return $this->lastLine;
-    }
-
-    /**
-     * Return the actual comment string.
-     *
-     * @return string The comment.
-     */
-    public function getComment()
-    {
-        return $this->comment;
-    }
-
-    /**
-     * Whether this comment is related with a given function.
-     *
-     * @param ParsedFunction $function The function to check.
-     * @return bool Whether the comment is related or not.
-     */
-    public function isRelatedWith(ParsedFunction $function)
-    {
-        return $this->getLastLine() === $function->getLine() || $this->getLastLine() === $function->getLine() - 1;
-    }
-
-    /**
-     * Whether the comment matches the required prefixes.
-     *
-     * @param array $prefixes An array of prefixes to check.
-     * @return bool Whether the comment matches the prefixes or not.
-     */
-    public function checkPrefixes(array $prefixes)
-    {
-        if ('' === $this->comment) {
-            return false;
-        }
-
-        if (empty($prefixes)) {
-            return true;
-        }
-
-        foreach ($prefixes as $prefix) {
-            if (strpos($this->comment, $prefix) === 0) {
-                return true;
-            }
-        }
-
-        return false;
-    }
+	/**
+	 * The comment itself.
+	 *
+	 * @var string
+	 */
+	protected $comment;
+
+	/**
+	 * The line where the comment starts.
+	 *
+	 * @var int
+	 */
+	protected $firstLine;
+
+	/**
+	 * The line where the comment ends.
+	 *
+	 * @var int
+	 */
+	protected $lastLine;
+
+	/**
+	 * Initializes the instance.
+	 *
+	 * @param string $comment The comment itself.
+	 * @param int    $firstLine The line where the comment starts.
+	 * @param int    $lastLine The line where the comment ends.
+	 */
+	public function __construct($comment, $firstLine, $lastLine)
+	{
+		$this->comment = $comment;
+		$this->firstLine = $firstLine;
+		$this->lastLine = $lastLine;
+	}
+
+	/**
+	 * Create new object from raw comment data.
+	 *
+	 * @param string $value The PHP comment string.
+	 * @param int $line The line where the comment starts.
+	 *
+	 * @return static The parsed comment.
+	 */
+	public static function create($value, $line)
+	{
+		$lastLine = $line + substr_count($value, "\n");
+
+		$lines = array_map(function ($line) {
+			if ('' === trim($line)) {
+				return null;
+			}
+
+			$line = ltrim($line, "#*/ \t");
+			$line = rtrim($line, "#*/ \t");
+
+			return trim($line);
+		}, explode("\n", $value));
+
+		// Remove empty lines.
+		$lines = array_filter($lines);
+		$value = implode(' ', $lines);
+
+		return new static($value, $line, $lastLine);
+	}
+
+	/**
+	 * Return the line where the comment starts.
+	 *
+	 * @return int Line number.
+	 */
+	public function getFirstLine()
+	{
+		return $this->firstLine;
+	}
+
+	/**
+	 * Return the line where the comment ends.
+	 *
+	 * @return int Line number.
+	 */
+	public function getLastLine()
+	{
+		return $this->lastLine;
+	}
+
+	/**
+	 * Return the actual comment string.
+	 *
+	 * @return string The comment.
+	 */
+	public function getComment()
+	{
+		return $this->comment;
+	}
+
+	/**
+	 * Whether this comment is related with a given function.
+	 *
+	 * @param ParsedFunction $function The function to check.
+	 * @return bool Whether the comment is related or not.
+	 */
+	public function isRelatedWith(ParsedFunction $function)
+	{
+		return $this->getLastLine() === $function->getLine() || $this->getLastLine() === $function->getLine() - 1;
+	}
+
+	/**
+	 * Whether the comment matches the required prefixes.
+	 *
+	 * @param array $prefixes An array of prefixes to check.
+	 * @return bool Whether the comment matches the prefixes or not.
+	 */
+	public function checkPrefixes(array $prefixes)
+	{
+		if ('' === $this->comment) {
+			return false;
+		}
+
+		if (empty($prefixes)) {
+			return true;
+		}
+
+		foreach ($prefixes as $prefix) {
+			if (strpos($this->comment, $prefix) === 0) {
+				return true;
+			}
+		}
+
+		return false;
+	}
 }

Spacing +18 added lines, -18 removed lines

@@ -35,7 +35,7 @@ 
      * @param int    $firstLine The line where the comment starts.
      * @param int    $lastLine The line where the comment ends.
      */
-    public function __construct($comment, $firstLine, $lastLine)
+    public function __construct( $comment, $firstLine, $lastLine )
     {
         $this->comment = $comment;
         $this->firstLine = $firstLine;
@@ -50,26 +50,26 @@ 
      *
      * @return static The parsed comment.
      */
-    public static function create($value, $line)
+    public static function create( $value, $line )
     {
-        $lastLine = $line + substr_count($value, "\n");
+        $lastLine = $line + substr_count( $value, "\n" );
 
-        $lines = array_map(function ($line) {
-            if ('' === trim($line)) {
+        $lines = array_map( function( $line ) {
+            if ( '' === trim( $line ) ) {
                 return null;
             }
 
-            $line = ltrim($line, "#*/ \t");
-            $line = rtrim($line, "#*/ \t");
+            $line = ltrim( $line, "#*/ \t" );
+            $line = rtrim( $line, "#*/ \t" );
 
-            return trim($line);
-        }, explode("\n", $value));
+            return trim( $line );
+        }, explode( "\n", $value ) );
 
         // Remove empty lines.
-        $lines = array_filter($lines);
-        $value = implode(' ', $lines);
+        $lines = array_filter( $lines );
+        $value = implode( ' ', $lines );
 
-        return new static($value, $line, $lastLine);
+        return new static( $value, $line, $lastLine );
     }
 
     /**
@@ -108,7 +108,7 @@ 
      * @param ParsedFunction $function The function to check.
      * @return bool Whether the comment is related or not.
      */
-    public function isRelatedWith(ParsedFunction $function)
+    public function isRelatedWith( ParsedFunction $function )
     {
         return $this->getLastLine() === $function->getLine() || $this->getLastLine() === $function->getLine() - 1;
     }
@@ -119,18 +119,18 @@ 
      * @param array $prefixes An array of prefixes to check.
      * @return bool Whether the comment matches the prefixes or not.
      */
-    public function checkPrefixes(array $prefixes)
+    public function checkPrefixes( array $prefixes )
     {
-        if ('' === $this->comment) {
+        if ( '' === $this->comment ) {
             return false;
         }
 
-        if (empty($prefixes)) {
+        if ( empty( $prefixes ) ) {
             return true;
         }
 
-        foreach ($prefixes as $prefix) {
-            if (strpos($this->comment, $prefix) === 0) {
+        foreach ( $prefixes as $prefix ) {
+            if ( strpos( $this->comment, $prefix ) === 0 ) {
                 return true;
             }
         }

Braces +8 added lines, -16 removed lines

@@ -5,8 +5,7 @@ 
 /**
  * Comment parsed by PhpFunctionsScanner.
  */
-class ParsedComment
-{
+class ParsedComment {
     /**
      * The comment itself.
      *
@@ -35,8 +34,7 @@ 
      * @param int    $firstLine The line where the comment starts.
      * @param int    $lastLine The line where the comment ends.
      */
-    public function __construct($comment, $firstLine, $lastLine)
-    {
+    public function __construct($comment, $firstLine, $lastLine) {
         $this->comment = $comment;
         $this->firstLine = $firstLine;
         $this->lastLine = $lastLine;
@@ -50,8 +48,7 @@ 
      *
      * @return static The parsed comment.
      */
-    public static function create($value, $line)
-    {
+    public static function create($value, $line) {
         $lastLine = $line + substr_count($value, "\n");
 
         $lines = array_map(function ($line) {
@@ -77,8 +74,7 @@ 
      *
      * @return int Line number.
      */
-    public function getFirstLine()
-    {
+    public function getFirstLine() {
         return $this->firstLine;
     }
 
@@ -87,8 +83,7 @@ 
      *
      * @return int Line number.
      */
-    public function getLastLine()
-    {
+    public function getLastLine() {
         return $this->lastLine;
     }
 
@@ -97,8 +92,7 @@ 
      *
      * @return string The comment.
      */
-    public function getComment()
-    {
+    public function getComment() {
         return $this->comment;
     }
 
@@ -108,8 +102,7 @@ 
      * @param ParsedFunction $function The function to check.
      * @return bool Whether the comment is related or not.
      */
-    public function isRelatedWith(ParsedFunction $function)
-    {
+    public function isRelatedWith(ParsedFunction $function) {
         return $this->getLastLine() === $function->getLine() || $this->getLastLine() === $function->getLine() - 1;
     }
 
@@ -119,8 +112,7 @@ 
      * @param array $prefixes An array of prefixes to check.
      * @return bool Whether the comment matches the prefixes or not.
      */
-    public function checkPrefixes(array $prefixes)
-    {
+    public function checkPrefixes(array $prefixes) {
         if ('' === $this->comment) {
             return false;
         }

vendor/gettext/gettext/src/Utils/FunctionsScanner.php

Indentation +171 added lines, -171 removed lines

@@ -7,175 +7,175 @@
 
 abstract class FunctionsScanner
 {
-    /**
-     * Scan and returns the functions and the arguments.
-     *
-     * @param array $constants Constants used in the code to replace
-     *
-     * @return array
-     */
-    abstract public function getFunctions(array $constants = []);
-
-    /**
-     * Search for specific functions and create translations.
-     *
-     * You can pass multiple translation with different domains and value found will be sorted respectively.
-     *
-     * @param Translations|Translations[] $translations Multiple domain translations instances where to save the values
-     * @param array $options The extractor options
-     * @throws Exception
-     */
-    public function saveGettextFunctions($translations, array $options)
-    {
-        $translations = is_array($translations) ? $translations : [$translations];
-
-        /** @var Translations[] $translationByDomain [domain => translations, ..] */
-        $translationByDomain = array_reduce($translations, function ($carry, Translations $translations) {
-            $carry[$translations->getDomain()] = $translations;
-            return $carry;
-        }, []);
-
-        $functions = $options['functions'];
-        $file = $options['file'];
-
-        /**
-         * List of source code comments already associated with a function.
-         *
-         * Prevents associating the same comment to multiple functions.
-         *
-         * @var ParsedComment[] $commentsCache
-         */
-        $commentsCache = [];
-
-        foreach ($this->getFunctions($options['constants']) as $function) {
-            list($name, $line, $args) = $function;
-
-            if (isset($options['lineOffset'])) {
-                $line += $options['lineOffset'];
-            }
-
-            if (!isset($functions[$name])) {
-                continue;
-            }
-
-            $deconstructed = $this->deconstructArgs($functions[$name], $args);
-
-            if (!$deconstructed) {
-                continue;
-            }
-
-            list($domain, $context, $original, $plural) = $deconstructed;
-
-            if ((string)$original === '') {
-                continue;
-            }
-
-            $isDefaultDomain = $domain === null;
-
-            $domainTranslations = isset($translationByDomain[$domain]) ? $translationByDomain[$domain] : false;
-
-            if (!empty($options['domainOnly']) && $isDefaultDomain) {
-                // If we want to find translations for a specific domain, skip default domain messages
-                continue;
-            }
-
-            if (!$domainTranslations) {
-                continue;
-            }
-
-            $translation = $domainTranslations->insert($context, $original, $plural);
-            $translation->addReference($file, $line);
-
-            if (isset($function[3])) {
-                /* @var ParsedComment $extractedComment */
-                foreach ($function[3] as $extractedComment) {
-                    if (in_array($extractedComment, $commentsCache, true)) {
-                        continue;
-                    }
-                    $translation->addExtractedComment($extractedComment->getComment());
-                    $commentsCache[] = $extractedComment;
-                }
-            }
-        }
-    }
-
-    /**
-     * Deconstruct arguments to translation values
-     *
-     * @param $function
-     * @param $args
-     * @return array|null
-     * @throws Exception
-     */
-    protected function deconstructArgs($function, $args)
-    {
-        $domain = null;
-        $context = null;
-        $original = null;
-        $plural = null;
-
-        switch ($function) {
-            case 'noop':
-            case 'gettext':
-                if (!isset($args[0])) {
-                    return null;
-                }
-
-                $original = $args[0];
-                break;
-            case 'ngettext':
-                if (!isset($args[1])) {
-                    return null;
-                }
-
-                list($original, $plural) = $args;
-                break;
-            case 'pgettext':
-                if (!isset($args[1])) {
-                    return null;
-                }
-
-                list($context, $original) = $args;
-                break;
-            case 'dgettext':
-                if (!isset($args[1])) {
-                    return null;
-                }
-
-                list($domain, $original) = $args;
-                break;
-            case 'dpgettext':
-                if (!isset($args[2])) {
-                    return null;
-                }
-
-                list($domain, $context, $original) = $args;
-                break;
-            case 'npgettext':
-                if (!isset($args[2])) {
-                    return null;
-                }
-
-                list($context, $original, $plural) = $args;
-                break;
-            case 'dnpgettext':
-                if (!isset($args[3])) {
-                    return null;
-                }
-
-                list($domain, $context, $original, $plural) = $args;
-                break;
-            case 'dngettext':
-                if (!isset($args[2])) {
-                    return null;
-                }
-
-                list($domain, $original, $plural) = $args;
-                break;
-            default:
-                throw new Exception(sprintf('Not valid function %s', $function));
-        }
-
-        return [$domain, $context, $original, $plural];
-    }
+	/**
+	 * Scan and returns the functions and the arguments.
+	 *
+	 * @param array $constants Constants used in the code to replace
+	 *
+	 * @return array
+	 */
+	abstract public function getFunctions(array $constants = []);
+
+	/**
+	 * Search for specific functions and create translations.
+	 *
+	 * You can pass multiple translation with different domains and value found will be sorted respectively.
+	 *
+	 * @param Translations|Translations[] $translations Multiple domain translations instances where to save the values
+	 * @param array $options The extractor options
+	 * @throws Exception
+	 */
+	public function saveGettextFunctions($translations, array $options)
+	{
+		$translations = is_array($translations) ? $translations : [$translations];
+
+		/** @var Translations[] $translationByDomain [domain => translations, ..] */
+		$translationByDomain = array_reduce($translations, function ($carry, Translations $translations) {
+			$carry[$translations->getDomain()] = $translations;
+			return $carry;
+		}, []);
+
+		$functions = $options['functions'];
+		$file = $options['file'];
+
+		/**
+		 * List of source code comments already associated with a function.
+		 *
+		 * Prevents associating the same comment to multiple functions.
+		 *
+		 * @var ParsedComment[] $commentsCache
+		 */
+		$commentsCache = [];
+
+		foreach ($this->getFunctions($options['constants']) as $function) {
+			list($name, $line, $args) = $function;
+
+			if (isset($options['lineOffset'])) {
+				$line += $options['lineOffset'];
+			}
+
+			if (!isset($functions[$name])) {
+				continue;
+			}
+
+			$deconstructed = $this->deconstructArgs($functions[$name], $args);
+
+			if (!$deconstructed) {
+				continue;
+			}
+
+			list($domain, $context, $original, $plural) = $deconstructed;
+
+			if ((string)$original === '') {
+				continue;
+			}
+
+			$isDefaultDomain = $domain === null;
+
+			$domainTranslations = isset($translationByDomain[$domain]) ? $translationByDomain[$domain] : false;
+
+			if (!empty($options['domainOnly']) && $isDefaultDomain) {
+				// If we want to find translations for a specific domain, skip default domain messages
+				continue;
+			}
+
+			if (!$domainTranslations) {
+				continue;
+			}
+
+			$translation = $domainTranslations->insert($context, $original, $plural);
+			$translation->addReference($file, $line);
+
+			if (isset($function[3])) {
+				/* @var ParsedComment $extractedComment */
+				foreach ($function[3] as $extractedComment) {
+					if (in_array($extractedComment, $commentsCache, true)) {
+						continue;
+					}
+					$translation->addExtractedComment($extractedComment->getComment());
+					$commentsCache[] = $extractedComment;
+				}
+			}
+		}
+	}
+
+	/**
+	 * Deconstruct arguments to translation values
+	 *
+	 * @param $function
+	 * @param $args
+	 * @return array|null
+	 * @throws Exception
+	 */
+	protected function deconstructArgs($function, $args)
+	{
+		$domain = null;
+		$context = null;
+		$original = null;
+		$plural = null;
+
+		switch ($function) {
+			case 'noop':
+			case 'gettext':
+				if (!isset($args[0])) {
+					return null;
+				}
+
+				$original = $args[0];
+				break;
+			case 'ngettext':
+				if (!isset($args[1])) {
+					return null;
+				}
+
+				list($original, $plural) = $args;
+				break;
+			case 'pgettext':
+				if (!isset($args[1])) {
+					return null;
+				}
+
+				list($context, $original) = $args;
+				break;
+			case 'dgettext':
+				if (!isset($args[1])) {
+					return null;
+				}
+
+				list($domain, $original) = $args;
+				break;
+			case 'dpgettext':
+				if (!isset($args[2])) {
+					return null;
+				}
+
+				list($domain, $context, $original) = $args;
+				break;
+			case 'npgettext':
+				if (!isset($args[2])) {
+					return null;
+				}
+
+				list($context, $original, $plural) = $args;
+				break;
+			case 'dnpgettext':
+				if (!isset($args[3])) {
+					return null;
+				}
+
+				list($domain, $context, $original, $plural) = $args;
+				break;
+			case 'dngettext':
+				if (!isset($args[2])) {
+					return null;
+				}
+
+				list($domain, $original, $plural) = $args;
+				break;
+			default:
+				throw new Exception(sprintf('Not valid function %s', $function));
+		}
+
+		return [$domain, $context, $original, $plural];
+	}
 }

Spacing +48 added lines, -48 removed lines

@@ -14,7 +14,7 @@ 
      *
      * @return array
      */
-    abstract public function getFunctions(array $constants = []);
+    abstract public function getFunctions( array $constants = [ ] );
 
     /**
      * Search for specific functions and create translations.
@@ -25,18 +25,18 @@ 
      * @param array $options The extractor options
      * @throws Exception
      */
-    public function saveGettextFunctions($translations, array $options)
+    public function saveGettextFunctions( $translations, array $options )
     {
-        $translations = is_array($translations) ? $translations : [$translations];
+        $translations = is_array( $translations ) ? $translations : [ $translations ];
 
         /** @var Translations[] $translationByDomain [domain => translations, ..] */
-        $translationByDomain = array_reduce($translations, function ($carry, Translations $translations) {
-            $carry[$translations->getDomain()] = $translations;
+        $translationByDomain = array_reduce( $translations, function( $carry, Translations $translations ) {
+            $carry[ $translations->getDomain() ] = $translations;
             return $carry;
-        }, []);
+        }, [ ] );
 
-        $functions = $options['functions'];
-        $file = $options['file'];
+        $functions = $options[ 'functions' ];
+        $file = $options[ 'file' ];
 
         /**
          * List of source code comments already associated with a function.
@@ -45,55 +45,55 @@ 
          *
          * @var ParsedComment[] $commentsCache
          */
-        $commentsCache = [];
+        $commentsCache = [ ];
 
-        foreach ($this->getFunctions($options['constants']) as $function) {
-            list($name, $line, $args) = $function;
+        foreach ( $this->getFunctions( $options[ 'constants' ] ) as $function ) {
+            list( $name, $line, $args ) = $function;
 
-            if (isset($options['lineOffset'])) {
-                $line += $options['lineOffset'];
+            if ( isset( $options[ 'lineOffset' ] ) ) {
+                $line += $options[ 'lineOffset' ];
             }
 
-            if (!isset($functions[$name])) {
+            if ( ! isset( $functions[ $name ] ) ) {
                 continue;
             }
 
-            $deconstructed = $this->deconstructArgs($functions[$name], $args);
+            $deconstructed = $this->deconstructArgs( $functions[ $name ], $args );
 
-            if (!$deconstructed) {
+            if ( ! $deconstructed ) {
                 continue;
             }
 
-            list($domain, $context, $original, $plural) = $deconstructed;
+            list( $domain, $context, $original, $plural ) = $deconstructed;
 
-            if ((string)$original === '') {
+            if ( (string)$original === '' ) {
                 continue;
             }
 
             $isDefaultDomain = $domain === null;
 
-            $domainTranslations = isset($translationByDomain[$domain]) ? $translationByDomain[$domain] : false;
+            $domainTranslations = isset( $translationByDomain[ $domain ] ) ? $translationByDomain[ $domain ] : false;
 
-            if (!empty($options['domainOnly']) && $isDefaultDomain) {
+            if ( ! empty( $options[ 'domainOnly' ] ) && $isDefaultDomain ) {
                 // If we want to find translations for a specific domain, skip default domain messages
                 continue;
             }
 
-            if (!$domainTranslations) {
+            if ( ! $domainTranslations ) {
                 continue;
             }
 
-            $translation = $domainTranslations->insert($context, $original, $plural);
-            $translation->addReference($file, $line);
+            $translation = $domainTranslations->insert( $context, $original, $plural );
+            $translation->addReference( $file, $line );
 
-            if (isset($function[3])) {
+            if ( isset( $function[ 3 ] ) ) {
                 /* @var ParsedComment $extractedComment */
-                foreach ($function[3] as $extractedComment) {
-                    if (in_array($extractedComment, $commentsCache, true)) {
+                foreach ( $function[ 3 ] as $extractedComment ) {
+                    if ( in_array( $extractedComment, $commentsCache, true ) ) {
                         continue;
                     }
-                    $translation->addExtractedComment($extractedComment->getComment());
-                    $commentsCache[] = $extractedComment;
+                    $translation->addExtractedComment( $extractedComment->getComment() );
+                    $commentsCache[ ] = $extractedComment;
                 }
             }
         }
@@ -107,75 +107,75 @@ 
      * @return array|null
      * @throws Exception
      */
-    protected function deconstructArgs($function, $args)
+    protected function deconstructArgs( $function, $args )
     {
         $domain = null;
         $context = null;
         $original = null;
         $plural = null;
 
-        switch ($function) {
+        switch ( $function ) {
             case 'noop':
             case 'gettext':
-                if (!isset($args[0])) {
+                if ( ! isset( $args[ 0 ] ) ) {
                     return null;
                 }
 
-                $original = $args[0];
+                $original = $args[ 0 ];
                 break;
             case 'ngettext':
-                if (!isset($args[1])) {
+                if ( ! isset( $args[ 1 ] ) ) {
                     return null;
                 }
 
-                list($original, $plural) = $args;
+                list( $original, $plural ) = $args;
                 break;
             case 'pgettext':
-                if (!isset($args[1])) {
+                if ( ! isset( $args[ 1 ] ) ) {
                     return null;
                 }
 
-                list($context, $original) = $args;
+                list( $context, $original ) = $args;
                 break;
             case 'dgettext':
-                if (!isset($args[1])) {
+                if ( ! isset( $args[ 1 ] ) ) {
                     return null;
                 }
 
-                list($domain, $original) = $args;
+                list( $domain, $original ) = $args;
                 break;
             case 'dpgettext':
-                if (!isset($args[2])) {
+                if ( ! isset( $args[ 2 ] ) ) {
                     return null;
                 }
 
-                list($domain, $context, $original) = $args;
+                list( $domain, $context, $original ) = $args;
                 break;
             case 'npgettext':
-                if (!isset($args[2])) {
+                if ( ! isset( $args[ 2 ] ) ) {
                     return null;
                 }
 
-                list($context, $original, $plural) = $args;
+                list( $context, $original, $plural ) = $args;
                 break;
             case 'dnpgettext':
-                if (!isset($args[3])) {
+                if ( ! isset( $args[ 3 ] ) ) {
                     return null;
                 }
 
-                list($domain, $context, $original, $plural) = $args;
+                list( $domain, $context, $original, $plural ) = $args;
                 break;
             case 'dngettext':
-                if (!isset($args[2])) {
+                if ( ! isset( $args[ 2 ] ) ) {
                     return null;
                 }
 
-                list($domain, $original, $plural) = $args;
+                list( $domain, $original, $plural ) = $args;
                 break;
             default:
-                throw new Exception(sprintf('Not valid function %s', $function));
+                throw new Exception( sprintf( 'Not valid function %s', $function ) );
         }
 
-        return [$domain, $context, $original, $plural];
+        return [ $domain, $context, $original, $plural ];
     }
 }

Braces +3 added lines, -6 removed lines

@@ -5,8 +5,7 @@ 
 use Exception;
 use Gettext\Translations;
 
-abstract class FunctionsScanner
-{
+abstract class FunctionsScanner {
     /**
      * Scan and returns the functions and the arguments.
      *
@@ -25,8 +24,7 @@ 
      * @param array $options The extractor options
      * @throws Exception
      */
-    public function saveGettextFunctions($translations, array $options)
-    {
+    public function saveGettextFunctions($translations, array $options) {
         $translations = is_array($translations) ? $translations : [$translations];
 
         /** @var Translations[] $translationByDomain [domain => translations, ..] */
@@ -107,8 +105,7 @@ 
      * @return array|null
      * @throws Exception
      */
-    protected function deconstructArgs($function, $args)
-    {
+    protected function deconstructArgs($function, $args) {
         $domain = null;
         $context = null;
         $original = null;

vendor/gettext/gettext/src/Utils/MultidimensionalArrayTrait.php

Indentation +75 added lines, -75 removed lines

@@ -10,91 +10,91 @@
  */
 trait MultidimensionalArrayTrait
 {
-    use HeadersGeneratorTrait;
-    use HeadersExtractorTrait;
+	use HeadersGeneratorTrait;
+	use HeadersExtractorTrait;
 
-    /**
-     * Returns a multidimensional array.
-     *
-     * @param Translations $translations
-     * @param bool         $includeHeaders
-     * @param bool         $forceArray
-     *
-     * @return array
-     */
-    protected static function toArray(Translations $translations, $includeHeaders, $forceArray = false)
-    {
-        $pluralForm = $translations->getPluralForms();
-        $pluralSize = is_array($pluralForm) ? ($pluralForm[0] - 1) : null;
-        $messages = [];
+	/**
+	 * Returns a multidimensional array.
+	 *
+	 * @param Translations $translations
+	 * @param bool         $includeHeaders
+	 * @param bool         $forceArray
+	 *
+	 * @return array
+	 */
+	protected static function toArray(Translations $translations, $includeHeaders, $forceArray = false)
+	{
+		$pluralForm = $translations->getPluralForms();
+		$pluralSize = is_array($pluralForm) ? ($pluralForm[0] - 1) : null;
+		$messages = [];
 
-        if ($includeHeaders) {
-            $messages[''] = [
-                '' => [static::generateHeaders($translations)],
-            ];
-        }
+		if ($includeHeaders) {
+			$messages[''] = [
+				'' => [static::generateHeaders($translations)],
+			];
+		}
 
-        foreach ($translations as $translation) {
-            if ($translation->isDisabled()) {
-                continue;
-            }
+		foreach ($translations as $translation) {
+			if ($translation->isDisabled()) {
+				continue;
+			}
 
-            $context = $translation->getContext();
-            $original = $translation->getOriginal();
+			$context = $translation->getContext();
+			$original = $translation->getOriginal();
 
-            if (!isset($messages[$context])) {
-                $messages[$context] = [];
-            }
+			if (!isset($messages[$context])) {
+				$messages[$context] = [];
+			}
 
-            if ($translation->hasPluralTranslations(true)) {
-                $messages[$context][$original] = $translation->getPluralTranslations($pluralSize);
-                array_unshift($messages[$context][$original], $translation->getTranslation());
-            } elseif ($forceArray) {
-                $messages[$context][$original] = [$translation->getTranslation()];
-            } else {
-                $messages[$context][$original] = $translation->getTranslation();
-            }
-        }
+			if ($translation->hasPluralTranslations(true)) {
+				$messages[$context][$original] = $translation->getPluralTranslations($pluralSize);
+				array_unshift($messages[$context][$original], $translation->getTranslation());
+			} elseif ($forceArray) {
+				$messages[$context][$original] = [$translation->getTranslation()];
+			} else {
+				$messages[$context][$original] = $translation->getTranslation();
+			}
+		}
 
-        return [
-            'domain' => $translations->getDomain(),
-            'plural-forms' => $translations->getHeader('Plural-Forms'),
-            'messages' => $messages,
-        ];
-    }
+		return [
+			'domain' => $translations->getDomain(),
+			'plural-forms' => $translations->getHeader('Plural-Forms'),
+			'messages' => $messages,
+		];
+	}
 
-    /**
-     * Extract the entries from a multidimensional array.
-     *
-     * @param array        $messages
-     * @param Translations $translations
-     */
-    protected static function fromArray(array $messages, Translations $translations)
-    {
-        if (!empty($messages['domain'])) {
-            $translations->setDomain($messages['domain']);
-        }
+	/**
+	 * Extract the entries from a multidimensional array.
+	 *
+	 * @param array        $messages
+	 * @param Translations $translations
+	 */
+	protected static function fromArray(array $messages, Translations $translations)
+	{
+		if (!empty($messages['domain'])) {
+			$translations->setDomain($messages['domain']);
+		}
 
-        if (!empty($messages['plural-forms'])) {
-            $translations->setHeader(Translations::HEADER_PLURAL, $messages['plural-forms']);
-        }
+		if (!empty($messages['plural-forms'])) {
+			$translations->setHeader(Translations::HEADER_PLURAL, $messages['plural-forms']);
+		}
 
-        foreach ($messages['messages'] as $context => $contextTranslations) {
-            foreach ($contextTranslations as $original => $value) {
-                if ($context === '' && $original === '') {
-                    static::extractHeaders(is_array($value) ? array_shift($value) : $value, $translations);
-                    continue;
-                }
+		foreach ($messages['messages'] as $context => $contextTranslations) {
+			foreach ($contextTranslations as $original => $value) {
+				if ($context === '' && $original === '') {
+					static::extractHeaders(is_array($value) ? array_shift($value) : $value, $translations);
+					continue;
+				}
 
-                $translation = $translations->insert($context, $original);
+				$translation = $translations->insert($context, $original);
 
-                if (is_array($value)) {
-                    $translation->setTranslation(array_shift($value));
-                    $translation->setPluralTranslations($value);
-                } else {
-                    $translation->setTranslation($value);
-                }
-            }
-        }
-    }
+				if (is_array($value)) {
+					$translation->setTranslation(array_shift($value));
+					$translation->setPluralTranslations($value);
+				} else {
+					$translation->setTranslation($value);
+				}
+			}
+		}
+	}
 }

Spacing +31 added lines, -31 removed lines

@@ -22,43 +22,43 @@ 
      *
      * @return array
      */
-    protected static function toArray(Translations $translations, $includeHeaders, $forceArray = false)
+    protected static function toArray( Translations $translations, $includeHeaders, $forceArray = false )
     {
         $pluralForm = $translations->getPluralForms();
-        $pluralSize = is_array($pluralForm) ? ($pluralForm[0] - 1) : null;
-        $messages = [];
+        $pluralSize = is_array( $pluralForm ) ? ( $pluralForm[ 0 ] - 1 ) : null;
+        $messages = [ ];
 
-        if ($includeHeaders) {
-            $messages[''] = [
-                '' => [static::generateHeaders($translations)],
+        if ( $includeHeaders ) {
+            $messages[ '' ] = [
+                '' => [ static::generateHeaders( $translations ) ],
             ];
         }
 
-        foreach ($translations as $translation) {
-            if ($translation->isDisabled()) {
+        foreach ( $translations as $translation ) {
+            if ( $translation->isDisabled() ) {
                 continue;
             }
 
             $context = $translation->getContext();
             $original = $translation->getOriginal();
 
-            if (!isset($messages[$context])) {
-                $messages[$context] = [];
+            if ( ! isset( $messages[ $context ] ) ) {
+                $messages[ $context ] = [ ];
             }
 
-            if ($translation->hasPluralTranslations(true)) {
-                $messages[$context][$original] = $translation->getPluralTranslations($pluralSize);
-                array_unshift($messages[$context][$original], $translation->getTranslation());
-            } elseif ($forceArray) {
-                $messages[$context][$original] = [$translation->getTranslation()];
+            if ( $translation->hasPluralTranslations( true ) ) {
+                $messages[ $context ][ $original ] = $translation->getPluralTranslations( $pluralSize );
+                array_unshift( $messages[ $context ][ $original ], $translation->getTranslation() );
+            } elseif ( $forceArray ) {
+                $messages[ $context ][ $original ] = [ $translation->getTranslation() ];
             } else {
-                $messages[$context][$original] = $translation->getTranslation();
+                $messages[ $context ][ $original ] = $translation->getTranslation();
             }
         }
 
         return [
             'domain' => $translations->getDomain(),
-            'plural-forms' => $translations->getHeader('Plural-Forms'),
+            'plural-forms' => $translations->getHeader( 'Plural-Forms' ),
             'messages' => $messages,
         ];
     }
@@ -69,30 +69,30 @@ 
      * @param array        $messages
      * @param Translations $translations
      */
-    protected static function fromArray(array $messages, Translations $translations)
+    protected static function fromArray( array $messages, Translations $translations )
     {
-        if (!empty($messages['domain'])) {
-            $translations->setDomain($messages['domain']);
+        if ( ! empty( $messages[ 'domain' ] ) ) {
+            $translations->setDomain( $messages[ 'domain' ] );
         }
 
-        if (!empty($messages['plural-forms'])) {
-            $translations->setHeader(Translations::HEADER_PLURAL, $messages['plural-forms']);
+        if ( ! empty( $messages[ 'plural-forms' ] ) ) {
+            $translations->setHeader( Translations::HEADER_PLURAL, $messages[ 'plural-forms' ] );
         }
 
-        foreach ($messages['messages'] as $context => $contextTranslations) {
-            foreach ($contextTranslations as $original => $value) {
-                if ($context === '' && $original === '') {
-                    static::extractHeaders(is_array($value) ? array_shift($value) : $value, $translations);
+        foreach ( $messages[ 'messages' ] as $context => $contextTranslations ) {
+            foreach ( $contextTranslations as $original => $value ) {
+                if ( $context === '' && $original === '' ) {
+                    static::extractHeaders( is_array( $value ) ? array_shift( $value ) : $value, $translations );
                     continue;
                 }
 
-                $translation = $translations->insert($context, $original);
+                $translation = $translations->insert( $context, $original );
 
-                if (is_array($value)) {
-                    $translation->setTranslation(array_shift($value));
-                    $translation->setPluralTranslations($value);
+                if ( is_array( $value ) ) {
+                    $translation->setTranslation( array_shift( $value ) );
+                    $translation->setPluralTranslations( $value );
                 } else {
-                    $translation->setTranslation($value);
+                    $translation->setTranslation( $value );
                 }
             }
         }

Braces +3 added lines, -6 removed lines

@@ -8,8 +8,7 @@ 
  * Trait used by all generators that exports the translations to multidimensional arrays
  * (context => [original => [translation, plural1, pluraln...]]).
  */
-trait MultidimensionalArrayTrait
-{
+trait MultidimensionalArrayTrait {
     use HeadersGeneratorTrait;
     use HeadersExtractorTrait;
 
@@ -22,8 +21,7 @@ 
      *
      * @return array
      */
-    protected static function toArray(Translations $translations, $includeHeaders, $forceArray = false)
-    {
+    protected static function toArray(Translations $translations, $includeHeaders, $forceArray = false) {
         $pluralForm = $translations->getPluralForms();
         $pluralSize = is_array($pluralForm) ? ($pluralForm[0] - 1) : null;
         $messages = [];
@@ -69,8 +67,7 @@ 
      * @param array        $messages
      * @param Translations $translations
      */
-    protected static function fromArray(array $messages, Translations $translations)
-    {
+    protected static function fromArray(array $messages, Translations $translations) {
         if (!empty($messages['domain'])) {
             $translations->setDomain($messages['domain']);
         }

vendor/gettext/gettext/src/Merge.php

Indentation +211 added lines, -211 removed lines

@@ -7,215 +7,215 @@
  */
 final class Merge
 {
-    const ADD = 1;
-    const REMOVE = 2;
-
-    const HEADERS_ADD = 4;
-    const HEADERS_REMOVE = 8;
-    const HEADERS_OVERRIDE = 16;
-
-    const LANGUAGE_OVERRIDE = 32;
-    const DOMAIN_OVERRIDE = 64;
-    const TRANSLATION_OVERRIDE = 128;
-
-    const COMMENTS_OURS = 256;
-    const COMMENTS_THEIRS = 512;
-
-    const EXTRACTED_COMMENTS_OURS = 1024;
-    const EXTRACTED_COMMENTS_THEIRS = 2048;
-
-    const FLAGS_OURS = 4096;
-    const FLAGS_THEIRS = 8192;
-
-    const REFERENCES_OURS = 16384;
-    const REFERENCES_THEIRS = 32768;
-
-    const DEFAULTS = 5; //1 + 4
-
-    /**
-     * Merge the flags of two translations.
-     *
-     * @param Translation $from
-     * @param Translation $to
-     * @param int         $options
-     */
-    public static function mergeFlags(Translation $from, Translation $to, $options = self::DEFAULTS)
-    {
-        if ($options & self::FLAGS_THEIRS) {
-            $to->deleteFlags();
-        }
-
-        if (!($options & self::FLAGS_OURS)) {
-            foreach ($from->getFlags() as $flag) {
-                $to->addFlag($flag);
-            }
-        }
-    }
-
-    /**
-     * Merge the extracted comments of two translations.
-     *
-     * @param Translation $from
-     * @param Translation $to
-     * @param int         $options
-     */
-    public static function mergeExtractedComments(Translation $from, Translation $to, $options = self::DEFAULTS)
-    {
-        if ($options & self::EXTRACTED_COMMENTS_THEIRS) {
-            $to->deleteExtractedComments();
-        }
-
-        if (!($options & self::EXTRACTED_COMMENTS_OURS)) {
-            foreach ($from->getExtractedComments() as $comment) {
-                $to->addExtractedComment($comment);
-            }
-        }
-    }
-
-    /**
-     * Merge the comments of two translations.
-     *
-     * @param Translation $from
-     * @param Translation $to
-     * @param int         $options
-     */
-    public static function mergeComments(Translation $from, Translation $to, $options = self::DEFAULTS)
-    {
-        if ($options & self::COMMENTS_THEIRS) {
-            $to->deleteComments();
-        }
-
-        if (!($options & self::COMMENTS_OURS)) {
-            foreach ($from->getComments() as $comment) {
-                $to->addComment($comment);
-            }
-        }
-    }
-
-    /**
-     * Merge the references of two translations.
-     *
-     * @param Translation $from
-     * @param Translation $to
-     * @param int         $options
-     */
-    public static function mergeReferences(Translation $from, Translation $to, $options = self::DEFAULTS)
-    {
-        if ($options & self::REFERENCES_THEIRS) {
-            $to->deleteReferences();
-        }
-
-        if (!($options & self::REFERENCES_OURS)) {
-            foreach ($from->getReferences() as $reference) {
-                $to->addReference($reference[0], $reference[1]);
-            }
-        }
-    }
-
-    /**
-     * Merge the translations of two translations.
-     *
-     * @param Translation $from
-     * @param Translation $to
-     * @param int         $options
-     */
-    public static function mergeTranslation(Translation $from, Translation $to, $options = self::DEFAULTS)
-    {
-        $override = (boolean) ($options & self::TRANSLATION_OVERRIDE);
-
-        if (!$to->hasTranslation() || ($from->hasTranslation() && $override)) {
-            $to->setTranslation($from->getTranslation());
-        }
-
-        if (!$to->hasPlural() || ($from->hasPlural() && $override)) {
-            $to->setPlural($from->getPlural());
-        }
-
-        if (!$to->hasPluralTranslations() || ($from->hasPluralTranslations() && $override)) {
-            $to->setPluralTranslations($from->getPluralTranslations());
-        }
-    }
-
-    /**
-     * Merge the translations of two translations.
-     *
-     * @param Translations $from
-     * @param Translations $to
-     * @param int          $options
-     */
-    public static function mergeTranslations(Translations $from, Translations $to, $options = self::DEFAULTS)
-    {
-        if ($options & self::REMOVE) {
-            $filtered = [];
-
-            foreach ($to as $entry) {
-                if ($from->find($entry)) {
-                    $filtered[$entry->getId()] = $entry;
-                }
-            }
-
-            $to->exchangeArray($filtered);
-        }
-
-        foreach ($from as $entry) {
-            if (($existing = $to->find($entry))) {
-                $existing->mergeWith($entry, $options);
-            } elseif ($options & self::ADD) {
-                $to[] = $entry->getClone();
-            }
-        }
-    }
-
-    /**
-     * Merge the headers of two translations.
-     *
-     * @param Translations $from
-     * @param Translations $to
-     * @param int          $options
-     */
-    public static function mergeHeaders(Translations $from, Translations $to, $options = self::DEFAULTS)
-    {
-        if ($options & self::HEADERS_REMOVE) {
-            foreach (array_keys($to->getHeaders()) as $name) {
-                if ($from->getHeader($name) === null) {
-                    $to->deleteHeader($name);
-                }
-            }
-        }
-
-        foreach ($from->getHeaders() as $name => $value) {
-            $current = $to->getHeader($name);
-
-            if (empty($current)) {
-                if ($options & self::HEADERS_ADD) {
-                    $to->setHeader($name, $value);
-                }
-                continue;
-            }
-
-            if (empty($value)) {
-                continue;
-            }
-
-            switch ($name) {
-                case Translations::HEADER_LANGUAGE:
-                case Translations::HEADER_PLURAL:
-                    if ($options & self::LANGUAGE_OVERRIDE) {
-                        $to->setHeader($name, $value);
-                    }
-                    break;
-
-                case Translations::HEADER_DOMAIN:
-                    if ($options & self::DOMAIN_OVERRIDE) {
-                        $to->setHeader($name, $value);
-                    }
-                    break;
-
-                default:
-                    if ($options & self::HEADERS_OVERRIDE) {
-                        $to->setHeader($name, $value);
-                    }
-            }
-        }
-    }
+	const ADD = 1;
+	const REMOVE = 2;
+
+	const HEADERS_ADD = 4;
+	const HEADERS_REMOVE = 8;
+	const HEADERS_OVERRIDE = 16;
+
+	const LANGUAGE_OVERRIDE = 32;
+	const DOMAIN_OVERRIDE = 64;
+	const TRANSLATION_OVERRIDE = 128;
+
+	const COMMENTS_OURS = 256;
+	const COMMENTS_THEIRS = 512;
+
+	const EXTRACTED_COMMENTS_OURS = 1024;
+	const EXTRACTED_COMMENTS_THEIRS = 2048;
+
+	const FLAGS_OURS = 4096;
+	const FLAGS_THEIRS = 8192;
+
+	const REFERENCES_OURS = 16384;
+	const REFERENCES_THEIRS = 32768;
+
+	const DEFAULTS = 5; //1 + 4
+
+	/**
+	 * Merge the flags of two translations.
+	 *
+	 * @param Translation $from
+	 * @param Translation $to
+	 * @param int         $options
+	 */
+	public static function mergeFlags(Translation $from, Translation $to, $options = self::DEFAULTS)
+	{
+		if ($options & self::FLAGS_THEIRS) {
+			$to->deleteFlags();
+		}
+
+		if (!($options & self::FLAGS_OURS)) {
+			foreach ($from->getFlags() as $flag) {
+				$to->addFlag($flag);
+			}
+		}
+	}
+
+	/**
+	 * Merge the extracted comments of two translations.
+	 *
+	 * @param Translation $from
+	 * @param Translation $to
+	 * @param int         $options
+	 */
+	public static function mergeExtractedComments(Translation $from, Translation $to, $options = self::DEFAULTS)
+	{
+		if ($options & self::EXTRACTED_COMMENTS_THEIRS) {
+			$to->deleteExtractedComments();
+		}
+
+		if (!($options & self::EXTRACTED_COMMENTS_OURS)) {
+			foreach ($from->getExtractedComments() as $comment) {
+				$to->addExtractedComment($comment);
+			}
+		}
+	}
+
+	/**
+	 * Merge the comments of two translations.
+	 *
+	 * @param Translation $from
+	 * @param Translation $to
+	 * @param int         $options
+	 */
+	public static function mergeComments(Translation $from, Translation $to, $options = self::DEFAULTS)
+	{
+		if ($options & self::COMMENTS_THEIRS) {
+			$to->deleteComments();
+		}
+
+		if (!($options & self::COMMENTS_OURS)) {
+			foreach ($from->getComments() as $comment) {
+				$to->addComment($comment);
+			}
+		}
+	}
+
+	/**
+	 * Merge the references of two translations.
+	 *
+	 * @param Translation $from
+	 * @param Translation $to
+	 * @param int         $options
+	 */
+	public static function mergeReferences(Translation $from, Translation $to, $options = self::DEFAULTS)
+	{
+		if ($options & self::REFERENCES_THEIRS) {
+			$to->deleteReferences();
+		}
+
+		if (!($options & self::REFERENCES_OURS)) {
+			foreach ($from->getReferences() as $reference) {
+				$to->addReference($reference[0], $reference[1]);
+			}
+		}
+	}
+
+	/**
+	 * Merge the translations of two translations.
+	 *
+	 * @param Translation $from
+	 * @param Translation $to
+	 * @param int         $options
+	 */
+	public static function mergeTranslation(Translation $from, Translation $to, $options = self::DEFAULTS)
+	{
+		$override = (boolean) ($options & self::TRANSLATION_OVERRIDE);
+
+		if (!$to->hasTranslation() || ($from->hasTranslation() && $override)) {
+			$to->setTranslation($from->getTranslation());
+		}
+
+		if (!$to->hasPlural() || ($from->hasPlural() && $override)) {
+			$to->setPlural($from->getPlural());
+		}
+
+		if (!$to->hasPluralTranslations() || ($from->hasPluralTranslations() && $override)) {
+			$to->setPluralTranslations($from->getPluralTranslations());
+		}
+	}
+
+	/**
+	 * Merge the translations of two translations.
+	 *
+	 * @param Translations $from
+	 * @param Translations $to
+	 * @param int          $options
+	 */
+	public static function mergeTranslations(Translations $from, Translations $to, $options = self::DEFAULTS)
+	{
+		if ($options & self::REMOVE) {
+			$filtered = [];
+
+			foreach ($to as $entry) {
+				if ($from->find($entry)) {
+					$filtered[$entry->getId()] = $entry;
+				}
+			}
+
+			$to->exchangeArray($filtered);
+		}
+
+		foreach ($from as $entry) {
+			if (($existing = $to->find($entry))) {
+				$existing->mergeWith($entry, $options);
+			} elseif ($options & self::ADD) {
+				$to[] = $entry->getClone();
+			}
+		}
+	}
+
+	/**
+	 * Merge the headers of two translations.
+	 *
+	 * @param Translations $from
+	 * @param Translations $to
+	 * @param int          $options
+	 */
+	public static function mergeHeaders(Translations $from, Translations $to, $options = self::DEFAULTS)
+	{
+		if ($options & self::HEADERS_REMOVE) {
+			foreach (array_keys($to->getHeaders()) as $name) {
+				if ($from->getHeader($name) === null) {
+					$to->deleteHeader($name);
+				}
+			}
+		}
+
+		foreach ($from->getHeaders() as $name => $value) {
+			$current = $to->getHeader($name);
+
+			if (empty($current)) {
+				if ($options & self::HEADERS_ADD) {
+					$to->setHeader($name, $value);
+				}
+				continue;
+			}
+
+			if (empty($value)) {
+				continue;
+			}
+
+			switch ($name) {
+				case Translations::HEADER_LANGUAGE:
+				case Translations::HEADER_PLURAL:
+					if ($options & self::LANGUAGE_OVERRIDE) {
+						$to->setHeader($name, $value);
+					}
+					break;
+
+				case Translations::HEADER_DOMAIN:
+					if ($options & self::DOMAIN_OVERRIDE) {
+						$to->setHeader($name, $value);
+					}
+					break;
+
+				default:
+					if ($options & self::HEADERS_OVERRIDE) {
+						$to->setHeader($name, $value);
+					}
+			}
+		}
+	}
 }

Spacing +58 added lines, -58 removed lines

@@ -39,15 +39,15 @@ 
      * @param Translation $to
      * @param int         $options
      */
-    public static function mergeFlags(Translation $from, Translation $to, $options = self::DEFAULTS)
+    public static function mergeFlags( Translation $from, Translation $to, $options = self::DEFAULTS )
     {
-        if ($options & self::FLAGS_THEIRS) {
+        if ( $options & self::FLAGS_THEIRS ) {
             $to->deleteFlags();
         }
 
-        if (!($options & self::FLAGS_OURS)) {
-            foreach ($from->getFlags() as $flag) {
-                $to->addFlag($flag);
+        if ( ! ( $options & self::FLAGS_OURS ) ) {
+            foreach ( $from->getFlags() as $flag ) {
+                $to->addFlag( $flag );
             }
         }
     }
@@ -59,15 +59,15 @@ 
      * @param Translation $to
      * @param int         $options
      */
-    public static function mergeExtractedComments(Translation $from, Translation $to, $options = self::DEFAULTS)
+    public static function mergeExtractedComments( Translation $from, Translation $to, $options = self::DEFAULTS )
     {
-        if ($options & self::EXTRACTED_COMMENTS_THEIRS) {
+        if ( $options & self::EXTRACTED_COMMENTS_THEIRS ) {
             $to->deleteExtractedComments();
         }
 
-        if (!($options & self::EXTRACTED_COMMENTS_OURS)) {
-            foreach ($from->getExtractedComments() as $comment) {
-                $to->addExtractedComment($comment);
+        if ( ! ( $options & self::EXTRACTED_COMMENTS_OURS ) ) {
+            foreach ( $from->getExtractedComments() as $comment ) {
+                $to->addExtractedComment( $comment );
             }
         }
     }
@@ -79,15 +79,15 @@ 
      * @param Translation $to
      * @param int         $options
      */
-    public static function mergeComments(Translation $from, Translation $to, $options = self::DEFAULTS)
+    public static function mergeComments( Translation $from, Translation $to, $options = self::DEFAULTS )
     {
-        if ($options & self::COMMENTS_THEIRS) {
+        if ( $options & self::COMMENTS_THEIRS ) {
             $to->deleteComments();
         }
 
-        if (!($options & self::COMMENTS_OURS)) {
-            foreach ($from->getComments() as $comment) {
-                $to->addComment($comment);
+        if ( ! ( $options & self::COMMENTS_OURS ) ) {
+            foreach ( $from->getComments() as $comment ) {
+                $to->addComment( $comment );
             }
         }
     }
@@ -99,15 +99,15 @@ 
      * @param Translation $to
      * @param int         $options
      */
-    public static function mergeReferences(Translation $from, Translation $to, $options = self::DEFAULTS)
+    public static function mergeReferences( Translation $from, Translation $to, $options = self::DEFAULTS )
     {
-        if ($options & self::REFERENCES_THEIRS) {
+        if ( $options & self::REFERENCES_THEIRS ) {
             $to->deleteReferences();
         }
 
-        if (!($options & self::REFERENCES_OURS)) {
-            foreach ($from->getReferences() as $reference) {
-                $to->addReference($reference[0], $reference[1]);
+        if ( ! ( $options & self::REFERENCES_OURS ) ) {
+            foreach ( $from->getReferences() as $reference ) {
+                $to->addReference( $reference[ 0 ], $reference[ 1 ] );
             }
         }
     }
@@ -119,20 +119,20 @@ 
      * @param Translation $to
      * @param int         $options
      */
-    public static function mergeTranslation(Translation $from, Translation $to, $options = self::DEFAULTS)
+    public static function mergeTranslation( Translation $from, Translation $to, $options = self::DEFAULTS )
     {
-        $override = (boolean) ($options & self::TRANSLATION_OVERRIDE);
+        $override = (boolean)( $options & self::TRANSLATION_OVERRIDE );
 
-        if (!$to->hasTranslation() || ($from->hasTranslation() && $override)) {
-            $to->setTranslation($from->getTranslation());
+        if ( ! $to->hasTranslation() || ( $from->hasTranslation() && $override ) ) {
+            $to->setTranslation( $from->getTranslation() );
         }
 
-        if (!$to->hasPlural() || ($from->hasPlural() && $override)) {
-            $to->setPlural($from->getPlural());
+        if ( ! $to->hasPlural() || ( $from->hasPlural() && $override ) ) {
+            $to->setPlural( $from->getPlural() );
         }
 
-        if (!$to->hasPluralTranslations() || ($from->hasPluralTranslations() && $override)) {
-            $to->setPluralTranslations($from->getPluralTranslations());
+        if ( ! $to->hasPluralTranslations() || ( $from->hasPluralTranslations() && $override ) ) {
+            $to->setPluralTranslations( $from->getPluralTranslations() );
         }
     }
 
@@ -143,25 +143,25 @@ 
      * @param Translations $to
      * @param int          $options
      */
-    public static function mergeTranslations(Translations $from, Translations $to, $options = self::DEFAULTS)
+    public static function mergeTranslations( Translations $from, Translations $to, $options = self::DEFAULTS )
     {
-        if ($options & self::REMOVE) {
-            $filtered = [];
+        if ( $options & self::REMOVE ) {
+            $filtered = [ ];
 
-            foreach ($to as $entry) {
-                if ($from->find($entry)) {
-                    $filtered[$entry->getId()] = $entry;
+            foreach ( $to as $entry ) {
+                if ( $from->find( $entry ) ) {
+                    $filtered[ $entry->getId() ] = $entry;
                 }
             }
 
-            $to->exchangeArray($filtered);
+            $to->exchangeArray( $filtered );
         }
 
-        foreach ($from as $entry) {
-            if (($existing = $to->find($entry))) {
-                $existing->mergeWith($entry, $options);
-            } elseif ($options & self::ADD) {
-                $to[] = $entry->getClone();
+        foreach ( $from as $entry ) {
+            if ( ( $existing = $to->find( $entry ) ) ) {
+                $existing->mergeWith( $entry, $options );
+            } elseif ( $options & self::ADD ) {
+                $to[ ] = $entry->getClone();
             }
         }
     }
@@ -173,47 +173,47 @@ 
      * @param Translations $to
      * @param int          $options
      */
-    public static function mergeHeaders(Translations $from, Translations $to, $options = self::DEFAULTS)
+    public static function mergeHeaders( Translations $from, Translations $to, $options = self::DEFAULTS )
     {
-        if ($options & self::HEADERS_REMOVE) {
-            foreach (array_keys($to->getHeaders()) as $name) {
-                if ($from->getHeader($name) === null) {
-                    $to->deleteHeader($name);
+        if ( $options & self::HEADERS_REMOVE ) {
+            foreach ( array_keys( $to->getHeaders() ) as $name ) {
+                if ( $from->getHeader( $name ) === null ) {
+                    $to->deleteHeader( $name );
                 }
             }
         }
 
-        foreach ($from->getHeaders() as $name => $value) {
-            $current = $to->getHeader($name);
+        foreach ( $from->getHeaders() as $name => $value ) {
+            $current = $to->getHeader( $name );
 
-            if (empty($current)) {
-                if ($options & self::HEADERS_ADD) {
-                    $to->setHeader($name, $value);
+            if ( empty( $current ) ) {
+                if ( $options & self::HEADERS_ADD ) {
+                    $to->setHeader( $name, $value );
                 }
                 continue;
             }
 
-            if (empty($value)) {
+            if ( empty( $value ) ) {
                 continue;
             }
 
-            switch ($name) {
+            switch ( $name ) {
                 case Translations::HEADER_LANGUAGE:
                 case Translations::HEADER_PLURAL:
-                    if ($options & self::LANGUAGE_OVERRIDE) {
-                        $to->setHeader($name, $value);
+                    if ( $options & self::LANGUAGE_OVERRIDE ) {
+                        $to->setHeader( $name, $value );
                     }
                     break;
 
                 case Translations::HEADER_DOMAIN:
-                    if ($options & self::DOMAIN_OVERRIDE) {
-                        $to->setHeader($name, $value);
+                    if ( $options & self::DOMAIN_OVERRIDE ) {
+                        $to->setHeader( $name, $value );
                     }
                     break;
 
                 default:
-                    if ($options & self::HEADERS_OVERRIDE) {
-                        $to->setHeader($name, $value);
+                    if ( $options & self::HEADERS_OVERRIDE ) {
+                        $to->setHeader( $name, $value );
                     }
             }
         }

Braces +8 added lines, -16 removed lines

@@ -5,8 +5,7 @@ 
 /**
  * Static class with merge contants.
  */
-final class Merge
-{
+final class Merge {
     const ADD = 1;
     const REMOVE = 2;
 
@@ -39,8 +38,7 @@ 
      * @param Translation $to
      * @param int         $options
      */
-    public static function mergeFlags(Translation $from, Translation $to, $options = self::DEFAULTS)
-    {
+    public static function mergeFlags(Translation $from, Translation $to, $options = self::DEFAULTS) {
         if ($options & self::FLAGS_THEIRS) {
             $to->deleteFlags();
         }
@@ -59,8 +57,7 @@ 
      * @param Translation $to
      * @param int         $options
      */
-    public static function mergeExtractedComments(Translation $from, Translation $to, $options = self::DEFAULTS)
-    {
+    public static function mergeExtractedComments(Translation $from, Translation $to, $options = self::DEFAULTS) {
         if ($options & self::EXTRACTED_COMMENTS_THEIRS) {
             $to->deleteExtractedComments();
         }
@@ -79,8 +76,7 @@ 
      * @param Translation $to
      * @param int         $options
      */
-    public static function mergeComments(Translation $from, Translation $to, $options = self::DEFAULTS)
-    {
+    public static function mergeComments(Translation $from, Translation $to, $options = self::DEFAULTS) {
         if ($options & self::COMMENTS_THEIRS) {
             $to->deleteComments();
         }
@@ -99,8 +95,7 @@ 
      * @param Translation $to
      * @param int         $options
      */
-    public static function mergeReferences(Translation $from, Translation $to, $options = self::DEFAULTS)
-    {
+    public static function mergeReferences(Translation $from, Translation $to, $options = self::DEFAULTS) {
         if ($options & self::REFERENCES_THEIRS) {
             $to->deleteReferences();
         }
@@ -119,8 +114,7 @@ 
      * @param Translation $to
      * @param int         $options
      */
-    public static function mergeTranslation(Translation $from, Translation $to, $options = self::DEFAULTS)
-    {
+    public static function mergeTranslation(Translation $from, Translation $to, $options = self::DEFAULTS) {
         $override = (boolean) ($options & self::TRANSLATION_OVERRIDE);
 
         if (!$to->hasTranslation() || ($from->hasTranslation() && $override)) {
@@ -143,8 +137,7 @@ 
      * @param Translations $to
      * @param int          $options
      */
-    public static function mergeTranslations(Translations $from, Translations $to, $options = self::DEFAULTS)
-    {
+    public static function mergeTranslations(Translations $from, Translations $to, $options = self::DEFAULTS) {
         if ($options & self::REMOVE) {
             $filtered = [];
 
@@ -173,8 +166,7 @@ 
      * @param Translations $to
      * @param int          $options
      */
-    public static function mergeHeaders(Translations $from, Translations $to, $options = self::DEFAULTS)
-    {
+    public static function mergeHeaders(Translations $from, Translations $to, $options = self::DEFAULTS) {
         if ($options & self::HEADERS_REMOVE) {
             foreach (array_keys($to->getHeaders()) as $name) {
                 if ($from->getHeader($name) === null) {

vendor/gettext/gettext/src/autoloader.php

Indentation +7 added lines, -7 removed lines

@@ -1,13 +1,13 @@
 <?php
 
 spl_autoload_register(function ($class) {
-    if (strpos($class, 'Gettext\\') !== 0) {
-        return;
-    }
+	if (strpos($class, 'Gettext\\') !== 0) {
+		return;
+	}
 
-    $file = __DIR__.str_replace('\\', DIRECTORY_SEPARATOR, substr($class, strlen('Gettext'))).'.php';
+	$file = __DIR__.str_replace('\\', DIRECTORY_SEPARATOR, substr($class, strlen('Gettext'))).'.php';
 
-    if (is_file($file)) {
-        require_once $file;
-    }
+	if (is_file($file)) {
+		require_once $file;
+	}
 });

Spacing +4 added lines, -4 removed lines

@@ -1,13 +1,13 @@
 <?php
 
-spl_autoload_register(function ($class) {
-    if (strpos($class, 'Gettext\\') !== 0) {
+spl_autoload_register( function( $class ) {
+    if ( strpos( $class, 'Gettext\\' ) !== 0 ) {
         return;
     }
 
-    $file = __DIR__.str_replace('\\', DIRECTORY_SEPARATOR, substr($class, strlen('Gettext'))).'.php';
+    $file = __DIR__ . str_replace( '\\', DIRECTORY_SEPARATOR, substr( $class, strlen( 'Gettext' ) ) ) . '.php';
 
-    if (is_file($file)) {
+    if ( is_file( $file ) ) {
         require_once $file;
     }
 });

vendor/gettext/gettext/src/Translator.php

Indentation +250 added lines, -250 removed lines

@@ -6,265 +6,265 @@
 
 class Translator extends BaseTranslator implements TranslatorInterface
 {
-    protected $domain;
-    protected $dictionary = [];
-    protected $plurals = [];
-
-    /**
-     * Loads translation from a Translations instance, a file on an array.
-     *
-     * @param Translations|string|array $translations
-     *
-     * @return static
-     */
-    public function loadTranslations($translations)
-    {
-        if (is_object($translations) && $translations instanceof Translations) {
-            $translations = PhpArray::generate($translations, ['includeHeaders' => false]);
-        } elseif (is_string($translations) && is_file($translations)) {
-            $translations = include $translations;
-        } elseif (!is_array($translations)) {
-            throw new \InvalidArgumentException(
-                'Invalid Translator: only arrays, files or instance of Translations are allowed'
-            );
-        }
-
-        $this->addTranslations($translations);
-
-        return $this;
-    }
-
-    /**
-     * Set the default domain.
-     *
-     * @param string $domain
-     *
-     * @return static
-     */
-    public function defaultDomain($domain)
-    {
-        $this->domain = $domain;
-
-        return $this;
-    }
-
-    /**
-     * @see TranslatorInterface
-     *
-     * {@inheritdoc}
-     */
-    public function gettext($original)
-    {
-        return $this->dpgettext($this->domain, null, $original);
-    }
-
-    /**
-     * @see TranslatorInterface
-     *
-     * {@inheritdoc}
-     */
-    public function ngettext($original, $plural, $value)
-    {
-        return $this->dnpgettext($this->domain, null, $original, $plural, $value);
-    }
-
-    /**
-     * @see TranslatorInterface
-     *
-     * {@inheritdoc}
-     */
-    public function dngettext($domain, $original, $plural, $value)
-    {
-        return $this->dnpgettext($domain, null, $original, $plural, $value);
-    }
-
-    /**
-     * @see TranslatorInterface
-     *
-     * {@inheritdoc}
-     */
-    public function npgettext($context, $original, $plural, $value)
-    {
-        return $this->dnpgettext($this->domain, $context, $original, $plural, $value);
-    }
-
-    /**
-     * @see TranslatorInterface
-     *
-     * {@inheritdoc}
-     */
-    public function pgettext($context, $original)
-    {
-        return $this->dpgettext($this->domain, $context, $original);
-    }
-
-    /**
-     * @see TranslatorInterface
-     *
-     * {@inheritdoc}
-     */
-    public function dgettext($domain, $original)
-    {
-        return $this->dpgettext($domain, null, $original);
-    }
-
-    /**
-     * @see TranslatorInterface
-     *
-     * {@inheritdoc}
-     */
-    public function dpgettext($domain, $context, $original)
-    {
-        $translation = $this->getTranslation($domain, $context, $original);
-
-        if (isset($translation[0]) && $translation[0] !== '') {
-            return $translation[0];
-        }
-
-        return $original;
-    }
-
-    /**
-     * @see TranslatorInterface
-     *
-     * {@inheritdoc}
-     */
-    public function dnpgettext($domain, $context, $original, $plural, $value)
-    {
-        $translation = $this->getTranslation($domain, $context, $original);
-        $key = $this->getPluralIndex($domain, $value, $translation === false);
-
-        if (isset($translation[$key]) && $translation[$key] !== '') {
-            return $translation[$key];
-        }
-
-        return ($key === 0) ? $original : $plural;
-    }
-
-    /**
-     * Set new translations to the dictionary.
-     *
-     * @param array $translations
-     */
-    protected function addTranslations(array $translations)
-    {
-        $domain = isset($translations['domain']) ? $translations['domain'] : '';
-
-        //Set the first domain loaded as default domain
-        if ($this->domain === null) {
-            $this->domain = $domain;
-        }
-
-        if (isset($this->dictionary[$domain])) {
-            $this->dictionary[$domain] = array_replace_recursive($this->dictionary[$domain], $translations['messages']);
-
-            return;
-        }
-
-        if (!empty($translations['plural-forms'])) {
-            list($count, $code) = array_map('trim', explode(';', $translations['plural-forms'], 2));
-
-            // extract just the expression turn 'n' into a php variable '$n'.
-            // Slap on a return keyword and semicolon at the end.
-            $this->plurals[$domain] = [
-                'count' => (int) str_replace('nplurals=', '', $count),
-                'code' => str_replace('plural=', 'return ', str_replace('n', '$n', $code)).';',
-            ];
-        }
-
-        $this->dictionary[$domain] = $translations['messages'];
-    }
-
-    /**
-     * Search and returns a translation.
-     *
-     * @param string $domain
-     * @param string $context
-     * @param string $original
-     *
-     * @return string|false
-     */
-    protected function getTranslation($domain, $context, $original)
-    {
-        return isset($this->dictionary[$domain][$context][$original])
-             ? $this->dictionary[$domain][$context][$original]
-             : false;
-    }
-
-    /**
-     * Executes the plural decision code given the number to decide which
-     * plural version to take.
-     *
-     * @param string $domain
-     * @param string $n
-     * @param bool   $fallback set to true to get fallback plural index
-     *
-     * @return int
-     */
-    protected function getPluralIndex($domain, $n, $fallback)
-    {
-        //Not loaded domain or translation, use a fallback
-        if (!isset($this->plurals[$domain]) || $fallback === true) {
-            return $n == 1 ? 0 : 1;
-        }
-
-        if (!isset($this->plurals[$domain]['function'])) {
-            $code = static::fixTerseIfs($this->plurals[$domain]['code']);
-            $this->plurals[$domain]['function'] = eval("return function (\$n) { $code };");
-        }
-
-        if ($this->plurals[$domain]['count'] <= 2) {
-            return call_user_func($this->plurals[$domain]['function'], $n) ? 1 : 0;
-        }
-
-        return call_user_func($this->plurals[$domain]['function'], $n);
-    }
-
-    /**
-     * This function will recursively wrap failure states in brackets if they contain a nested terse if.
-     *
-     * This because PHP can not handle nested terse if's unless they are wrapped in brackets.
-     *
-     * This code probably only works for the gettext plural decision codes.
-     *
-     * return ($n==1 ? 0 : $n%10>=2 && $n%10<=4 && ($n%100<10 || $n%100>=20) ? 1 : 2);
-     * becomes
-     * return ($n==1 ? 0 : ($n%10>=2 && $n%10<=4 && ($n%100<10 || $n%100>=20) ? 1 : 2));
-     *
-     * @param string $code  the terse if string
-     * @param bool   $inner If inner is true we wrap it in brackets
-     *
-     * @return string A formatted terse If that PHP can work with.
-     */
-    private static function fixTerseIfs($code, $inner = false)
-    {
-        /*
+	protected $domain;
+	protected $dictionary = [];
+	protected $plurals = [];
+
+	/**
+	 * Loads translation from a Translations instance, a file on an array.
+	 *
+	 * @param Translations|string|array $translations
+	 *
+	 * @return static
+	 */
+	public function loadTranslations($translations)
+	{
+		if (is_object($translations) && $translations instanceof Translations) {
+			$translations = PhpArray::generate($translations, ['includeHeaders' => false]);
+		} elseif (is_string($translations) && is_file($translations)) {
+			$translations = include $translations;
+		} elseif (!is_array($translations)) {
+			throw new \InvalidArgumentException(
+				'Invalid Translator: only arrays, files or instance of Translations are allowed'
+			);
+		}
+
+		$this->addTranslations($translations);
+
+		return $this;
+	}
+
+	/**
+	 * Set the default domain.
+	 *
+	 * @param string $domain
+	 *
+	 * @return static
+	 */
+	public function defaultDomain($domain)
+	{
+		$this->domain = $domain;
+
+		return $this;
+	}
+
+	/**
+	 * @see TranslatorInterface
+	 *
+	 * {@inheritdoc}
+	 */
+	public function gettext($original)
+	{
+		return $this->dpgettext($this->domain, null, $original);
+	}
+
+	/**
+	 * @see TranslatorInterface
+	 *
+	 * {@inheritdoc}
+	 */
+	public function ngettext($original, $plural, $value)
+	{
+		return $this->dnpgettext($this->domain, null, $original, $plural, $value);
+	}
+
+	/**
+	 * @see TranslatorInterface
+	 *
+	 * {@inheritdoc}
+	 */
+	public function dngettext($domain, $original, $plural, $value)
+	{
+		return $this->dnpgettext($domain, null, $original, $plural, $value);
+	}
+
+	/**
+	 * @see TranslatorInterface
+	 *
+	 * {@inheritdoc}
+	 */
+	public function npgettext($context, $original, $plural, $value)
+	{
+		return $this->dnpgettext($this->domain, $context, $original, $plural, $value);
+	}
+
+	/**
+	 * @see TranslatorInterface
+	 *
+	 * {@inheritdoc}
+	 */
+	public function pgettext($context, $original)
+	{
+		return $this->dpgettext($this->domain, $context, $original);
+	}
+
+	/**
+	 * @see TranslatorInterface
+	 *
+	 * {@inheritdoc}
+	 */
+	public function dgettext($domain, $original)
+	{
+		return $this->dpgettext($domain, null, $original);
+	}
+
+	/**
+	 * @see TranslatorInterface
+	 *
+	 * {@inheritdoc}
+	 */
+	public function dpgettext($domain, $context, $original)
+	{
+		$translation = $this->getTranslation($domain, $context, $original);
+
+		if (isset($translation[0]) && $translation[0] !== '') {
+			return $translation[0];
+		}
+
+		return $original;
+	}
+
+	/**
+	 * @see TranslatorInterface
+	 *
+	 * {@inheritdoc}
+	 */
+	public function dnpgettext($domain, $context, $original, $plural, $value)
+	{
+		$translation = $this->getTranslation($domain, $context, $original);
+		$key = $this->getPluralIndex($domain, $value, $translation === false);
+
+		if (isset($translation[$key]) && $translation[$key] !== '') {
+			return $translation[$key];
+		}
+
+		return ($key === 0) ? $original : $plural;
+	}
+
+	/**
+	 * Set new translations to the dictionary.
+	 *
+	 * @param array $translations
+	 */
+	protected function addTranslations(array $translations)
+	{
+		$domain = isset($translations['domain']) ? $translations['domain'] : '';
+
+		//Set the first domain loaded as default domain
+		if ($this->domain === null) {
+			$this->domain = $domain;
+		}
+
+		if (isset($this->dictionary[$domain])) {
+			$this->dictionary[$domain] = array_replace_recursive($this->dictionary[$domain], $translations['messages']);
+
+			return;
+		}
+
+		if (!empty($translations['plural-forms'])) {
+			list($count, $code) = array_map('trim', explode(';', $translations['plural-forms'], 2));
+
+			// extract just the expression turn 'n' into a php variable '$n'.
+			// Slap on a return keyword and semicolon at the end.
+			$this->plurals[$domain] = [
+				'count' => (int) str_replace('nplurals=', '', $count),
+				'code' => str_replace('plural=', 'return ', str_replace('n', '$n', $code)).';',
+			];
+		}
+
+		$this->dictionary[$domain] = $translations['messages'];
+	}
+
+	/**
+	 * Search and returns a translation.
+	 *
+	 * @param string $domain
+	 * @param string $context
+	 * @param string $original
+	 *
+	 * @return string|false
+	 */
+	protected function getTranslation($domain, $context, $original)
+	{
+		return isset($this->dictionary[$domain][$context][$original])
+			 ? $this->dictionary[$domain][$context][$original]
+			 : false;
+	}
+
+	/**
+	 * Executes the plural decision code given the number to decide which
+	 * plural version to take.
+	 *
+	 * @param string $domain
+	 * @param string $n
+	 * @param bool   $fallback set to true to get fallback plural index
+	 *
+	 * @return int
+	 */
+	protected function getPluralIndex($domain, $n, $fallback)
+	{
+		//Not loaded domain or translation, use a fallback
+		if (!isset($this->plurals[$domain]) || $fallback === true) {
+			return $n == 1 ? 0 : 1;
+		}
+
+		if (!isset($this->plurals[$domain]['function'])) {
+			$code = static::fixTerseIfs($this->plurals[$domain]['code']);
+			$this->plurals[$domain]['function'] = eval("return function (\$n) { $code };");
+		}
+
+		if ($this->plurals[$domain]['count'] <= 2) {
+			return call_user_func($this->plurals[$domain]['function'], $n) ? 1 : 0;
+		}
+
+		return call_user_func($this->plurals[$domain]['function'], $n);
+	}
+
+	/**
+	 * This function will recursively wrap failure states in brackets if they contain a nested terse if.
+	 *
+	 * This because PHP can not handle nested terse if's unless they are wrapped in brackets.
+	 *
+	 * This code probably only works for the gettext plural decision codes.
+	 *
+	 * return ($n==1 ? 0 : $n%10>=2 && $n%10<=4 && ($n%100<10 || $n%100>=20) ? 1 : 2);
+	 * becomes
+	 * return ($n==1 ? 0 : ($n%10>=2 && $n%10<=4 && ($n%100<10 || $n%100>=20) ? 1 : 2));
+	 *
+	 * @param string $code  the terse if string
+	 * @param bool   $inner If inner is true we wrap it in brackets
+	 *
+	 * @return string A formatted terse If that PHP can work with.
+	 */
+	private static function fixTerseIfs($code, $inner = false)
+	{
+		/*
          * (?P<expression>[^?]+)   Capture everything up to ? as 'expression'
          * \?                      ?
          * (?P<success>[^:]+)      Capture everything up to : as 'success'
          * :                       :
          * (?P<failure>[^;]+)      Capture everything up to ; as 'failure'
          */
-        preg_match('/(?P<expression>[^?]+)\?(?P<success>[^:]+):(?P<failure>[^;]+)/', $code, $matches);
+		preg_match('/(?P<expression>[^?]+)\?(?P<success>[^:]+):(?P<failure>[^;]+)/', $code, $matches);
 
-        // If no match was found then no terse if was present
-        if (!isset($matches[0])) {
-            return $code;
-        }
+		// If no match was found then no terse if was present
+		if (!isset($matches[0])) {
+			return $code;
+		}
 
-        $expression = $matches['expression'];
-        $success = $matches['success'];
-        $failure = $matches['failure'];
+		$expression = $matches['expression'];
+		$success = $matches['success'];
+		$failure = $matches['failure'];
 
-        // Go look for another terse if in the failure state.
-        $failure = static::fixTerseIfs($failure, true);
-        $code = $expression.' ? '.$success.' : '.$failure;
+		// Go look for another terse if in the failure state.
+		$failure = static::fixTerseIfs($failure, true);
+		$code = $expression.' ? '.$success.' : '.$failure;
 
-        if ($inner) {
-            return "($code)";
-        }
+		if ($inner) {
+			return "($code)";
+		}
 
-        // note the semicolon. We need that for executing the code.
-        return "$code;";
-    }
+		// note the semicolon. We need that for executing the code.
+		return "$code;";
+	}
 }

Spacing +62 added lines, -62 removed lines

@@ -7,8 +7,8 @@ 
 class Translator extends BaseTranslator implements TranslatorInterface
 {
     protected $domain;
-    protected $dictionary = [];
-    protected $plurals = [];
+    protected $dictionary = [ ];
+    protected $plurals = [ ];
 
     /**
      * Loads translation from a Translations instance, a file on an array.
@@ -17,19 +17,19 @@ 
      *
      * @return static
      */
-    public function loadTranslations($translations)
+    public function loadTranslations( $translations )
     {
-        if (is_object($translations) && $translations instanceof Translations) {
-            $translations = PhpArray::generate($translations, ['includeHeaders' => false]);
-        } elseif (is_string($translations) && is_file($translations)) {
+        if ( is_object( $translations ) && $translations instanceof Translations ) {
+            $translations = PhpArray::generate( $translations, [ 'includeHeaders' => false ] );
+        } elseif ( is_string( $translations ) && is_file( $translations ) ) {
             $translations = include $translations;
-        } elseif (!is_array($translations)) {
+        } elseif ( ! is_array( $translations ) ) {
             throw new \InvalidArgumentException(
                 'Invalid Translator: only arrays, files or instance of Translations are allowed'
             );
         }
 
-        $this->addTranslations($translations);
+        $this->addTranslations( $translations );
 
         return $this;
     }
@@ -41,7 +41,7 @@ 
      *
      * @return static
      */
-    public function defaultDomain($domain)
+    public function defaultDomain( $domain )
     {
         $this->domain = $domain;
 
@@ -53,9 +53,9 @@ 
      *
      * {@inheritdoc}
      */
-    public function gettext($original)
+    public function gettext( $original )
     {
-        return $this->dpgettext($this->domain, null, $original);
+        return $this->dpgettext( $this->domain, null, $original );
     }
 
     /**
@@ -63,9 +63,9 @@ 
      *
      * {@inheritdoc}
      */
-    public function ngettext($original, $plural, $value)
+    public function ngettext( $original, $plural, $value )
     {
-        return $this->dnpgettext($this->domain, null, $original, $plural, $value);
+        return $this->dnpgettext( $this->domain, null, $original, $plural, $value );
     }
 
     /**
@@ -73,9 +73,9 @@ 
      *
      * {@inheritdoc}
      */
-    public function dngettext($domain, $original, $plural, $value)
+    public function dngettext( $domain, $original, $plural, $value )
     {
-        return $this->dnpgettext($domain, null, $original, $plural, $value);
+        return $this->dnpgettext( $domain, null, $original, $plural, $value );
     }
 
     /**
@@ -83,9 +83,9 @@ 
      *
      * {@inheritdoc}
      */
-    public function npgettext($context, $original, $plural, $value)
+    public function npgettext( $context, $original, $plural, $value )
     {
-        return $this->dnpgettext($this->domain, $context, $original, $plural, $value);
+        return $this->dnpgettext( $this->domain, $context, $original, $plural, $value );
     }
 
     /**
@@ -93,9 +93,9 @@ 
      *
      * {@inheritdoc}
      */
-    public function pgettext($context, $original)
+    public function pgettext( $context, $original )
     {
-        return $this->dpgettext($this->domain, $context, $original);
+        return $this->dpgettext( $this->domain, $context, $original );
     }
 
     /**
@@ -103,9 +103,9 @@ 
      *
      * {@inheritdoc}
      */
-    public function dgettext($domain, $original)
+    public function dgettext( $domain, $original )
     {
-        return $this->dpgettext($domain, null, $original);
+        return $this->dpgettext( $domain, null, $original );
     }
 
     /**
@@ -113,12 +113,12 @@ 
      *
      * {@inheritdoc}
      */
-    public function dpgettext($domain, $context, $original)
+    public function dpgettext( $domain, $context, $original )
     {
-        $translation = $this->getTranslation($domain, $context, $original);
+        $translation = $this->getTranslation( $domain, $context, $original );
 
-        if (isset($translation[0]) && $translation[0] !== '') {
-            return $translation[0];
+        if ( isset( $translation[ 0 ] ) && $translation[ 0 ] !== '' ) {
+            return $translation[ 0 ];
         }
 
         return $original;
@@ -129,16 +129,16 @@ 
      *
      * {@inheritdoc}
      */
-    public function dnpgettext($domain, $context, $original, $plural, $value)
+    public function dnpgettext( $domain, $context, $original, $plural, $value )
     {
-        $translation = $this->getTranslation($domain, $context, $original);
-        $key = $this->getPluralIndex($domain, $value, $translation === false);
+        $translation = $this->getTranslation( $domain, $context, $original );
+        $key = $this->getPluralIndex( $domain, $value, $translation === false );
 
-        if (isset($translation[$key]) && $translation[$key] !== '') {
-            return $translation[$key];
+        if ( isset( $translation[ $key ] ) && $translation[ $key ] !== '' ) {
+            return $translation[ $key ];
         }
 
-        return ($key === 0) ? $original : $plural;
+        return ( $key === 0 ) ? $original : $plural;
     }
 
     /**
@@ -146,33 +146,33 @@ 
      *
      * @param array $translations
      */
-    protected function addTranslations(array $translations)
+    protected function addTranslations( array $translations )
     {
-        $domain = isset($translations['domain']) ? $translations['domain'] : '';
+        $domain = isset( $translations[ 'domain' ] ) ? $translations[ 'domain' ] : '';
 
         //Set the first domain loaded as default domain
-        if ($this->domain === null) {
+        if ( $this->domain === null ) {
             $this->domain = $domain;
         }
 
-        if (isset($this->dictionary[$domain])) {
-            $this->dictionary[$domain] = array_replace_recursive($this->dictionary[$domain], $translations['messages']);
+        if ( isset( $this->dictionary[ $domain ] ) ) {
+            $this->dictionary[ $domain ] = array_replace_recursive( $this->dictionary[ $domain ], $translations[ 'messages' ] );
 
             return;
         }
 
-        if (!empty($translations['plural-forms'])) {
-            list($count, $code) = array_map('trim', explode(';', $translations['plural-forms'], 2));
+        if ( ! empty( $translations[ 'plural-forms' ] ) ) {
+            list( $count, $code ) = array_map( 'trim', explode( ';', $translations[ 'plural-forms' ], 2 ) );
 
             // extract just the expression turn 'n' into a php variable '$n'.
             // Slap on a return keyword and semicolon at the end.
-            $this->plurals[$domain] = [
-                'count' => (int) str_replace('nplurals=', '', $count),
-                'code' => str_replace('plural=', 'return ', str_replace('n', '$n', $code)).';',
+            $this->plurals[ $domain ] = [
+                'count' => (int)str_replace( 'nplurals=', '', $count ),
+                'code' => str_replace( 'plural=', 'return ', str_replace( 'n', '$n', $code ) ) . ';',
             ];
         }
 
-        $this->dictionary[$domain] = $translations['messages'];
+        $this->dictionary[ $domain ] = $translations[ 'messages' ];
     }
 
     /**
@@ -184,10 +184,10 @@ 
      *
      * @return string|false
      */
-    protected function getTranslation($domain, $context, $original)
+    protected function getTranslation( $domain, $context, $original )
     {
-        return isset($this->dictionary[$domain][$context][$original])
-             ? $this->dictionary[$domain][$context][$original]
+        return isset( $this->dictionary[ $domain ][ $context ][ $original ] )
+             ? $this->dictionary[ $domain ][ $context ][ $original ]
              : false;
     }
 
@@ -201,23 +201,23 @@ 
      *
      * @return int
      */
-    protected function getPluralIndex($domain, $n, $fallback)
+    protected function getPluralIndex( $domain, $n, $fallback )
     {
         //Not loaded domain or translation, use a fallback
-        if (!isset($this->plurals[$domain]) || $fallback === true) {
+        if ( ! isset( $this->plurals[ $domain ] ) || $fallback === true ) {
             return $n == 1 ? 0 : 1;
         }
 
-        if (!isset($this->plurals[$domain]['function'])) {
-            $code = static::fixTerseIfs($this->plurals[$domain]['code']);
-            $this->plurals[$domain]['function'] = eval("return function (\$n) { $code };");
+        if ( ! isset( $this->plurals[ $domain ][ 'function' ] ) ) {
+            $code = static::fixTerseIfs( $this->plurals[ $domain ][ 'code' ] );
+            $this->plurals[ $domain ][ 'function' ] = eval( "return function (\$n) { $code };" );
         }
 
-        if ($this->plurals[$domain]['count'] <= 2) {
-            return call_user_func($this->plurals[$domain]['function'], $n) ? 1 : 0;
+        if ( $this->plurals[ $domain ][ 'count' ] <= 2 ) {
+            return call_user_func( $this->plurals[ $domain ][ 'function' ], $n ) ? 1 : 0;
         }
 
-        return call_user_func($this->plurals[$domain]['function'], $n);
+        return call_user_func( $this->plurals[ $domain ][ 'function' ], $n );
     }
 
     /**
@@ -236,7 +236,7 @@ 
      *
      * @return string A formatted terse If that PHP can work with.
      */
-    private static function fixTerseIfs($code, $inner = false)
+    private static function fixTerseIfs( $code, $inner = false )
     {
         /*
          * (?P<expression>[^?]+)   Capture everything up to ? as 'expression'
@@ -245,22 +245,22 @@ 
          * :                       :
          * (?P<failure>[^;]+)      Capture everything up to ; as 'failure'
          */
-        preg_match('/(?P<expression>[^?]+)\?(?P<success>[^:]+):(?P<failure>[^;]+)/', $code, $matches);
+        preg_match( '/(?P<expression>[^?]+)\?(?P<success>[^:]+):(?P<failure>[^;]+)/', $code, $matches );
 
         // If no match was found then no terse if was present
-        if (!isset($matches[0])) {
+        if ( ! isset( $matches[ 0 ] ) ) {
             return $code;
         }
 
-        $expression = $matches['expression'];
-        $success = $matches['success'];
-        $failure = $matches['failure'];
+        $expression = $matches[ 'expression' ];
+        $success = $matches[ 'success' ];
+        $failure = $matches[ 'failure' ];
 
         // Go look for another terse if in the failure state.
-        $failure = static::fixTerseIfs($failure, true);
-        $code = $expression.' ? '.$success.' : '.$failure;
+        $failure = static::fixTerseIfs( $failure, true );
+        $code = $expression . ' ? ' . $success . ' : ' . $failure;
 
-        if ($inner) {
+        if ( $inner ) {
             return "($code)";
         }
 

Braces +15 added lines, -30 removed lines

@@ -4,8 +4,7 @@ 
 
 use Gettext\Generators\PhpArray;
 
-class Translator extends BaseTranslator implements TranslatorInterface
-{
+class Translator extends BaseTranslator implements TranslatorInterface {
     protected $domain;
     protected $dictionary = [];
     protected $plurals = [];
@@ -17,8 +16,7 @@ 
      *
      * @return static
      */
-    public function loadTranslations($translations)
-    {
+    public function loadTranslations($translations) {
         if (is_object($translations) && $translations instanceof Translations) {
             $translations = PhpArray::generate($translations, ['includeHeaders' => false]);
         } elseif (is_string($translations) && is_file($translations)) {
@@ -41,8 +39,7 @@ 
      *
      * @return static
      */
-    public function defaultDomain($domain)
-    {
+    public function defaultDomain($domain) {
         $this->domain = $domain;
 
         return $this;
@@ -53,8 +50,7 @@ 
      *
      * {@inheritdoc}
      */
-    public function gettext($original)
-    {
+    public function gettext($original) {
         return $this->dpgettext($this->domain, null, $original);
     }
 
@@ -63,8 +59,7 @@ 
      *
      * {@inheritdoc}
      */
-    public function ngettext($original, $plural, $value)
-    {
+    public function ngettext($original, $plural, $value) {
         return $this->dnpgettext($this->domain, null, $original, $plural, $value);
     }
 
@@ -73,8 +68,7 @@ 
      *
      * {@inheritdoc}
      */
-    public function dngettext($domain, $original, $plural, $value)
-    {
+    public function dngettext($domain, $original, $plural, $value) {
         return $this->dnpgettext($domain, null, $original, $plural, $value);
     }
 
@@ -83,8 +77,7 @@ 
      *
      * {@inheritdoc}
      */
-    public function npgettext($context, $original, $plural, $value)
-    {
+    public function npgettext($context, $original, $plural, $value) {
         return $this->dnpgettext($this->domain, $context, $original, $plural, $value);
     }
 
@@ -93,8 +86,7 @@ 
      *
      * {@inheritdoc}
      */
-    public function pgettext($context, $original)
-    {
+    public function pgettext($context, $original) {
         return $this->dpgettext($this->domain, $context, $original);
     }
 
@@ -103,8 +95,7 @@ 
      *
      * {@inheritdoc}
      */
-    public function dgettext($domain, $original)
-    {
+    public function dgettext($domain, $original) {
         return $this->dpgettext($domain, null, $original);
     }
 
@@ -113,8 +104,7 @@ 
      *
      * {@inheritdoc}
      */
-    public function dpgettext($domain, $context, $original)
-    {
+    public function dpgettext($domain, $context, $original) {
         $translation = $this->getTranslation($domain, $context, $original);
 
         if (isset($translation[0]) && $translation[0] !== '') {
@@ -129,8 +119,7 @@ 
      *
      * {@inheritdoc}
      */
-    public function dnpgettext($domain, $context, $original, $plural, $value)
-    {
+    public function dnpgettext($domain, $context, $original, $plural, $value) {
         $translation = $this->getTranslation($domain, $context, $original);
         $key = $this->getPluralIndex($domain, $value, $translation === false);
 
@@ -146,8 +135,7 @@ 
      *
      * @param array $translations
      */
-    protected function addTranslations(array $translations)
-    {
+    protected function addTranslations(array $translations) {
         $domain = isset($translations['domain']) ? $translations['domain'] : '';
 
         //Set the first domain loaded as default domain
@@ -184,8 +172,7 @@ 
      *
      * @return string|false
      */
-    protected function getTranslation($domain, $context, $original)
-    {
+    protected function getTranslation($domain, $context, $original) {
         return isset($this->dictionary[$domain][$context][$original])
              ? $this->dictionary[$domain][$context][$original]
              : false;
@@ -201,8 +188,7 @@ 
      *
      * @return int
      */
-    protected function getPluralIndex($domain, $n, $fallback)
-    {
+    protected function getPluralIndex($domain, $n, $fallback) {
         //Not loaded domain or translation, use a fallback
         if (!isset($this->plurals[$domain]) || $fallback === true) {
             return $n == 1 ? 0 : 1;
@@ -236,8 +222,7 @@ 
      *
      * @return string A formatted terse If that PHP can work with.
      */
-    private static function fixTerseIfs($code, $inner = false)
-    {
+    private static function fixTerseIfs($code, $inner = false) {
         /*
          * (?P<expression>[^?]+)   Capture everything up to ? as 'expression'
          * \?                      ?

vendor/gettext/gettext/src/Extractors/PhpArray.php

Indentation +17 added lines, -17 removed lines

@@ -11,23 +11,23 @@
  */
 class PhpArray extends Extractor implements ExtractorInterface
 {
-    use MultidimensionalArrayTrait;
+	use MultidimensionalArrayTrait;
 
-    /**
-     * {@inheritdoc}
-     */
-    public static function fromFile($file, Translations $translations, array $options = [])
-    {
-        foreach (static::getFiles($file) as $file) {
-            static::fromArray(include($file), $translations);
-        }
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public static function fromFile($file, Translations $translations, array $options = [])
+	{
+		foreach (static::getFiles($file) as $file) {
+			static::fromArray(include($file), $translations);
+		}
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public static function fromString($string, Translations $translations, array $options = [])
-    {
-        throw new BadMethodCallException('PhpArray::fromString() cannot be called. Use PhpArray::fromFile()');
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public static function fromString($string, Translations $translations, array $options = [])
+	{
+		throw new BadMethodCallException('PhpArray::fromString() cannot be called. Use PhpArray::fromFile()');
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -16,18 +16,18 @@
     /**
      * {@inheritdoc}
      */
-    public static function fromFile($file, Translations $translations, array $options = [])
+    public static function fromFile( $file, Translations $translations, array $options = [ ] )
     {
-        foreach (static::getFiles($file) as $file) {
-            static::fromArray(include($file), $translations);
+        foreach ( static::getFiles( $file ) as $file ) {
+            static::fromArray( include( $file ), $translations );
         }
     }
 
     /**
      * {@inheritdoc}
      */
-    public static function fromString($string, Translations $translations, array $options = [])
+    public static function fromString( $string, Translations $translations, array $options = [ ] )
     {
-        throw new BadMethodCallException('PhpArray::fromString() cannot be called. Use PhpArray::fromFile()');
+        throw new BadMethodCallException( 'PhpArray::fromString() cannot be called. Use PhpArray::fromFile()' );
     }
 }

Braces +3 added lines, -6 removed lines

@@ -9,15 +9,13 @@ 
 /**
  * Class to get gettext strings from php files returning arrays.
  */
-class PhpArray extends Extractor implements ExtractorInterface
-{
+class PhpArray extends Extractor implements ExtractorInterface {
     use MultidimensionalArrayTrait;
 
     /**
      * {@inheritdoc}
      */
-    public static function fromFile($file, Translations $translations, array $options = [])
-    {
+    public static function fromFile($file, Translations $translations, array $options = []) {
         foreach (static::getFiles($file) as $file) {
             static::fromArray(include($file), $translations);
         }
@@ -26,8 +24,7 @@ 
     /**
      * {@inheritdoc}
      */
-    public static function fromString($string, Translations $translations, array $options = [])
-    {
+    public static function fromString($string, Translations $translations, array $options = []) {
         throw new BadMethodCallException('PhpArray::fromString() cannot be called. Use PhpArray::fromFile()');
     }
 }

vendor/gettext/gettext/src/Extractors/CsvDictionary.php

Indentation +33 added lines, -33 removed lines

@@ -11,37 +11,37 @@
  */
 class CsvDictionary extends Extractor implements ExtractorInterface
 {
-    use HeadersExtractorTrait;
-    use CsvTrait;
-
-    public static $options = [
-        'delimiter' => ",",
-        'enclosure' => '"',
-        'escape_char' => "\\"
-    ];
-
-    /**
-     * {@inheritdoc}
-     */
-    public static function fromString($string, Translations $translations, array $options = [])
-    {
-        $options += static::$options;
-        $handle = fopen('php://memory', 'w');
-
-        fputs($handle, $string);
-        rewind($handle);
-
-        while ($row = static::fgetcsv($handle, $options)) {
-            list($original, $translation) = $row + ['', ''];
-
-            if ($original === '') {
-                static::extractHeaders($translation, $translations);
-                continue;
-            }
-
-            $translations->insert(null, $original)->setTranslation($translation);
-        }
-
-        fclose($handle);
-    }
+	use HeadersExtractorTrait;
+	use CsvTrait;
+
+	public static $options = [
+		'delimiter' => ",",
+		'enclosure' => '"',
+		'escape_char' => "\\"
+	];
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public static function fromString($string, Translations $translations, array $options = [])
+	{
+		$options += static::$options;
+		$handle = fopen('php://memory', 'w');
+
+		fputs($handle, $string);
+		rewind($handle);
+
+		while ($row = static::fgetcsv($handle, $options)) {
+			list($original, $translation) = $row + ['', ''];
+
+			if ($original === '') {
+				static::extractHeaders($translation, $translations);
+				continue;
+			}
+
+			$translations->insert(null, $original)->setTranslation($translation);
+		}
+
+		fclose($handle);
+	}
 }

Spacing +10 added lines, -10 removed lines

@@ -23,25 +23,25 @@
     /**
      * {@inheritdoc}
      */
-    public static function fromString($string, Translations $translations, array $options = [])
+    public static function fromString( $string, Translations $translations, array $options = [ ] )
     {
         $options += static::$options;
-        $handle = fopen('php://memory', 'w');
+        $handle = fopen( 'php://memory', 'w' );
 
-        fputs($handle, $string);
-        rewind($handle);
+        fputs( $handle, $string );
+        rewind( $handle );
 
-        while ($row = static::fgetcsv($handle, $options)) {
-            list($original, $translation) = $row + ['', ''];
+        while ( $row = static::fgetcsv( $handle, $options ) ) {
+            list( $original, $translation ) = $row + [ '', '' ];
 
-            if ($original === '') {
-                static::extractHeaders($translation, $translations);
+            if ( $original === '' ) {
+                static::extractHeaders( $translation, $translations );
                 continue;
             }
 
-            $translations->insert(null, $original)->setTranslation($translation);
+            $translations->insert( null, $original )->setTranslation( $translation );
         }
 
-        fclose($handle);
+        fclose( $handle );
     }
 }

Braces +2 added lines, -4 removed lines

@@ -9,8 +9,7 @@ 
 /**
  * Class to get gettext strings from csv.
  */
-class CsvDictionary extends Extractor implements ExtractorInterface
-{
+class CsvDictionary extends Extractor implements ExtractorInterface {
     use HeadersExtractorTrait;
     use CsvTrait;
 
@@ -23,8 +22,7 @@ 
     /**
      * {@inheritdoc}
      */
-    public static function fromString($string, Translations $translations, array $options = [])
-    {
+    public static function fromString($string, Translations $translations, array $options = []) {
         $options += static::$options;
         $handle = fopen('php://memory', 'w');