gravityview / GravityView

vendor/gettext/gettext/src/BaseTranslator.php

Indentation +32 added lines, -32 removed lines

@@ -4,36 +4,36 @@
 
 abstract class BaseTranslator implements TranslatorInterface
 {
-    /** @var TranslatorInterface */
-    public static $current;
-
-    /**
-     * @see TranslatorInterface
-     */
-    public function noop($original)
-    {
-        return $original;
-    }
-
-    /**
-     * @see TranslatorInterface
-     */
-    public function register()
-    {
-        $previous = static::$current;
-
-        static::$current = $this;
-
-        static::includeFunctions();
-
-        return $previous;
-    }
-
-    /**
-     * Include the gettext functions
-     */
-    public static function includeFunctions()
-    {
-        include_once __DIR__.'/translator_functions.php';
-    }
+	/** @var TranslatorInterface */
+	public static $current;
+
+	/**
+	 * @see TranslatorInterface
+	 */
+	public function noop($original)
+	{
+		return $original;
+	}
+
+	/**
+	 * @see TranslatorInterface
+	 */
+	public function register()
+	{
+		$previous = static::$current;
+
+		static::$current = $this;
+
+		static::includeFunctions();
+
+		return $previous;
+	}
+
+	/**
+	 * Include the gettext functions
+	 */
+	public static function includeFunctions()
+	{
+		include_once __DIR__.'/translator_functions.php';
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -10,7 +10,7 @@ 
     /**
      * @see TranslatorInterface
      */
-    public function noop($original)
+    public function noop( $original )
     {
         return $original;
     }
@@ -34,6 +34,6 @@ 
      */
     public static function includeFunctions()
     {
-        include_once __DIR__.'/translator_functions.php';
+        include_once __DIR__ . '/translator_functions.php';
     }
 }

Braces +4 added lines, -8 removed lines

@@ -2,24 +2,21 @@ 
 
 namespace Gettext;
 
-abstract class BaseTranslator implements TranslatorInterface
-{
+abstract class BaseTranslator implements TranslatorInterface {
     /** @var TranslatorInterface */
     public static $current;
 
     /**
      * @see TranslatorInterface
      */
-    public function noop($original)
-    {
+    public function noop($original) {
         return $original;
     }
 
     /**
      * @see TranslatorInterface
      */
-    public function register()
-    {
+    public function register() {
         $previous = static::$current;
 
         static::$current = $this;
@@ -32,8 +29,7 @@ 
     /**
      * Include the gettext functions
      */
-    public static function includeFunctions()
-    {
+    public static function includeFunctions() {
         include_once __DIR__.'/translator_functions.php';
     }
 }

vendor/gettext/gettext/src/GettextTranslator.php

Indentation +154 added lines, -154 removed lines

@@ -4,158 +4,158 @@
 
 class GettextTranslator extends BaseTranslator implements TranslatorInterface
 {
-    /**
-     * Constructor. Detects the current language using the environment variables.
-     *
-     * @param string $language
-     */
-    public function __construct($language = null)
-    {
-        if (!function_exists('gettext')) {
-            throw new \RuntimeException('This class require the gettext extension for PHP');
-        }
-
-        //detects the language environment respecting the priority order
-        //http://php.net/manual/en/function.gettext.php#114062
-        if (empty($language)) {
-            $language = getenv('LANGUAGE') ?: getenv('LC_ALL') ?: getenv('LC_MESSAGES') ?: getenv('LANG');
-        }
-
-        if (!empty($language)) {
-            $this->setLanguage($language);
-        }
-    }
-
-    /**
-     * Define the current locale.
-     *
-     * @param string   $language
-     * @param int|null $category
-     *
-     * @return self
-     */
-    public function setLanguage($language, $category = null)
-    {
-        if ($category === null) {
-            $category = defined('LC_MESSAGES') ? LC_MESSAGES : LC_ALL;
-        }
-
-        setlocale($category, $language);
-        putenv('LANGUAGE='.$language);
-
-        return $this;
-    }
-
-    /**
-     * Loads a gettext domain.
-     *
-     * @param string $domain
-     * @param string $path
-     * @param bool   $default
-     *
-     * @return self
-     */
-    public function loadDomain($domain, $path = null, $default = true)
-    {
-        bindtextdomain($domain, $path);
-        bind_textdomain_codeset($domain, 'UTF-8');
-
-        if ($default) {
-            textdomain($domain);
-        }
-
-        return $this;
-    }
-
-    /**
-     * @see TranslatorInterface
-     *
-     * {@inheritdoc}
-     */
-    public function gettext($original)
-    {
-        return gettext($original);
-    }
-
-    /**
-     * @see TranslatorInterface
-     *
-     * {@inheritdoc}
-     */
-    public function ngettext($original, $plural, $value)
-    {
-        return ngettext($original, $plural, $value);
-    }
-
-    /**
-     * @see TranslatorInterface
-     *
-     * {@inheritdoc}
-     */
-    public function dngettext($domain, $original, $plural, $value)
-    {
-        return dngettext($domain, $original, $plural, $value);
-    }
-
-    /**
-     * @see TranslatorInterface
-     *
-     * {@inheritdoc}
-     */
-    public function npgettext($context, $original, $plural, $value)
-    {
-        $message = $context."\x04".$original;
-        $translation = ngettext($message, $plural, $value);
-
-        return ($translation === $message) ? $original : $translation;
-    }
-
-    /**
-     * @see TranslatorInterface
-     *
-     * {@inheritdoc}
-     */
-    public function pgettext($context, $original)
-    {
-        $message = $context."\x04".$original;
-        $translation = gettext($message);
-
-        return ($translation === $message) ? $original : $translation;
-    }
-
-    /**
-     * @see TranslatorInterface
-     *
-     * {@inheritdoc}
-     */
-    public function dgettext($domain, $original)
-    {
-        return dgettext($domain, $original);
-    }
-
-    /**
-     * @see TranslatorInterface
-     *
-     * {@inheritdoc}
-     */
-    public function dpgettext($domain, $context, $original)
-    {
-        $message = $context."\x04".$original;
-        $translation = dgettext($domain, $message);
-
-        return ($translation === $message) ? $original : $translation;
-    }
-
-    /**
-     * @see TranslatorInterface
-     *
-     * {@inheritdoc}
-     */
-    public function dnpgettext($domain, $context, $original, $plural, $value)
-    {
-        $message = $context."\x04".$original;
-        $translation = dngettext($domain, $message, $plural, $value);
-
-        return ($translation === $message) ? $original : $translation;
-    }
+	/**
+	 * Constructor. Detects the current language using the environment variables.
+	 *
+	 * @param string $language
+	 */
+	public function __construct($language = null)
+	{
+		if (!function_exists('gettext')) {
+			throw new \RuntimeException('This class require the gettext extension for PHP');
+		}
+
+		//detects the language environment respecting the priority order
+		//http://php.net/manual/en/function.gettext.php#114062
+		if (empty($language)) {
+			$language = getenv('LANGUAGE') ?: getenv('LC_ALL') ?: getenv('LC_MESSAGES') ?: getenv('LANG');
+		}
+
+		if (!empty($language)) {
+			$this->setLanguage($language);
+		}
+	}
+
+	/**
+	 * Define the current locale.
+	 *
+	 * @param string   $language
+	 * @param int|null $category
+	 *
+	 * @return self
+	 */
+	public function setLanguage($language, $category = null)
+	{
+		if ($category === null) {
+			$category = defined('LC_MESSAGES') ? LC_MESSAGES : LC_ALL;
+		}
+
+		setlocale($category, $language);
+		putenv('LANGUAGE='.$language);
+
+		return $this;
+	}
+
+	/**
+	 * Loads a gettext domain.
+	 *
+	 * @param string $domain
+	 * @param string $path
+	 * @param bool   $default
+	 *
+	 * @return self
+	 */
+	public function loadDomain($domain, $path = null, $default = true)
+	{
+		bindtextdomain($domain, $path);
+		bind_textdomain_codeset($domain, 'UTF-8');
+
+		if ($default) {
+			textdomain($domain);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * @see TranslatorInterface
+	 *
+	 * {@inheritdoc}
+	 */
+	public function gettext($original)
+	{
+		return gettext($original);
+	}
+
+	/**
+	 * @see TranslatorInterface
+	 *
+	 * {@inheritdoc}
+	 */
+	public function ngettext($original, $plural, $value)
+	{
+		return ngettext($original, $plural, $value);
+	}
+
+	/**
+	 * @see TranslatorInterface
+	 *
+	 * {@inheritdoc}
+	 */
+	public function dngettext($domain, $original, $plural, $value)
+	{
+		return dngettext($domain, $original, $plural, $value);
+	}
+
+	/**
+	 * @see TranslatorInterface
+	 *
+	 * {@inheritdoc}
+	 */
+	public function npgettext($context, $original, $plural, $value)
+	{
+		$message = $context."\x04".$original;
+		$translation = ngettext($message, $plural, $value);
+
+		return ($translation === $message) ? $original : $translation;
+	}
+
+	/**
+	 * @see TranslatorInterface
+	 *
+	 * {@inheritdoc}
+	 */
+	public function pgettext($context, $original)
+	{
+		$message = $context."\x04".$original;
+		$translation = gettext($message);
+
+		return ($translation === $message) ? $original : $translation;
+	}
+
+	/**
+	 * @see TranslatorInterface
+	 *
+	 * {@inheritdoc}
+	 */
+	public function dgettext($domain, $original)
+	{
+		return dgettext($domain, $original);
+	}
+
+	/**
+	 * @see TranslatorInterface
+	 *
+	 * {@inheritdoc}
+	 */
+	public function dpgettext($domain, $context, $original)
+	{
+		$message = $context."\x04".$original;
+		$translation = dgettext($domain, $message);
+
+		return ($translation === $message) ? $original : $translation;
+	}
+
+	/**
+	 * @see TranslatorInterface
+	 *
+	 * {@inheritdoc}
+	 */
+	public function dnpgettext($domain, $context, $original, $plural, $value)
+	{
+		$message = $context."\x04".$original;
+		$translation = dngettext($domain, $message, $plural, $value);
+
+		return ($translation === $message) ? $original : $translation;
+	}
 }

Spacing +41 added lines, -41 removed lines

@@ -9,20 +9,20 @@ 
      *
      * @param string $language
      */
-    public function __construct($language = null)
+    public function __construct( $language = null )
     {
-        if (!function_exists('gettext')) {
-            throw new \RuntimeException('This class require the gettext extension for PHP');
+        if ( ! function_exists( 'gettext' ) ) {
+            throw new \RuntimeException( 'This class require the gettext extension for PHP' );
         }
 
         //detects the language environment respecting the priority order
         //http://php.net/manual/en/function.gettext.php#114062
-        if (empty($language)) {
-            $language = getenv('LANGUAGE') ?: getenv('LC_ALL') ?: getenv('LC_MESSAGES') ?: getenv('LANG');
+        if ( empty( $language ) ) {
+            $language = getenv( 'LANGUAGE' ) ?: getenv( 'LC_ALL' ) ?: getenv( 'LC_MESSAGES' ) ?: getenv( 'LANG' );
         }
 
-        if (!empty($language)) {
-            $this->setLanguage($language);
+        if ( ! empty( $language ) ) {
+            $this->setLanguage( $language );
         }
     }
 
@@ -34,14 +34,14 @@ 
      *
      * @return self
      */
-    public function setLanguage($language, $category = null)
+    public function setLanguage( $language, $category = null )
     {
-        if ($category === null) {
-            $category = defined('LC_MESSAGES') ? LC_MESSAGES : LC_ALL;
+        if ( $category === null ) {
+            $category = defined( 'LC_MESSAGES' ) ? LC_MESSAGES : LC_ALL;
         }
 
-        setlocale($category, $language);
-        putenv('LANGUAGE='.$language);
+        setlocale( $category, $language );
+        putenv( 'LANGUAGE=' . $language );
 
         return $this;
     }
@@ -55,13 +55,13 @@ 
      *
      * @return self
      */
-    public function loadDomain($domain, $path = null, $default = true)
+    public function loadDomain( $domain, $path = null, $default = true )
     {
-        bindtextdomain($domain, $path);
-        bind_textdomain_codeset($domain, 'UTF-8');
+        bindtextdomain( $domain, $path );
+        bind_textdomain_codeset( $domain, 'UTF-8' );
 
-        if ($default) {
-            textdomain($domain);
+        if ( $default ) {
+            textdomain( $domain );
         }
 
         return $this;
@@ -72,9 +72,9 @@ 
      *
      * {@inheritdoc}
      */
-    public function gettext($original)
+    public function gettext( $original )
     {
-        return gettext($original);
+        return gettext( $original );
     }
 
     /**
@@ -82,9 +82,9 @@ 
      *
      * {@inheritdoc}
      */
-    public function ngettext($original, $plural, $value)
+    public function ngettext( $original, $plural, $value )
     {
-        return ngettext($original, $plural, $value);
+        return ngettext( $original, $plural, $value );
     }
 
     /**
@@ -92,9 +92,9 @@ 
      *
      * {@inheritdoc}
      */
-    public function dngettext($domain, $original, $plural, $value)
+    public function dngettext( $domain, $original, $plural, $value )
     {
-        return dngettext($domain, $original, $plural, $value);
+        return dngettext( $domain, $original, $plural, $value );
     }
 
     /**
@@ -102,12 +102,12 @@ 
      *
      * {@inheritdoc}
      */
-    public function npgettext($context, $original, $plural, $value)
+    public function npgettext( $context, $original, $plural, $value )
     {
-        $message = $context."\x04".$original;
-        $translation = ngettext($message, $plural, $value);
+        $message = $context . "\x04" . $original;
+        $translation = ngettext( $message, $plural, $value );
 
-        return ($translation === $message) ? $original : $translation;
+        return ( $translation === $message ) ? $original : $translation;
     }
 
     /**
@@ -115,12 +115,12 @@ 
      *
      * {@inheritdoc}
      */
-    public function pgettext($context, $original)
+    public function pgettext( $context, $original )
     {
-        $message = $context."\x04".$original;
-        $translation = gettext($message);
+        $message = $context . "\x04" . $original;
+        $translation = gettext( $message );
 
-        return ($translation === $message) ? $original : $translation;
+        return ( $translation === $message ) ? $original : $translation;
     }
 
     /**
@@ -128,9 +128,9 @@ 
      *
      * {@inheritdoc}
      */
-    public function dgettext($domain, $original)
+    public function dgettext( $domain, $original )
     {
-        return dgettext($domain, $original);
+        return dgettext( $domain, $original );
     }
 
     /**
@@ -138,12 +138,12 @@ 
      *
      * {@inheritdoc}
      */
-    public function dpgettext($domain, $context, $original)
+    public function dpgettext( $domain, $context, $original )
     {
-        $message = $context."\x04".$original;
-        $translation = dgettext($domain, $message);
+        $message = $context . "\x04" . $original;
+        $translation = dgettext( $domain, $message );
 
-        return ($translation === $message) ? $original : $translation;
+        return ( $translation === $message ) ? $original : $translation;
     }
 
     /**
@@ -151,11 +151,11 @@ 
      *
      * {@inheritdoc}
      */
-    public function dnpgettext($domain, $context, $original, $plural, $value)
+    public function dnpgettext( $domain, $context, $original, $plural, $value )
     {
-        $message = $context."\x04".$original;
-        $translation = dngettext($domain, $message, $plural, $value);
+        $message = $context . "\x04" . $original;
+        $translation = dngettext( $domain, $message, $plural, $value );
 
-        return ($translation === $message) ? $original : $translation;
+        return ( $translation === $message ) ? $original : $translation;
     }
 }

Braces +12 added lines, -24 removed lines

@@ -2,15 +2,13 @@ 
 
 namespace Gettext;
 
-class GettextTranslator extends BaseTranslator implements TranslatorInterface
-{
+class GettextTranslator extends BaseTranslator implements TranslatorInterface {
     /**
      * Constructor. Detects the current language using the environment variables.
      *
      * @param string $language
      */
-    public function __construct($language = null)
-    {
+    public function __construct($language = null) {
         if (!function_exists('gettext')) {
             throw new \RuntimeException('This class require the gettext extension for PHP');
         }
@@ -34,8 +32,7 @@ 
      *
      * @return self
      */
-    public function setLanguage($language, $category = null)
-    {
+    public function setLanguage($language, $category = null) {
         if ($category === null) {
             $category = defined('LC_MESSAGES') ? LC_MESSAGES : LC_ALL;
         }
@@ -55,8 +52,7 @@ 
      *
      * @return self
      */
-    public function loadDomain($domain, $path = null, $default = true)
-    {
+    public function loadDomain($domain, $path = null, $default = true) {
         bindtextdomain($domain, $path);
         bind_textdomain_codeset($domain, 'UTF-8');
 
@@ -72,8 +68,7 @@ 
      *
      * {@inheritdoc}
      */
-    public function gettext($original)
-    {
+    public function gettext($original) {
         return gettext($original);
     }
 
@@ -82,8 +77,7 @@ 
      *
      * {@inheritdoc}
      */
-    public function ngettext($original, $plural, $value)
-    {
+    public function ngettext($original, $plural, $value) {
         return ngettext($original, $plural, $value);
     }
 
@@ -92,8 +86,7 @@ 
      *
      * {@inheritdoc}
      */
-    public function dngettext($domain, $original, $plural, $value)
-    {
+    public function dngettext($domain, $original, $plural, $value) {
         return dngettext($domain, $original, $plural, $value);
     }
 
@@ -102,8 +95,7 @@ 
      *
      * {@inheritdoc}
      */
-    public function npgettext($context, $original, $plural, $value)
-    {
+    public function npgettext($context, $original, $plural, $value) {
         $message = $context."\x04".$original;
         $translation = ngettext($message, $plural, $value);
 
@@ -115,8 +107,7 @@ 
      *
      * {@inheritdoc}
      */
-    public function pgettext($context, $original)
-    {
+    public function pgettext($context, $original) {
         $message = $context."\x04".$original;
         $translation = gettext($message);
 
@@ -128,8 +119,7 @@ 
      *
      * {@inheritdoc}
      */
-    public function dgettext($domain, $original)
-    {
+    public function dgettext($domain, $original) {
         return dgettext($domain, $original);
     }
 
@@ -138,8 +128,7 @@ 
      *
      * {@inheritdoc}
      */
-    public function dpgettext($domain, $context, $original)
-    {
+    public function dpgettext($domain, $context, $original) {
         $message = $context."\x04".$original;
         $translation = dgettext($domain, $message);
 
@@ -151,8 +140,7 @@ 
      *
      * {@inheritdoc}
      */
-    public function dnpgettext($domain, $context, $original, $plural, $value)
-    {
+    public function dnpgettext($domain, $context, $original, $plural, $value) {
         $message = $context."\x04".$original;
         $translation = dngettext($domain, $message, $plural, $value);
 

vendor/gettext/gettext/src/Utils/HeadersGeneratorTrait.php

Indentation +15 added lines, -15 removed lines

@@ -9,21 +9,21 @@
  */
 trait HeadersGeneratorTrait
 {
-    /**
-     * Returns the headers as a string.
-     *
-     * @param Translations $translations
-     *
-     * @return string
-     */
-    protected static function generateHeaders(Translations $translations)
-    {
-        $headers = '';
+	/**
+	 * Returns the headers as a string.
+	 *
+	 * @param Translations $translations
+	 *
+	 * @return string
+	 */
+	protected static function generateHeaders(Translations $translations)
+	{
+		$headers = '';
 
-        foreach ($translations->getHeaders() as $name => $value) {
-            $headers .= sprintf("%s: %s\n", $name, $value);
-        }
+		foreach ($translations->getHeaders() as $name => $value) {
+			$headers .= sprintf("%s: %s\n", $name, $value);
+		}
 
-        return $headers;
-    }
+		return $headers;
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -16,12 +16,12 @@
      *
      * @return string
      */
-    protected static function generateHeaders(Translations $translations)
+    protected static function generateHeaders( Translations $translations )
     {
         $headers = '';
 
-        foreach ($translations->getHeaders() as $name => $value) {
-            $headers .= sprintf("%s: %s\n", $name, $value);
+        foreach ( $translations->getHeaders() as $name => $value ) {
+            $headers .= sprintf( "%s: %s\n", $name, $value );
         }
 
         return $headers;

Braces +2 added lines, -4 removed lines

@@ -7,8 +7,7 @@ 
 /**
  * Trait to provide the functionality of extracting headers.
  */
-trait HeadersGeneratorTrait
-{
+trait HeadersGeneratorTrait {
     /**
      * Returns the headers as a string.
      *
@@ -16,8 +15,7 @@ 
      *
      * @return string
      */
-    protected static function generateHeaders(Translations $translations)
-    {
+    protected static function generateHeaders(Translations $translations) {
         $headers = '';
 
         foreach ($translations->getHeaders() as $name => $value) {

vendor/gettext/gettext/src/Utils/DictionaryTrait.php

Indentation +47 added lines, -47 removed lines

@@ -9,51 +9,51 @@
  */
 trait DictionaryTrait
 {
-    use HeadersGeneratorTrait;
-    use HeadersExtractorTrait;
-
-    /**
-     * Returns a plain dictionary with the format [original => translation].
-     *
-     * @param Translations $translations
-     * @param bool         $includeHeaders
-     *
-     * @return array
-     */
-    protected static function toArray(Translations $translations, $includeHeaders)
-    {
-        $messages = [];
-
-        if ($includeHeaders) {
-            $messages[''] = static::generateHeaders($translations);
-        }
-
-        foreach ($translations as $translation) {
-            if ($translation->isDisabled()) {
-                continue;
-            }
-
-            $messages[$translation->getOriginal()] = $translation->getTranslation();
-        }
-
-        return $messages;
-    }
-
-    /**
-     * Extract the entries from a dictionary.
-     *
-     * @param array        $messages
-     * @param Translations $translations
-     */
-    protected static function fromArray(array $messages, Translations $translations)
-    {
-        foreach ($messages as $original => $translation) {
-            if ($original === '') {
-                static::extractHeaders($translation, $translations);
-                continue;
-            }
-
-            $translations->insert(null, $original)->setTranslation($translation);
-        }
-    }
+	use HeadersGeneratorTrait;
+	use HeadersExtractorTrait;
+
+	/**
+	 * Returns a plain dictionary with the format [original => translation].
+	 *
+	 * @param Translations $translations
+	 * @param bool         $includeHeaders
+	 *
+	 * @return array
+	 */
+	protected static function toArray(Translations $translations, $includeHeaders)
+	{
+		$messages = [];
+
+		if ($includeHeaders) {
+			$messages[''] = static::generateHeaders($translations);
+		}
+
+		foreach ($translations as $translation) {
+			if ($translation->isDisabled()) {
+				continue;
+			}
+
+			$messages[$translation->getOriginal()] = $translation->getTranslation();
+		}
+
+		return $messages;
+	}
+
+	/**
+	 * Extract the entries from a dictionary.
+	 *
+	 * @param array        $messages
+	 * @param Translations $translations
+	 */
+	protected static function fromArray(array $messages, Translations $translations)
+	{
+		foreach ($messages as $original => $translation) {
+			if ($original === '') {
+				static::extractHeaders($translation, $translations);
+				continue;
+			}
+
+			$translations->insert(null, $original)->setTranslation($translation);
+		}
+	}
 }

Spacing +12 added lines, -12 removed lines

@@ -20,20 +20,20 @@ 
      *
      * @return array
      */
-    protected static function toArray(Translations $translations, $includeHeaders)
+    protected static function toArray( Translations $translations, $includeHeaders )
     {
-        $messages = [];
+        $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;
             }
 
-            $messages[$translation->getOriginal()] = $translation->getTranslation();
+            $messages[ $translation->getOriginal() ] = $translation->getTranslation();
         }
 
         return $messages;
@@ -45,15 +45,15 @@ 
      * @param array        $messages
      * @param Translations $translations
      */
-    protected static function fromArray(array $messages, Translations $translations)
+    protected static function fromArray( array $messages, Translations $translations )
     {
-        foreach ($messages as $original => $translation) {
-            if ($original === '') {
-                static::extractHeaders($translation, $translations);
+        foreach ( $messages as $original => $translation ) {
+            if ( $original === '' ) {
+                static::extractHeaders( $translation, $translations );
                 continue;
             }
 
-            $translations->insert(null, $original)->setTranslation($translation);
+            $translations->insert( null, $original )->setTranslation( $translation );
         }
     }
 }

Braces +3 added lines, -6 removed lines

@@ -7,8 +7,7 @@ 
 /**
  * Trait used by all generators that exports the translations to plain dictionary (original => singular-translation).
  */
-trait DictionaryTrait
-{
+trait DictionaryTrait {
     use HeadersGeneratorTrait;
     use HeadersExtractorTrait;
 
@@ -20,8 +19,7 @@ 
      *
      * @return array
      */
-    protected static function toArray(Translations $translations, $includeHeaders)
-    {
+    protected static function toArray(Translations $translations, $includeHeaders) {
         $messages = [];
 
         if ($includeHeaders) {
@@ -45,8 +43,7 @@ 
      * @param array        $messages
      * @param Translations $translations
      */
-    protected static function fromArray(array $messages, Translations $translations)
-    {
+    protected static function fromArray(array $messages, Translations $translations) {
         foreach ($messages as $original => $translation) {
             if ($original === '') {
                 static::extractHeaders($translation, $translations);

vendor/gettext/gettext/src/Utils/JsFunctionsScanner.php

Indentation +313 added lines, -313 removed lines

@@ -4,317 +4,317 @@
 
 class JsFunctionsScanner extends FunctionsScanner
 {
-    protected $code;
-    protected $status = [];
-
-    /**
-     * Constructor.
-     *
-     * @param string $code The php code to scan
-     */
-    public function __construct($code)
-    {
-        // Normalize newline characters
-        $this->code = str_replace(["\r\n", "\n\r", "\r"], "\n", $code);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getFunctions(array $constants = [])
-    {
-        $length = strlen($this->code);
-        $line = 1;
-        $buffer = '';
-        $functions = [];
-        $bufferFunctions = [];
-        $char = null;
-
-        for ($pos = 0; $pos < $length; ++$pos) {
-            $prev = $char;
-            $char = $this->code[$pos];
-            $next = isset($this->code[$pos + 1]) ? $this->code[$pos + 1] : null;
-
-            switch ($char) {
-                case '\\':
-                    switch ($this->status()) {
-                        case 'simple-quote':
-                            if ($next !== "'") {
-                                break 2;
-                            }
-                            break;
-
-                        case 'double-quote':
-                            if ($next !== '"') {
-                                break 2;
-                            }
-                            break;
-
-                        case 'back-tick':
-                            if ($next !== '`') {
-                                break 2;
-                            }
-                            break;
-                    }
-
-                    $prev = $char;
-                    $char = $next;
-                    $pos++;
-                    $next = isset($this->code[$pos]) ? $this->code[$pos] : null;
-                    break;
-
-                case "\n":
-                    ++$line;
-
-                    if ($this->status('line-comment')) {
-                        $this->upStatus();
-                    }
-                    break;
-
-                case '/':
-                    switch ($this->status()) {
-                        case 'simple-quote':
-                        case 'double-quote':
-                        case 'back-tick':
-                        case 'line-comment':
-                            break;
-
-                        case 'block-comment':
-                            if ($prev === '*') {
-                                $this->upStatus();
-                            }
-                            break;
-
-                        default:
-                            if ($next === '/') {
-                                $this->downStatus('line-comment');
-                            } elseif ($next === '*') {
-                                $this->downStatus('block-comment');
-                            }
-                            break;
-                    }
-                    break;
-
-                case "'":
-                    switch ($this->status()) {
-                        case 'simple-quote':
-                            $this->upStatus();
-                            break;
-
-                        case 'line-comment':
-                        case 'block-comment':
-                        case 'double-quote':
-                        case 'back-tick':
-                            break;
-
-                        default:
-                            $this->downStatus('simple-quote');
-                            break;
-                    }
-                    break;
-
-                case '"':
-                    switch ($this->status()) {
-                        case 'double-quote':
-                            $this->upStatus();
-                            break;
-
-                        case 'line-comment':
-                        case 'block-comment':
-                        case 'simple-quote':
-                        case 'back-tick':
-                            break;
-
-                        default:
-                            $this->downStatus('double-quote');
-                            break;
-                    }
-                    break;
-
-                case '`':
-                    switch ($this->status()) {
-                        case 'back-tick':
-                            $this->upStatus();
-                            break;
-
-                        case 'line-comment':
-                        case 'block-comment':
-                        case 'simple-quote':
-                        case 'double-quote':
-                            break;
-
-                        default:
-                            $this->downStatus('back-tick');
-                            break;
-                    }
-                    break;
-
-                case '(':
-                    switch ($this->status()) {
-                        case 'simple-quote':
-                        case 'double-quote':
-                        case 'back-tick':
-                        case 'line-comment':
-                        case 'block-comment':
-                            break;
-
-                        default:
-                            if ($buffer && preg_match('/(\w+)$/', $buffer, $matches)) {
-                                $this->downStatus('function');
-                                array_unshift($bufferFunctions, [$matches[1], $line, []]);
-                                $buffer = '';
-                                continue 3;
-                            }
-                            break;
-                    }
-                    break;
-
-                case ')':
-                    switch ($this->status()) {
-                        case 'function':
-                            if (($argument = static::prepareArgument($buffer))) {
-                                $bufferFunctions[0][2][] = $argument;
-                            }
-
-                            if (!empty($bufferFunctions)) {
-                                $functions[] = array_shift($bufferFunctions);
-                            }
-
-                            $this->upStatus();
-                            $buffer = '';
-                            continue 3;
-                    }
-                    break;
-
-                case ',':
-                    switch ($this->status()) {
-                        case 'function':
-                            if (($argument = static::prepareArgument($buffer))) {
-                                $bufferFunctions[0][2][] = $argument;
-                            }
-
-                            $buffer = '';
-                            continue 3;
-                    }
-                    break;
-
-                case ' ':
-                case '\t':
-                    switch ($this->status()) {
-                        case 'double-quote':
-                        case 'simple-quote':
-                        case 'back-tick':
-                            break;
-
-                        default:
-                            $buffer = '';
-                            continue 3;
-                    }
-                    break;
-            }
-
-            switch ($this->status()) {
-                case 'line-comment':
-                case 'block-comment':
-                    break;
-
-                default:
-                    $buffer .= $char;
-                    break;
-            }
-        }
-
-        return $functions;
-    }
-
-    /**
-     * Get the current context of the scan.
-     *
-     * @param null|string $match To check whether the current status is this value
-     *
-     * @return string|bool
-     */
-    protected function status($match = null)
-    {
-        $status = isset($this->status[0]) ? $this->status[0] : null;
-
-        if ($match !== null) {
-            return $status === $match;
-        }
-
-        return $status;
-    }
-
-    /**
-     * Add a new status to the stack.
-     *
-     * @param string $status
-     */
-    protected function downStatus($status)
-    {
-        array_unshift($this->status, $status);
-    }
-
-    /**
-     * Removes and return the current status.
-     *
-     * @return string|null
-     */
-    protected function upStatus()
-    {
-        return array_shift($this->status);
-    }
-
-    /**
-     * Prepares the arguments found in functions.
-     *
-     * @param string $argument
-     *
-     * @return string
-     */
-    protected static function prepareArgument($argument)
-    {
-        if ($argument && in_array($argument[0], ['"', "'", '`'], true)) {
-            return static::convertString(substr($argument, 1, -1));
-        }
-    }
-
-    /**
-     * Decodes a string with an argument.
-     *
-     * @param string $value
-     *
-     * @return string
-     */
-    protected static function convertString($value)
-    {
-        if (strpos($value, '\\') === false) {
-            return $value;
-        }
-
-        return preg_replace_callback(
-            '/\\\(n|r|t|v|e|f|"|\\\)/',
-            function ($match) {
-                switch ($match[1][0]) {
-                    case 'n':
-                        return "\n";
-                    case 'r':
-                        return "\r";
-                    case 't':
-                        return "\t";
-                    case 'v':
-                        return "\v";
-                    case 'e':
-                        return "\e";
-                    case 'f':
-                        return "\f";
-                    case '"':
-                        return '"';
-                    case '\\':
-                        return '\\';
-                }
-            },
-            $value
-        );
-    }
+	protected $code;
+	protected $status = [];
+
+	/**
+	 * Constructor.
+	 *
+	 * @param string $code The php code to scan
+	 */
+	public function __construct($code)
+	{
+		// Normalize newline characters
+		$this->code = str_replace(["\r\n", "\n\r", "\r"], "\n", $code);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getFunctions(array $constants = [])
+	{
+		$length = strlen($this->code);
+		$line = 1;
+		$buffer = '';
+		$functions = [];
+		$bufferFunctions = [];
+		$char = null;
+
+		for ($pos = 0; $pos < $length; ++$pos) {
+			$prev = $char;
+			$char = $this->code[$pos];
+			$next = isset($this->code[$pos + 1]) ? $this->code[$pos + 1] : null;
+
+			switch ($char) {
+				case '\\':
+					switch ($this->status()) {
+						case 'simple-quote':
+							if ($next !== "'") {
+								break 2;
+							}
+							break;
+
+						case 'double-quote':
+							if ($next !== '"') {
+								break 2;
+							}
+							break;
+
+						case 'back-tick':
+							if ($next !== '`') {
+								break 2;
+							}
+							break;
+					}
+
+					$prev = $char;
+					$char = $next;
+					$pos++;
+					$next = isset($this->code[$pos]) ? $this->code[$pos] : null;
+					break;
+
+				case "\n":
+					++$line;
+
+					if ($this->status('line-comment')) {
+						$this->upStatus();
+					}
+					break;
+
+				case '/':
+					switch ($this->status()) {
+						case 'simple-quote':
+						case 'double-quote':
+						case 'back-tick':
+						case 'line-comment':
+							break;
+
+						case 'block-comment':
+							if ($prev === '*') {
+								$this->upStatus();
+							}
+							break;
+
+						default:
+							if ($next === '/') {
+								$this->downStatus('line-comment');
+							} elseif ($next === '*') {
+								$this->downStatus('block-comment');
+							}
+							break;
+					}
+					break;
+
+				case "'":
+					switch ($this->status()) {
+						case 'simple-quote':
+							$this->upStatus();
+							break;
+
+						case 'line-comment':
+						case 'block-comment':
+						case 'double-quote':
+						case 'back-tick':
+							break;
+
+						default:
+							$this->downStatus('simple-quote');
+							break;
+					}
+					break;
+
+				case '"':
+					switch ($this->status()) {
+						case 'double-quote':
+							$this->upStatus();
+							break;
+
+						case 'line-comment':
+						case 'block-comment':
+						case 'simple-quote':
+						case 'back-tick':
+							break;
+
+						default:
+							$this->downStatus('double-quote');
+							break;
+					}
+					break;
+
+				case '`':
+					switch ($this->status()) {
+						case 'back-tick':
+							$this->upStatus();
+							break;
+
+						case 'line-comment':
+						case 'block-comment':
+						case 'simple-quote':
+						case 'double-quote':
+							break;
+
+						default:
+							$this->downStatus('back-tick');
+							break;
+					}
+					break;
+
+				case '(':
+					switch ($this->status()) {
+						case 'simple-quote':
+						case 'double-quote':
+						case 'back-tick':
+						case 'line-comment':
+						case 'block-comment':
+							break;
+
+						default:
+							if ($buffer && preg_match('/(\w+)$/', $buffer, $matches)) {
+								$this->downStatus('function');
+								array_unshift($bufferFunctions, [$matches[1], $line, []]);
+								$buffer = '';
+								continue 3;
+							}
+							break;
+					}
+					break;
+
+				case ')':
+					switch ($this->status()) {
+						case 'function':
+							if (($argument = static::prepareArgument($buffer))) {
+								$bufferFunctions[0][2][] = $argument;
+							}
+
+							if (!empty($bufferFunctions)) {
+								$functions[] = array_shift($bufferFunctions);
+							}
+
+							$this->upStatus();
+							$buffer = '';
+							continue 3;
+					}
+					break;
+
+				case ',':
+					switch ($this->status()) {
+						case 'function':
+							if (($argument = static::prepareArgument($buffer))) {
+								$bufferFunctions[0][2][] = $argument;
+							}
+
+							$buffer = '';
+							continue 3;
+					}
+					break;
+
+				case ' ':
+				case '\t':
+					switch ($this->status()) {
+						case 'double-quote':
+						case 'simple-quote':
+						case 'back-tick':
+							break;
+
+						default:
+							$buffer = '';
+							continue 3;
+					}
+					break;
+			}
+
+			switch ($this->status()) {
+				case 'line-comment':
+				case 'block-comment':
+					break;
+
+				default:
+					$buffer .= $char;
+					break;
+			}
+		}
+
+		return $functions;
+	}
+
+	/**
+	 * Get the current context of the scan.
+	 *
+	 * @param null|string $match To check whether the current status is this value
+	 *
+	 * @return string|bool
+	 */
+	protected function status($match = null)
+	{
+		$status = isset($this->status[0]) ? $this->status[0] : null;
+
+		if ($match !== null) {
+			return $status === $match;
+		}
+
+		return $status;
+	}
+
+	/**
+	 * Add a new status to the stack.
+	 *
+	 * @param string $status
+	 */
+	protected function downStatus($status)
+	{
+		array_unshift($this->status, $status);
+	}
+
+	/**
+	 * Removes and return the current status.
+	 *
+	 * @return string|null
+	 */
+	protected function upStatus()
+	{
+		return array_shift($this->status);
+	}
+
+	/**
+	 * Prepares the arguments found in functions.
+	 *
+	 * @param string $argument
+	 *
+	 * @return string
+	 */
+	protected static function prepareArgument($argument)
+	{
+		if ($argument && in_array($argument[0], ['"', "'", '`'], true)) {
+			return static::convertString(substr($argument, 1, -1));
+		}
+	}
+
+	/**
+	 * Decodes a string with an argument.
+	 *
+	 * @param string $value
+	 *
+	 * @return string
+	 */
+	protected static function convertString($value)
+	{
+		if (strpos($value, '\\') === false) {
+			return $value;
+		}
+
+		return preg_replace_callback(
+			'/\\\(n|r|t|v|e|f|"|\\\)/',
+			function ($match) {
+				switch ($match[1][0]) {
+					case 'n':
+						return "\n";
+					case 'r':
+						return "\r";
+					case 't':
+						return "\t";
+					case 'v':
+						return "\v";
+					case 'e':
+						return "\e";
+					case 'f':
+						return "\f";
+					case '"':
+						return '"';
+					case '\\':
+						return '\\';
+				}
+			},
+			$value
+		);
+	}
 }

Spacing +56 added lines, -56 removed lines

@@ -5,53 +5,53 @@ 
 class JsFunctionsScanner extends FunctionsScanner
 {
     protected $code;
-    protected $status = [];
+    protected $status = [ ];
 
     /**
      * Constructor.
      *
      * @param string $code The php code to scan
      */
-    public function __construct($code)
+    public function __construct( $code )
     {
         // Normalize newline characters
-        $this->code = str_replace(["\r\n", "\n\r", "\r"], "\n", $code);
+        $this->code = str_replace( [ "\r\n", "\n\r", "\r" ], "\n", $code );
     }
 
     /**
      * {@inheritdoc}
      */
-    public function getFunctions(array $constants = [])
+    public function getFunctions( array $constants = [ ] )
     {
-        $length = strlen($this->code);
+        $length = strlen( $this->code );
         $line = 1;
         $buffer = '';
-        $functions = [];
-        $bufferFunctions = [];
+        $functions = [ ];
+        $bufferFunctions = [ ];
         $char = null;
 
-        for ($pos = 0; $pos < $length; ++$pos) {
+        for ( $pos = 0; $pos < $length; ++$pos ) {
             $prev = $char;
-            $char = $this->code[$pos];
-            $next = isset($this->code[$pos + 1]) ? $this->code[$pos + 1] : null;
+            $char = $this->code[ $pos ];
+            $next = isset( $this->code[ $pos + 1 ] ) ? $this->code[ $pos + 1 ] : null;
 
-            switch ($char) {
+            switch ( $char ) {
                 case '\\':
-                    switch ($this->status()) {
+                    switch ( $this->status() ) {
                         case 'simple-quote':
-                            if ($next !== "'") {
+                            if ( $next !== "'" ) {
                                 break 2;
                             }
                             break;
 
                         case 'double-quote':
-                            if ($next !== '"') {
+                            if ( $next !== '"' ) {
                                 break 2;
                             }
                             break;
 
                         case 'back-tick':
-                            if ($next !== '`') {
+                            if ( $next !== '`' ) {
                                 break 2;
                             }
                             break;
@@ -60,19 +60,19 @@ 
                     $prev = $char;
                     $char = $next;
                     $pos++;
-                    $next = isset($this->code[$pos]) ? $this->code[$pos] : null;
+                    $next = isset( $this->code[ $pos ] ) ? $this->code[ $pos ] : null;
                     break;
 
                 case "\n":
                     ++$line;
 
-                    if ($this->status('line-comment')) {
+                    if ( $this->status( 'line-comment' ) ) {
                         $this->upStatus();
                     }
                     break;
 
                 case '/':
-                    switch ($this->status()) {
+                    switch ( $this->status() ) {
                         case 'simple-quote':
                         case 'double-quote':
                         case 'back-tick':
@@ -80,23 +80,23 @@ 
                             break;
 
                         case 'block-comment':
-                            if ($prev === '*') {
+                            if ( $prev === '*' ) {
                                 $this->upStatus();
                             }
                             break;
 
                         default:
-                            if ($next === '/') {
-                                $this->downStatus('line-comment');
-                            } elseif ($next === '*') {
-                                $this->downStatus('block-comment');
+                            if ( $next === '/' ) {
+                                $this->downStatus( 'line-comment' );
+                            } elseif ( $next === '*' ) {
+                                $this->downStatus( 'block-comment' );
                             }
                             break;
                     }
                     break;
 
                 case "'":
-                    switch ($this->status()) {
+                    switch ( $this->status() ) {
                         case 'simple-quote':
                             $this->upStatus();
                             break;
@@ -108,13 +108,13 @@ 
                             break;
 
                         default:
-                            $this->downStatus('simple-quote');
+                            $this->downStatus( 'simple-quote' );
                             break;
                     }
                     break;
 
                 case '"':
-                    switch ($this->status()) {
+                    switch ( $this->status() ) {
                         case 'double-quote':
                             $this->upStatus();
                             break;
@@ -126,13 +126,13 @@ 
                             break;
 
                         default:
-                            $this->downStatus('double-quote');
+                            $this->downStatus( 'double-quote' );
                             break;
                     }
                     break;
 
                 case '`':
-                    switch ($this->status()) {
+                    switch ( $this->status() ) {
                         case 'back-tick':
                             $this->upStatus();
                             break;
@@ -144,13 +144,13 @@ 
                             break;
 
                         default:
-                            $this->downStatus('back-tick');
+                            $this->downStatus( 'back-tick' );
                             break;
                     }
                     break;
 
                 case '(':
-                    switch ($this->status()) {
+                    switch ( $this->status() ) {
                         case 'simple-quote':
                         case 'double-quote':
                         case 'back-tick':
@@ -159,9 +159,9 @@ 
                             break;
 
                         default:
-                            if ($buffer && preg_match('/(\w+)$/', $buffer, $matches)) {
-                                $this->downStatus('function');
-                                array_unshift($bufferFunctions, [$matches[1], $line, []]);
+                            if ( $buffer && preg_match( '/(\w+)$/', $buffer, $matches ) ) {
+                                $this->downStatus( 'function' );
+                                array_unshift( $bufferFunctions, [ $matches[ 1 ], $line, [ ] ] );
                                 $buffer = '';
                                 continue 3;
                             }
@@ -170,14 +170,14 @@ 
                     break;
 
                 case ')':
-                    switch ($this->status()) {
+                    switch ( $this->status() ) {
                         case 'function':
-                            if (($argument = static::prepareArgument($buffer))) {
-                                $bufferFunctions[0][2][] = $argument;
+                            if ( ( $argument = static::prepareArgument( $buffer ) ) ) {
+                                $bufferFunctions[ 0 ][ 2 ][ ] = $argument;
                             }
 
-                            if (!empty($bufferFunctions)) {
-                                $functions[] = array_shift($bufferFunctions);
+                            if ( ! empty( $bufferFunctions ) ) {
+                                $functions[ ] = array_shift( $bufferFunctions );
                             }
 
                             $this->upStatus();
@@ -187,10 +187,10 @@ 
                     break;
 
                 case ',':
-                    switch ($this->status()) {
+                    switch ( $this->status() ) {
                         case 'function':
-                            if (($argument = static::prepareArgument($buffer))) {
-                                $bufferFunctions[0][2][] = $argument;
+                            if ( ( $argument = static::prepareArgument( $buffer ) ) ) {
+                                $bufferFunctions[ 0 ][ 2 ][ ] = $argument;
                             }
 
                             $buffer = '';
@@ -200,7 +200,7 @@ 
 
                 case ' ':
                 case '\t':
-                    switch ($this->status()) {
+                    switch ( $this->status() ) {
                         case 'double-quote':
                         case 'simple-quote':
                         case 'back-tick':
@@ -213,7 +213,7 @@ 
                     break;
             }
 
-            switch ($this->status()) {
+            switch ( $this->status() ) {
                 case 'line-comment':
                 case 'block-comment':
                     break;
@@ -234,11 +234,11 @@ 
      *
      * @return string|bool
      */
-    protected function status($match = null)
+    protected function status( $match = null )
     {
-        $status = isset($this->status[0]) ? $this->status[0] : null;
+        $status = isset( $this->status[ 0 ] ) ? $this->status[ 0 ] : null;
 
-        if ($match !== null) {
+        if ( $match !== null ) {
             return $status === $match;
         }
 
@@ -250,9 +250,9 @@ 
      *
      * @param string $status
      */
-    protected function downStatus($status)
+    protected function downStatus( $status )
     {
-        array_unshift($this->status, $status);
+        array_unshift( $this->status, $status );
     }
 
     /**
@@ -262,7 +262,7 @@ 
      */
     protected function upStatus()
     {
-        return array_shift($this->status);
+        return array_shift( $this->status );
     }
 
     /**
@@ -272,10 +272,10 @@ 
      *
      * @return string
      */
-    protected static function prepareArgument($argument)
+    protected static function prepareArgument( $argument )
     {
-        if ($argument && in_array($argument[0], ['"', "'", '`'], true)) {
-            return static::convertString(substr($argument, 1, -1));
+        if ( $argument && in_array( $argument[ 0 ], [ '"', "'", '`' ], true ) ) {
+            return static::convertString( substr( $argument, 1, -1 ) );
         }
     }
 
@@ -286,16 +286,16 @@ 
      *
      * @return string
      */
-    protected static function convertString($value)
+    protected static function convertString( $value )
     {
-        if (strpos($value, '\\') === false) {
+        if ( strpos( $value, '\\' ) === false ) {
             return $value;
         }
 
         return preg_replace_callback(
             '/\\\(n|r|t|v|e|f|"|\\\)/',
-            function ($match) {
-                switch ($match[1][0]) {
+            function( $match ) {
+                switch ( $match[ 1 ][ 0 ] ) {
                     case 'n':
                         return "\n";
                     case 'r':

Braces +8 added lines, -16 removed lines

@@ -2,8 +2,7 @@ 
 
 namespace Gettext\Utils;
 
-class JsFunctionsScanner extends FunctionsScanner
-{
+class JsFunctionsScanner extends FunctionsScanner {
     protected $code;
     protected $status = [];
 
@@ -12,8 +11,7 @@ 
      *
      * @param string $code The php code to scan
      */
-    public function __construct($code)
-    {
+    public function __construct($code) {
         // Normalize newline characters
         $this->code = str_replace(["\r\n", "\n\r", "\r"], "\n", $code);
     }
@@ -21,8 +19,7 @@ 
     /**
      * {@inheritdoc}
      */
-    public function getFunctions(array $constants = [])
-    {
+    public function getFunctions(array $constants = []) {
         $length = strlen($this->code);
         $line = 1;
         $buffer = '';
@@ -234,8 +231,7 @@ 
      *
      * @return string|bool
      */
-    protected function status($match = null)
-    {
+    protected function status($match = null) {
         $status = isset($this->status[0]) ? $this->status[0] : null;
 
         if ($match !== null) {
@@ -250,8 +246,7 @@ 
      *
      * @param string $status
      */
-    protected function downStatus($status)
-    {
+    protected function downStatus($status) {
         array_unshift($this->status, $status);
     }
 
@@ -260,8 +255,7 @@ 
      *
      * @return string|null
      */
-    protected function upStatus()
-    {
+    protected function upStatus() {
         return array_shift($this->status);
     }
 
@@ -272,8 +266,7 @@ 
      *
      * @return string
      */
-    protected static function prepareArgument($argument)
-    {
+    protected static function prepareArgument($argument) {
         if ($argument && in_array($argument[0], ['"', "'", '`'], true)) {
             return static::convertString(substr($argument, 1, -1));
         }
@@ -286,8 +279,7 @@ 
      *
      * @return string
      */
-    protected static function convertString($value)
-    {
+    protected static function convertString($value) {
         if (strpos($value, '\\') === false) {
             return $value;
         }

vendor/gettext/gettext/src/Utils/CsvTrait.php

Indentation +46 added lines, -46 removed lines

@@ -7,50 +7,50 @@
  */
 trait CsvTrait
 {
-    protected static $csvEscapeChar;
-
-    /**
-     * Check whether support the escape_char argument to fgetcsv/fputcsv or not
-     *
-     * @return bool
-     */
-    protected static function supportsCsvEscapeChar()
-    {
-        if (static::$csvEscapeChar === null) {
-            static::$csvEscapeChar = version_compare(PHP_VERSION, '5.5.4') >= 0;
-        }
-
-        return static::$csvEscapeChar;
-    }
-
-    /**
-     * @param resource $handle
-     * @param array $options
-     *
-     * @return array
-     */
-    protected static function fgetcsv($handle, $options)
-    {
-        if (static::supportsCsvEscapeChar()) {
-            return fgetcsv($handle, 0, $options['delimiter'], $options['enclosure'], $options['escape_char']);
-        }
-
-        return fgetcsv($handle, 0, $options['delimiter'], $options['enclosure']);
-    }
-
-    /**
-     * @param resource $handle
-     * @param array $fields
-     * @param array $options
-     *
-     * @return bool|int
-     */
-    protected static function fputcsv($handle, $fields, $options)
-    {
-        if (static::supportsCsvEscapeChar()) {
-            return fputcsv($handle, $fields, $options['delimiter'], $options['enclosure'], $options['escape_char']);
-        }
-
-        return fputcsv($handle, $fields, $options['delimiter'], $options['enclosure']);
-    }
+	protected static $csvEscapeChar;
+
+	/**
+	 * Check whether support the escape_char argument to fgetcsv/fputcsv or not
+	 *
+	 * @return bool
+	 */
+	protected static function supportsCsvEscapeChar()
+	{
+		if (static::$csvEscapeChar === null) {
+			static::$csvEscapeChar = version_compare(PHP_VERSION, '5.5.4') >= 0;
+		}
+
+		return static::$csvEscapeChar;
+	}
+
+	/**
+	 * @param resource $handle
+	 * @param array $options
+	 *
+	 * @return array
+	 */
+	protected static function fgetcsv($handle, $options)
+	{
+		if (static::supportsCsvEscapeChar()) {
+			return fgetcsv($handle, 0, $options['delimiter'], $options['enclosure'], $options['escape_char']);
+		}
+
+		return fgetcsv($handle, 0, $options['delimiter'], $options['enclosure']);
+	}
+
+	/**
+	 * @param resource $handle
+	 * @param array $fields
+	 * @param array $options
+	 *
+	 * @return bool|int
+	 */
+	protected static function fputcsv($handle, $fields, $options)
+	{
+		if (static::supportsCsvEscapeChar()) {
+			return fputcsv($handle, $fields, $options['delimiter'], $options['enclosure'], $options['escape_char']);
+		}
+
+		return fputcsv($handle, $fields, $options['delimiter'], $options['enclosure']);
+	}
 }

Spacing +10 added lines, -10 removed lines

@@ -16,8 +16,8 @@ 
      */
     protected static function supportsCsvEscapeChar()
     {
-        if (static::$csvEscapeChar === null) {
-            static::$csvEscapeChar = version_compare(PHP_VERSION, '5.5.4') >= 0;
+        if ( static::$csvEscapeChar === null ) {
+            static::$csvEscapeChar = version_compare( PHP_VERSION, '5.5.4' ) >= 0;
         }
 
         return static::$csvEscapeChar;
@@ -29,13 +29,13 @@ 
      *
      * @return array
      */
-    protected static function fgetcsv($handle, $options)
+    protected static function fgetcsv( $handle, $options )
     {
-        if (static::supportsCsvEscapeChar()) {
-            return fgetcsv($handle, 0, $options['delimiter'], $options['enclosure'], $options['escape_char']);
+        if ( static::supportsCsvEscapeChar() ) {
+            return fgetcsv( $handle, 0, $options[ 'delimiter' ], $options[ 'enclosure' ], $options[ 'escape_char' ] );
         }
 
-        return fgetcsv($handle, 0, $options['delimiter'], $options['enclosure']);
+        return fgetcsv( $handle, 0, $options[ 'delimiter' ], $options[ 'enclosure' ] );
     }
 
     /**
@@ -45,12 +45,12 @@ 
      *
      * @return bool|int
      */
-    protected static function fputcsv($handle, $fields, $options)
+    protected static function fputcsv( $handle, $fields, $options )
     {
-        if (static::supportsCsvEscapeChar()) {
-            return fputcsv($handle, $fields, $options['delimiter'], $options['enclosure'], $options['escape_char']);
+        if ( static::supportsCsvEscapeChar() ) {
+            return fputcsv( $handle, $fields, $options[ 'delimiter' ], $options[ 'enclosure' ], $options[ 'escape_char' ] );
         }
 
-        return fputcsv($handle, $fields, $options['delimiter'], $options['enclosure']);
+        return fputcsv( $handle, $fields, $options[ 'delimiter' ], $options[ 'enclosure' ] );
     }
 }

Braces +4 added lines, -8 removed lines

@@ -5,8 +5,7 @@ 
 /*
  * Trait to provide the functionality of read/write csv.
  */
-trait CsvTrait
-{
+trait CsvTrait {
     protected static $csvEscapeChar;
 
     /**
@@ -14,8 +13,7 @@ 
      *
      * @return bool
      */
-    protected static function supportsCsvEscapeChar()
-    {
+    protected static function supportsCsvEscapeChar() {
         if (static::$csvEscapeChar === null) {
             static::$csvEscapeChar = version_compare(PHP_VERSION, '5.5.4') >= 0;
         }
@@ -29,8 +27,7 @@ 
      *
      * @return array
      */
-    protected static function fgetcsv($handle, $options)
-    {
+    protected static function fgetcsv($handle, $options) {
         if (static::supportsCsvEscapeChar()) {
             return fgetcsv($handle, 0, $options['delimiter'], $options['enclosure'], $options['escape_char']);
         }
@@ -45,8 +42,7 @@ 
      *
      * @return bool|int
      */
-    protected static function fputcsv($handle, $fields, $options)
-    {
+    protected static function fputcsv($handle, $fields, $options) {
         if (static::supportsCsvEscapeChar()) {
             return fputcsv($handle, $fields, $options['delimiter'], $options['enclosure'], $options['escape_char']);
         }

vendor/gettext/gettext/src/Utils/StringReader.php

Indentation +44 added lines, -44 removed lines

@@ -4,48 +4,48 @@
 
 class StringReader
 {
-    public $pos;
-    public $str;
-    public $strlen;
-
-    /**
-     * Constructor.
-     *
-     * @param string $str The string to read
-     */
-    public function __construct($str)
-    {
-        $this->str = $str;
-        $this->strlen = strlen($this->str);
-    }
-
-    /**
-     * Read and returns a part of the string.
-     *
-     * @param int $bytes The number of bytes to read
-     *
-     * @return string
-     */
-    public function read($bytes)
-    {
-        $data = substr($this->str, $this->pos, $bytes);
-
-        $this->seekto($this->pos + $bytes);
-
-        return $data;
-    }
-
-    /**
-     * Move the cursor to a specific position.
-     *
-     * @param int $pos The amount of bytes to move
-     *
-     * @return int The new position
-     */
-    public function seekto($pos)
-    {
-        $this->pos = ($this->strlen < $pos) ? $this->strlen : $pos;
-
-        return $this->pos;
-    }
+	public $pos;
+	public $str;
+	public $strlen;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param string $str The string to read
+	 */
+	public function __construct($str)
+	{
+		$this->str = $str;
+		$this->strlen = strlen($this->str);
+	}
+
+	/**
+	 * Read and returns a part of the string.
+	 *
+	 * @param int $bytes The number of bytes to read
+	 *
+	 * @return string
+	 */
+	public function read($bytes)
+	{
+		$data = substr($this->str, $this->pos, $bytes);
+
+		$this->seekto($this->pos + $bytes);
+
+		return $data;
+	}
+
+	/**
+	 * Move the cursor to a specific position.
+	 *
+	 * @param int $pos The amount of bytes to move
+	 *
+	 * @return int The new position
+	 */
+	public function seekto($pos)
+	{
+		$this->pos = ($this->strlen < $pos) ? $this->strlen : $pos;
+
+		return $this->pos;
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -13,10 +13,10 @@ 
      *
      * @param string $str The string to read
      */
-    public function __construct($str)
+    public function __construct( $str )
     {
         $this->str = $str;
-        $this->strlen = strlen($this->str);
+        $this->strlen = strlen( $this->str );
     }
 
     /**
@@ -26,11 +26,11 @@ 
      *
      * @return string
      */
-    public function read($bytes)
+    public function read( $bytes )
     {
-        $data = substr($this->str, $this->pos, $bytes);
+        $data = substr( $this->str, $this->pos, $bytes );
 
-        $this->seekto($this->pos + $bytes);
+        $this->seekto( $this->pos + $bytes );
 
         return $data;
     }
@@ -42,9 +42,9 @@ 
      *
      * @return int The new position
      */
-    public function seekto($pos)
+    public function seekto( $pos )
     {
-        $this->pos = ($this->strlen < $pos) ? $this->strlen : $pos;
+        $this->pos = ( $this->strlen < $pos ) ? $this->strlen : $pos;
 
         return $this->pos;
     }

Braces +4 added lines, -8 removed lines

@@ -2,8 +2,7 @@ 
 
 namespace Gettext\Utils;
 
-class StringReader
-{
+class StringReader {
     public $pos;
     public $str;
     public $strlen;
@@ -13,8 +12,7 @@ 
      *
      * @param string $str The string to read
      */
-    public function __construct($str)
-    {
+    public function __construct($str) {
         $this->str = $str;
         $this->strlen = strlen($this->str);
     }
@@ -26,8 +24,7 @@ 
      *
      * @return string
      */
-    public function read($bytes)
-    {
+    public function read($bytes) {
         $data = substr($this->str, $this->pos, $bytes);
 
         $this->seekto($this->pos + $bytes);
@@ -42,8 +39,7 @@ 
      *
      * @return int The new position
      */
-    public function seekto($pos)
-    {
+    public function seekto($pos) {
         $this->pos = ($this->strlen < $pos) ? $this->strlen : $pos;
 
         return $this->pos;

vendor/gettext/gettext/src/Utils/ParsedFunction.php

Indentation +136 added lines, -136 removed lines

@@ -7,153 +7,153 @@
  */
 class ParsedFunction
 {
-    /**
-     * The function name.
-     *
-     * @var string
-     */
-    protected $name;
+	/**
+	 * The function name.
+	 *
+	 * @var string
+	 */
+	protected $name;
 
-    /**
-     * The line where the function starts.
-     *
-     * @var int
-     */
-    protected $line;
+	/**
+	 * The line where the function starts.
+	 *
+	 * @var int
+	 */
+	protected $line;
 
-    /**
-     * The strings extracted from the function arguments.
-     *
-     * @var string[]
-     */
-    protected $arguments;
+	/**
+	 * The strings extracted from the function arguments.
+	 *
+	 * @var string[]
+	 */
+	protected $arguments;
 
-    /**
-     * The current index of the function (-1 if no arguments).
-     *
-     * @var int|null
-     */
-    protected $argumentIndex;
+	/**
+	 * The current index of the function (-1 if no arguments).
+	 *
+	 * @var int|null
+	 */
+	protected $argumentIndex;
 
-    /**
-     * Shall we stop adding string chunks to the current argument?
-     *
-     * @var bool
-     */
-    protected $argumentStopped;
+	/**
+	 * Shall we stop adding string chunks to the current argument?
+	 *
+	 * @var bool
+	 */
+	protected $argumentStopped;
 
-    /**
-     * Extracted comments.
-     *
-     * @var ParsedComment[]|null
-     */
-    protected $comments;
+	/**
+	 * Extracted comments.
+	 *
+	 * @var ParsedComment[]|null
+	 */
+	protected $comments;
 
-    /**
-     * Initializes the instance.
-     *
-     * @param string $name The function name.
-     * @param int    $line The line where the function starts.
-     */
-    public function __construct($name, $line)
-    {
-        $this->name = $name;
-        $this->line = $line;
-        $this->arguments = [];
-        $this->argumentIndex = -1;
-        $this->argumentStopped = false;
-        $this->comments = null;
-    }
+	/**
+	 * Initializes the instance.
+	 *
+	 * @param string $name The function name.
+	 * @param int    $line The line where the function starts.
+	 */
+	public function __construct($name, $line)
+	{
+		$this->name = $name;
+		$this->line = $line;
+		$this->arguments = [];
+		$this->argumentIndex = -1;
+		$this->argumentStopped = false;
+		$this->comments = null;
+	}
 
-    /**
-     * Stop extracting strings from the current argument (because we found something that's not a string).
-     */
-    public function stopArgument()
-    {
-        if ($this->argumentIndex === -1) {
-            $this->argumentIndex = 0;
-        }
-        $this->argumentStopped = true;
-    }
+	/**
+	 * Stop extracting strings from the current argument (because we found something that's not a string).
+	 */
+	public function stopArgument()
+	{
+		if ($this->argumentIndex === -1) {
+			$this->argumentIndex = 0;
+		}
+		$this->argumentStopped = true;
+	}
 
-    /**
-     * Go to the next argument because we a comma was found.
-     */
-    public function nextArgument()
-    {
-        if ($this->argumentIndex === -1) {
-            // This should neve occur, but let's stay safe - During test/development an Exception should be thrown.
-            $this->argumentIndex = 1;
-        } else {
-            ++$this->argumentIndex;
-        }
-        $this->argumentStopped = false;
-    }
+	/**
+	 * Go to the next argument because we a comma was found.
+	 */
+	public function nextArgument()
+	{
+		if ($this->argumentIndex === -1) {
+			// This should neve occur, but let's stay safe - During test/development an Exception should be thrown.
+			$this->argumentIndex = 1;
+		} else {
+			++$this->argumentIndex;
+		}
+		$this->argumentStopped = false;
+	}
 
-    /**
-     * Add a string to the current argument.
-     *
-     * @param string|null $chunk
-     */
-    public function addArgumentChunk($chunk)
-    {
-        if ($this->argumentStopped === false) {
-            if ($this->argumentIndex === -1) {
-                $this->argumentIndex = 0;
-            }
-            if (isset($this->arguments[$this->argumentIndex])) {
-                $this->arguments[$this->argumentIndex] .= $chunk;
-            } else {
-                $this->arguments[$this->argumentIndex] = $chunk;
-            }
-        }
-    }
+	/**
+	 * Add a string to the current argument.
+	 *
+	 * @param string|null $chunk
+	 */
+	public function addArgumentChunk($chunk)
+	{
+		if ($this->argumentStopped === false) {
+			if ($this->argumentIndex === -1) {
+				$this->argumentIndex = 0;
+			}
+			if (isset($this->arguments[$this->argumentIndex])) {
+				$this->arguments[$this->argumentIndex] .= $chunk;
+			} else {
+				$this->arguments[$this->argumentIndex] = $chunk;
+			}
+		}
+	}
 
-    /**
-     * Add a comment associated to this function.
-     *
-     * @param ParsedComment $comment
-     */
-    public function addComment($comment)
-    {
-        if ($this->comments === null) {
-            $this->comments = [];
-        }
-        $this->comments[] = $comment;
-    }
+	/**
+	 * Add a comment associated to this function.
+	 *
+	 * @param ParsedComment $comment
+	 */
+	public function addComment($comment)
+	{
+		if ($this->comments === null) {
+			$this->comments = [];
+		}
+		$this->comments[] = $comment;
+	}
 
-    /**
-     * Return the line the function starts.
-     *
-     * @return int Line number.
-     */
-    public function getLine()
-    {
-        return $this->line;
-    }
+	/**
+	 * Return the line the function starts.
+	 *
+	 * @return int Line number.
+	 */
+	public function getLine()
+	{
+		return $this->line;
+	}
 
-    /**
-     * A closing parenthesis was found: return the final data.
-     * The array returned has the following values:
-     *  0 => string The function name.
-     *  1 => int The line where the function starts.
-     *  2 => string[] the strings extracted from the function arguments.
-     *  3 => string[] the comments associated to the function.
-     *
-     * @return array
-     */
-    public function close()
-    {
-        $arguments = [];
-        for ($i = 0; $i <= $this->argumentIndex; ++$i) {
-            $arguments[$i] = isset($this->arguments[$i]) ? $this->arguments[$i] : null;
-        }
+	/**
+	 * A closing parenthesis was found: return the final data.
+	 * The array returned has the following values:
+	 *  0 => string The function name.
+	 *  1 => int The line where the function starts.
+	 *  2 => string[] the strings extracted from the function arguments.
+	 *  3 => string[] the comments associated to the function.
+	 *
+	 * @return array
+	 */
+	public function close()
+	{
+		$arguments = [];
+		for ($i = 0; $i <= $this->argumentIndex; ++$i) {
+			$arguments[$i] = isset($this->arguments[$i]) ? $this->arguments[$i] : null;
+		}
 
-        return [
-            $this->name,
-            $this->line,
-            $arguments,
-            $this->comments,
-        ];
-    }
+		return [
+			$this->name,
+			$this->line,
+			$arguments,
+			$this->comments,
+		];
+	}
 }

Spacing +17 added lines, -17 removed lines

@@ -55,11 +55,11 @@ 
      * @param string $name The function name.
      * @param int    $line The line where the function starts.
      */
-    public function __construct($name, $line)
+    public function __construct( $name, $line )
     {
         $this->name = $name;
         $this->line = $line;
-        $this->arguments = [];
+        $this->arguments = [ ];
         $this->argumentIndex = -1;
         $this->argumentStopped = false;
         $this->comments = null;
@@ -70,7 +70,7 @@ 
      */
     public function stopArgument()
     {
-        if ($this->argumentIndex === -1) {
+        if ( $this->argumentIndex === -1 ) {
             $this->argumentIndex = 0;
         }
         $this->argumentStopped = true;
@@ -81,7 +81,7 @@ 
      */
     public function nextArgument()
     {
-        if ($this->argumentIndex === -1) {
+        if ( $this->argumentIndex === -1 ) {
             // This should neve occur, but let's stay safe - During test/development an Exception should be thrown.
             $this->argumentIndex = 1;
         } else {
@@ -95,16 +95,16 @@ 
      *
      * @param string|null $chunk
      */
-    public function addArgumentChunk($chunk)
+    public function addArgumentChunk( $chunk )
     {
-        if ($this->argumentStopped === false) {
-            if ($this->argumentIndex === -1) {
+        if ( $this->argumentStopped === false ) {
+            if ( $this->argumentIndex === -1 ) {
                 $this->argumentIndex = 0;
             }
-            if (isset($this->arguments[$this->argumentIndex])) {
-                $this->arguments[$this->argumentIndex] .= $chunk;
+            if ( isset( $this->arguments[ $this->argumentIndex ] ) ) {
+                $this->arguments[ $this->argumentIndex ] .= $chunk;
             } else {
-                $this->arguments[$this->argumentIndex] = $chunk;
+                $this->arguments[ $this->argumentIndex ] = $chunk;
             }
         }
     }
@@ -114,12 +114,12 @@ 
      *
      * @param ParsedComment $comment
      */
-    public function addComment($comment)
+    public function addComment( $comment )
     {
-        if ($this->comments === null) {
-            $this->comments = [];
+        if ( $this->comments === null ) {
+            $this->comments = [ ];
         }
-        $this->comments[] = $comment;
+        $this->comments[ ] = $comment;
     }
 
     /**
@@ -144,9 +144,9 @@ 
      */
     public function close()
     {
-        $arguments = [];
-        for ($i = 0; $i <= $this->argumentIndex; ++$i) {
-            $arguments[$i] = isset($this->arguments[$i]) ? $this->arguments[$i] : null;
+        $arguments = [ ];
+        for ( $i = 0; $i <= $this->argumentIndex; ++$i ) {
+            $arguments[ $i ] = isset( $this->arguments[ $i ] ) ? $this->arguments[ $i ] : null;
         }
 
         return [

Braces +8 added lines, -16 removed lines

@@ -5,8 +5,7 @@ 
 /**
  * Function parsed by PhpFunctionsScanner.
  */
-class ParsedFunction
-{
+class ParsedFunction {
     /**
      * The function name.
      *
@@ -55,8 +54,7 @@ 
      * @param string $name The function name.
      * @param int    $line The line where the function starts.
      */
-    public function __construct($name, $line)
-    {
+    public function __construct($name, $line) {
         $this->name = $name;
         $this->line = $line;
         $this->arguments = [];
@@ -68,8 +66,7 @@ 
     /**
      * Stop extracting strings from the current argument (because we found something that's not a string).
      */
-    public function stopArgument()
-    {
+    public function stopArgument() {
         if ($this->argumentIndex === -1) {
             $this->argumentIndex = 0;
         }
@@ -79,8 +76,7 @@ 
     /**
      * Go to the next argument because we a comma was found.
      */
-    public function nextArgument()
-    {
+    public function nextArgument() {
         if ($this->argumentIndex === -1) {
             // This should neve occur, but let's stay safe - During test/development an Exception should be thrown.
             $this->argumentIndex = 1;
@@ -95,8 +91,7 @@ 
      *
      * @param string|null $chunk
      */
-    public function addArgumentChunk($chunk)
-    {
+    public function addArgumentChunk($chunk) {
         if ($this->argumentStopped === false) {
             if ($this->argumentIndex === -1) {
                 $this->argumentIndex = 0;
@@ -114,8 +109,7 @@ 
      *
      * @param ParsedComment $comment
      */
-    public function addComment($comment)
-    {
+    public function addComment($comment) {
         if ($this->comments === null) {
             $this->comments = [];
         }
@@ -127,8 +121,7 @@ 
      *
      * @return int Line number.
      */
-    public function getLine()
-    {
+    public function getLine() {
         return $this->line;
     }
 
@@ -142,8 +135,7 @@ 
      *
      * @return array
      */
-    public function close()
-    {
+    public function close() {
         $arguments = [];
         for ($i = 0; $i <= $this->argumentIndex; ++$i) {
             $arguments[$i] = isset($this->arguments[$i]) ? $this->arguments[$i] : null;

vendor/gettext/gettext/src/Utils/PhpFunctionsScanner.php

Indentation +185 added lines, -185 removed lines

@@ -6,189 +6,189 @@
 
 class PhpFunctionsScanner extends FunctionsScanner
 {
-    /**
-     * PHP tokens of the code to be parsed.
-     *
-     * @var array
-     */
-    protected $tokens;
-
-    /**
-     * If not false, comments will be extracted.
-     *
-     * @var string|false|array
-     */
-    protected $extractComments = false;
-
-    /**
-     * Enable extracting comments that start with a tag (if $tag is empty all the comments will be extracted).
-     *
-     * @param mixed $tag
-     */
-    public function enableCommentsExtraction($tag = '')
-    {
-        $this->extractComments = $tag;
-    }
-
-    /**
-     * Disable comments extraction.
-     */
-    public function disableCommentsExtraction()
-    {
-        $this->extractComments = false;
-    }
-
-    /**
-     * Constructor.
-     *
-     * @param string $code The php code to scan
-     */
-    public function __construct($code)
-    {
-        $this->tokens = array_values(
-            array_filter(
-                token_get_all($code),
-                function ($token) {
-                    return !is_array($token) || $token[0] !== T_WHITESPACE;
-                }
-            )
-        );
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getFunctions(array $constants = [])
-    {
-        $count = count($this->tokens);
-        /* @var ParsedFunction[] $bufferFunctions */
-        $bufferFunctions = [];
-        /* @var ParsedComment[] $bufferComments */
-        $bufferComments = [];
-        /* @var array $functions */
-        $functions = [];
-
-        for ($k = 0; $k < $count; ++$k) {
-            $value = $this->tokens[$k];
-
-            if (is_string($value)) {
-                if (isset($bufferFunctions[0])) {
-                    switch ($value) {
-                        case ',':
-                            $bufferFunctions[0]->nextArgument();
-                            break;
-                        case ')':
-                            $functions[] = array_shift($bufferFunctions)->close();
-                            break;
-                        case '.':
-                            break;
-                        default:
-                            $bufferFunctions[0]->stopArgument();
-                            break;
-                    }
-                }
-                continue;
-            }
-
-            switch ($value[0]) {
-                case T_CONSTANT_ENCAPSED_STRING:
-                    //add an argument to the current function
-                    if (isset($bufferFunctions[0])) {
-                        $bufferFunctions[0]->addArgumentChunk(PhpCode::convertString($value[1]));
-                    }
-                    break;
-
-                case T_STRING:
-                    if (isset($bufferFunctions[0])) {
-                        if (isset($constants[$value[1]])) {
-                            $bufferFunctions[0]->addArgumentChunk($constants[$value[1]]);
-                            break;
-                        }
-
-                        if (strtolower($value[1]) === 'null') {
-                            $bufferFunctions[0]->addArgumentChunk(null);
-                            break;
-                        }
-
-                        $bufferFunctions[0]->stopArgument();
-                    }
-
-                    //new function found
-                    for ($j = $k + 1; $j < $count; ++$j) {
-                        $nextToken = $this->tokens[$j];
-
-                        if (is_array($nextToken) && $nextToken[0] === T_COMMENT) {
-                            continue;
-                        }
-
-                        if ($nextToken === '(') {
-                            $newFunction = new ParsedFunction($value[1], $value[2]);
-
-                            // add comment that was on the line before.
-                            if (isset($bufferComments[0])) {
-                                $comment = $bufferComments[0];
-
-                                if ($comment->isRelatedWith($newFunction)) {
-                                    $newFunction->addComment($comment);
-                                }
-                            }
-
-                            array_unshift($bufferFunctions, $newFunction);
-                            $k = $j;
-                        }
-                        break;
-                    }
-                    break;
-
-                case T_COMMENT:
-                    $comment = $this->parsePhpComment($value[1], $value[2]);
-
-                    if ($comment) {
-                        array_unshift($bufferComments, $comment);
-
-                        // The comment is inside the function call.
-                        if (isset($bufferFunctions[0])) {
-                            $bufferFunctions[0]->addComment($comment);
-                        }
-                    }
-                    break;
-
-                default:
-                    if (isset($bufferFunctions[0])) {
-                        $bufferFunctions[0]->stopArgument();
-                    }
-                    break;
-            }
-        }
-
-        return $functions;
-    }
-
-    /**
-     * Extract the actual text from a PHP comment.
-     *
-     * If set, only returns comments that match the prefix(es).
-     *
-     * @param string $value The PHP comment.
-     * @param int $line Line number.
-     *
-     * @return null|ParsedComment Comment or null if comment extraction is disabled or if there is a prefix mismatch.
-     */
-    protected function parsePhpComment($value, $line)
-    {
-        if ($this->extractComments === false) {
-            return null;
-        }
-
-        //this returns a comment or null
-        $comment = ParsedComment::create($value, $line);
-
-        $prefixes = array_filter((array) $this->extractComments);
-
-        if ($comment && $comment->checkPrefixes($prefixes)) {
-            return $comment;
-        }
-
-        return null;
-    }
+	/**
+	 * PHP tokens of the code to be parsed.
+	 *
+	 * @var array
+	 */
+	protected $tokens;
+
+	/**
+	 * If not false, comments will be extracted.
+	 *
+	 * @var string|false|array
+	 */
+	protected $extractComments = false;
+
+	/**
+	 * Enable extracting comments that start with a tag (if $tag is empty all the comments will be extracted).
+	 *
+	 * @param mixed $tag
+	 */
+	public function enableCommentsExtraction($tag = '')
+	{
+		$this->extractComments = $tag;
+	}
+
+	/**
+	 * Disable comments extraction.
+	 */
+	public function disableCommentsExtraction()
+	{
+		$this->extractComments = false;
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param string $code The php code to scan
+	 */
+	public function __construct($code)
+	{
+		$this->tokens = array_values(
+			array_filter(
+				token_get_all($code),
+				function ($token) {
+					return !is_array($token) || $token[0] !== T_WHITESPACE;
+				}
+			)
+		);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getFunctions(array $constants = [])
+	{
+		$count = count($this->tokens);
+		/* @var ParsedFunction[] $bufferFunctions */
+		$bufferFunctions = [];
+		/* @var ParsedComment[] $bufferComments */
+		$bufferComments = [];
+		/* @var array $functions */
+		$functions = [];
+
+		for ($k = 0; $k < $count; ++$k) {
+			$value = $this->tokens[$k];
+
+			if (is_string($value)) {
+				if (isset($bufferFunctions[0])) {
+					switch ($value) {
+						case ',':
+							$bufferFunctions[0]->nextArgument();
+							break;
+						case ')':
+							$functions[] = array_shift($bufferFunctions)->close();
+							break;
+						case '.':
+							break;
+						default:
+							$bufferFunctions[0]->stopArgument();
+							break;
+					}
+				}
+				continue;
+			}
+
+			switch ($value[0]) {
+				case T_CONSTANT_ENCAPSED_STRING:
+					//add an argument to the current function
+					if (isset($bufferFunctions[0])) {
+						$bufferFunctions[0]->addArgumentChunk(PhpCode::convertString($value[1]));
+					}
+					break;
+
+				case T_STRING:
+					if (isset($bufferFunctions[0])) {
+						if (isset($constants[$value[1]])) {
+							$bufferFunctions[0]->addArgumentChunk($constants[$value[1]]);
+							break;
+						}
+
+						if (strtolower($value[1]) === 'null') {
+							$bufferFunctions[0]->addArgumentChunk(null);
+							break;
+						}
+
+						$bufferFunctions[0]->stopArgument();
+					}
+
+					//new function found
+					for ($j = $k + 1; $j < $count; ++$j) {
+						$nextToken = $this->tokens[$j];
+
+						if (is_array($nextToken) && $nextToken[0] === T_COMMENT) {
+							continue;
+						}
+
+						if ($nextToken === '(') {
+							$newFunction = new ParsedFunction($value[1], $value[2]);
+
+							// add comment that was on the line before.
+							if (isset($bufferComments[0])) {
+								$comment = $bufferComments[0];
+
+								if ($comment->isRelatedWith($newFunction)) {
+									$newFunction->addComment($comment);
+								}
+							}
+
+							array_unshift($bufferFunctions, $newFunction);
+							$k = $j;
+						}
+						break;
+					}
+					break;
+
+				case T_COMMENT:
+					$comment = $this->parsePhpComment($value[1], $value[2]);
+
+					if ($comment) {
+						array_unshift($bufferComments, $comment);
+
+						// The comment is inside the function call.
+						if (isset($bufferFunctions[0])) {
+							$bufferFunctions[0]->addComment($comment);
+						}
+					}
+					break;
+
+				default:
+					if (isset($bufferFunctions[0])) {
+						$bufferFunctions[0]->stopArgument();
+					}
+					break;
+			}
+		}
+
+		return $functions;
+	}
+
+	/**
+	 * Extract the actual text from a PHP comment.
+	 *
+	 * If set, only returns comments that match the prefix(es).
+	 *
+	 * @param string $value The PHP comment.
+	 * @param int $line Line number.
+	 *
+	 * @return null|ParsedComment Comment or null if comment extraction is disabled or if there is a prefix mismatch.
+	 */
+	protected function parsePhpComment($value, $line)
+	{
+		if ($this->extractComments === false) {
+			return null;
+		}
+
+		//this returns a comment or null
+		$comment = ParsedComment::create($value, $line);
+
+		$prefixes = array_filter((array) $this->extractComments);
+
+		if ($comment && $comment->checkPrefixes($prefixes)) {
+			return $comment;
+		}
+
+		return null;
+	}
 }

Spacing +49 added lines, -49 removed lines

@@ -25,7 +25,7 @@ 
      *
      * @param mixed $tag
      */
-    public function enableCommentsExtraction($tag = '')
+    public function enableCommentsExtraction( $tag = '' )
     {
         $this->extractComments = $tag;
     }
@@ -43,13 +43,13 @@ 
      *
      * @param string $code The php code to scan
      */
-    public function __construct($code)
+    public function __construct( $code )
     {
         $this->tokens = array_values(
             array_filter(
-                token_get_all($code),
-                function ($token) {
-                    return !is_array($token) || $token[0] !== T_WHITESPACE;
+                token_get_all( $code ),
+                function( $token ) {
+                    return ! is_array( $token ) || $token[ 0 ] !== T_WHITESPACE;
                 }
             )
         );
@@ -58,82 +58,82 @@ 
     /**
      * {@inheritdoc}
      */
-    public function getFunctions(array $constants = [])
+    public function getFunctions( array $constants = [ ] )
     {
-        $count = count($this->tokens);
+        $count = count( $this->tokens );
         /* @var ParsedFunction[] $bufferFunctions */
-        $bufferFunctions = [];
+        $bufferFunctions = [ ];
         /* @var ParsedComment[] $bufferComments */
-        $bufferComments = [];
+        $bufferComments = [ ];
         /* @var array $functions */
-        $functions = [];
+        $functions = [ ];
 
-        for ($k = 0; $k < $count; ++$k) {
-            $value = $this->tokens[$k];
+        for ( $k = 0; $k < $count; ++$k ) {
+            $value = $this->tokens[ $k ];
 
-            if (is_string($value)) {
-                if (isset($bufferFunctions[0])) {
-                    switch ($value) {
+            if ( is_string( $value ) ) {
+                if ( isset( $bufferFunctions[ 0 ] ) ) {
+                    switch ( $value ) {
                         case ',':
-                            $bufferFunctions[0]->nextArgument();
+                            $bufferFunctions[ 0 ]->nextArgument();
                             break;
                         case ')':
-                            $functions[] = array_shift($bufferFunctions)->close();
+                            $functions[ ] = array_shift( $bufferFunctions )->close();
                             break;
                         case '.':
                             break;
                         default:
-                            $bufferFunctions[0]->stopArgument();
+                            $bufferFunctions[ 0 ]->stopArgument();
                             break;
                     }
                 }
                 continue;
             }
 
-            switch ($value[0]) {
+            switch ( $value[ 0 ] ) {
                 case T_CONSTANT_ENCAPSED_STRING:
                     //add an argument to the current function
-                    if (isset($bufferFunctions[0])) {
-                        $bufferFunctions[0]->addArgumentChunk(PhpCode::convertString($value[1]));
+                    if ( isset( $bufferFunctions[ 0 ] ) ) {
+                        $bufferFunctions[ 0 ]->addArgumentChunk( PhpCode::convertString( $value[ 1 ] ) );
                     }
                     break;
 
                 case T_STRING:
-                    if (isset($bufferFunctions[0])) {
-                        if (isset($constants[$value[1]])) {
-                            $bufferFunctions[0]->addArgumentChunk($constants[$value[1]]);
+                    if ( isset( $bufferFunctions[ 0 ] ) ) {
+                        if ( isset( $constants[ $value[ 1 ] ] ) ) {
+                            $bufferFunctions[ 0 ]->addArgumentChunk( $constants[ $value[ 1 ] ] );
                             break;
                         }
 
-                        if (strtolower($value[1]) === 'null') {
-                            $bufferFunctions[0]->addArgumentChunk(null);
+                        if ( strtolower( $value[ 1 ] ) === 'null' ) {
+                            $bufferFunctions[ 0 ]->addArgumentChunk( null );
                             break;
                         }
 
-                        $bufferFunctions[0]->stopArgument();
+                        $bufferFunctions[ 0 ]->stopArgument();
                     }
 
                     //new function found
-                    for ($j = $k + 1; $j < $count; ++$j) {
-                        $nextToken = $this->tokens[$j];
+                    for ( $j = $k + 1; $j < $count; ++$j ) {
+                        $nextToken = $this->tokens[ $j ];
 
-                        if (is_array($nextToken) && $nextToken[0] === T_COMMENT) {
+                        if ( is_array( $nextToken ) && $nextToken[ 0 ] === T_COMMENT ) {
                             continue;
                         }
 
-                        if ($nextToken === '(') {
-                            $newFunction = new ParsedFunction($value[1], $value[2]);
+                        if ( $nextToken === '(' ) {
+                            $newFunction = new ParsedFunction( $value[ 1 ], $value[ 2 ] );
 
                             // add comment that was on the line before.
-                            if (isset($bufferComments[0])) {
-                                $comment = $bufferComments[0];
+                            if ( isset( $bufferComments[ 0 ] ) ) {
+                                $comment = $bufferComments[ 0 ];
 
-                                if ($comment->isRelatedWith($newFunction)) {
-                                    $newFunction->addComment($comment);
+                                if ( $comment->isRelatedWith( $newFunction ) ) {
+                                    $newFunction->addComment( $comment );
                                 }
                             }
 
-                            array_unshift($bufferFunctions, $newFunction);
+                            array_unshift( $bufferFunctions, $newFunction );
                             $k = $j;
                         }
                         break;
@@ -141,21 +141,21 @@ 
                     break;
 
                 case T_COMMENT:
-                    $comment = $this->parsePhpComment($value[1], $value[2]);
+                    $comment = $this->parsePhpComment( $value[ 1 ], $value[ 2 ] );
 
-                    if ($comment) {
-                        array_unshift($bufferComments, $comment);
+                    if ( $comment ) {
+                        array_unshift( $bufferComments, $comment );
 
                         // The comment is inside the function call.
-                        if (isset($bufferFunctions[0])) {
-                            $bufferFunctions[0]->addComment($comment);
+                        if ( isset( $bufferFunctions[ 0 ] ) ) {
+                            $bufferFunctions[ 0 ]->addComment( $comment );
                         }
                     }
                     break;
 
                 default:
-                    if (isset($bufferFunctions[0])) {
-                        $bufferFunctions[0]->stopArgument();
+                    if ( isset( $bufferFunctions[ 0 ] ) ) {
+                        $bufferFunctions[ 0 ]->stopArgument();
                     }
                     break;
             }
@@ -174,18 +174,18 @@ 
      *
      * @return null|ParsedComment Comment or null if comment extraction is disabled or if there is a prefix mismatch.
      */
-    protected function parsePhpComment($value, $line)
+    protected function parsePhpComment( $value, $line )
     {
-        if ($this->extractComments === false) {
+        if ( $this->extractComments === false ) {
             return null;
         }
 
         //this returns a comment or null
-        $comment = ParsedComment::create($value, $line);
+        $comment = ParsedComment::create( $value, $line );
 
-        $prefixes = array_filter((array) $this->extractComments);
+        $prefixes = array_filter( (array)$this->extractComments );
 
-        if ($comment && $comment->checkPrefixes($prefixes)) {
+        if ( $comment && $comment->checkPrefixes( $prefixes ) ) {
             return $comment;
         }
 

Braces +6 added lines, -12 removed lines

@@ -4,8 +4,7 @@ 
 
 use Gettext\Extractors\PhpCode;
 
-class PhpFunctionsScanner extends FunctionsScanner
-{
+class PhpFunctionsScanner extends FunctionsScanner {
     /**
      * PHP tokens of the code to be parsed.
      *
@@ -25,16 +24,14 @@ 
      *
      * @param mixed $tag
      */
-    public function enableCommentsExtraction($tag = '')
-    {
+    public function enableCommentsExtraction($tag = '') {
         $this->extractComments = $tag;
     }
 
     /**
      * Disable comments extraction.
      */
-    public function disableCommentsExtraction()
-    {
+    public function disableCommentsExtraction() {
         $this->extractComments = false;
     }
 
@@ -43,8 +40,7 @@ 
      *
      * @param string $code The php code to scan
      */
-    public function __construct($code)
-    {
+    public function __construct($code) {
         $this->tokens = array_values(
             array_filter(
                 token_get_all($code),
@@ -58,8 +54,7 @@ 
     /**
      * {@inheritdoc}
      */
-    public function getFunctions(array $constants = [])
-    {
+    public function getFunctions(array $constants = []) {
         $count = count($this->tokens);
         /* @var ParsedFunction[] $bufferFunctions */
         $bufferFunctions = [];
@@ -174,8 +169,7 @@ 
      *
      * @return null|ParsedComment Comment or null if comment extraction is disabled or if there is a prefix mismatch.
      */
-    protected function parsePhpComment($value, $line)
-    {
+    protected function parsePhpComment($value, $line) {
         if ($this->extractComments === false) {
             return null;
         }