gravityview / GravityView

vendor/gettext/gettext/src/Extractors/Po.php

Indentation +201 added lines, -201 removed lines

@@ -11,205 +11,205 @@
  */
 class Po extends Extractor implements ExtractorInterface
 {
-    use HeadersExtractorTrait;
-
-    /**
-     * Parses a .po file and append the translations found in the Translations instance.
-     *
-     * {@inheritdoc}
-     */
-    public static function fromString($string, Translations $translations, array $options = [])
-    {
-        $lines = explode("\n", $string);
-        $i = 0;
-
-        $translation = $translations->createNewTranslation('', '');
-
-        for ($n = count($lines); $i < $n; ++$i) {
-            $line = trim($lines[$i]);
-            $line = static::fixMultiLines($line, $lines, $i);
-
-            if ($line === '') {
-                if ($translation->is('', '')) {
-                    static::extractHeaders($translation->getTranslation(), $translations);
-                } elseif ($translation->hasOriginal()) {
-                    $translations[] = $translation;
-                }
-
-                $translation = $translations->createNewTranslation('', '');
-                continue;
-            }
-
-            $splitLine = preg_split('/\s+/', $line, 2);
-            $key = $splitLine[0];
-            $data = isset($splitLine[1]) ? $splitLine[1] : '';
-
-            if ($key === '#~') {
-                $translation->setDisabled(true);
-
-                $splitLine = preg_split('/\s+/', $data, 2);
-                $key = $splitLine[0];
-                $data = isset($splitLine[1]) ? $splitLine[1] : '';
-            }
-
-            switch ($key) {
-                case '#':
-                    $translation->addComment($data);
-                    $append = null;
-                    break;
-
-                case '#.':
-                    $translation->addExtractedComment($data);
-                    $append = null;
-                    break;
-
-                case '#,':
-                    foreach (array_map('trim', explode(',', trim($data))) as $value) {
-                        $translation->addFlag($value);
-                    }
-                    $append = null;
-                    break;
-
-                case '#:':
-                    foreach (preg_split('/\s+/', trim($data)) as $value) {
-                        if (preg_match('/^(.+)(:(\d*))?$/U', $value, $matches)) {
-                            $translation->addReference($matches[1], isset($matches[3]) ? $matches[3] : null);
-                        }
-                    }
-                    $append = null;
-                    break;
-
-                case 'msgctxt':
-                    $translation = $translation->getClone(static::convertString($data));
-                    $append = 'Context';
-                    break;
-
-                case 'msgid':
-                    $translation = $translation->getClone(null, static::convertString($data));
-                    $append = 'Original';
-                    break;
-
-                case 'msgid_plural':
-                    $translation->setPlural(static::convertString($data));
-                    $append = 'Plural';
-                    break;
-
-                case 'msgstr':
-                case 'msgstr[0]':
-                    $translation->setTranslation(static::convertString($data));
-                    $append = 'Translation';
-                    break;
-
-                case 'msgstr[1]':
-                    $translation->setPluralTranslations([static::convertString($data)]);
-                    $append = 'PluralTranslation';
-                    break;
-
-                default:
-                    if (strpos($key, 'msgstr[') === 0) {
-                        $p = $translation->getPluralTranslations();
-                        $p[] = static::convertString($data);
-
-                        $translation->setPluralTranslations($p);
-                        $append = 'PluralTranslation';
-                        break;
-                    }
-
-                    if (isset($append)) {
-                        if ($append === 'Context') {
-                            $translation = $translation->getClone($translation->getContext()
-                                ."\n"
-                                .static::convertString($data));
-                            break;
-                        }
-
-                        if ($append === 'Original') {
-                            $translation = $translation->getClone(null, $translation->getOriginal()
-                                ."\n"
-                                .static::convertString($data));
-                            break;
-                        }
-
-                        if ($append === 'PluralTranslation') {
-                            $p = $translation->getPluralTranslations();
-                            $p[] = array_pop($p)."\n".static::convertString($data);
-                            $translation->setPluralTranslations($p);
-                            break;
-                        }
-
-                        $getMethod = 'get'.$append;
-                        $setMethod = 'set'.$append;
-                        $translation->$setMethod($translation->$getMethod()."\n".static::convertString($data));
-                    }
-                    break;
-            }
-        }
-
-        if ($translation->hasOriginal() && !in_array($translation, iterator_to_array($translations))) {
-            $translations[] = $translation;
-        }
-    }
-
-    /**
-     * Gets one string from multiline strings.
-     *
-     * @param string $line
-     * @param array  $lines
-     * @param int    &$i
-     *
-     * @return string
-     */
-    protected static function fixMultiLines($line, array $lines, &$i)
-    {
-        for ($j = $i, $t = count($lines); $j < $t; ++$j) {
-            if (substr($line, -1, 1) == '"' && isset($lines[$j + 1])) {
-                $nextLine = trim($lines[$j + 1]);
-                if (substr($nextLine, 0, 1) == '"') {
-                    $line = substr($line, 0, -1).substr($nextLine, 1);
-                    continue;
-                }
-                if (substr($nextLine, 0, 4) == '#~ "') {
-                    $line = substr($line, 0, -1).substr($nextLine, 4);
-                    continue;
-                }
-            }
-            $i = $j;
-            break;
-        }
-
-        return $line;
-    }
-
-    /**
-     * Convert a string from its PO representation.
-     *
-     * @param string $value
-     *
-     * @return string
-     */
-    public static function convertString($value)
-    {
-        if (!$value) {
-            return '';
-        }
-
-        if ($value[0] === '"') {
-            $value = substr($value, 1, -1);
-        }
-
-        return strtr(
-            $value,
-            [
-                '\\\\' => '\\',
-                '\\a' => "\x07",
-                '\\b' => "\x08",
-                '\\t' => "\t",
-                '\\n' => "\n",
-                '\\v' => "\x0b",
-                '\\f' => "\x0c",
-                '\\r' => "\r",
-                '\\"' => '"',
-            ]
-        );
-    }
+	use HeadersExtractorTrait;
+
+	/**
+	 * Parses a .po file and append the translations found in the Translations instance.
+	 *
+	 * {@inheritdoc}
+	 */
+	public static function fromString($string, Translations $translations, array $options = [])
+	{
+		$lines = explode("\n", $string);
+		$i = 0;
+
+		$translation = $translations->createNewTranslation('', '');
+
+		for ($n = count($lines); $i < $n; ++$i) {
+			$line = trim($lines[$i]);
+			$line = static::fixMultiLines($line, $lines, $i);
+
+			if ($line === '') {
+				if ($translation->is('', '')) {
+					static::extractHeaders($translation->getTranslation(), $translations);
+				} elseif ($translation->hasOriginal()) {
+					$translations[] = $translation;
+				}
+
+				$translation = $translations->createNewTranslation('', '');
+				continue;
+			}
+
+			$splitLine = preg_split('/\s+/', $line, 2);
+			$key = $splitLine[0];
+			$data = isset($splitLine[1]) ? $splitLine[1] : '';
+
+			if ($key === '#~') {
+				$translation->setDisabled(true);
+
+				$splitLine = preg_split('/\s+/', $data, 2);
+				$key = $splitLine[0];
+				$data = isset($splitLine[1]) ? $splitLine[1] : '';
+			}
+
+			switch ($key) {
+				case '#':
+					$translation->addComment($data);
+					$append = null;
+					break;
+
+				case '#.':
+					$translation->addExtractedComment($data);
+					$append = null;
+					break;
+
+				case '#,':
+					foreach (array_map('trim', explode(',', trim($data))) as $value) {
+						$translation->addFlag($value);
+					}
+					$append = null;
+					break;
+
+				case '#:':
+					foreach (preg_split('/\s+/', trim($data)) as $value) {
+						if (preg_match('/^(.+)(:(\d*))?$/U', $value, $matches)) {
+							$translation->addReference($matches[1], isset($matches[3]) ? $matches[3] : null);
+						}
+					}
+					$append = null;
+					break;
+
+				case 'msgctxt':
+					$translation = $translation->getClone(static::convertString($data));
+					$append = 'Context';
+					break;
+
+				case 'msgid':
+					$translation = $translation->getClone(null, static::convertString($data));
+					$append = 'Original';
+					break;
+
+				case 'msgid_plural':
+					$translation->setPlural(static::convertString($data));
+					$append = 'Plural';
+					break;
+
+				case 'msgstr':
+				case 'msgstr[0]':
+					$translation->setTranslation(static::convertString($data));
+					$append = 'Translation';
+					break;
+
+				case 'msgstr[1]':
+					$translation->setPluralTranslations([static::convertString($data)]);
+					$append = 'PluralTranslation';
+					break;
+
+				default:
+					if (strpos($key, 'msgstr[') === 0) {
+						$p = $translation->getPluralTranslations();
+						$p[] = static::convertString($data);
+
+						$translation->setPluralTranslations($p);
+						$append = 'PluralTranslation';
+						break;
+					}
+
+					if (isset($append)) {
+						if ($append === 'Context') {
+							$translation = $translation->getClone($translation->getContext()
+								."\n"
+								.static::convertString($data));
+							break;
+						}
+
+						if ($append === 'Original') {
+							$translation = $translation->getClone(null, $translation->getOriginal()
+								."\n"
+								.static::convertString($data));
+							break;
+						}
+
+						if ($append === 'PluralTranslation') {
+							$p = $translation->getPluralTranslations();
+							$p[] = array_pop($p)."\n".static::convertString($data);
+							$translation->setPluralTranslations($p);
+							break;
+						}
+
+						$getMethod = 'get'.$append;
+						$setMethod = 'set'.$append;
+						$translation->$setMethod($translation->$getMethod()."\n".static::convertString($data));
+					}
+					break;
+			}
+		}
+
+		if ($translation->hasOriginal() && !in_array($translation, iterator_to_array($translations))) {
+			$translations[] = $translation;
+		}
+	}
+
+	/**
+	 * Gets one string from multiline strings.
+	 *
+	 * @param string $line
+	 * @param array  $lines
+	 * @param int    &$i
+	 *
+	 * @return string
+	 */
+	protected static function fixMultiLines($line, array $lines, &$i)
+	{
+		for ($j = $i, $t = count($lines); $j < $t; ++$j) {
+			if (substr($line, -1, 1) == '"' && isset($lines[$j + 1])) {
+				$nextLine = trim($lines[$j + 1]);
+				if (substr($nextLine, 0, 1) == '"') {
+					$line = substr($line, 0, -1).substr($nextLine, 1);
+					continue;
+				}
+				if (substr($nextLine, 0, 4) == '#~ "') {
+					$line = substr($line, 0, -1).substr($nextLine, 4);
+					continue;
+				}
+			}
+			$i = $j;
+			break;
+		}
+
+		return $line;
+	}
+
+	/**
+	 * Convert a string from its PO representation.
+	 *
+	 * @param string $value
+	 *
+	 * @return string
+	 */
+	public static function convertString($value)
+	{
+		if (!$value) {
+			return '';
+		}
+
+		if ($value[0] === '"') {
+			$value = substr($value, 1, -1);
+		}
+
+		return strtr(
+			$value,
+			[
+				'\\\\' => '\\',
+				'\\a' => "\x07",
+				'\\b' => "\x08",
+				'\\t' => "\t",
+				'\\n' => "\n",
+				'\\v' => "\x0b",
+				'\\f' => "\x0c",
+				'\\r' => "\r",
+				'\\"' => '"',
+			]
+		);
+	}
 }

Spacing +63 added lines, -63 removed lines

@@ -18,135 +18,135 @@ 
      *
      * {@inheritdoc}
      */
-    public static function fromString($string, Translations $translations, array $options = [])
+    public static function fromString( $string, Translations $translations, array $options = [ ] )
     {
-        $lines = explode("\n", $string);
+        $lines = explode( "\n", $string );
         $i = 0;
 
-        $translation = $translations->createNewTranslation('', '');
+        $translation = $translations->createNewTranslation( '', '' );
 
-        for ($n = count($lines); $i < $n; ++$i) {
-            $line = trim($lines[$i]);
-            $line = static::fixMultiLines($line, $lines, $i);
+        for ( $n = count( $lines ); $i < $n; ++$i ) {
+            $line = trim( $lines[ $i ] );
+            $line = static::fixMultiLines( $line, $lines, $i );
 
-            if ($line === '') {
-                if ($translation->is('', '')) {
-                    static::extractHeaders($translation->getTranslation(), $translations);
-                } elseif ($translation->hasOriginal()) {
-                    $translations[] = $translation;
+            if ( $line === '' ) {
+                if ( $translation->is( '', '' ) ) {
+                    static::extractHeaders( $translation->getTranslation(), $translations );
+                } elseif ( $translation->hasOriginal() ) {
+                    $translations[ ] = $translation;
                 }
 
-                $translation = $translations->createNewTranslation('', '');
+                $translation = $translations->createNewTranslation( '', '' );
                 continue;
             }
 
-            $splitLine = preg_split('/\s+/', $line, 2);
-            $key = $splitLine[0];
-            $data = isset($splitLine[1]) ? $splitLine[1] : '';
+            $splitLine = preg_split( '/\s+/', $line, 2 );
+            $key = $splitLine[ 0 ];
+            $data = isset( $splitLine[ 1 ] ) ? $splitLine[ 1 ] : '';
 
-            if ($key === '#~') {
-                $translation->setDisabled(true);
+            if ( $key === '#~' ) {
+                $translation->setDisabled( true );
 
-                $splitLine = preg_split('/\s+/', $data, 2);
-                $key = $splitLine[0];
-                $data = isset($splitLine[1]) ? $splitLine[1] : '';
+                $splitLine = preg_split( '/\s+/', $data, 2 );
+                $key = $splitLine[ 0 ];
+                $data = isset( $splitLine[ 1 ] ) ? $splitLine[ 1 ] : '';
             }
 
-            switch ($key) {
+            switch ( $key ) {
                 case '#':
-                    $translation->addComment($data);
+                    $translation->addComment( $data );
                     $append = null;
                     break;
 
                 case '#.':
-                    $translation->addExtractedComment($data);
+                    $translation->addExtractedComment( $data );
                     $append = null;
                     break;
 
                 case '#,':
-                    foreach (array_map('trim', explode(',', trim($data))) as $value) {
-                        $translation->addFlag($value);
+                    foreach ( array_map( 'trim', explode( ',', trim( $data ) ) ) as $value ) {
+                        $translation->addFlag( $value );
                     }
                     $append = null;
                     break;
 
                 case '#:':
-                    foreach (preg_split('/\s+/', trim($data)) as $value) {
-                        if (preg_match('/^(.+)(:(\d*))?$/U', $value, $matches)) {
-                            $translation->addReference($matches[1], isset($matches[3]) ? $matches[3] : null);
+                    foreach ( preg_split( '/\s+/', trim( $data ) ) as $value ) {
+                        if ( preg_match( '/^(.+)(:(\d*))?$/U', $value, $matches ) ) {
+                            $translation->addReference( $matches[ 1 ], isset( $matches[ 3 ] ) ? $matches[ 3 ] : null );
                         }
                     }
                     $append = null;
                     break;
 
                 case 'msgctxt':
-                    $translation = $translation->getClone(static::convertString($data));
+                    $translation = $translation->getClone( static::convertString( $data ) );
                     $append = 'Context';
                     break;
 
                 case 'msgid':
-                    $translation = $translation->getClone(null, static::convertString($data));
+                    $translation = $translation->getClone( null, static::convertString( $data ) );
                     $append = 'Original';
                     break;
 
                 case 'msgid_plural':
-                    $translation->setPlural(static::convertString($data));
+                    $translation->setPlural( static::convertString( $data ) );
                     $append = 'Plural';
                     break;
 
                 case 'msgstr':
                 case 'msgstr[0]':
-                    $translation->setTranslation(static::convertString($data));
+                    $translation->setTranslation( static::convertString( $data ) );
                     $append = 'Translation';
                     break;
 
                 case 'msgstr[1]':
-                    $translation->setPluralTranslations([static::convertString($data)]);
+                    $translation->setPluralTranslations( [ static::convertString( $data ) ] );
                     $append = 'PluralTranslation';
                     break;
 
                 default:
-                    if (strpos($key, 'msgstr[') === 0) {
+                    if ( strpos( $key, 'msgstr[' ) === 0 ) {
                         $p = $translation->getPluralTranslations();
-                        $p[] = static::convertString($data);
+                        $p[ ] = static::convertString( $data );
 
-                        $translation->setPluralTranslations($p);
+                        $translation->setPluralTranslations( $p );
                         $append = 'PluralTranslation';
                         break;
                     }
 
-                    if (isset($append)) {
-                        if ($append === 'Context') {
-                            $translation = $translation->getClone($translation->getContext()
+                    if ( isset( $append ) ) {
+                        if ( $append === 'Context' ) {
+                            $translation = $translation->getClone( $translation->getContext()
                                 ."\n"
-                                .static::convertString($data));
+                                .static::convertString( $data ) );
                             break;
                         }
 
-                        if ($append === 'Original') {
-                            $translation = $translation->getClone(null, $translation->getOriginal()
+                        if ( $append === 'Original' ) {
+                            $translation = $translation->getClone( null, $translation->getOriginal()
                                 ."\n"
-                                .static::convertString($data));
+                                .static::convertString( $data ) );
                             break;
                         }
 
-                        if ($append === 'PluralTranslation') {
+                        if ( $append === 'PluralTranslation' ) {
                             $p = $translation->getPluralTranslations();
-                            $p[] = array_pop($p)."\n".static::convertString($data);
-                            $translation->setPluralTranslations($p);
+                            $p[ ] = array_pop( $p ) . "\n" . static::convertString( $data );
+                            $translation->setPluralTranslations( $p );
                             break;
                         }
 
-                        $getMethod = 'get'.$append;
-                        $setMethod = 'set'.$append;
-                        $translation->$setMethod($translation->$getMethod()."\n".static::convertString($data));
+                        $getMethod = 'get' . $append;
+                        $setMethod = 'set' . $append;
+                        $translation->$setMethod( $translation->$getMethod() . "\n" . static::convertString( $data ) );
                     }
                     break;
             }
         }
 
-        if ($translation->hasOriginal() && !in_array($translation, iterator_to_array($translations))) {
-            $translations[] = $translation;
+        if ( $translation->hasOriginal() && ! in_array( $translation, iterator_to_array( $translations ) ) ) {
+            $translations[ ] = $translation;
         }
     }
 
@@ -159,17 +159,17 @@ 
      *
      * @return string
      */
-    protected static function fixMultiLines($line, array $lines, &$i)
+    protected static function fixMultiLines( $line, array $lines, &$i )
     {
-        for ($j = $i, $t = count($lines); $j < $t; ++$j) {
-            if (substr($line, -1, 1) == '"' && isset($lines[$j + 1])) {
-                $nextLine = trim($lines[$j + 1]);
-                if (substr($nextLine, 0, 1) == '"') {
-                    $line = substr($line, 0, -1).substr($nextLine, 1);
+        for ( $j = $i, $t = count( $lines ); $j < $t; ++$j ) {
+            if ( substr( $line, -1, 1 ) == '"' && isset( $lines[ $j + 1 ] ) ) {
+                $nextLine = trim( $lines[ $j + 1 ] );
+                if ( substr( $nextLine, 0, 1 ) == '"' ) {
+                    $line = substr( $line, 0, -1 ) . substr( $nextLine, 1 );
                     continue;
                 }
-                if (substr($nextLine, 0, 4) == '#~ "') {
-                    $line = substr($line, 0, -1).substr($nextLine, 4);
+                if ( substr( $nextLine, 0, 4 ) == '#~ "' ) {
+                    $line = substr( $line, 0, -1 ) . substr( $nextLine, 4 );
                     continue;
                 }
             }
@@ -187,14 +187,14 @@ 
      *
      * @return string
      */
-    public static function convertString($value)
+    public static function convertString( $value )
     {
-        if (!$value) {
+        if ( ! $value ) {
             return '';
         }
 
-        if ($value[0] === '"') {
-            $value = substr($value, 1, -1);
+        if ( $value[ 0 ] === '"' ) {
+            $value = substr( $value, 1, -1 );
         }
 
         return strtr(

Braces +4 added lines, -8 removed lines

@@ -9,8 +9,7 @@ 
 /**
  * Class to get gettext strings from php files returning arrays.
  */
-class Po extends Extractor implements ExtractorInterface
-{
+class Po extends Extractor implements ExtractorInterface {
     use HeadersExtractorTrait;
 
     /**
@@ -18,8 +17,7 @@ 
      *
      * {@inheritdoc}
      */
-    public static function fromString($string, Translations $translations, array $options = [])
-    {
+    public static function fromString($string, Translations $translations, array $options = []) {
         $lines = explode("\n", $string);
         $i = 0;
 
@@ -159,8 +157,7 @@ 
      *
      * @return string
      */
-    protected static function fixMultiLines($line, array $lines, &$i)
-    {
+    protected static function fixMultiLines($line, array $lines, &$i) {
         for ($j = $i, $t = count($lines); $j < $t; ++$j) {
             if (substr($line, -1, 1) == '"' && isset($lines[$j + 1])) {
                 $nextLine = trim($lines[$j + 1]);
@@ -187,8 +184,7 @@ 
      *
      * @return string
      */
-    public static function convertString($value)
-    {
+    public static function convertString($value) {
         if (!$value) {
             return '';
         }

vendor/gettext/gettext/src/Extractors/VueJs.php

Indentation +404 added lines, -404 removed lines

@@ -16,408 +16,408 @@
  */
 class VueJs extends Extractor implements ExtractorInterface, ExtractorMultiInterface
 {
-    public static $options = [
-        'constants' => [],
-
-        'functions' => [
-            'gettext' => 'gettext',
-            '__' => 'gettext',
-            'ngettext' => 'ngettext',
-            'n__' => 'ngettext',
-            'pgettext' => 'pgettext',
-            'p__' => 'pgettext',
-            'dgettext' => 'dgettext',
-            'd__' => 'dgettext',
-            'dngettext' => 'dngettext',
-            'dn__' => 'dngettext',
-            'dpgettext' => 'dpgettext',
-            'dp__' => 'dpgettext',
-            'npgettext' => 'npgettext',
-            'np__' => 'npgettext',
-            'dnpgettext' => 'dnpgettext',
-            'dnp__' => 'dnpgettext',
-            'noop' => 'noop',
-            'noop__' => 'noop',
-        ],
-    ];
-
-    protected static $functionsScannerClass = 'Gettext\Utils\JsFunctionsScanner';
-
-    /**
-     * @inheritDoc
-     * @throws Exception
-     */
-    public static function fromFileMultiple($file, array $translations, array $options = [])
-    {
-        foreach (static::getFiles($file) as $file) {
-            $options['file'] = $file;
-            static::fromStringMultiple(static::readFile($file), $translations, $options);
-        }
-    }
-
-    /**
-     * @inheritdoc
-     * @throws Exception
-     */
-    public static function fromString($string, Translations $translations, array $options = [])
-    {
-        static::fromStringMultiple($string, [$translations], $options);
-    }
-
-    /**
-     * @inheritDoc
-     * @throws Exception
-     */
-    public static function fromStringMultiple($string, array $translations, array $options = [])
-    {
-        $options += static::$options;
-        $options += [
-            // HTML attribute prefixes we parse as JS which could contain translations (are JS expressions)
-            'attributePrefixes' => [
-                ':',
-                'v-bind:',
-                'v-on:',
-                'v-text',
-            ],
-            // HTML Tags to parse
-            'tagNames' => [
-                'translate',
-            ],
-            // HTML tags to parse when attribute exists
-            'tagAttributes' => [
-                'v-translate',
-            ],
-            // Comments
-            'commentAttributes' => [
-                'translate-comment',
-            ],
-            'contextAttributes' => [
-                'translate-context',
-            ],
-            // Attribute with plural content
-            'pluralAttributes' => [
-                'translate-plural',
-            ],
-        ];
-
-        // Ok, this is the weirdest hack, but let me explain:
-        // On Linux (Mac is fine), when converting HTML to DOM, new lines get trimmed after the first tag.
-        // So if there are new lines between <template> and next element, they are lost
-        // So we insert a "." which is a text node, and it will prevent that newlines are stripped between elements.
-        // Same thing happens between template and script tag.
-        $string = str_replace('<template>', '<template>.', $string);
-        $string = str_replace('</template>', '</template>.', $string);
-
-        // Normalize newlines
-        $string = str_replace(["\r\n", "\n\r", "\r"], "\n", $string);
-
-        // VueJS files are valid HTML files, we will operate with the DOM here
-        $dom = static::convertHtmlToDom($string);
-
-        $script = static::extractScriptTag($string);
-
-        // Parse the script part as a regular JS code
-        if ($script) {
-            $scriptLineNumber = $dom->getElementsByTagName('script')->item(0)->getLineNo();
-            static::getScriptTranslationsFromString(
-                $script,
-                $translations,
-                $options,
-                $scriptLineNumber - 1
-            );
-        }
-
-        // Template part is parsed separately, all variables will be extracted
-        // and handled as a regular JS code
-        $template = $dom->getElementsByTagName('template')->item(0);
-        if ($template) {
-            static::getTemplateTranslations(
-                $template,
-                $translations,
-                $options,
-                $template->getLineNo() - 1
-            );
-        }
-    }
-
-    /**
-     * Extracts script tag contents using regex instead of DOM operations.
-     * If we parse using DOM, some contents may change, for example, tags within strings will be stripped
-     *
-     * @param $string
-     * @return bool|string
-     */
-    protected static function extractScriptTag($string)
-    {
-        if (preg_match('#<\s*?script\b[^>]*>(.*?)</script\b[^>]*>#s', $string, $matches)) {
-            return $matches[1];
-        }
-
-        return '';
-    }
-
-    /**
-     * @param string $html
-     * @return DOMDocument
-     */
-    protected static function convertHtmlToDom($html)
-    {
-        $dom = new DOMDocument;
-
-        libxml_use_internal_errors(true);
-
-        // Prepend xml encoding so DOMDocument document handles UTF8 correctly.
-        // Assuming that vue template files will not have any xml encoding tags, because duplicate tags may be ignored.
-        $dom->loadHTML('<?xml encoding="utf-8"?>' . $html);
-
-        libxml_clear_errors();
-
-        return $dom;
-    }
-
-    /**
-     * Extract translations from script part
-     *
-     * @param string $scriptContents Only script tag contents, not the whole template
-     * @param Translations|Translations[] $translations One or multiple domain Translation objects
-     * @param array $options
-     * @param int $lineOffset Number of lines the script is offset in the vue template file
-     * @throws Exception
-     */
-    protected static function getScriptTranslationsFromString(
-        $scriptContents,
-        $translations,
-        array $options = [],
-        $lineOffset = 0
-    ) {
-        /** @var FunctionsScanner $functions */
-        $functions = new static::$functionsScannerClass($scriptContents);
-        $options['lineOffset'] = $lineOffset;
-        $functions->saveGettextFunctions($translations, $options);
-    }
-
-    /**
-     * Parse template to extract all translations (element content and dynamic element attributes)
-     *
-     * @param DOMNode $dom
-     * @param Translations|Translations[] $translations One or multiple domain Translation objects
-     * @param array $options
-     * @param int $lineOffset Line number where the template part starts in the vue file
-     * @throws Exception
-     */
-    protected static function getTemplateTranslations(
-        DOMNode $dom,
-        $translations,
-        array $options,
-        $lineOffset = 0
-    ) {
-        // Build a JS string from all template attribute expressions
-        $fakeAttributeJs = static::getTemplateAttributeFakeJs($options, $dom);
-
-        // 1 line offset is necessary because parent template element was ignored when converting to DOM
-        static::getScriptTranslationsFromString($fakeAttributeJs, $translations, $options, $lineOffset);
-
-        // Build a JS string from template element content expressions
-        $fakeTemplateJs = static::getTemplateFakeJs($dom);
-        static::getScriptTranslationsFromString($fakeTemplateJs, $translations, $options, $lineOffset);
-
-        static::getTagTranslations($options, $dom, $translations);
-    }
-
-    /**
-     * @param array $options
-     * @param DOMNode $dom
-     * @param Translations|Translations[] $translations
-     */
-    protected static function getTagTranslations(array $options, DOMNode $dom, $translations)
-    {
-        // Since tag scanning does not support domains, we always use the first translation given
-        $translations = is_array($translations) ? reset($translations) : $translations;
-
-        $children = $dom->childNodes;
-        for ($i = 0; $i < $children->length; $i++) {
-            $node = $children->item($i);
-
-            if (!($node instanceof DOMElement)) {
-                continue;
-            }
-
-            $translatable = false;
-
-            if (in_array($node->tagName, $options['tagNames'], true)) {
-                $translatable = true;
-            }
-
-            $attrList = $node->attributes;
-            $context = null;
-            $plural = "";
-            $comment = null;
-
-            for ($j = 0; $j < $attrList->length; $j++) {
-                /** @var DOMAttr $domAttr */
-                $domAttr = $attrList->item($j);
-                // Check if this is a dynamic vue attribute
-                if (in_array($domAttr->name, $options['tagAttributes'])) {
-                    $translatable = true;
-                }
-                if (in_array($domAttr->name, $options['contextAttributes'])) {
-                    $context = $domAttr->value;
-                }
-                if (in_array($domAttr->name, $options['pluralAttributes'])) {
-                    $plural = $domAttr->value;
-                }
-                if (in_array($domAttr->name, $options['commentAttributes'])) {
-                    $comment = $domAttr->value;
-                }
-            }
-
-            if ($translatable) {
-                $translation = $translations->insert($context, trim($node->textContent), $plural);
-                $translation->addReference($options['file'], $node->getLineNo());
-                if ($comment) {
-                    $translation->addExtractedComment($comment);
-                }
-            }
-
-            if ($node->hasChildNodes()) {
-                static::getTagTranslations($options, $node, $translations);
-            }
-        }
-    }
-
-    /**
-     * Extract JS expressions from element attribute bindings (excluding text within elements)
-     * For example: <span :title="__('extract this')"> skip element content </span>
-     *
-     * @param array $options
-     * @param DOMNode $dom
-     * @return string JS code
-     */
-    protected static function getTemplateAttributeFakeJs(array $options, DOMNode $dom)
-    {
-        $expressionsByLine = static::getVueAttributeExpressions($options['attributePrefixes'], $dom);
-
-        if (empty($expressionsByLine)) {
-            return '';
-        }
-
-        $maxLines = max(array_keys($expressionsByLine));
-        $fakeJs = '';
-
-        for ($line = 1; $line <= $maxLines; $line++) {
-            if (isset($expressionsByLine[$line])) {
-                $fakeJs .= implode("; ", $expressionsByLine[$line]);
-            }
-            $fakeJs .= "\n";
-        }
-
-        return $fakeJs;
-    }
-
-    /**
-     * Loop DOM element recursively and parse out all dynamic vue attributes which are basically JS expressions
-     *
-     * @param array $attributePrefixes List of attribute prefixes we parse as JS (may contain translations)
-     * @param DOMNode $dom
-     * @param array $expressionByLine [lineNumber => [jsExpression, ..], ..]
-     * @return array [lineNumber => [jsExpression, ..], ..]
-     */
-    protected static function getVueAttributeExpressions(
-        array $attributePrefixes,
-        DOMNode $dom,
-        array &$expressionByLine = []
-    ) {
-        $children = $dom->childNodes;
-
-        for ($i = 0; $i < $children->length; $i++) {
-            $node = $children->item($i);
-
-            if (!($node instanceof DOMElement)) {
-                continue;
-            }
-            $attrList = $node->attributes;
-
-            for ($j = 0; $j < $attrList->length; $j++) {
-                /** @var DOMAttr $domAttr */
-                $domAttr = $attrList->item($j);
-
-                // Check if this is a dynamic vue attribute
-                if (static::isAttributeMatching($domAttr->name, $attributePrefixes)) {
-                    $line = $domAttr->getLineNo();
-                    $expressionByLine += [$line => []];
-                    $expressionByLine[$line][] = $domAttr->value;
-                }
-            }
-
-            if ($node->hasChildNodes()) {
-                $expressionByLine = static::getVueAttributeExpressions($attributePrefixes, $node, $expressionByLine);
-            }
-        }
-
-        return $expressionByLine;
-    }
-
-    /**
-     * Check if this attribute name should be parsed for translations
-     *
-     * @param string $attributeName
-     * @param string[] $attributePrefixes
-     * @return bool
-     */
-    protected static function isAttributeMatching($attributeName, $attributePrefixes)
-    {
-        foreach ($attributePrefixes as $prefix) {
-            if (strpos($attributeName, $prefix) === 0) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Extract JS expressions from within template elements (excluding attributes)
-     * For example: <span :title="skip attributes"> {{__("extract element content")}} </span>
-     *
-     * @param DOMNode $dom
-     * @return string JS code
-     */
-    protected static function getTemplateFakeJs(DOMNode $dom)
-    {
-        $fakeJs = '';
-        $lines = explode("\n", $dom->textContent);
-
-        // Build a fake JS file from template by extracting JS expressions within each template line
-        foreach ($lines as $line) {
-            $expressionMatched = static::parseOneTemplateLine($line);
-
-            $fakeJs .= implode("; ", $expressionMatched) . "\n";
-        }
-
-        return $fakeJs;
-    }
-
-    /**
-     * Match JS expressions in a template line
-     *
-     * @param string $line
-     * @return string[]
-     */
-    protected static function parseOneTemplateLine($line)
-    {
-        $line = trim($line);
-
-        if (!$line) {
-            return [];
-        }
-
-        $regex = '#\{\{(.*?)\}\}#';
-
-        preg_match_all($regex, $line, $matches);
-
-        $matched = array_map(function ($v) {
-            return trim($v, '\'"{}');
-        }, $matches[1]);
-
-        return $matched;
-    }
+	public static $options = [
+		'constants' => [],
+
+		'functions' => [
+			'gettext' => 'gettext',
+			'__' => 'gettext',
+			'ngettext' => 'ngettext',
+			'n__' => 'ngettext',
+			'pgettext' => 'pgettext',
+			'p__' => 'pgettext',
+			'dgettext' => 'dgettext',
+			'd__' => 'dgettext',
+			'dngettext' => 'dngettext',
+			'dn__' => 'dngettext',
+			'dpgettext' => 'dpgettext',
+			'dp__' => 'dpgettext',
+			'npgettext' => 'npgettext',
+			'np__' => 'npgettext',
+			'dnpgettext' => 'dnpgettext',
+			'dnp__' => 'dnpgettext',
+			'noop' => 'noop',
+			'noop__' => 'noop',
+		],
+	];
+
+	protected static $functionsScannerClass = 'Gettext\Utils\JsFunctionsScanner';
+
+	/**
+	 * @inheritDoc
+	 * @throws Exception
+	 */
+	public static function fromFileMultiple($file, array $translations, array $options = [])
+	{
+		foreach (static::getFiles($file) as $file) {
+			$options['file'] = $file;
+			static::fromStringMultiple(static::readFile($file), $translations, $options);
+		}
+	}
+
+	/**
+	 * @inheritdoc
+	 * @throws Exception
+	 */
+	public static function fromString($string, Translations $translations, array $options = [])
+	{
+		static::fromStringMultiple($string, [$translations], $options);
+	}
+
+	/**
+	 * @inheritDoc
+	 * @throws Exception
+	 */
+	public static function fromStringMultiple($string, array $translations, array $options = [])
+	{
+		$options += static::$options;
+		$options += [
+			// HTML attribute prefixes we parse as JS which could contain translations (are JS expressions)
+			'attributePrefixes' => [
+				':',
+				'v-bind:',
+				'v-on:',
+				'v-text',
+			],
+			// HTML Tags to parse
+			'tagNames' => [
+				'translate',
+			],
+			// HTML tags to parse when attribute exists
+			'tagAttributes' => [
+				'v-translate',
+			],
+			// Comments
+			'commentAttributes' => [
+				'translate-comment',
+			],
+			'contextAttributes' => [
+				'translate-context',
+			],
+			// Attribute with plural content
+			'pluralAttributes' => [
+				'translate-plural',
+			],
+		];
+
+		// Ok, this is the weirdest hack, but let me explain:
+		// On Linux (Mac is fine), when converting HTML to DOM, new lines get trimmed after the first tag.
+		// So if there are new lines between <template> and next element, they are lost
+		// So we insert a "." which is a text node, and it will prevent that newlines are stripped between elements.
+		// Same thing happens between template and script tag.
+		$string = str_replace('<template>', '<template>.', $string);
+		$string = str_replace('</template>', '</template>.', $string);
+
+		// Normalize newlines
+		$string = str_replace(["\r\n", "\n\r", "\r"], "\n", $string);
+
+		// VueJS files are valid HTML files, we will operate with the DOM here
+		$dom = static::convertHtmlToDom($string);
+
+		$script = static::extractScriptTag($string);
+
+		// Parse the script part as a regular JS code
+		if ($script) {
+			$scriptLineNumber = $dom->getElementsByTagName('script')->item(0)->getLineNo();
+			static::getScriptTranslationsFromString(
+				$script,
+				$translations,
+				$options,
+				$scriptLineNumber - 1
+			);
+		}
+
+		// Template part is parsed separately, all variables will be extracted
+		// and handled as a regular JS code
+		$template = $dom->getElementsByTagName('template')->item(0);
+		if ($template) {
+			static::getTemplateTranslations(
+				$template,
+				$translations,
+				$options,
+				$template->getLineNo() - 1
+			);
+		}
+	}
+
+	/**
+	 * Extracts script tag contents using regex instead of DOM operations.
+	 * If we parse using DOM, some contents may change, for example, tags within strings will be stripped
+	 *
+	 * @param $string
+	 * @return bool|string
+	 */
+	protected static function extractScriptTag($string)
+	{
+		if (preg_match('#<\s*?script\b[^>]*>(.*?)</script\b[^>]*>#s', $string, $matches)) {
+			return $matches[1];
+		}
+
+		return '';
+	}
+
+	/**
+	 * @param string $html
+	 * @return DOMDocument
+	 */
+	protected static function convertHtmlToDom($html)
+	{
+		$dom = new DOMDocument;
+
+		libxml_use_internal_errors(true);
+
+		// Prepend xml encoding so DOMDocument document handles UTF8 correctly.
+		// Assuming that vue template files will not have any xml encoding tags, because duplicate tags may be ignored.
+		$dom->loadHTML('<?xml encoding="utf-8"?>' . $html);
+
+		libxml_clear_errors();
+
+		return $dom;
+	}
+
+	/**
+	 * Extract translations from script part
+	 *
+	 * @param string $scriptContents Only script tag contents, not the whole template
+	 * @param Translations|Translations[] $translations One or multiple domain Translation objects
+	 * @param array $options
+	 * @param int $lineOffset Number of lines the script is offset in the vue template file
+	 * @throws Exception
+	 */
+	protected static function getScriptTranslationsFromString(
+		$scriptContents,
+		$translations,
+		array $options = [],
+		$lineOffset = 0
+	) {
+		/** @var FunctionsScanner $functions */
+		$functions = new static::$functionsScannerClass($scriptContents);
+		$options['lineOffset'] = $lineOffset;
+		$functions->saveGettextFunctions($translations, $options);
+	}
+
+	/**
+	 * Parse template to extract all translations (element content and dynamic element attributes)
+	 *
+	 * @param DOMNode $dom
+	 * @param Translations|Translations[] $translations One or multiple domain Translation objects
+	 * @param array $options
+	 * @param int $lineOffset Line number where the template part starts in the vue file
+	 * @throws Exception
+	 */
+	protected static function getTemplateTranslations(
+		DOMNode $dom,
+		$translations,
+		array $options,
+		$lineOffset = 0
+	) {
+		// Build a JS string from all template attribute expressions
+		$fakeAttributeJs = static::getTemplateAttributeFakeJs($options, $dom);
+
+		// 1 line offset is necessary because parent template element was ignored when converting to DOM
+		static::getScriptTranslationsFromString($fakeAttributeJs, $translations, $options, $lineOffset);
+
+		// Build a JS string from template element content expressions
+		$fakeTemplateJs = static::getTemplateFakeJs($dom);
+		static::getScriptTranslationsFromString($fakeTemplateJs, $translations, $options, $lineOffset);
+
+		static::getTagTranslations($options, $dom, $translations);
+	}
+
+	/**
+	 * @param array $options
+	 * @param DOMNode $dom
+	 * @param Translations|Translations[] $translations
+	 */
+	protected static function getTagTranslations(array $options, DOMNode $dom, $translations)
+	{
+		// Since tag scanning does not support domains, we always use the first translation given
+		$translations = is_array($translations) ? reset($translations) : $translations;
+
+		$children = $dom->childNodes;
+		for ($i = 0; $i < $children->length; $i++) {
+			$node = $children->item($i);
+
+			if (!($node instanceof DOMElement)) {
+				continue;
+			}
+
+			$translatable = false;
+
+			if (in_array($node->tagName, $options['tagNames'], true)) {
+				$translatable = true;
+			}
+
+			$attrList = $node->attributes;
+			$context = null;
+			$plural = "";
+			$comment = null;
+
+			for ($j = 0; $j < $attrList->length; $j++) {
+				/** @var DOMAttr $domAttr */
+				$domAttr = $attrList->item($j);
+				// Check if this is a dynamic vue attribute
+				if (in_array($domAttr->name, $options['tagAttributes'])) {
+					$translatable = true;
+				}
+				if (in_array($domAttr->name, $options['contextAttributes'])) {
+					$context = $domAttr->value;
+				}
+				if (in_array($domAttr->name, $options['pluralAttributes'])) {
+					$plural = $domAttr->value;
+				}
+				if (in_array($domAttr->name, $options['commentAttributes'])) {
+					$comment = $domAttr->value;
+				}
+			}
+
+			if ($translatable) {
+				$translation = $translations->insert($context, trim($node->textContent), $plural);
+				$translation->addReference($options['file'], $node->getLineNo());
+				if ($comment) {
+					$translation->addExtractedComment($comment);
+				}
+			}
+
+			if ($node->hasChildNodes()) {
+				static::getTagTranslations($options, $node, $translations);
+			}
+		}
+	}
+
+	/**
+	 * Extract JS expressions from element attribute bindings (excluding text within elements)
+	 * For example: <span :title="__('extract this')"> skip element content </span>
+	 *
+	 * @param array $options
+	 * @param DOMNode $dom
+	 * @return string JS code
+	 */
+	protected static function getTemplateAttributeFakeJs(array $options, DOMNode $dom)
+	{
+		$expressionsByLine = static::getVueAttributeExpressions($options['attributePrefixes'], $dom);
+
+		if (empty($expressionsByLine)) {
+			return '';
+		}
+
+		$maxLines = max(array_keys($expressionsByLine));
+		$fakeJs = '';
+
+		for ($line = 1; $line <= $maxLines; $line++) {
+			if (isset($expressionsByLine[$line])) {
+				$fakeJs .= implode("; ", $expressionsByLine[$line]);
+			}
+			$fakeJs .= "\n";
+		}
+
+		return $fakeJs;
+	}
+
+	/**
+	 * Loop DOM element recursively and parse out all dynamic vue attributes which are basically JS expressions
+	 *
+	 * @param array $attributePrefixes List of attribute prefixes we parse as JS (may contain translations)
+	 * @param DOMNode $dom
+	 * @param array $expressionByLine [lineNumber => [jsExpression, ..], ..]
+	 * @return array [lineNumber => [jsExpression, ..], ..]
+	 */
+	protected static function getVueAttributeExpressions(
+		array $attributePrefixes,
+		DOMNode $dom,
+		array &$expressionByLine = []
+	) {
+		$children = $dom->childNodes;
+
+		for ($i = 0; $i < $children->length; $i++) {
+			$node = $children->item($i);
+
+			if (!($node instanceof DOMElement)) {
+				continue;
+			}
+			$attrList = $node->attributes;
+
+			for ($j = 0; $j < $attrList->length; $j++) {
+				/** @var DOMAttr $domAttr */
+				$domAttr = $attrList->item($j);
+
+				// Check if this is a dynamic vue attribute
+				if (static::isAttributeMatching($domAttr->name, $attributePrefixes)) {
+					$line = $domAttr->getLineNo();
+					$expressionByLine += [$line => []];
+					$expressionByLine[$line][] = $domAttr->value;
+				}
+			}
+
+			if ($node->hasChildNodes()) {
+				$expressionByLine = static::getVueAttributeExpressions($attributePrefixes, $node, $expressionByLine);
+			}
+		}
+
+		return $expressionByLine;
+	}
+
+	/**
+	 * Check if this attribute name should be parsed for translations
+	 *
+	 * @param string $attributeName
+	 * @param string[] $attributePrefixes
+	 * @return bool
+	 */
+	protected static function isAttributeMatching($attributeName, $attributePrefixes)
+	{
+		foreach ($attributePrefixes as $prefix) {
+			if (strpos($attributeName, $prefix) === 0) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Extract JS expressions from within template elements (excluding attributes)
+	 * For example: <span :title="skip attributes"> {{__("extract element content")}} </span>
+	 *
+	 * @param DOMNode $dom
+	 * @return string JS code
+	 */
+	protected static function getTemplateFakeJs(DOMNode $dom)
+	{
+		$fakeJs = '';
+		$lines = explode("\n", $dom->textContent);
+
+		// Build a fake JS file from template by extracting JS expressions within each template line
+		foreach ($lines as $line) {
+			$expressionMatched = static::parseOneTemplateLine($line);
+
+			$fakeJs .= implode("; ", $expressionMatched) . "\n";
+		}
+
+		return $fakeJs;
+	}
+
+	/**
+	 * Match JS expressions in a template line
+	 *
+	 * @param string $line
+	 * @return string[]
+	 */
+	protected static function parseOneTemplateLine($line)
+	{
+		$line = trim($line);
+
+		if (!$line) {
+			return [];
+		}
+
+		$regex = '#\{\{(.*?)\}\}#';
+
+		preg_match_all($regex, $line, $matches);
+
+		$matched = array_map(function ($v) {
+			return trim($v, '\'"{}');
+		}, $matches[1]);
+
+		return $matched;
+	}
 }

Spacing +85 added lines, -85 removed lines

@@ -17,7 +17,7 @@ 
 class VueJs extends Extractor implements ExtractorInterface, ExtractorMultiInterface
 {
     public static $options = [
-        'constants' => [],
+        'constants' => [ ],
 
         'functions' => [
             'gettext' => 'gettext',
@@ -47,11 +47,11 @@ 
      * @inheritDoc
      * @throws Exception
      */
-    public static function fromFileMultiple($file, array $translations, array $options = [])
+    public static function fromFileMultiple( $file, array $translations, array $options = [ ] )
     {
-        foreach (static::getFiles($file) as $file) {
-            $options['file'] = $file;
-            static::fromStringMultiple(static::readFile($file), $translations, $options);
+        foreach ( static::getFiles( $file ) as $file ) {
+            $options[ 'file' ] = $file;
+            static::fromStringMultiple( static::readFile( $file ), $translations, $options );
         }
     }
 
@@ -59,16 +59,16 @@ 
      * @inheritdoc
      * @throws Exception
      */
-    public static function fromString($string, Translations $translations, array $options = [])
+    public static function fromString( $string, Translations $translations, array $options = [ ] )
     {
-        static::fromStringMultiple($string, [$translations], $options);
+        static::fromStringMultiple( $string, [ $translations ], $options );
     }
 
     /**
      * @inheritDoc
      * @throws Exception
      */
-    public static function fromStringMultiple($string, array $translations, array $options = [])
+    public static function fromStringMultiple( $string, array $translations, array $options = [ ] )
     {
         $options += static::$options;
         $options += [
@@ -105,20 +105,20 @@ 
         // So if there are new lines between <template> and next element, they are lost
         // So we insert a "." which is a text node, and it will prevent that newlines are stripped between elements.
         // Same thing happens between template and script tag.
-        $string = str_replace('<template>', '<template>.', $string);
-        $string = str_replace('</template>', '</template>.', $string);
+        $string = str_replace( '<template>', '<template>.', $string );
+        $string = str_replace( '</template>', '</template>.', $string );
 
         // Normalize newlines
-        $string = str_replace(["\r\n", "\n\r", "\r"], "\n", $string);
+        $string = str_replace( [ "\r\n", "\n\r", "\r" ], "\n", $string );
 
         // VueJS files are valid HTML files, we will operate with the DOM here
-        $dom = static::convertHtmlToDom($string);
+        $dom = static::convertHtmlToDom( $string );
 
-        $script = static::extractScriptTag($string);
+        $script = static::extractScriptTag( $string );
 
         // Parse the script part as a regular JS code
-        if ($script) {
-            $scriptLineNumber = $dom->getElementsByTagName('script')->item(0)->getLineNo();
+        if ( $script ) {
+            $scriptLineNumber = $dom->getElementsByTagName( 'script' )->item( 0 )->getLineNo();
             static::getScriptTranslationsFromString(
                 $script,
                 $translations,
@@ -129,8 +129,8 @@ 
 
         // Template part is parsed separately, all variables will be extracted
         // and handled as a regular JS code
-        $template = $dom->getElementsByTagName('template')->item(0);
-        if ($template) {
+        $template = $dom->getElementsByTagName( 'template' )->item( 0 );
+        if ( $template ) {
             static::getTemplateTranslations(
                 $template,
                 $translations,
@@ -147,10 +147,10 @@ 
      * @param $string
      * @return bool|string
      */
-    protected static function extractScriptTag($string)
+    protected static function extractScriptTag( $string )
     {
-        if (preg_match('#<\s*?script\b[^>]*>(.*?)</script\b[^>]*>#s', $string, $matches)) {
-            return $matches[1];
+        if ( preg_match( '#<\s*?script\b[^>]*>(.*?)</script\b[^>]*>#s', $string, $matches ) ) {
+            return $matches[ 1 ];
         }
 
         return '';
@@ -160,15 +160,15 @@ 
      * @param string $html
      * @return DOMDocument
      */
-    protected static function convertHtmlToDom($html)
+    protected static function convertHtmlToDom( $html )
     {
         $dom = new DOMDocument;
 
-        libxml_use_internal_errors(true);
+        libxml_use_internal_errors( true );
 
         // Prepend xml encoding so DOMDocument document handles UTF8 correctly.
         // Assuming that vue template files will not have any xml encoding tags, because duplicate tags may be ignored.
-        $dom->loadHTML('<?xml encoding="utf-8"?>' . $html);
+        $dom->loadHTML( '<?xml encoding="utf-8"?>' . $html );
 
         libxml_clear_errors();
 
@@ -187,13 +187,13 @@ 
     protected static function getScriptTranslationsFromString(
         $scriptContents,
         $translations,
-        array $options = [],
+        array $options = [ ],
         $lineOffset = 0
     ) {
         /** @var FunctionsScanner $functions */
-        $functions = new static::$functionsScannerClass($scriptContents);
-        $options['lineOffset'] = $lineOffset;
-        $functions->saveGettextFunctions($translations, $options);
+        $functions = new static::$functionsScannerClass( $scriptContents );
+        $options[ 'lineOffset' ] = $lineOffset;
+        $functions->saveGettextFunctions( $translations, $options );
     }
 
     /**
@@ -212,16 +212,16 @@ 
         $lineOffset = 0
     ) {
         // Build a JS string from all template attribute expressions
-        $fakeAttributeJs = static::getTemplateAttributeFakeJs($options, $dom);
+        $fakeAttributeJs = static::getTemplateAttributeFakeJs( $options, $dom );
 
         // 1 line offset is necessary because parent template element was ignored when converting to DOM
-        static::getScriptTranslationsFromString($fakeAttributeJs, $translations, $options, $lineOffset);
+        static::getScriptTranslationsFromString( $fakeAttributeJs, $translations, $options, $lineOffset );
 
         // Build a JS string from template element content expressions
-        $fakeTemplateJs = static::getTemplateFakeJs($dom);
-        static::getScriptTranslationsFromString($fakeTemplateJs, $translations, $options, $lineOffset);
+        $fakeTemplateJs = static::getTemplateFakeJs( $dom );
+        static::getScriptTranslationsFromString( $fakeTemplateJs, $translations, $options, $lineOffset );
 
-        static::getTagTranslations($options, $dom, $translations);
+        static::getTagTranslations( $options, $dom, $translations );
     }
 
     /**
@@ -229,22 +229,22 @@ 
      * @param DOMNode $dom
      * @param Translations|Translations[] $translations
      */
-    protected static function getTagTranslations(array $options, DOMNode $dom, $translations)
+    protected static function getTagTranslations( array $options, DOMNode $dom, $translations )
     {
         // Since tag scanning does not support domains, we always use the first translation given
-        $translations = is_array($translations) ? reset($translations) : $translations;
+        $translations = is_array( $translations ) ? reset( $translations ) : $translations;
 
         $children = $dom->childNodes;
-        for ($i = 0; $i < $children->length; $i++) {
-            $node = $children->item($i);
+        for ( $i = 0; $i < $children->length; $i++ ) {
+            $node = $children->item( $i );
 
-            if (!($node instanceof DOMElement)) {
+            if ( ! ( $node instanceof DOMElement ) ) {
                 continue;
             }
 
             $translatable = false;
 
-            if (in_array($node->tagName, $options['tagNames'], true)) {
+            if ( in_array( $node->tagName, $options[ 'tagNames' ], true ) ) {
                 $translatable = true;
             }
 
@@ -253,34 +253,34 @@ 
             $plural = "";
             $comment = null;
 
-            for ($j = 0; $j < $attrList->length; $j++) {
+            for ( $j = 0; $j < $attrList->length; $j++ ) {
                 /** @var DOMAttr $domAttr */
-                $domAttr = $attrList->item($j);
+                $domAttr = $attrList->item( $j );
                 // Check if this is a dynamic vue attribute
-                if (in_array($domAttr->name, $options['tagAttributes'])) {
+                if ( in_array( $domAttr->name, $options[ 'tagAttributes' ] ) ) {
                     $translatable = true;
                 }
-                if (in_array($domAttr->name, $options['contextAttributes'])) {
+                if ( in_array( $domAttr->name, $options[ 'contextAttributes' ] ) ) {
                     $context = $domAttr->value;
                 }
-                if (in_array($domAttr->name, $options['pluralAttributes'])) {
+                if ( in_array( $domAttr->name, $options[ 'pluralAttributes' ] ) ) {
                     $plural = $domAttr->value;
                 }
-                if (in_array($domAttr->name, $options['commentAttributes'])) {
+                if ( in_array( $domAttr->name, $options[ 'commentAttributes' ] ) ) {
                     $comment = $domAttr->value;
                 }
             }
 
-            if ($translatable) {
-                $translation = $translations->insert($context, trim($node->textContent), $plural);
-                $translation->addReference($options['file'], $node->getLineNo());
-                if ($comment) {
-                    $translation->addExtractedComment($comment);
+            if ( $translatable ) {
+                $translation = $translations->insert( $context, trim( $node->textContent ), $plural );
+                $translation->addReference( $options[ 'file' ], $node->getLineNo() );
+                if ( $comment ) {
+                    $translation->addExtractedComment( $comment );
                 }
             }
 
-            if ($node->hasChildNodes()) {
-                static::getTagTranslations($options, $node, $translations);
+            if ( $node->hasChildNodes() ) {
+                static::getTagTranslations( $options, $node, $translations );
             }
         }
     }
@@ -293,20 +293,20 @@ 
      * @param DOMNode $dom
      * @return string JS code
      */
-    protected static function getTemplateAttributeFakeJs(array $options, DOMNode $dom)
+    protected static function getTemplateAttributeFakeJs( array $options, DOMNode $dom )
     {
-        $expressionsByLine = static::getVueAttributeExpressions($options['attributePrefixes'], $dom);
+        $expressionsByLine = static::getVueAttributeExpressions( $options[ 'attributePrefixes' ], $dom );
 
-        if (empty($expressionsByLine)) {
+        if ( empty( $expressionsByLine ) ) {
             return '';
         }
 
-        $maxLines = max(array_keys($expressionsByLine));
+        $maxLines = max( array_keys( $expressionsByLine ) );
         $fakeJs = '';
 
-        for ($line = 1; $line <= $maxLines; $line++) {
-            if (isset($expressionsByLine[$line])) {
-                $fakeJs .= implode("; ", $expressionsByLine[$line]);
+        for ( $line = 1; $line <= $maxLines; $line++ ) {
+            if ( isset( $expressionsByLine[ $line ] ) ) {
+                $fakeJs .= implode( "; ", $expressionsByLine[ $line ] );
             }
             $fakeJs .= "\n";
         }
@@ -325,32 +325,32 @@ 
     protected static function getVueAttributeExpressions(
         array $attributePrefixes,
         DOMNode $dom,
-        array &$expressionByLine = []
+        array &$expressionByLine = [ ]
     ) {
         $children = $dom->childNodes;
 
-        for ($i = 0; $i < $children->length; $i++) {
-            $node = $children->item($i);
+        for ( $i = 0; $i < $children->length; $i++ ) {
+            $node = $children->item( $i );
 
-            if (!($node instanceof DOMElement)) {
+            if ( ! ( $node instanceof DOMElement ) ) {
                 continue;
             }
             $attrList = $node->attributes;
 
-            for ($j = 0; $j < $attrList->length; $j++) {
+            for ( $j = 0; $j < $attrList->length; $j++ ) {
                 /** @var DOMAttr $domAttr */
-                $domAttr = $attrList->item($j);
+                $domAttr = $attrList->item( $j );
 
                 // Check if this is a dynamic vue attribute
-                if (static::isAttributeMatching($domAttr->name, $attributePrefixes)) {
+                if ( static::isAttributeMatching( $domAttr->name, $attributePrefixes ) ) {
                     $line = $domAttr->getLineNo();
-                    $expressionByLine += [$line => []];
-                    $expressionByLine[$line][] = $domAttr->value;
+                    $expressionByLine += [ $line => [ ] ];
+                    $expressionByLine[ $line ][ ] = $domAttr->value;
                 }
             }
 
-            if ($node->hasChildNodes()) {
-                $expressionByLine = static::getVueAttributeExpressions($attributePrefixes, $node, $expressionByLine);
+            if ( $node->hasChildNodes() ) {
+                $expressionByLine = static::getVueAttributeExpressions( $attributePrefixes, $node, $expressionByLine );
             }
         }
 
@@ -364,10 +364,10 @@ 
      * @param string[] $attributePrefixes
      * @return bool
      */
-    protected static function isAttributeMatching($attributeName, $attributePrefixes)
+    protected static function isAttributeMatching( $attributeName, $attributePrefixes )
     {
-        foreach ($attributePrefixes as $prefix) {
-            if (strpos($attributeName, $prefix) === 0) {
+        foreach ( $attributePrefixes as $prefix ) {
+            if ( strpos( $attributeName, $prefix ) === 0 ) {
                 return true;
             }
         }
@@ -381,16 +381,16 @@ 
      * @param DOMNode $dom
      * @return string JS code
      */
-    protected static function getTemplateFakeJs(DOMNode $dom)
+    protected static function getTemplateFakeJs( DOMNode $dom )
     {
         $fakeJs = '';
-        $lines = explode("\n", $dom->textContent);
+        $lines = explode( "\n", $dom->textContent );
 
         // Build a fake JS file from template by extracting JS expressions within each template line
-        foreach ($lines as $line) {
-            $expressionMatched = static::parseOneTemplateLine($line);
+        foreach ( $lines as $line ) {
+            $expressionMatched = static::parseOneTemplateLine( $line );
 
-            $fakeJs .= implode("; ", $expressionMatched) . "\n";
+            $fakeJs .= implode( "; ", $expressionMatched ) . "\n";
         }
 
         return $fakeJs;
@@ -402,21 +402,21 @@ 
      * @param string $line
      * @return string[]
      */
-    protected static function parseOneTemplateLine($line)
+    protected static function parseOneTemplateLine( $line )
     {
-        $line = trim($line);
+        $line = trim( $line );
 
-        if (!$line) {
-            return [];
+        if ( ! $line ) {
+            return [ ];
         }
 
         $regex = '#\{\{(.*?)\}\}#';
 
-        preg_match_all($regex, $line, $matches);
+        preg_match_all( $regex, $line, $matches );
 
-        $matched = array_map(function ($v) {
-            return trim($v, '\'"{}');
-        }, $matches[1]);
+        $matched = array_map( function( $v ) {
+            return trim( $v, '\'"{}' );
+        }, $matches[ 1 ] );
 
         return $matched;
     }

Braces +10 added lines, -20 removed lines

@@ -47,8 +47,7 @@ 
      * @inheritDoc
      * @throws Exception
      */
-    public static function fromFileMultiple($file, array $translations, array $options = [])
-    {
+    public static function fromFileMultiple($file, array $translations, array $options = []) {
         foreach (static::getFiles($file) as $file) {
             $options['file'] = $file;
             static::fromStringMultiple(static::readFile($file), $translations, $options);
@@ -59,8 +58,7 @@ 
      * @inheritdoc
      * @throws Exception
      */
-    public static function fromString($string, Translations $translations, array $options = [])
-    {
+    public static function fromString($string, Translations $translations, array $options = []) {
         static::fromStringMultiple($string, [$translations], $options);
     }
 
@@ -68,8 +66,7 @@ 
      * @inheritDoc
      * @throws Exception
      */
-    public static function fromStringMultiple($string, array $translations, array $options = [])
-    {
+    public static function fromStringMultiple($string, array $translations, array $options = []) {
         $options += static::$options;
         $options += [
             // HTML attribute prefixes we parse as JS which could contain translations (are JS expressions)
@@ -147,8 +144,7 @@ 
      * @param $string
      * @return bool|string
      */
-    protected static function extractScriptTag($string)
-    {
+    protected static function extractScriptTag($string) {
         if (preg_match('#<\s*?script\b[^>]*>(.*?)</script\b[^>]*>#s', $string, $matches)) {
             return $matches[1];
         }
@@ -160,8 +156,7 @@ 
      * @param string $html
      * @return DOMDocument
      */
-    protected static function convertHtmlToDom($html)
-    {
+    protected static function convertHtmlToDom($html) {
         $dom = new DOMDocument;
 
         libxml_use_internal_errors(true);
@@ -229,8 +224,7 @@ 
      * @param DOMNode $dom
      * @param Translations|Translations[] $translations
      */
-    protected static function getTagTranslations(array $options, DOMNode $dom, $translations)
-    {
+    protected static function getTagTranslations(array $options, DOMNode $dom, $translations) {
         // Since tag scanning does not support domains, we always use the first translation given
         $translations = is_array($translations) ? reset($translations) : $translations;
 
@@ -293,8 +287,7 @@ 
      * @param DOMNode $dom
      * @return string JS code
      */
-    protected static function getTemplateAttributeFakeJs(array $options, DOMNode $dom)
-    {
+    protected static function getTemplateAttributeFakeJs(array $options, DOMNode $dom) {
         $expressionsByLine = static::getVueAttributeExpressions($options['attributePrefixes'], $dom);
 
         if (empty($expressionsByLine)) {
@@ -364,8 +357,7 @@ 
      * @param string[] $attributePrefixes
      * @return bool
      */
-    protected static function isAttributeMatching($attributeName, $attributePrefixes)
-    {
+    protected static function isAttributeMatching($attributeName, $attributePrefixes) {
         foreach ($attributePrefixes as $prefix) {
             if (strpos($attributeName, $prefix) === 0) {
                 return true;
@@ -381,8 +373,7 @@ 
      * @param DOMNode $dom
      * @return string JS code
      */
-    protected static function getTemplateFakeJs(DOMNode $dom)
-    {
+    protected static function getTemplateFakeJs(DOMNode $dom) {
         $fakeJs = '';
         $lines = explode("\n", $dom->textContent);
 
@@ -402,8 +393,7 @@ 
      * @param string $line
      * @return string[]
      */
-    protected static function parseOneTemplateLine($line)
-    {
+    protected static function parseOneTemplateLine($line) {
         $line = trim($line);
 
         if (!$line) {

vendor/gettext/gettext/src/Extractors/Extractor.php

Indentation +57 added lines, -57 removed lines

@@ -8,73 +8,73 @@
 
 abstract class Extractor implements ExtractorInterface
 {
-    /**
-     * {@inheritdoc}
-     */
-    public static function fromFile($file, Translations $translations, array $options = [])
-    {
-        foreach (static::getFiles($file) as $file) {
-            $options['file'] = $file;
-            static::fromString(static::readFile($file), $translations, $options);
-        }
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public static function fromFile($file, Translations $translations, array $options = [])
+	{
+		foreach (static::getFiles($file) as $file) {
+			$options['file'] = $file;
+			static::fromString(static::readFile($file), $translations, $options);
+		}
+	}
 
-    /**
-     * Checks and returns all files.
-     *
-     * @param string|array $file The file/s
-     *
-     * @return array The file paths
-     */
-    protected static function getFiles($file)
-    {
-        if (empty($file)) {
-            throw new InvalidArgumentException('There is not any file defined');
-        }
+	/**
+	 * Checks and returns all files.
+	 *
+	 * @param string|array $file The file/s
+	 *
+	 * @return array The file paths
+	 */
+	protected static function getFiles($file)
+	{
+		if (empty($file)) {
+			throw new InvalidArgumentException('There is not any file defined');
+		}
 
-        if (is_string($file)) {
-            if (!is_file($file)) {
-                throw new InvalidArgumentException("'$file' is not a valid file");
-            }
+		if (is_string($file)) {
+			if (!is_file($file)) {
+				throw new InvalidArgumentException("'$file' is not a valid file");
+			}
 
-            if (!is_readable($file)) {
-                throw new InvalidArgumentException("'$file' is not a readable file");
-            }
+			if (!is_readable($file)) {
+				throw new InvalidArgumentException("'$file' is not a readable file");
+			}
 
-            return [$file];
-        }
+			return [$file];
+		}
 
-        if (is_array($file)) {
-            $files = [];
+		if (is_array($file)) {
+			$files = [];
 
-            foreach ($file as $f) {
-                $files = array_merge($files, static::getFiles($f));
-            }
+			foreach ($file as $f) {
+				$files = array_merge($files, static::getFiles($f));
+			}
 
-            return $files;
-        }
+			return $files;
+		}
 
-        throw new InvalidArgumentException('The first argument must be string or array');
-    }
+		throw new InvalidArgumentException('The first argument must be string or array');
+	}
 
-    /**
-     * Reads and returns the content of a file.
-     *
-     * @param string $file
-     *
-     * @return string
-     */
-    protected static function readFile($file)
-    {
-        $length = filesize($file);
+	/**
+	 * Reads and returns the content of a file.
+	 *
+	 * @param string $file
+	 *
+	 * @return string
+	 */
+	protected static function readFile($file)
+	{
+		$length = filesize($file);
 
-        if (!($fd = fopen($file, 'rb'))) {
-            throw new Exception("Cannot read the file '$file', probably permissions");
-        }
+		if (!($fd = fopen($file, 'rb'))) {
+			throw new Exception("Cannot read the file '$file', probably permissions");
+		}
 
-        $content = $length ? fread($fd, $length) : '';
-        fclose($fd);
+		$content = $length ? fread($fd, $length) : '';
+		fclose($fd);
 
-        return $content;
-    }
+		return $content;
+	}
 }

Spacing +24 added lines, -24 removed lines

@@ -11,11 +11,11 @@ 
     /**
      * {@inheritdoc}
      */
-    public static function fromFile($file, Translations $translations, array $options = [])
+    public static function fromFile( $file, Translations $translations, array $options = [ ] )
     {
-        foreach (static::getFiles($file) as $file) {
-            $options['file'] = $file;
-            static::fromString(static::readFile($file), $translations, $options);
+        foreach ( static::getFiles( $file ) as $file ) {
+            $options[ 'file' ] = $file;
+            static::fromString( static::readFile( $file ), $translations, $options );
         }
     }
 
@@ -26,35 +26,35 @@ 
      *
      * @return array The file paths
      */
-    protected static function getFiles($file)
+    protected static function getFiles( $file )
     {
-        if (empty($file)) {
-            throw new InvalidArgumentException('There is not any file defined');
+        if ( empty( $file ) ) {
+            throw new InvalidArgumentException( 'There is not any file defined' );
         }
 
-        if (is_string($file)) {
-            if (!is_file($file)) {
-                throw new InvalidArgumentException("'$file' is not a valid file");
+        if ( is_string( $file ) ) {
+            if ( ! is_file( $file ) ) {
+                throw new InvalidArgumentException( "'$file' is not a valid file" );
             }
 
-            if (!is_readable($file)) {
-                throw new InvalidArgumentException("'$file' is not a readable file");
+            if ( ! is_readable( $file ) ) {
+                throw new InvalidArgumentException( "'$file' is not a readable file" );
             }
 
-            return [$file];
+            return [ $file ];
         }
 
-        if (is_array($file)) {
-            $files = [];
+        if ( is_array( $file ) ) {
+            $files = [ ];
 
-            foreach ($file as $f) {
-                $files = array_merge($files, static::getFiles($f));
+            foreach ( $file as $f ) {
+                $files = array_merge( $files, static::getFiles( $f ) );
             }
 
             return $files;
         }
 
-        throw new InvalidArgumentException('The first argument must be string or array');
+        throw new InvalidArgumentException( 'The first argument must be string or array' );
     }
 
     /**
@@ -64,16 +64,16 @@ 
      *
      * @return string
      */
-    protected static function readFile($file)
+    protected static function readFile( $file )
     {
-        $length = filesize($file);
+        $length = filesize( $file );
 
-        if (!($fd = fopen($file, 'rb'))) {
-            throw new Exception("Cannot read the file '$file', probably permissions");
+        if ( ! ( $fd = fopen( $file, 'rb' ) ) ) {
+            throw new Exception( "Cannot read the file '$file', probably permissions" );
         }
 
-        $content = $length ? fread($fd, $length) : '';
-        fclose($fd);
+        $content = $length ? fread( $fd, $length ) : '';
+        fclose( $fd );
 
         return $content;
     }

Braces +4 added lines, -8 removed lines

@@ -6,13 +6,11 @@ 
 use InvalidArgumentException;
 use Gettext\Translations;
 
-abstract class Extractor implements ExtractorInterface
-{
+abstract class Extractor implements ExtractorInterface {
     /**
      * {@inheritdoc}
      */
-    public static function fromFile($file, Translations $translations, array $options = [])
-    {
+    public static function fromFile($file, Translations $translations, array $options = []) {
         foreach (static::getFiles($file) as $file) {
             $options['file'] = $file;
             static::fromString(static::readFile($file), $translations, $options);
@@ -26,8 +24,7 @@ 
      *
      * @return array The file paths
      */
-    protected static function getFiles($file)
-    {
+    protected static function getFiles($file) {
         if (empty($file)) {
             throw new InvalidArgumentException('There is not any file defined');
         }
@@ -64,8 +61,7 @@ 
      *
      * @return string
      */
-    protected static function readFile($file)
-    {
+    protected static function readFile($file) {
         $length = filesize($file);
 
         if (!($fd = fopen($file, 'rb'))) {

vendor/gettext/gettext/src/Extractors/Json.php

Indentation +11 added lines, -11 removed lines

@@ -10,17 +10,17 @@
  */
 class Json extends Extractor implements ExtractorInterface
 {
-    use MultidimensionalArrayTrait;
+	use MultidimensionalArrayTrait;
 
-    /**
-     * {@inheritdoc}
-     */
-    public static function fromString($string, Translations $translations, array $options = [])
-    {
-        $messages = json_decode($string, true);
+	/**
+	 * {@inheritdoc}
+	 */
+	public static function fromString($string, Translations $translations, array $options = [])
+	{
+		$messages = json_decode($string, true);
 
-        if (is_array($messages)) {
-            static::fromArray($messages, $translations);
-        }
-    }
+		if (is_array($messages)) {
+			static::fromArray($messages, $translations);
+		}
+	}
 }

Braces +2 added lines, -4 removed lines

@@ -8,15 +8,13 @@
 /**
  * Class to get gettext strings from json.
  */
-class Json extends Extractor implements ExtractorInterface
-{
+class Json extends Extractor implements ExtractorInterface {
     use MultidimensionalArrayTrait;
 
     /**
      * {@inheritdoc}
      */
-    public static function fromString($string, Translations $translations, array $options = [])
-    {
+    public static function fromString($string, Translations $translations, array $options = []) {
         $messages = json_decode($string, true);
 
         if (is_array($messages)) {

Spacing +4 added lines, -4 removed lines

@@ -15,12 +15,12 @@
     /**
      * {@inheritdoc}
      */
-    public static function fromString($string, Translations $translations, array $options = [])
+    public static function fromString( $string, Translations $translations, array $options = [ ] )
     {
-        $messages = json_decode($string, true);
+        $messages = json_decode( $string, true );
 
-        if (is_array($messages)) {
-            static::fromArray($messages, $translations);
+        if ( is_array( $messages ) ) {
+            static::fromArray( $messages, $translations );
         }
     }
 }

vendor/gettext/gettext/src/Extractors/Yaml.php

Indentation +11 added lines, -11 removed lines

@@ -11,17 +11,17 @@
  */
 class Yaml extends Extractor implements ExtractorInterface
 {
-    use MultidimensionalArrayTrait;
+	use MultidimensionalArrayTrait;
 
-    /**
-     * {@inheritdoc}
-     */
-    public static function fromString($string, Translations $translations, array $options = [])
-    {
-        $messages = YamlParser::parse($string);
+	/**
+	 * {@inheritdoc}
+	 */
+	public static function fromString($string, Translations $translations, array $options = [])
+	{
+		$messages = YamlParser::parse($string);
 
-        if (is_array($messages)) {
-            static::fromArray($messages, $translations);
-        }
-    }
+		if (is_array($messages)) {
+			static::fromArray($messages, $translations);
+		}
+	}
 }

Braces +2 added lines, -4 removed lines

@@ -9,15 +9,13 @@
 /**
  * Class to get gettext strings from yaml.
  */
-class Yaml extends Extractor implements ExtractorInterface
-{
+class Yaml extends Extractor implements ExtractorInterface {
     use MultidimensionalArrayTrait;
 
     /**
      * {@inheritdoc}
      */
-    public static function fromString($string, Translations $translations, array $options = [])
-    {
+    public static function fromString($string, Translations $translations, array $options = []) {
         $messages = YamlParser::parse($string);
 
         if (is_array($messages)) {

Spacing +4 added lines, -4 removed lines

@@ -16,12 +16,12 @@
     /**
      * {@inheritdoc}
      */
-    public static function fromString($string, Translations $translations, array $options = [])
+    public static function fromString( $string, Translations $translations, array $options = [ ] )
     {
-        $messages = YamlParser::parse($string);
+        $messages = YamlParser::parse( $string );
 
-        if (is_array($messages)) {
-            static::fromArray($messages, $translations);
+        if ( is_array( $messages ) ) {
+            static::fromArray( $messages, $translations );
         }
     }
 }

vendor/gettext/gettext/src/Extractors/ExtractorMultiInterface.php

Indentation +18 added lines, -18 removed lines

@@ -6,23 +6,23 @@
 
 interface ExtractorMultiInterface
 {
-    /**
-     * Parses a string and append the translations found in the Translations instance.
-     * Allows scanning for multiple domains at a time (each Translation has to have a different domain)
-     *
-     * @param string $string
-     * @param Translations[] $translations
-     * @param array $options
-     */
-    public static function fromStringMultiple($string, array $translations, array $options = []);
+	/**
+	 * Parses a string and append the translations found in the Translations instance.
+	 * Allows scanning for multiple domains at a time (each Translation has to have a different domain)
+	 *
+	 * @param string $string
+	 * @param Translations[] $translations
+	 * @param array $options
+	 */
+	public static function fromStringMultiple($string, array $translations, array $options = []);
 
-    /**
-     * Parses a string and append the translations found in the Translations instance.
-     * Allows scanning for multiple domains at a time (each Translation has to have a different domain)
-     *
-     * @param $file
-     * @param Translations[] $translations
-     * @param array $options
-     */
-    public static function fromFileMultiple($file, array $translations, array $options = []);
+	/**
+	 * Parses a string and append the translations found in the Translations instance.
+	 * Allows scanning for multiple domains at a time (each Translation has to have a different domain)
+	 *
+	 * @param $file
+	 * @param Translations[] $translations
+	 * @param array $options
+	 */
+	public static function fromFileMultiple($file, array $translations, array $options = []);
 }

Spacing +2 added lines, -2 removed lines

@@ -14,7 +14,7 @@ 
      * @param Translations[] $translations
      * @param array $options
      */
-    public static function fromStringMultiple($string, array $translations, array $options = []);
+    public static function fromStringMultiple( $string, array $translations, array $options = [ ] );
 
     /**
      * Parses a string and append the translations found in the Translations instance.
@@ -24,5 +24,5 @@ 
      * @param Translations[] $translations
      * @param array $options
      */
-    public static function fromFileMultiple($file, array $translations, array $options = []);
+    public static function fromFileMultiple( $file, array $translations, array $options = [ ] );
 }

Braces +1 added lines, -2 removed lines

@@ -4,8 +4,7 @@
 
 use Gettext\Translations;
 
-interface ExtractorMultiInterface
-{
+interface ExtractorMultiInterface {
     /**
      * Parses a string and append the translations found in the Translations instance.
      * Allows scanning for multiple domains at a time (each Translation has to have a different domain)

vendor/gettext/gettext/src/Translation.php

Indentation +527 added lines, -527 removed lines

@@ -7,531 +7,531 @@
  */
 class Translation
 {
-    protected $id;
-    protected $context;
-    protected $original;
-    protected $translation = '';
-    protected $plural;
-    protected $pluralTranslation = [];
-    protected $references = [];
-    protected $comments = [];
-    protected $extractedComments = [];
-    protected $flags = [];
-    protected $disabled = false;
-
-    /**
-     * Generates the id of a translation (context + glue + original).
-     *
-     * @param string $context
-     * @param string $original
-     *
-     * @return string
-     */
-    public static function generateId($context, $original)
-    {
-        return "{$context}\004{$original}";
-    }
-
-    /**
-     * Create a new instance of a Translation object.
-     *
-     * This is a factory method that will work even when Translation is extended.
-     *
-     * @param string $context  The context of the translation
-     * @param string $original The original string
-     * @param string $plural   The original plural string
-     * @return static New Translation instance
-     */
-    public static function create($context, $original, $plural = '')
-    {
-        return new static($context, $original, $plural);
-    }
-
-    /**
-     * Construct.
-     *
-     * @param string $context  The context of the translation
-     * @param string $original The original string
-     * @param string $plural   The original plural string
-     */
-    public function __construct($context, $original, $plural = '')
-    {
-        $this->context = (string) $context;
-        $this->original = (string) $original;
-
-        $this->setPlural($plural);
-    }
-
-    /**
-     * Clones this translation.
-     *
-     * @param null|string $context  Optional new context
-     * @param null|string $original Optional new original
-     *
-     * @return Translation
-     */
-    public function getClone($context = null, $original = null)
-    {
-        $new = clone $this;
-
-        if ($context !== null) {
-            $new->context = (string) $context;
-        }
-
-        if ($original !== null) {
-            $new->original = (string) $original;
-        }
-
-        return $new;
-    }
-
-    /**
-     * Sets the id of this translation.
-     * @warning The use of this function to set a custom ID will prevent
-     *  Translations::find from matching this translation.
-     *
-     * @param string $id
-     */
-    public function setId($id)
-    {
-        $this->id = $id;
-    }
-
-
-    /**
-     * Returns the id of this translation.
-     *
-     * @return string
-     */
-    public function getId()
-    {
-        if ($this->id === null) {
-            return static::generateId($this->context, $this->original);
-        }
-        return $this->id;
-    }
-
-    /**
-     * Checks whether the translation matches with the arguments.
-     *
-     * @param string $context
-     * @param string $original
-     *
-     * @return bool
-     */
-    public function is($context, $original = '')
-    {
-        return (($this->context === $context) && ($this->original === $original)) ? true : false;
-    }
-
-    /**
-     * Enable or disable the translation
-     *
-     * @param bool $disabled
-     *
-     * @return self
-     */
-    public function setDisabled($disabled)
-    {
-        $this->disabled = (bool) $disabled;
-
-        return $this;
-    }
-
-    /**
-     * Returns whether the translation is disabled
-     *
-     * @return bool
-     */
-    public function isDisabled()
-    {
-        return $this->disabled;
-    }
-
-    /**
-     * Gets the original string.
-     *
-     * @return string
-     */
-    public function getOriginal()
-    {
-        return $this->original;
-    }
-
-    /**
-     * Checks if the original string is empty or not.
-     *
-     * @return bool
-     */
-    public function hasOriginal()
-    {
-        return ($this->original !== '') ? true : false;
-    }
-
-    /**
-     * Sets the translation string.
-     *
-     * @param string $translation
-     *
-     * @return self
-     */
-    public function setTranslation($translation)
-    {
-        $this->translation = (string) $translation;
-
-        return $this;
-    }
-
-    /**
-     * Gets the translation string.
-     *
-     * @return string
-     */
-    public function getTranslation()
-    {
-        return $this->translation;
-    }
-
-    /**
-     * Checks if the translation string is empty or not.
-     *
-     * @return bool
-     */
-    public function hasTranslation()
-    {
-        return ($this->translation !== '') ? true : false;
-    }
-
-    /**
-     * Sets the plural translation string.
-     *
-     * @param string $plural
-     *
-     * @return self
-     */
-    public function setPlural($plural)
-    {
-        $this->plural = (string) $plural;
-
-        return $this;
-    }
-
-    /**
-     * Gets the plural translation string.
-     *
-     * @return string
-     */
-    public function getPlural()
-    {
-        return $this->plural;
-    }
-
-    /**
-     * Checks if the plural translation string is empty or not.
-     *
-     * @return bool
-     */
-    public function hasPlural()
-    {
-        return ($this->plural !== '') ? true : false;
-    }
-
-    /**
-     * Set a new plural translation.
-     *
-     * @param array $plural
-     *
-     * @return self
-     */
-    public function setPluralTranslations(array $plural)
-    {
-        $this->pluralTranslation = $plural;
-
-        return $this;
-    }
-
-    /**
-     * Gets all plural translations.
-     *
-     * @param int $size
-     *
-     * @return array
-     */
-    public function getPluralTranslations($size = null)
-    {
-        if ($size === null) {
-            return $this->pluralTranslation;
-        }
-
-        $current = count($this->pluralTranslation);
-
-        if ($size > $current) {
-            return $this->pluralTranslation + array_fill(0, $size, '');
-        }
-
-        if ($size < $current) {
-            return array_slice($this->pluralTranslation, 0, $size);
-        }
-
-        return $this->pluralTranslation;
-    }
-
-    /**
-     * Checks if there are any plural translation.
-     *
-     * @param bool $checkContent
-     *
-     * @return bool
-     */
-    public function hasPluralTranslations($checkContent = false)
-    {
-        if ($checkContent) {
-            return implode('', $this->pluralTranslation) !== '';
-        }
-
-        return !empty($this->pluralTranslation);
-    }
-
-    /**
-     * Removes all plural translations.
-     *
-     * @return self
-     */
-    public function deletePluralTranslation()
-    {
-        $this->pluralTranslation = [];
-
-        return $this;
-    }
-
-    /**
-     * Gets the context of this translation.
-     *
-     * @return string
-     */
-    public function getContext()
-    {
-        return $this->context;
-    }
-
-    /**
-     * Checks if the context is empty or not.
-     *
-     * @return bool
-     */
-    public function hasContext()
-    {
-        return (isset($this->context) && ($this->context !== '')) ? true : false;
-    }
-
-    /**
-     * Adds a new reference for this translation.
-     *
-     * @param string   $filename The file path where the translation has been found
-     * @param null|int $line     The line number where the translation has been found
-     *
-     * @return self
-     */
-    public function addReference($filename, $line = null)
-    {
-        $key = "{$filename}:{$line}";
-        $this->references[$key] = [$filename, $line];
-
-        return $this;
-    }
-
-    /**
-     * Checks if the translation has any reference.
-     *
-     * @return bool
-     */
-    public function hasReferences()
-    {
-        return !empty($this->references);
-    }
-
-    /**
-     * Return all references for this translation.
-     *
-     * @return array
-     */
-    public function getReferences()
-    {
-        return array_values($this->references);
-    }
-
-    /**
-     * Removes all references.
-     *
-     * @return self
-     */
-    public function deleteReferences()
-    {
-        $this->references = [];
-
-        return $this;
-    }
-
-    /**
-     * Adds a new comment for this translation.
-     *
-     * @param string $comment
-     *
-     * @return self
-     */
-    public function addComment($comment)
-    {
-        if (!in_array($comment, $this->comments, true)) {
-            $this->comments[] = $comment;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Checks if the translation has any comment.
-     *
-     * @return bool
-     */
-    public function hasComments()
-    {
-        return isset($this->comments[0]);
-    }
-
-    /**
-     * Returns all comments for this translation.
-     *
-     * @return array
-     */
-    public function getComments()
-    {
-        return $this->comments;
-    }
-
-    /**
-     * Removes all comments.
-     *
-     * @return self
-     */
-    public function deleteComments()
-    {
-        $this->comments = [];
-
-        return $this;
-    }
-
-    /**
-     * Adds a new extracted comment for this translation.
-     *
-     * @param string $comment
-     *
-     * @return self
-     */
-    public function addExtractedComment($comment)
-    {
-        if (!in_array($comment, $this->extractedComments, true)) {
-            $this->extractedComments[] = $comment;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Checks if the translation has any extracted comment.
-     *
-     * @return bool
-     */
-    public function hasExtractedComments()
-    {
-        return isset($this->extractedComments[0]);
-    }
-
-    /**
-     * Returns all extracted comments for this translation.
-     *
-     * @return array
-     */
-    public function getExtractedComments()
-    {
-        return $this->extractedComments;
-    }
-
-    /**
-     * Removes all extracted comments.
-     *
-     * @return self
-     */
-    public function deleteExtractedComments()
-    {
-        $this->extractedComments = [];
-
-        return $this;
-    }
-
-    /**
-     * Adds a new flag for this translation.
-     *
-     * @param string $flag
-     *
-     * @return self
-     */
-    public function addFlag($flag)
-    {
-        if (!in_array($flag, $this->flags, true)) {
-            $this->flags[] = $flag;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Checks if the translation has any flag.
-     *
-     * @return bool
-     */
-    public function hasFlags()
-    {
-        return isset($this->flags[0]);
-    }
-
-    /**
-     * Returns all extracted flags for this translation.
-     *
-     * @return array
-     */
-    public function getFlags()
-    {
-        return $this->flags;
-    }
-
-    /**
-     * Removes all flags.
-     *
-     * @return self
-     */
-    public function deleteFlags()
-    {
-        $this->flags = [];
-
-        return $this;
-    }
-
-    /**
-     * Merges this translation with other translation.
-     *
-     * @param Translation $translation The translation to merge with
-     * @param int         $options
-     *
-     * @return self
-     */
-    public function mergeWith(Translation $translation, $options = Merge::DEFAULTS)
-    {
-        Merge::mergeTranslation($translation, $this, $options);
-        Merge::mergeReferences($translation, $this, $options);
-        Merge::mergeComments($translation, $this, $options);
-        Merge::mergeExtractedComments($translation, $this, $options);
-        Merge::mergeFlags($translation, $this, $options);
-
-        return $this;
-    }
+	protected $id;
+	protected $context;
+	protected $original;
+	protected $translation = '';
+	protected $plural;
+	protected $pluralTranslation = [];
+	protected $references = [];
+	protected $comments = [];
+	protected $extractedComments = [];
+	protected $flags = [];
+	protected $disabled = false;
+
+	/**
+	 * Generates the id of a translation (context + glue + original).
+	 *
+	 * @param string $context
+	 * @param string $original
+	 *
+	 * @return string
+	 */
+	public static function generateId($context, $original)
+	{
+		return "{$context}\004{$original}";
+	}
+
+	/**
+	 * Create a new instance of a Translation object.
+	 *
+	 * This is a factory method that will work even when Translation is extended.
+	 *
+	 * @param string $context  The context of the translation
+	 * @param string $original The original string
+	 * @param string $plural   The original plural string
+	 * @return static New Translation instance
+	 */
+	public static function create($context, $original, $plural = '')
+	{
+		return new static($context, $original, $plural);
+	}
+
+	/**
+	 * Construct.
+	 *
+	 * @param string $context  The context of the translation
+	 * @param string $original The original string
+	 * @param string $plural   The original plural string
+	 */
+	public function __construct($context, $original, $plural = '')
+	{
+		$this->context = (string) $context;
+		$this->original = (string) $original;
+
+		$this->setPlural($plural);
+	}
+
+	/**
+	 * Clones this translation.
+	 *
+	 * @param null|string $context  Optional new context
+	 * @param null|string $original Optional new original
+	 *
+	 * @return Translation
+	 */
+	public function getClone($context = null, $original = null)
+	{
+		$new = clone $this;
+
+		if ($context !== null) {
+			$new->context = (string) $context;
+		}
+
+		if ($original !== null) {
+			$new->original = (string) $original;
+		}
+
+		return $new;
+	}
+
+	/**
+	 * Sets the id of this translation.
+	 * @warning The use of this function to set a custom ID will prevent
+	 *  Translations::find from matching this translation.
+	 *
+	 * @param string $id
+	 */
+	public function setId($id)
+	{
+		$this->id = $id;
+	}
+
+
+	/**
+	 * Returns the id of this translation.
+	 *
+	 * @return string
+	 */
+	public function getId()
+	{
+		if ($this->id === null) {
+			return static::generateId($this->context, $this->original);
+		}
+		return $this->id;
+	}
+
+	/**
+	 * Checks whether the translation matches with the arguments.
+	 *
+	 * @param string $context
+	 * @param string $original
+	 *
+	 * @return bool
+	 */
+	public function is($context, $original = '')
+	{
+		return (($this->context === $context) && ($this->original === $original)) ? true : false;
+	}
+
+	/**
+	 * Enable or disable the translation
+	 *
+	 * @param bool $disabled
+	 *
+	 * @return self
+	 */
+	public function setDisabled($disabled)
+	{
+		$this->disabled = (bool) $disabled;
+
+		return $this;
+	}
+
+	/**
+	 * Returns whether the translation is disabled
+	 *
+	 * @return bool
+	 */
+	public function isDisabled()
+	{
+		return $this->disabled;
+	}
+
+	/**
+	 * Gets the original string.
+	 *
+	 * @return string
+	 */
+	public function getOriginal()
+	{
+		return $this->original;
+	}
+
+	/**
+	 * Checks if the original string is empty or not.
+	 *
+	 * @return bool
+	 */
+	public function hasOriginal()
+	{
+		return ($this->original !== '') ? true : false;
+	}
+
+	/**
+	 * Sets the translation string.
+	 *
+	 * @param string $translation
+	 *
+	 * @return self
+	 */
+	public function setTranslation($translation)
+	{
+		$this->translation = (string) $translation;
+
+		return $this;
+	}
+
+	/**
+	 * Gets the translation string.
+	 *
+	 * @return string
+	 */
+	public function getTranslation()
+	{
+		return $this->translation;
+	}
+
+	/**
+	 * Checks if the translation string is empty or not.
+	 *
+	 * @return bool
+	 */
+	public function hasTranslation()
+	{
+		return ($this->translation !== '') ? true : false;
+	}
+
+	/**
+	 * Sets the plural translation string.
+	 *
+	 * @param string $plural
+	 *
+	 * @return self
+	 */
+	public function setPlural($plural)
+	{
+		$this->plural = (string) $plural;
+
+		return $this;
+	}
+
+	/**
+	 * Gets the plural translation string.
+	 *
+	 * @return string
+	 */
+	public function getPlural()
+	{
+		return $this->plural;
+	}
+
+	/**
+	 * Checks if the plural translation string is empty or not.
+	 *
+	 * @return bool
+	 */
+	public function hasPlural()
+	{
+		return ($this->plural !== '') ? true : false;
+	}
+
+	/**
+	 * Set a new plural translation.
+	 *
+	 * @param array $plural
+	 *
+	 * @return self
+	 */
+	public function setPluralTranslations(array $plural)
+	{
+		$this->pluralTranslation = $plural;
+
+		return $this;
+	}
+
+	/**
+	 * Gets all plural translations.
+	 *
+	 * @param int $size
+	 *
+	 * @return array
+	 */
+	public function getPluralTranslations($size = null)
+	{
+		if ($size === null) {
+			return $this->pluralTranslation;
+		}
+
+		$current = count($this->pluralTranslation);
+
+		if ($size > $current) {
+			return $this->pluralTranslation + array_fill(0, $size, '');
+		}
+
+		if ($size < $current) {
+			return array_slice($this->pluralTranslation, 0, $size);
+		}
+
+		return $this->pluralTranslation;
+	}
+
+	/**
+	 * Checks if there are any plural translation.
+	 *
+	 * @param bool $checkContent
+	 *
+	 * @return bool
+	 */
+	public function hasPluralTranslations($checkContent = false)
+	{
+		if ($checkContent) {
+			return implode('', $this->pluralTranslation) !== '';
+		}
+
+		return !empty($this->pluralTranslation);
+	}
+
+	/**
+	 * Removes all plural translations.
+	 *
+	 * @return self
+	 */
+	public function deletePluralTranslation()
+	{
+		$this->pluralTranslation = [];
+
+		return $this;
+	}
+
+	/**
+	 * Gets the context of this translation.
+	 *
+	 * @return string
+	 */
+	public function getContext()
+	{
+		return $this->context;
+	}
+
+	/**
+	 * Checks if the context is empty or not.
+	 *
+	 * @return bool
+	 */
+	public function hasContext()
+	{
+		return (isset($this->context) && ($this->context !== '')) ? true : false;
+	}
+
+	/**
+	 * Adds a new reference for this translation.
+	 *
+	 * @param string   $filename The file path where the translation has been found
+	 * @param null|int $line     The line number where the translation has been found
+	 *
+	 * @return self
+	 */
+	public function addReference($filename, $line = null)
+	{
+		$key = "{$filename}:{$line}";
+		$this->references[$key] = [$filename, $line];
+
+		return $this;
+	}
+
+	/**
+	 * Checks if the translation has any reference.
+	 *
+	 * @return bool
+	 */
+	public function hasReferences()
+	{
+		return !empty($this->references);
+	}
+
+	/**
+	 * Return all references for this translation.
+	 *
+	 * @return array
+	 */
+	public function getReferences()
+	{
+		return array_values($this->references);
+	}
+
+	/**
+	 * Removes all references.
+	 *
+	 * @return self
+	 */
+	public function deleteReferences()
+	{
+		$this->references = [];
+
+		return $this;
+	}
+
+	/**
+	 * Adds a new comment for this translation.
+	 *
+	 * @param string $comment
+	 *
+	 * @return self
+	 */
+	public function addComment($comment)
+	{
+		if (!in_array($comment, $this->comments, true)) {
+			$this->comments[] = $comment;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Checks if the translation has any comment.
+	 *
+	 * @return bool
+	 */
+	public function hasComments()
+	{
+		return isset($this->comments[0]);
+	}
+
+	/**
+	 * Returns all comments for this translation.
+	 *
+	 * @return array
+	 */
+	public function getComments()
+	{
+		return $this->comments;
+	}
+
+	/**
+	 * Removes all comments.
+	 *
+	 * @return self
+	 */
+	public function deleteComments()
+	{
+		$this->comments = [];
+
+		return $this;
+	}
+
+	/**
+	 * Adds a new extracted comment for this translation.
+	 *
+	 * @param string $comment
+	 *
+	 * @return self
+	 */
+	public function addExtractedComment($comment)
+	{
+		if (!in_array($comment, $this->extractedComments, true)) {
+			$this->extractedComments[] = $comment;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Checks if the translation has any extracted comment.
+	 *
+	 * @return bool
+	 */
+	public function hasExtractedComments()
+	{
+		return isset($this->extractedComments[0]);
+	}
+
+	/**
+	 * Returns all extracted comments for this translation.
+	 *
+	 * @return array
+	 */
+	public function getExtractedComments()
+	{
+		return $this->extractedComments;
+	}
+
+	/**
+	 * Removes all extracted comments.
+	 *
+	 * @return self
+	 */
+	public function deleteExtractedComments()
+	{
+		$this->extractedComments = [];
+
+		return $this;
+	}
+
+	/**
+	 * Adds a new flag for this translation.
+	 *
+	 * @param string $flag
+	 *
+	 * @return self
+	 */
+	public function addFlag($flag)
+	{
+		if (!in_array($flag, $this->flags, true)) {
+			$this->flags[] = $flag;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Checks if the translation has any flag.
+	 *
+	 * @return bool
+	 */
+	public function hasFlags()
+	{
+		return isset($this->flags[0]);
+	}
+
+	/**
+	 * Returns all extracted flags for this translation.
+	 *
+	 * @return array
+	 */
+	public function getFlags()
+	{
+		return $this->flags;
+	}
+
+	/**
+	 * Removes all flags.
+	 *
+	 * @return self
+	 */
+	public function deleteFlags()
+	{
+		$this->flags = [];
+
+		return $this;
+	}
+
+	/**
+	 * Merges this translation with other translation.
+	 *
+	 * @param Translation $translation The translation to merge with
+	 * @param int         $options
+	 *
+	 * @return self
+	 */
+	public function mergeWith(Translation $translation, $options = Merge::DEFAULTS)
+	{
+		Merge::mergeTranslation($translation, $this, $options);
+		Merge::mergeReferences($translation, $this, $options);
+		Merge::mergeComments($translation, $this, $options);
+		Merge::mergeExtractedComments($translation, $this, $options);
+		Merge::mergeFlags($translation, $this, $options);
+
+		return $this;
+	}
 }

Spacing +71 added lines, -71 removed lines

@@ -12,11 +12,11 @@ 
     protected $original;
     protected $translation = '';
     protected $plural;
-    protected $pluralTranslation = [];
-    protected $references = [];
-    protected $comments = [];
-    protected $extractedComments = [];
-    protected $flags = [];
+    protected $pluralTranslation = [ ];
+    protected $references = [ ];
+    protected $comments = [ ];
+    protected $extractedComments = [ ];
+    protected $flags = [ ];
     protected $disabled = false;
 
     /**
@@ -27,7 +27,7 @@ 
      *
      * @return string
      */
-    public static function generateId($context, $original)
+    public static function generateId( $context, $original )
     {
         return "{$context}\004{$original}";
     }
@@ -42,9 +42,9 @@ 
      * @param string $plural   The original plural string
      * @return static New Translation instance
      */
-    public static function create($context, $original, $plural = '')
+    public static function create( $context, $original, $plural = '' )
     {
-        return new static($context, $original, $plural);
+        return new static( $context, $original, $plural );
     }
 
     /**
@@ -54,12 +54,12 @@ 
      * @param string $original The original string
      * @param string $plural   The original plural string
      */
-    public function __construct($context, $original, $plural = '')
+    public function __construct( $context, $original, $plural = '' )
     {
-        $this->context = (string) $context;
-        $this->original = (string) $original;
+        $this->context = (string)$context;
+        $this->original = (string)$original;
 
-        $this->setPlural($plural);
+        $this->setPlural( $plural );
     }
 
     /**
@@ -70,16 +70,16 @@ 
      *
      * @return Translation
      */
-    public function getClone($context = null, $original = null)
+    public function getClone( $context = null, $original = null )
     {
         $new = clone $this;
 
-        if ($context !== null) {
-            $new->context = (string) $context;
+        if ( $context !== null ) {
+            $new->context = (string)$context;
         }
 
-        if ($original !== null) {
-            $new->original = (string) $original;
+        if ( $original !== null ) {
+            $new->original = (string)$original;
         }
 
         return $new;
@@ -92,7 +92,7 @@ 
      *
      * @param string $id
      */
-    public function setId($id)
+    public function setId( $id )
     {
         $this->id = $id;
     }
@@ -105,8 +105,8 @@ 
      */
     public function getId()
     {
-        if ($this->id === null) {
-            return static::generateId($this->context, $this->original);
+        if ( $this->id === null ) {
+            return static::generateId( $this->context, $this->original );
         }
         return $this->id;
     }
@@ -119,9 +119,9 @@ 
      *
      * @return bool
      */
-    public function is($context, $original = '')
+    public function is( $context, $original = '' )
     {
-        return (($this->context === $context) && ($this->original === $original)) ? true : false;
+        return ( ( $this->context === $context ) && ( $this->original === $original ) ) ? true : false;
     }
 
     /**
@@ -131,9 +131,9 @@ 
      *
      * @return self
      */
-    public function setDisabled($disabled)
+    public function setDisabled( $disabled )
     {
-        $this->disabled = (bool) $disabled;
+        $this->disabled = (bool)$disabled;
 
         return $this;
     }
@@ -165,7 +165,7 @@ 
      */
     public function hasOriginal()
     {
-        return ($this->original !== '') ? true : false;
+        return ( $this->original !== '' ) ? true : false;
     }
 
     /**
@@ -175,9 +175,9 @@ 
      *
      * @return self
      */
-    public function setTranslation($translation)
+    public function setTranslation( $translation )
     {
-        $this->translation = (string) $translation;
+        $this->translation = (string)$translation;
 
         return $this;
     }
@@ -199,7 +199,7 @@ 
      */
     public function hasTranslation()
     {
-        return ($this->translation !== '') ? true : false;
+        return ( $this->translation !== '' ) ? true : false;
     }
 
     /**
@@ -209,9 +209,9 @@ 
      *
      * @return self
      */
-    public function setPlural($plural)
+    public function setPlural( $plural )
     {
-        $this->plural = (string) $plural;
+        $this->plural = (string)$plural;
 
         return $this;
     }
@@ -233,7 +233,7 @@ 
      */
     public function hasPlural()
     {
-        return ($this->plural !== '') ? true : false;
+        return ( $this->plural !== '' ) ? true : false;
     }
 
     /**
@@ -243,7 +243,7 @@ 
      *
      * @return self
      */
-    public function setPluralTranslations(array $plural)
+    public function setPluralTranslations( array $plural )
     {
         $this->pluralTranslation = $plural;
 
@@ -257,20 +257,20 @@ 
      *
      * @return array
      */
-    public function getPluralTranslations($size = null)
+    public function getPluralTranslations( $size = null )
     {
-        if ($size === null) {
+        if ( $size === null ) {
             return $this->pluralTranslation;
         }
 
-        $current = count($this->pluralTranslation);
+        $current = count( $this->pluralTranslation );
 
-        if ($size > $current) {
-            return $this->pluralTranslation + array_fill(0, $size, '');
+        if ( $size > $current ) {
+            return $this->pluralTranslation + array_fill( 0, $size, '' );
         }
 
-        if ($size < $current) {
-            return array_slice($this->pluralTranslation, 0, $size);
+        if ( $size < $current ) {
+            return array_slice( $this->pluralTranslation, 0, $size );
         }
 
         return $this->pluralTranslation;
@@ -283,13 +283,13 @@ 
      *
      * @return bool
      */
-    public function hasPluralTranslations($checkContent = false)
+    public function hasPluralTranslations( $checkContent = false )
     {
-        if ($checkContent) {
-            return implode('', $this->pluralTranslation) !== '';
+        if ( $checkContent ) {
+            return implode( '', $this->pluralTranslation ) !== '';
         }
 
-        return !empty($this->pluralTranslation);
+        return ! empty( $this->pluralTranslation );
     }
 
     /**
@@ -299,7 +299,7 @@ 
      */
     public function deletePluralTranslation()
     {
-        $this->pluralTranslation = [];
+        $this->pluralTranslation = [ ];
 
         return $this;
     }
@@ -321,7 +321,7 @@ 
      */
     public function hasContext()
     {
-        return (isset($this->context) && ($this->context !== '')) ? true : false;
+        return ( isset( $this->context ) && ( $this->context !== '' ) ) ? true : false;
     }
 
     /**
@@ -332,10 +332,10 @@ 
      *
      * @return self
      */
-    public function addReference($filename, $line = null)
+    public function addReference( $filename, $line = null )
     {
         $key = "{$filename}:{$line}";
-        $this->references[$key] = [$filename, $line];
+        $this->references[ $key ] = [ $filename, $line ];
 
         return $this;
     }
@@ -347,7 +347,7 @@ 
      */
     public function hasReferences()
     {
-        return !empty($this->references);
+        return ! empty( $this->references );
     }
 
     /**
@@ -357,7 +357,7 @@ 
      */
     public function getReferences()
     {
-        return array_values($this->references);
+        return array_values( $this->references );
     }
 
     /**
@@ -367,7 +367,7 @@ 
      */
     public function deleteReferences()
     {
-        $this->references = [];
+        $this->references = [ ];
 
         return $this;
     }
@@ -379,10 +379,10 @@ 
      *
      * @return self
      */
-    public function addComment($comment)
+    public function addComment( $comment )
     {
-        if (!in_array($comment, $this->comments, true)) {
-            $this->comments[] = $comment;
+        if ( ! in_array( $comment, $this->comments, true ) ) {
+            $this->comments[ ] = $comment;
         }
 
         return $this;
@@ -395,7 +395,7 @@ 
      */
     public function hasComments()
     {
-        return isset($this->comments[0]);
+        return isset( $this->comments[ 0 ] );
     }
 
     /**
@@ -415,7 +415,7 @@ 
      */
     public function deleteComments()
     {
-        $this->comments = [];
+        $this->comments = [ ];
 
         return $this;
     }
@@ -427,10 +427,10 @@ 
      *
      * @return self
      */
-    public function addExtractedComment($comment)
+    public function addExtractedComment( $comment )
     {
-        if (!in_array($comment, $this->extractedComments, true)) {
-            $this->extractedComments[] = $comment;
+        if ( ! in_array( $comment, $this->extractedComments, true ) ) {
+            $this->extractedComments[ ] = $comment;
         }
 
         return $this;
@@ -443,7 +443,7 @@ 
      */
     public function hasExtractedComments()
     {
-        return isset($this->extractedComments[0]);
+        return isset( $this->extractedComments[ 0 ] );
     }
 
     /**
@@ -463,7 +463,7 @@ 
      */
     public function deleteExtractedComments()
     {
-        $this->extractedComments = [];
+        $this->extractedComments = [ ];
 
         return $this;
     }
@@ -475,10 +475,10 @@ 
      *
      * @return self
      */
-    public function addFlag($flag)
+    public function addFlag( $flag )
     {
-        if (!in_array($flag, $this->flags, true)) {
-            $this->flags[] = $flag;
+        if ( ! in_array( $flag, $this->flags, true ) ) {
+            $this->flags[ ] = $flag;
         }
 
         return $this;
@@ -491,7 +491,7 @@ 
      */
     public function hasFlags()
     {
-        return isset($this->flags[0]);
+        return isset( $this->flags[ 0 ] );
     }
 
     /**
@@ -511,7 +511,7 @@ 
      */
     public function deleteFlags()
     {
-        $this->flags = [];
+        $this->flags = [ ];
 
         return $this;
     }
@@ -524,13 +524,13 @@ 
      *
      * @return self
      */
-    public function mergeWith(Translation $translation, $options = Merge::DEFAULTS)
+    public function mergeWith( Translation $translation, $options = Merge::DEFAULTS )
     {
-        Merge::mergeTranslation($translation, $this, $options);
-        Merge::mergeReferences($translation, $this, $options);
-        Merge::mergeComments($translation, $this, $options);
-        Merge::mergeExtractedComments($translation, $this, $options);
-        Merge::mergeFlags($translation, $this, $options);
+        Merge::mergeTranslation( $translation, $this, $options );
+        Merge::mergeReferences( $translation, $this, $options );
+        Merge::mergeComments( $translation, $this, $options );
+        Merge::mergeExtractedComments( $translation, $this, $options );
+        Merge::mergeFlags( $translation, $this, $options );
 
         return $this;
     }

Braces +41 added lines, -82 removed lines

@@ -5,8 +5,7 @@ 
 /**
  * Class to manage a translation string.
  */
-class Translation
-{
+class Translation {
     protected $id;
     protected $context;
     protected $original;
@@ -27,8 +26,7 @@ 
      *
      * @return string
      */
-    public static function generateId($context, $original)
-    {
+    public static function generateId($context, $original) {
         return "{$context}\004{$original}";
     }
 
@@ -42,8 +40,7 @@ 
      * @param string $plural   The original plural string
      * @return static New Translation instance
      */
-    public static function create($context, $original, $plural = '')
-    {
+    public static function create($context, $original, $plural = '') {
         return new static($context, $original, $plural);
     }
 
@@ -54,8 +51,7 @@ 
      * @param string $original The original string
      * @param string $plural   The original plural string
      */
-    public function __construct($context, $original, $plural = '')
-    {
+    public function __construct($context, $original, $plural = '') {
         $this->context = (string) $context;
         $this->original = (string) $original;
 
@@ -70,8 +66,7 @@ 
      *
      * @return Translation
      */
-    public function getClone($context = null, $original = null)
-    {
+    public function getClone($context = null, $original = null) {
         $new = clone $this;
 
         if ($context !== null) {
@@ -92,8 +87,7 @@ 
      *
      * @param string $id
      */
-    public function setId($id)
-    {
+    public function setId($id) {
         $this->id = $id;
     }
 
@@ -103,8 +97,7 @@ 
      *
      * @return string
      */
-    public function getId()
-    {
+    public function getId() {
         if ($this->id === null) {
             return static::generateId($this->context, $this->original);
         }
@@ -119,8 +112,7 @@ 
      *
      * @return bool
      */
-    public function is($context, $original = '')
-    {
+    public function is($context, $original = '') {
         return (($this->context === $context) && ($this->original === $original)) ? true : false;
     }
 
@@ -131,8 +123,7 @@ 
      *
      * @return self
      */
-    public function setDisabled($disabled)
-    {
+    public function setDisabled($disabled) {
         $this->disabled = (bool) $disabled;
 
         return $this;
@@ -143,8 +134,7 @@ 
      *
      * @return bool
      */
-    public function isDisabled()
-    {
+    public function isDisabled() {
         return $this->disabled;
     }
 
@@ -153,8 +143,7 @@ 
      *
      * @return string
      */
-    public function getOriginal()
-    {
+    public function getOriginal() {
         return $this->original;
     }
 
@@ -163,8 +152,7 @@ 
      *
      * @return bool
      */
-    public function hasOriginal()
-    {
+    public function hasOriginal() {
         return ($this->original !== '') ? true : false;
     }
 
@@ -175,8 +163,7 @@ 
      *
      * @return self
      */
-    public function setTranslation($translation)
-    {
+    public function setTranslation($translation) {
         $this->translation = (string) $translation;
 
         return $this;
@@ -187,8 +174,7 @@ 
      *
      * @return string
      */
-    public function getTranslation()
-    {
+    public function getTranslation() {
         return $this->translation;
     }
 
@@ -197,8 +183,7 @@ 
      *
      * @return bool
      */
-    public function hasTranslation()
-    {
+    public function hasTranslation() {
         return ($this->translation !== '') ? true : false;
     }
 
@@ -209,8 +194,7 @@ 
      *
      * @return self
      */
-    public function setPlural($plural)
-    {
+    public function setPlural($plural) {
         $this->plural = (string) $plural;
 
         return $this;
@@ -221,8 +205,7 @@ 
      *
      * @return string
      */
-    public function getPlural()
-    {
+    public function getPlural() {
         return $this->plural;
     }
 
@@ -231,8 +214,7 @@ 
      *
      * @return bool
      */
-    public function hasPlural()
-    {
+    public function hasPlural() {
         return ($this->plural !== '') ? true : false;
     }
 
@@ -243,8 +225,7 @@ 
      *
      * @return self
      */
-    public function setPluralTranslations(array $plural)
-    {
+    public function setPluralTranslations(array $plural) {
         $this->pluralTranslation = $plural;
 
         return $this;
@@ -257,8 +238,7 @@ 
      *
      * @return array
      */
-    public function getPluralTranslations($size = null)
-    {
+    public function getPluralTranslations($size = null) {
         if ($size === null) {
             return $this->pluralTranslation;
         }
@@ -283,8 +263,7 @@ 
      *
      * @return bool
      */
-    public function hasPluralTranslations($checkContent = false)
-    {
+    public function hasPluralTranslations($checkContent = false) {
         if ($checkContent) {
             return implode('', $this->pluralTranslation) !== '';
         }
@@ -297,8 +276,7 @@ 
      *
      * @return self
      */
-    public function deletePluralTranslation()
-    {
+    public function deletePluralTranslation() {
         $this->pluralTranslation = [];
 
         return $this;
@@ -309,8 +287,7 @@ 
      *
      * @return string
      */
-    public function getContext()
-    {
+    public function getContext() {
         return $this->context;
     }
 
@@ -319,8 +296,7 @@ 
      *
      * @return bool
      */
-    public function hasContext()
-    {
+    public function hasContext() {
         return (isset($this->context) && ($this->context !== '')) ? true : false;
     }
 
@@ -332,8 +308,7 @@ 
      *
      * @return self
      */
-    public function addReference($filename, $line = null)
-    {
+    public function addReference($filename, $line = null) {
         $key = "{$filename}:{$line}";
         $this->references[$key] = [$filename, $line];
 
@@ -345,8 +320,7 @@ 
      *
      * @return bool
      */
-    public function hasReferences()
-    {
+    public function hasReferences() {
         return !empty($this->references);
     }
 
@@ -355,8 +329,7 @@ 
      *
      * @return array
      */
-    public function getReferences()
-    {
+    public function getReferences() {
         return array_values($this->references);
     }
 
@@ -365,8 +338,7 @@ 
      *
      * @return self
      */
-    public function deleteReferences()
-    {
+    public function deleteReferences() {
         $this->references = [];
 
         return $this;
@@ -379,8 +351,7 @@ 
      *
      * @return self
      */
-    public function addComment($comment)
-    {
+    public function addComment($comment) {
         if (!in_array($comment, $this->comments, true)) {
             $this->comments[] = $comment;
         }
@@ -393,8 +364,7 @@ 
      *
      * @return bool
      */
-    public function hasComments()
-    {
+    public function hasComments() {
         return isset($this->comments[0]);
     }
 
@@ -403,8 +373,7 @@ 
      *
      * @return array
      */
-    public function getComments()
-    {
+    public function getComments() {
         return $this->comments;
     }
 
@@ -413,8 +382,7 @@ 
      *
      * @return self
      */
-    public function deleteComments()
-    {
+    public function deleteComments() {
         $this->comments = [];
 
         return $this;
@@ -427,8 +395,7 @@ 
      *
      * @return self
      */
-    public function addExtractedComment($comment)
-    {
+    public function addExtractedComment($comment) {
         if (!in_array($comment, $this->extractedComments, true)) {
             $this->extractedComments[] = $comment;
         }
@@ -441,8 +408,7 @@ 
      *
      * @return bool
      */
-    public function hasExtractedComments()
-    {
+    public function hasExtractedComments() {
         return isset($this->extractedComments[0]);
     }
 
@@ -451,8 +417,7 @@ 
      *
      * @return array
      */
-    public function getExtractedComments()
-    {
+    public function getExtractedComments() {
         return $this->extractedComments;
     }
 
@@ -461,8 +426,7 @@ 
      *
      * @return self
      */
-    public function deleteExtractedComments()
-    {
+    public function deleteExtractedComments() {
         $this->extractedComments = [];
 
         return $this;
@@ -475,8 +439,7 @@ 
      *
      * @return self
      */
-    public function addFlag($flag)
-    {
+    public function addFlag($flag) {
         if (!in_array($flag, $this->flags, true)) {
             $this->flags[] = $flag;
         }
@@ -489,8 +452,7 @@ 
      *
      * @return bool
      */
-    public function hasFlags()
-    {
+    public function hasFlags() {
         return isset($this->flags[0]);
     }
 
@@ -499,8 +461,7 @@ 
      *
      * @return array
      */
-    public function getFlags()
-    {
+    public function getFlags() {
         return $this->flags;
     }
 
@@ -509,8 +470,7 @@ 
      *
      * @return self
      */
-    public function deleteFlags()
-    {
+    public function deleteFlags() {
         $this->flags = [];
 
         return $this;
@@ -524,8 +484,7 @@ 
      *
      * @return self
      */
-    public function mergeWith(Translation $translation, $options = Merge::DEFAULTS)
-    {
+    public function mergeWith(Translation $translation, $options = Merge::DEFAULTS) {
         Merge::mergeTranslation($translation, $this, $options);
         Merge::mergeReferences($translation, $this, $options);
         Merge::mergeComments($translation, $this, $options);

vendor/illuminate/support/HigherOrderTapProxy.php

Indentation +28 added lines, -28 removed lines

@@ -4,35 +4,35 @@
 
 class HigherOrderTapProxy
 {
-    /**
-     * The target being tapped.
-     *
-     * @var mixed
-     */
-    public $target;
+	/**
+	 * The target being tapped.
+	 *
+	 * @var mixed
+	 */
+	public $target;
 
-    /**
-     * Create a new tap proxy instance.
-     *
-     * @param  mixed  $target
-     * @return void
-     */
-    public function __construct($target)
-    {
-        $this->target = $target;
-    }
+	/**
+	 * Create a new tap proxy instance.
+	 *
+	 * @param  mixed  $target
+	 * @return void
+	 */
+	public function __construct($target)
+	{
+		$this->target = $target;
+	}
 
-    /**
-     * Dynamically pass method calls to the target.
-     *
-     * @param  string  $method
-     * @param  array  $parameters
-     * @return mixed
-     */
-    public function __call($method, $parameters)
-    {
-        $this->target->{$method}(...$parameters);
+	/**
+	 * Dynamically pass method calls to the target.
+	 *
+	 * @param  string  $method
+	 * @param  array  $parameters
+	 * @return mixed
+	 */
+	public function __call($method, $parameters)
+	{
+		$this->target->{$method}(...$parameters);
 
-        return $this->target;
-    }
+		return $this->target;
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -17,7 +17,7 @@ 
      * @param  mixed  $target
      * @return void
      */
-    public function __construct($target)
+    public function __construct( $target )
     {
         $this->target = $target;
     }
@@ -29,9 +29,9 @@ 
      * @param  array  $parameters
      * @return mixed
      */
-    public function __call($method, $parameters)
+    public function __call( $method, $parameters )
     {
-        $this->target->{$method}(...$parameters);
+        $this->target->{$method}( ...$parameters );
 
         return $this->target;
     }

Braces +3 added lines, -6 removed lines

@@ -2,8 +2,7 @@ 
 
 namespace Illuminate\Support;
 
-class HigherOrderTapProxy
-{
+class HigherOrderTapProxy {
     /**
      * The target being tapped.
      *
@@ -17,8 +16,7 @@ 
      * @param  mixed  $target
      * @return void
      */
-    public function __construct($target)
-    {
+    public function __construct($target) {
         $this->target = $target;
     }
 
@@ -29,8 +27,7 @@ 
      * @param  array  $parameters
      * @return mixed
      */
-    public function __call($method, $parameters)
-    {
+    public function __call($method, $parameters) {
         $this->target->{$method}(...$parameters);
 
         return $this->target;

vendor/illuminate/support/Facades/File.php

Indentation +9 added lines, -9 removed lines

@@ -50,13 +50,13 @@
  */
 class File extends Facade
 {
-    /**
-     * Get the registered name of the component.
-     *
-     * @return string
-     */
-    protected static function getFacadeAccessor()
-    {
-        return 'files';
-    }
+	/**
+	 * Get the registered name of the component.
+	 *
+	 * @return string
+	 */
+	protected static function getFacadeAccessor()
+	{
+		return 'files';
+	}
 }

Braces +2 added lines, -4 removed lines

@@ -5,15 +5,13 @@
 /**
  * @see \Illuminate\Filesystem\Filesystem
  */
-class File extends Facade
-{
+class File extends Facade {
     /**
      * Get the registered name of the component.
      *
      * @return string
      */
-    protected static function getFacadeAccessor()
-    {
+    protected static function getFacadeAccessor() {
         return 'files';
     }
 }