gravityview / GravityView

vendor/symfony/console/Helper/HelperSet.php

Indentation +66 added lines, -66 removed lines

@@ -21,79 +21,79 @@
  */
 class HelperSet implements \IteratorAggregate
 {
-    /**
-     * @var Helper[]
-     */
-    private $helpers = [];
-    private $command;
+	/**
+	 * @var Helper[]
+	 */
+	private $helpers = [];
+	private $command;
 
-    /**
-     * @param Helper[] $helpers An array of helper
-     */
-    public function __construct(array $helpers = [])
-    {
-        foreach ($helpers as $alias => $helper) {
-            $this->set($helper, \is_int($alias) ? null : $alias);
-        }
-    }
+	/**
+	 * @param Helper[] $helpers An array of helper
+	 */
+	public function __construct(array $helpers = [])
+	{
+		foreach ($helpers as $alias => $helper) {
+			$this->set($helper, \is_int($alias) ? null : $alias);
+		}
+	}
 
-    public function set(HelperInterface $helper, string $alias = null)
-    {
-        $this->helpers[$helper->getName()] = $helper;
-        if (null !== $alias) {
-            $this->helpers[$alias] = $helper;
-        }
+	public function set(HelperInterface $helper, string $alias = null)
+	{
+		$this->helpers[$helper->getName()] = $helper;
+		if (null !== $alias) {
+			$this->helpers[$alias] = $helper;
+		}
 
-        $helper->setHelperSet($this);
-    }
+		$helper->setHelperSet($this);
+	}
 
-    /**
-     * Returns true if the helper if defined.
-     *
-     * @return bool true if the helper is defined, false otherwise
-     */
-    public function has(string $name)
-    {
-        return isset($this->helpers[$name]);
-    }
+	/**
+	 * Returns true if the helper if defined.
+	 *
+	 * @return bool true if the helper is defined, false otherwise
+	 */
+	public function has(string $name)
+	{
+		return isset($this->helpers[$name]);
+	}
 
-    /**
-     * Gets a helper value.
-     *
-     * @return HelperInterface The helper instance
-     *
-     * @throws InvalidArgumentException if the helper is not defined
-     */
-    public function get(string $name)
-    {
-        if (!$this->has($name)) {
-            throw new InvalidArgumentException(sprintf('The helper "%s" is not defined.', $name));
-        }
+	/**
+	 * Gets a helper value.
+	 *
+	 * @return HelperInterface The helper instance
+	 *
+	 * @throws InvalidArgumentException if the helper is not defined
+	 */
+	public function get(string $name)
+	{
+		if (!$this->has($name)) {
+			throw new InvalidArgumentException(sprintf('The helper "%s" is not defined.', $name));
+		}
 
-        return $this->helpers[$name];
-    }
+		return $this->helpers[$name];
+	}
 
-    public function setCommand(Command $command = null)
-    {
-        $this->command = $command;
-    }
+	public function setCommand(Command $command = null)
+	{
+		$this->command = $command;
+	}
 
-    /**
-     * Gets the command associated with this helper set.
-     *
-     * @return Command A Command instance
-     */
-    public function getCommand()
-    {
-        return $this->command;
-    }
+	/**
+	 * Gets the command associated with this helper set.
+	 *
+	 * @return Command A Command instance
+	 */
+	public function getCommand()
+	{
+		return $this->command;
+	}
 
-    /**
-     * @return \Traversable<Helper>
-     */
-    #[\ReturnTypeWillChange]
-    public function getIterator()
-    {
-        return new \ArrayIterator($this->helpers);
-    }
+	/**
+	 * @return \Traversable<Helper>
+	 */
+	#[\ReturnTypeWillChange]
+	public function getIterator()
+	{
+		return new \ArrayIterator($this->helpers);
+	}
 }

Spacing +17 added lines, -17 removed lines

@@ -24,27 +24,27 @@ 
     /**
      * @var Helper[]
      */
-    private $helpers = [];
+    private $helpers = [ ];
     private $command;
 
     /**
      * @param Helper[] $helpers An array of helper
      */
-    public function __construct(array $helpers = [])
+    public function __construct( array $helpers = [ ] )
     {
-        foreach ($helpers as $alias => $helper) {
-            $this->set($helper, \is_int($alias) ? null : $alias);
+        foreach ( $helpers as $alias => $helper ) {
+            $this->set( $helper, \is_int( $alias ) ? null : $alias );
         }
     }
 
-    public function set(HelperInterface $helper, string $alias = null)
+    public function set( HelperInterface $helper, string $alias = null )
     {
-        $this->helpers[$helper->getName()] = $helper;
-        if (null !== $alias) {
-            $this->helpers[$alias] = $helper;
+        $this->helpers[ $helper->getName() ] = $helper;
+        if ( null !== $alias ) {
+            $this->helpers[ $alias ] = $helper;
         }
 
-        $helper->setHelperSet($this);
+        $helper->setHelperSet( $this );
     }
 
     /**
@@ -52,9 +52,9 @@ 
      *
      * @return bool true if the helper is defined, false otherwise
      */
-    public function has(string $name)
+    public function has( string $name )
     {
-        return isset($this->helpers[$name]);
+        return isset( $this->helpers[ $name ] );
     }
 
     /**
@@ -64,16 +64,16 @@ 
      *
      * @throws InvalidArgumentException if the helper is not defined
      */
-    public function get(string $name)
+    public function get( string $name )
     {
-        if (!$this->has($name)) {
-            throw new InvalidArgumentException(sprintf('The helper "%s" is not defined.', $name));
+        if ( ! $this->has( $name ) ) {
+            throw new InvalidArgumentException( sprintf( 'The helper "%s" is not defined.', $name ) );
         }
 
-        return $this->helpers[$name];
+        return $this->helpers[ $name ];
     }
 
-    public function setCommand(Command $command = null)
+    public function setCommand( Command $command = null )
     {
         $this->command = $command;
     }
@@ -94,6 +94,6 @@ 
     #[\ReturnTypeWillChange]
     public function getIterator()
     {
-        return new \ArrayIterator($this->helpers);
+        return new \ArrayIterator( $this->helpers );
     }
 }

Braces +8 added lines, -16 removed lines

@@ -19,8 +19,7 @@ 
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
-class HelperSet implements \IteratorAggregate
-{
+class HelperSet implements \IteratorAggregate {
     /**
      * @var Helper[]
      */
@@ -30,15 +29,13 @@ 
     /**
      * @param Helper[] $helpers An array of helper
      */
-    public function __construct(array $helpers = [])
-    {
+    public function __construct(array $helpers = []) {
         foreach ($helpers as $alias => $helper) {
             $this->set($helper, \is_int($alias) ? null : $alias);
         }
     }
 
-    public function set(HelperInterface $helper, string $alias = null)
-    {
+    public function set(HelperInterface $helper, string $alias = null) {
         $this->helpers[$helper->getName()] = $helper;
         if (null !== $alias) {
             $this->helpers[$alias] = $helper;
@@ -52,8 +49,7 @@ 
      *
      * @return bool true if the helper is defined, false otherwise
      */
-    public function has(string $name)
-    {
+    public function has(string $name) {
         return isset($this->helpers[$name]);
     }
 
@@ -64,8 +60,7 @@ 
      *
      * @throws InvalidArgumentException if the helper is not defined
      */
-    public function get(string $name)
-    {
+    public function get(string $name) {
         if (!$this->has($name)) {
             throw new InvalidArgumentException(sprintf('The helper "%s" is not defined.', $name));
         }
@@ -73,8 +68,7 @@ 
         return $this->helpers[$name];
     }
 
-    public function setCommand(Command $command = null)
-    {
+    public function setCommand(Command $command = null) {
         $this->command = $command;
     }
 
@@ -83,8 +77,7 @@ 
      *
      * @return Command A Command instance
      */
-    public function getCommand()
-    {
+    public function getCommand() {
         return $this->command;
     }
 
@@ -92,8 +85,7 @@ 
      * @return \Traversable<Helper>
      */
     #[\ReturnTypeWillChange]
-    public function getIterator()
-    {
+    public function getIterator() {
         return new \ArrayIterator($this->helpers);
     }
 }

vendor/symfony/console/Helper/DebugFormatterHelper.php

Indentation +84 added lines, -84 removed lines

@@ -20,88 +20,88 @@
  */
 class DebugFormatterHelper extends Helper
 {
-    private $colors = ['black', 'red', 'green', 'yellow', 'blue', 'magenta', 'cyan', 'white', 'default'];
-    private $started = [];
-    private $count = -1;
-
-    /**
-     * Starts a debug formatting session.
-     *
-     * @return string
-     */
-    public function start(string $id, string $message, string $prefix = 'RUN')
-    {
-        $this->started[$id] = ['border' => ++$this->count % \count($this->colors)];
-
-        return sprintf("%s<bg=blue;fg=white> %s </> <fg=blue>%s</>\n", $this->getBorder($id), $prefix, $message);
-    }
-
-    /**
-     * Adds progress to a formatting session.
-     *
-     * @return string
-     */
-    public function progress(string $id, string $buffer, bool $error = false, string $prefix = 'OUT', string $errorPrefix = 'ERR')
-    {
-        $message = '';
-
-        if ($error) {
-            if (isset($this->started[$id]['out'])) {
-                $message .= "\n";
-                unset($this->started[$id]['out']);
-            }
-            if (!isset($this->started[$id]['err'])) {
-                $message .= sprintf('%s<bg=red;fg=white> %s </> ', $this->getBorder($id), $errorPrefix);
-                $this->started[$id]['err'] = true;
-            }
-
-            $message .= str_replace("\n", sprintf("\n%s<bg=red;fg=white> %s </> ", $this->getBorder($id), $errorPrefix), $buffer);
-        } else {
-            if (isset($this->started[$id]['err'])) {
-                $message .= "\n";
-                unset($this->started[$id]['err']);
-            }
-            if (!isset($this->started[$id]['out'])) {
-                $message .= sprintf('%s<bg=green;fg=white> %s </> ', $this->getBorder($id), $prefix);
-                $this->started[$id]['out'] = true;
-            }
-
-            $message .= str_replace("\n", sprintf("\n%s<bg=green;fg=white> %s </> ", $this->getBorder($id), $prefix), $buffer);
-        }
-
-        return $message;
-    }
-
-    /**
-     * Stops a formatting session.
-     *
-     * @return string
-     */
-    public function stop(string $id, string $message, bool $successful, string $prefix = 'RES')
-    {
-        $trailingEOL = isset($this->started[$id]['out']) || isset($this->started[$id]['err']) ? "\n" : '';
-
-        if ($successful) {
-            return sprintf("%s%s<bg=green;fg=white> %s </> <fg=green>%s</>\n", $trailingEOL, $this->getBorder($id), $prefix, $message);
-        }
-
-        $message = sprintf("%s%s<bg=red;fg=white> %s </> <fg=red>%s</>\n", $trailingEOL, $this->getBorder($id), $prefix, $message);
-
-        unset($this->started[$id]['out'], $this->started[$id]['err']);
-
-        return $message;
-    }
-
-    private function getBorder(string $id): string
-    {
-        return sprintf('<bg=%s> </>', $this->colors[$this->started[$id]['border']]);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return 'debug_formatter';
-    }
+	private $colors = ['black', 'red', 'green', 'yellow', 'blue', 'magenta', 'cyan', 'white', 'default'];
+	private $started = [];
+	private $count = -1;
+
+	/**
+	 * Starts a debug formatting session.
+	 *
+	 * @return string
+	 */
+	public function start(string $id, string $message, string $prefix = 'RUN')
+	{
+		$this->started[$id] = ['border' => ++$this->count % \count($this->colors)];
+
+		return sprintf("%s<bg=blue;fg=white> %s </> <fg=blue>%s</>\n", $this->getBorder($id), $prefix, $message);
+	}
+
+	/**
+	 * Adds progress to a formatting session.
+	 *
+	 * @return string
+	 */
+	public function progress(string $id, string $buffer, bool $error = false, string $prefix = 'OUT', string $errorPrefix = 'ERR')
+	{
+		$message = '';
+
+		if ($error) {
+			if (isset($this->started[$id]['out'])) {
+				$message .= "\n";
+				unset($this->started[$id]['out']);
+			}
+			if (!isset($this->started[$id]['err'])) {
+				$message .= sprintf('%s<bg=red;fg=white> %s </> ', $this->getBorder($id), $errorPrefix);
+				$this->started[$id]['err'] = true;
+			}
+
+			$message .= str_replace("\n", sprintf("\n%s<bg=red;fg=white> %s </> ", $this->getBorder($id), $errorPrefix), $buffer);
+		} else {
+			if (isset($this->started[$id]['err'])) {
+				$message .= "\n";
+				unset($this->started[$id]['err']);
+			}
+			if (!isset($this->started[$id]['out'])) {
+				$message .= sprintf('%s<bg=green;fg=white> %s </> ', $this->getBorder($id), $prefix);
+				$this->started[$id]['out'] = true;
+			}
+
+			$message .= str_replace("\n", sprintf("\n%s<bg=green;fg=white> %s </> ", $this->getBorder($id), $prefix), $buffer);
+		}
+
+		return $message;
+	}
+
+	/**
+	 * Stops a formatting session.
+	 *
+	 * @return string
+	 */
+	public function stop(string $id, string $message, bool $successful, string $prefix = 'RES')
+	{
+		$trailingEOL = isset($this->started[$id]['out']) || isset($this->started[$id]['err']) ? "\n" : '';
+
+		if ($successful) {
+			return sprintf("%s%s<bg=green;fg=white> %s </> <fg=green>%s</>\n", $trailingEOL, $this->getBorder($id), $prefix, $message);
+		}
+
+		$message = sprintf("%s%s<bg=red;fg=white> %s </> <fg=red>%s</>\n", $trailingEOL, $this->getBorder($id), $prefix, $message);
+
+		unset($this->started[$id]['out'], $this->started[$id]['err']);
+
+		return $message;
+	}
+
+	private function getBorder(string $id): string
+	{
+		return sprintf('<bg=%s> </>', $this->colors[$this->started[$id]['border']]);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getName()
+	{
+		return 'debug_formatter';
+	}
 }

Spacing +27 added lines, -27 removed lines

@@ -20,8 +20,8 @@ 
  */
 class DebugFormatterHelper extends Helper
 {
-    private $colors = ['black', 'red', 'green', 'yellow', 'blue', 'magenta', 'cyan', 'white', 'default'];
-    private $started = [];
+    private $colors = [ 'black', 'red', 'green', 'yellow', 'blue', 'magenta', 'cyan', 'white', 'default' ];
+    private $started = [ ];
     private $count = -1;
 
     /**
@@ -29,11 +29,11 @@ 
      *
      * @return string
      */
-    public function start(string $id, string $message, string $prefix = 'RUN')
+    public function start( string $id, string $message, string $prefix = 'RUN' )
     {
-        $this->started[$id] = ['border' => ++$this->count % \count($this->colors)];
+        $this->started[ $id ] = [ 'border' => ++$this->count % \count( $this->colors ) ];
 
-        return sprintf("%s<bg=blue;fg=white> %s </> <fg=blue>%s</>\n", $this->getBorder($id), $prefix, $message);
+        return sprintf( "%s<bg=blue;fg=white> %s </> <fg=blue>%s</>\n", $this->getBorder( $id ), $prefix, $message );
     }
 
     /**
@@ -41,32 +41,32 @@ 
      *
      * @return string
      */
-    public function progress(string $id, string $buffer, bool $error = false, string $prefix = 'OUT', string $errorPrefix = 'ERR')
+    public function progress( string $id, string $buffer, bool $error = false, string $prefix = 'OUT', string $errorPrefix = 'ERR' )
     {
         $message = '';
 
-        if ($error) {
-            if (isset($this->started[$id]['out'])) {
+        if ( $error ) {
+            if ( isset( $this->started[ $id ][ 'out' ] ) ) {
                 $message .= "\n";
-                unset($this->started[$id]['out']);
+                unset( $this->started[ $id ][ 'out' ] );
             }
-            if (!isset($this->started[$id]['err'])) {
-                $message .= sprintf('%s<bg=red;fg=white> %s </> ', $this->getBorder($id), $errorPrefix);
-                $this->started[$id]['err'] = true;
+            if ( ! isset( $this->started[ $id ][ 'err' ] ) ) {
+                $message .= sprintf( '%s<bg=red;fg=white> %s </> ', $this->getBorder( $id ), $errorPrefix );
+                $this->started[ $id ][ 'err' ] = true;
             }
 
-            $message .= str_replace("\n", sprintf("\n%s<bg=red;fg=white> %s </> ", $this->getBorder($id), $errorPrefix), $buffer);
+            $message .= str_replace( "\n", sprintf( "\n%s<bg=red;fg=white> %s </> ", $this->getBorder( $id ), $errorPrefix ), $buffer );
         } else {
-            if (isset($this->started[$id]['err'])) {
+            if ( isset( $this->started[ $id ][ 'err' ] ) ) {
                 $message .= "\n";
-                unset($this->started[$id]['err']);
+                unset( $this->started[ $id ][ 'err' ] );
             }
-            if (!isset($this->started[$id]['out'])) {
-                $message .= sprintf('%s<bg=green;fg=white> %s </> ', $this->getBorder($id), $prefix);
-                $this->started[$id]['out'] = true;
+            if ( ! isset( $this->started[ $id ][ 'out' ] ) ) {
+                $message .= sprintf( '%s<bg=green;fg=white> %s </> ', $this->getBorder( $id ), $prefix );
+                $this->started[ $id ][ 'out' ] = true;
             }
 
-            $message .= str_replace("\n", sprintf("\n%s<bg=green;fg=white> %s </> ", $this->getBorder($id), $prefix), $buffer);
+            $message .= str_replace( "\n", sprintf( "\n%s<bg=green;fg=white> %s </> ", $this->getBorder( $id ), $prefix ), $buffer );
         }
 
         return $message;
@@ -77,24 +77,24 @@ 
      *
      * @return string
      */
-    public function stop(string $id, string $message, bool $successful, string $prefix = 'RES')
+    public function stop( string $id, string $message, bool $successful, string $prefix = 'RES' )
     {
-        $trailingEOL = isset($this->started[$id]['out']) || isset($this->started[$id]['err']) ? "\n" : '';
+        $trailingEOL = isset( $this->started[ $id ][ 'out' ] ) || isset( $this->started[ $id ][ 'err' ] ) ? "\n" : '';
 
-        if ($successful) {
-            return sprintf("%s%s<bg=green;fg=white> %s </> <fg=green>%s</>\n", $trailingEOL, $this->getBorder($id), $prefix, $message);
+        if ( $successful ) {
+            return sprintf( "%s%s<bg=green;fg=white> %s </> <fg=green>%s</>\n", $trailingEOL, $this->getBorder( $id ), $prefix, $message );
         }
 
-        $message = sprintf("%s%s<bg=red;fg=white> %s </> <fg=red>%s</>\n", $trailingEOL, $this->getBorder($id), $prefix, $message);
+        $message = sprintf( "%s%s<bg=red;fg=white> %s </> <fg=red>%s</>\n", $trailingEOL, $this->getBorder( $id ), $prefix, $message );
 
-        unset($this->started[$id]['out'], $this->started[$id]['err']);
+        unset( $this->started[ $id ][ 'out' ], $this->started[ $id ][ 'err' ] );
 
         return $message;
     }
 
-    private function getBorder(string $id): string
+    private function getBorder( string $id ): string
     {
-        return sprintf('<bg=%s> </>', $this->colors[$this->started[$id]['border']]);
+        return sprintf( '<bg=%s> </>', $this->colors[ $this->started[ $id ][ 'border' ] ] );
     }
 
     /**

Braces +5 added lines, -10 removed lines

@@ -18,8 +18,7 @@ 
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
-class DebugFormatterHelper extends Helper
-{
+class DebugFormatterHelper extends Helper {
     private $colors = ['black', 'red', 'green', 'yellow', 'blue', 'magenta', 'cyan', 'white', 'default'];
     private $started = [];
     private $count = -1;
@@ -29,8 +28,7 @@ 
      *
      * @return string
      */
-    public function start(string $id, string $message, string $prefix = 'RUN')
-    {
+    public function start(string $id, string $message, string $prefix = 'RUN') {
         $this->started[$id] = ['border' => ++$this->count % \count($this->colors)];
 
         return sprintf("%s<bg=blue;fg=white> %s </> <fg=blue>%s</>\n", $this->getBorder($id), $prefix, $message);
@@ -41,8 +39,7 @@ 
      *
      * @return string
      */
-    public function progress(string $id, string $buffer, bool $error = false, string $prefix = 'OUT', string $errorPrefix = 'ERR')
-    {
+    public function progress(string $id, string $buffer, bool $error = false, string $prefix = 'OUT', string $errorPrefix = 'ERR') {
         $message = '';
 
         if ($error) {
@@ -77,8 +74,7 @@ 
      *
      * @return string
      */
-    public function stop(string $id, string $message, bool $successful, string $prefix = 'RES')
-    {
+    public function stop(string $id, string $message, bool $successful, string $prefix = 'RES') {
         $trailingEOL = isset($this->started[$id]['out']) || isset($this->started[$id]['err']) ? "\n" : '';
 
         if ($successful) {
@@ -100,8 +96,7 @@ 
     /**
      * {@inheritdoc}
      */
-    public function getName()
-    {
+    public function getName() {
         return 'debug_formatter';
     }
 }

vendor/symfony/console/Helper/Helper.php

Indentation +154 added lines, -154 removed lines

@@ -21,158 +21,158 @@
  */
 abstract class Helper implements HelperInterface
 {
-    protected $helperSet = null;
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setHelperSet(HelperSet $helperSet = null)
-    {
-        $this->helperSet = $helperSet;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getHelperSet()
-    {
-        return $this->helperSet;
-    }
-
-    /**
-     * Returns the length of a string, using mb_strwidth if it is available.
-     *
-     * @deprecated since Symfony 5.3
-     *
-     * @return int The length of the string
-     */
-    public static function strlen(?string $string)
-    {
-        trigger_deprecation('symfony/console', '5.3', 'Method "%s()" is deprecated and will be removed in Symfony 6.0. Use Helper::width() or Helper::length() instead.', __METHOD__);
-
-        return self::width($string);
-    }
-
-    /**
-     * Returns the width of a string, using mb_strwidth if it is available.
-     * The width is how many characters positions the string will use.
-     */
-    public static function width(?string $string): int
-    {
-        $string ?? $string = '';
-
-        if (preg_match('//u', $string)) {
-            return (new UnicodeString($string))->width(false);
-        }
-
-        if (false === $encoding = mb_detect_encoding($string, null, true)) {
-            return \strlen($string);
-        }
-
-        return mb_strwidth($string, $encoding);
-    }
-
-    /**
-     * Returns the length of a string, using mb_strlen if it is available.
-     * The length is related to how many bytes the string will use.
-     */
-    public static function length(?string $string): int
-    {
-        $string ?? $string = '';
-
-        if (preg_match('//u', $string)) {
-            return (new UnicodeString($string))->length();
-        }
-
-        if (false === $encoding = mb_detect_encoding($string, null, true)) {
-            return \strlen($string);
-        }
-
-        return mb_strlen($string, $encoding);
-    }
-
-    /**
-     * Returns the subset of a string, using mb_substr if it is available.
-     *
-     * @return string The string subset
-     */
-    public static function substr(?string $string, int $from, int $length = null)
-    {
-        $string ?? $string = '';
-
-        if (false === $encoding = mb_detect_encoding($string, null, true)) {
-            return substr($string, $from, $length);
-        }
-
-        return mb_substr($string, $from, $length, $encoding);
-    }
-
-    public static function formatTime($secs)
-    {
-        static $timeFormats = [
-            [0, '< 1 sec'],
-            [1, '1 sec'],
-            [2, 'secs', 1],
-            [60, '1 min'],
-            [120, 'mins', 60],
-            [3600, '1 hr'],
-            [7200, 'hrs', 3600],
-            [86400, '1 day'],
-            [172800, 'days', 86400],
-        ];
-
-        foreach ($timeFormats as $index => $format) {
-            if ($secs >= $format[0]) {
-                if ((isset($timeFormats[$index + 1]) && $secs < $timeFormats[$index + 1][0])
-                    || $index == \count($timeFormats) - 1
-                ) {
-                    if (2 == \count($format)) {
-                        return $format[1];
-                    }
-
-                    return floor($secs / $format[2]).' '.$format[1];
-                }
-            }
-        }
-    }
-
-    public static function formatMemory(int $memory)
-    {
-        if ($memory >= 1024 * 1024 * 1024) {
-            return sprintf('%.1f GiB', $memory / 1024 / 1024 / 1024);
-        }
-
-        if ($memory >= 1024 * 1024) {
-            return sprintf('%.1f MiB', $memory / 1024 / 1024);
-        }
-
-        if ($memory >= 1024) {
-            return sprintf('%d KiB', $memory / 1024);
-        }
-
-        return sprintf('%d B', $memory);
-    }
-
-    /**
-     * @deprecated since Symfony 5.3
-     */
-    public static function strlenWithoutDecoration(OutputFormatterInterface $formatter, ?string $string)
-    {
-        trigger_deprecation('symfony/console', '5.3', 'Method "%s()" is deprecated and will be removed in Symfony 6.0. Use Helper::removeDecoration() instead.', __METHOD__);
-
-        return self::width(self::removeDecoration($formatter, $string));
-    }
-
-    public static function removeDecoration(OutputFormatterInterface $formatter, ?string $string)
-    {
-        $isDecorated = $formatter->isDecorated();
-        $formatter->setDecorated(false);
-        // remove <...> formatting
-        $string = $formatter->format($string ?? '');
-        // remove already formatted characters
-        $string = preg_replace("/\033\[[^m]*m/", '', $string ?? '');
-        $formatter->setDecorated($isDecorated);
-
-        return $string;
-    }
+	protected $helperSet = null;
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function setHelperSet(HelperSet $helperSet = null)
+	{
+		$this->helperSet = $helperSet;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getHelperSet()
+	{
+		return $this->helperSet;
+	}
+
+	/**
+	 * Returns the length of a string, using mb_strwidth if it is available.
+	 *
+	 * @deprecated since Symfony 5.3
+	 *
+	 * @return int The length of the string
+	 */
+	public static function strlen(?string $string)
+	{
+		trigger_deprecation('symfony/console', '5.3', 'Method "%s()" is deprecated and will be removed in Symfony 6.0. Use Helper::width() or Helper::length() instead.', __METHOD__);
+
+		return self::width($string);
+	}
+
+	/**
+	 * Returns the width of a string, using mb_strwidth if it is available.
+	 * The width is how many characters positions the string will use.
+	 */
+	public static function width(?string $string): int
+	{
+		$string ?? $string = '';
+
+		if (preg_match('//u', $string)) {
+			return (new UnicodeString($string))->width(false);
+		}
+
+		if (false === $encoding = mb_detect_encoding($string, null, true)) {
+			return \strlen($string);
+		}
+
+		return mb_strwidth($string, $encoding);
+	}
+
+	/**
+	 * Returns the length of a string, using mb_strlen if it is available.
+	 * The length is related to how many bytes the string will use.
+	 */
+	public static function length(?string $string): int
+	{
+		$string ?? $string = '';
+
+		if (preg_match('//u', $string)) {
+			return (new UnicodeString($string))->length();
+		}
+
+		if (false === $encoding = mb_detect_encoding($string, null, true)) {
+			return \strlen($string);
+		}
+
+		return mb_strlen($string, $encoding);
+	}
+
+	/**
+	 * Returns the subset of a string, using mb_substr if it is available.
+	 *
+	 * @return string The string subset
+	 */
+	public static function substr(?string $string, int $from, int $length = null)
+	{
+		$string ?? $string = '';
+
+		if (false === $encoding = mb_detect_encoding($string, null, true)) {
+			return substr($string, $from, $length);
+		}
+
+		return mb_substr($string, $from, $length, $encoding);
+	}
+
+	public static function formatTime($secs)
+	{
+		static $timeFormats = [
+			[0, '< 1 sec'],
+			[1, '1 sec'],
+			[2, 'secs', 1],
+			[60, '1 min'],
+			[120, 'mins', 60],
+			[3600, '1 hr'],
+			[7200, 'hrs', 3600],
+			[86400, '1 day'],
+			[172800, 'days', 86400],
+		];
+
+		foreach ($timeFormats as $index => $format) {
+			if ($secs >= $format[0]) {
+				if ((isset($timeFormats[$index + 1]) && $secs < $timeFormats[$index + 1][0])
+					|| $index == \count($timeFormats) - 1
+				) {
+					if (2 == \count($format)) {
+						return $format[1];
+					}
+
+					return floor($secs / $format[2]).' '.$format[1];
+				}
+			}
+		}
+	}
+
+	public static function formatMemory(int $memory)
+	{
+		if ($memory >= 1024 * 1024 * 1024) {
+			return sprintf('%.1f GiB', $memory / 1024 / 1024 / 1024);
+		}
+
+		if ($memory >= 1024 * 1024) {
+			return sprintf('%.1f MiB', $memory / 1024 / 1024);
+		}
+
+		if ($memory >= 1024) {
+			return sprintf('%d KiB', $memory / 1024);
+		}
+
+		return sprintf('%d B', $memory);
+	}
+
+	/**
+	 * @deprecated since Symfony 5.3
+	 */
+	public static function strlenWithoutDecoration(OutputFormatterInterface $formatter, ?string $string)
+	{
+		trigger_deprecation('symfony/console', '5.3', 'Method "%s()" is deprecated and will be removed in Symfony 6.0. Use Helper::removeDecoration() instead.', __METHOD__);
+
+		return self::width(self::removeDecoration($formatter, $string));
+	}
+
+	public static function removeDecoration(OutputFormatterInterface $formatter, ?string $string)
+	{
+		$isDecorated = $formatter->isDecorated();
+		$formatter->setDecorated(false);
+		// remove <...> formatting
+		$string = $formatter->format($string ?? '');
+		// remove already formatted characters
+		$string = preg_replace("/\033\[[^m]*m/", '', $string ?? '');
+		$formatter->setDecorated($isDecorated);
+
+		return $string;
+	}
 }

Spacing +53 added lines, -53 removed lines

@@ -26,7 +26,7 @@ 
     /**
      * {@inheritdoc}
      */
-    public function setHelperSet(HelperSet $helperSet = null)
+    public function setHelperSet( HelperSet $helperSet = null )
     {
         $this->helperSet = $helperSet;
     }
@@ -46,49 +46,49 @@ 
      *
      * @return int The length of the string
      */
-    public static function strlen(?string $string)
+    public static function strlen( ?string $string )
     {
-        trigger_deprecation('symfony/console', '5.3', 'Method "%s()" is deprecated and will be removed in Symfony 6.0. Use Helper::width() or Helper::length() instead.', __METHOD__);
+        trigger_deprecation( 'symfony/console', '5.3', 'Method "%s()" is deprecated and will be removed in Symfony 6.0. Use Helper::width() or Helper::length() instead.', __METHOD__ );
 
-        return self::width($string);
+        return self::width( $string );
     }
 
     /**
      * Returns the width of a string, using mb_strwidth if it is available.
      * The width is how many characters positions the string will use.
      */
-    public static function width(?string $string): int
+    public static function width( ?string $string ): int
     {
         $string ?? $string = '';
 
-        if (preg_match('//u', $string)) {
-            return (new UnicodeString($string))->width(false);
+        if ( preg_match( '//u', $string ) ) {
+            return ( new UnicodeString( $string ) )->width( false );
         }
 
-        if (false === $encoding = mb_detect_encoding($string, null, true)) {
-            return \strlen($string);
+        if ( false === $encoding = mb_detect_encoding( $string, null, true ) ) {
+            return \strlen( $string );
         }
 
-        return mb_strwidth($string, $encoding);
+        return mb_strwidth( $string, $encoding );
     }
 
     /**
      * Returns the length of a string, using mb_strlen if it is available.
      * The length is related to how many bytes the string will use.
      */
-    public static function length(?string $string): int
+    public static function length( ?string $string ): int
     {
         $string ?? $string = '';
 
-        if (preg_match('//u', $string)) {
-            return (new UnicodeString($string))->length();
+        if ( preg_match( '//u', $string ) ) {
+            return ( new UnicodeString( $string ) )->length();
         }
 
-        if (false === $encoding = mb_detect_encoding($string, null, true)) {
-            return \strlen($string);
+        if ( false === $encoding = mb_detect_encoding( $string, null, true ) ) {
+            return \strlen( $string );
         }
 
-        return mb_strlen($string, $encoding);
+        return mb_strlen( $string, $encoding );
     }
 
     /**
@@ -96,82 +96,82 @@ 
      *
      * @return string The string subset
      */
-    public static function substr(?string $string, int $from, int $length = null)
+    public static function substr( ?string $string, int $from, int $length = null )
     {
         $string ?? $string = '';
 
-        if (false === $encoding = mb_detect_encoding($string, null, true)) {
-            return substr($string, $from, $length);
+        if ( false === $encoding = mb_detect_encoding( $string, null, true ) ) {
+            return substr( $string, $from, $length );
         }
 
-        return mb_substr($string, $from, $length, $encoding);
+        return mb_substr( $string, $from, $length, $encoding );
     }
 
-    public static function formatTime($secs)
+    public static function formatTime( $secs )
     {
         static $timeFormats = [
-            [0, '< 1 sec'],
-            [1, '1 sec'],
-            [2, 'secs', 1],
-            [60, '1 min'],
-            [120, 'mins', 60],
-            [3600, '1 hr'],
-            [7200, 'hrs', 3600],
-            [86400, '1 day'],
-            [172800, 'days', 86400],
+            [ 0, '< 1 sec' ],
+            [ 1, '1 sec' ],
+            [ 2, 'secs', 1 ],
+            [ 60, '1 min' ],
+            [ 120, 'mins', 60 ],
+            [ 3600, '1 hr' ],
+            [ 7200, 'hrs', 3600 ],
+            [ 86400, '1 day' ],
+            [ 172800, 'days', 86400 ],
         ];
 
-        foreach ($timeFormats as $index => $format) {
-            if ($secs >= $format[0]) {
-                if ((isset($timeFormats[$index + 1]) && $secs < $timeFormats[$index + 1][0])
-                    || $index == \count($timeFormats) - 1
+        foreach ( $timeFormats as $index => $format ) {
+            if ( $secs >= $format[ 0 ] ) {
+                if ( ( isset( $timeFormats[ $index + 1 ] ) && $secs < $timeFormats[ $index + 1 ][ 0 ] )
+                    || $index == \count( $timeFormats ) - 1
                 ) {
-                    if (2 == \count($format)) {
-                        return $format[1];
+                    if ( 2 == \count( $format ) ) {
+                        return $format[ 1 ];
                     }
 
-                    return floor($secs / $format[2]).' '.$format[1];
+                    return floor( $secs / $format[ 2 ] ) . ' ' . $format[ 1 ];
                 }
             }
         }
     }
 
-    public static function formatMemory(int $memory)
+    public static function formatMemory( int $memory )
     {
-        if ($memory >= 1024 * 1024 * 1024) {
-            return sprintf('%.1f GiB', $memory / 1024 / 1024 / 1024);
+        if ( $memory >= 1024 * 1024 * 1024 ) {
+            return sprintf( '%.1f GiB', $memory / 1024 / 1024 / 1024 );
         }
 
-        if ($memory >= 1024 * 1024) {
-            return sprintf('%.1f MiB', $memory / 1024 / 1024);
+        if ( $memory >= 1024 * 1024 ) {
+            return sprintf( '%.1f MiB', $memory / 1024 / 1024 );
         }
 
-        if ($memory >= 1024) {
-            return sprintf('%d KiB', $memory / 1024);
+        if ( $memory >= 1024 ) {
+            return sprintf( '%d KiB', $memory / 1024 );
         }
 
-        return sprintf('%d B', $memory);
+        return sprintf( '%d B', $memory );
     }
 
     /**
      * @deprecated since Symfony 5.3
      */
-    public static function strlenWithoutDecoration(OutputFormatterInterface $formatter, ?string $string)
+    public static function strlenWithoutDecoration( OutputFormatterInterface $formatter, ?string $string )
     {
-        trigger_deprecation('symfony/console', '5.3', 'Method "%s()" is deprecated and will be removed in Symfony 6.0. Use Helper::removeDecoration() instead.', __METHOD__);
+        trigger_deprecation( 'symfony/console', '5.3', 'Method "%s()" is deprecated and will be removed in Symfony 6.0. Use Helper::removeDecoration() instead.', __METHOD__ );
 
-        return self::width(self::removeDecoration($formatter, $string));
+        return self::width( self::removeDecoration( $formatter, $string ) );
     }
 
-    public static function removeDecoration(OutputFormatterInterface $formatter, ?string $string)
+    public static function removeDecoration( OutputFormatterInterface $formatter, ?string $string )
     {
         $isDecorated = $formatter->isDecorated();
-        $formatter->setDecorated(false);
+        $formatter->setDecorated( false );
         // remove <...> formatting
-        $string = $formatter->format($string ?? '');
+        $string = $formatter->format( $string ?? '' );
         // remove already formatted characters
-        $string = preg_replace("/\033\[[^m]*m/", '', $string ?? '');
-        $formatter->setDecorated($isDecorated);
+        $string = preg_replace( "/\033\[[^m]*m/", '', $string ?? '' );
+        $formatter->setDecorated( $isDecorated );
 
         return $string;
     }

Braces +9 added lines, -18 removed lines

@@ -19,23 +19,20 @@ 
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
-abstract class Helper implements HelperInterface
-{
+abstract class Helper implements HelperInterface {
     protected $helperSet = null;
 
     /**
      * {@inheritdoc}
      */
-    public function setHelperSet(HelperSet $helperSet = null)
-    {
+    public function setHelperSet(HelperSet $helperSet = null) {
         $this->helperSet = $helperSet;
     }
 
     /**
      * {@inheritdoc}
      */
-    public function getHelperSet()
-    {
+    public function getHelperSet() {
         return $this->helperSet;
     }
 
@@ -46,8 +43,7 @@ 
      *
      * @return int The length of the string
      */
-    public static function strlen(?string $string)
-    {
+    public static function strlen(?string $string) {
         trigger_deprecation('symfony/console', '5.3', 'Method "%s()" is deprecated and will be removed in Symfony 6.0. Use Helper::width() or Helper::length() instead.', __METHOD__);
 
         return self::width($string);
@@ -96,8 +92,7 @@ 
      *
      * @return string The string subset
      */
-    public static function substr(?string $string, int $from, int $length = null)
-    {
+    public static function substr(?string $string, int $from, int $length = null) {
         $string ?? $string = '';
 
         if (false === $encoding = mb_detect_encoding($string, null, true)) {
@@ -107,8 +102,7 @@ 
         return mb_substr($string, $from, $length, $encoding);
     }
 
-    public static function formatTime($secs)
-    {
+    public static function formatTime($secs) {
         static $timeFormats = [
             [0, '< 1 sec'],
             [1, '1 sec'],
@@ -136,8 +130,7 @@ 
         }
     }
 
-    public static function formatMemory(int $memory)
-    {
+    public static function formatMemory(int $memory) {
         if ($memory >= 1024 * 1024 * 1024) {
             return sprintf('%.1f GiB', $memory / 1024 / 1024 / 1024);
         }
@@ -156,15 +149,13 @@ 
     /**
      * @deprecated since Symfony 5.3
      */
-    public static function strlenWithoutDecoration(OutputFormatterInterface $formatter, ?string $string)
-    {
+    public static function strlenWithoutDecoration(OutputFormatterInterface $formatter, ?string $string) {
         trigger_deprecation('symfony/console', '5.3', 'Method "%s()" is deprecated and will be removed in Symfony 6.0. Use Helper::removeDecoration() instead.', __METHOD__);
 
         return self::width(self::removeDecoration($formatter, $string));
     }
 
-    public static function removeDecoration(OutputFormatterInterface $formatter, ?string $string)
-    {
+    public static function removeDecoration(OutputFormatterInterface $formatter, ?string $string) {
         $isDecorated = $formatter->isDecorated();
         $formatter->setDecorated(false);
         // remove <...> formatting

vendor/symfony/console/Helper/FormatterHelper.php

Indentation +60 added lines, -60 removed lines

@@ -20,73 +20,73 @@
  */
 class FormatterHelper extends Helper
 {
-    /**
-     * Formats a message within a section.
-     *
-     * @return string The format section
-     */
-    public function formatSection(string $section, string $message, string $style = 'info')
-    {
-        return sprintf('<%s>[%s]</%s> %s', $style, $section, $style, $message);
-    }
+	/**
+	 * Formats a message within a section.
+	 *
+	 * @return string The format section
+	 */
+	public function formatSection(string $section, string $message, string $style = 'info')
+	{
+		return sprintf('<%s>[%s]</%s> %s', $style, $section, $style, $message);
+	}
 
-    /**
-     * Formats a message as a block of text.
-     *
-     * @param string|array $messages The message to write in the block
-     *
-     * @return string The formatter message
-     */
-    public function formatBlock($messages, string $style, bool $large = false)
-    {
-        if (!\is_array($messages)) {
-            $messages = [$messages];
-        }
+	/**
+	 * Formats a message as a block of text.
+	 *
+	 * @param string|array $messages The message to write in the block
+	 *
+	 * @return string The formatter message
+	 */
+	public function formatBlock($messages, string $style, bool $large = false)
+	{
+		if (!\is_array($messages)) {
+			$messages = [$messages];
+		}
 
-        $len = 0;
-        $lines = [];
-        foreach ($messages as $message) {
-            $message = OutputFormatter::escape($message);
-            $lines[] = sprintf($large ? '  %s  ' : ' %s ', $message);
-            $len = max(self::width($message) + ($large ? 4 : 2), $len);
-        }
+		$len = 0;
+		$lines = [];
+		foreach ($messages as $message) {
+			$message = OutputFormatter::escape($message);
+			$lines[] = sprintf($large ? '  %s  ' : ' %s ', $message);
+			$len = max(self::width($message) + ($large ? 4 : 2), $len);
+		}
 
-        $messages = $large ? [str_repeat(' ', $len)] : [];
-        for ($i = 0; isset($lines[$i]); ++$i) {
-            $messages[] = $lines[$i].str_repeat(' ', $len - self::width($lines[$i]));
-        }
-        if ($large) {
-            $messages[] = str_repeat(' ', $len);
-        }
+		$messages = $large ? [str_repeat(' ', $len)] : [];
+		for ($i = 0; isset($lines[$i]); ++$i) {
+			$messages[] = $lines[$i].str_repeat(' ', $len - self::width($lines[$i]));
+		}
+		if ($large) {
+			$messages[] = str_repeat(' ', $len);
+		}
 
-        for ($i = 0; isset($messages[$i]); ++$i) {
-            $messages[$i] = sprintf('<%s>%s</%s>', $style, $messages[$i], $style);
-        }
+		for ($i = 0; isset($messages[$i]); ++$i) {
+			$messages[$i] = sprintf('<%s>%s</%s>', $style, $messages[$i], $style);
+		}
 
-        return implode("\n", $messages);
-    }
+		return implode("\n", $messages);
+	}
 
-    /**
-     * Truncates a message to the given length.
-     *
-     * @return string
-     */
-    public function truncate(string $message, int $length, string $suffix = '...')
-    {
-        $computedLength = $length - self::width($suffix);
+	/**
+	 * Truncates a message to the given length.
+	 *
+	 * @return string
+	 */
+	public function truncate(string $message, int $length, string $suffix = '...')
+	{
+		$computedLength = $length - self::width($suffix);
 
-        if ($computedLength > self::width($message)) {
-            return $message;
-        }
+		if ($computedLength > self::width($message)) {
+			return $message;
+		}
 
-        return self::substr($message, 0, $length).$suffix;
-    }
+		return self::substr($message, 0, $length).$suffix;
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return 'formatter';
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getName()
+	{
+		return 'formatter';
+	}
 }

Spacing +22 added lines, -22 removed lines

@@ -25,9 +25,9 @@ 
      *
      * @return string The format section
      */
-    public function formatSection(string $section, string $message, string $style = 'info')
+    public function formatSection( string $section, string $message, string $style = 'info' )
     {
-        return sprintf('<%s>[%s]</%s> %s', $style, $section, $style, $message);
+        return sprintf( '<%s>[%s]</%s> %s', $style, $section, $style, $message );
     }
 
     /**
@@ -37,33 +37,33 @@ 
      *
      * @return string The formatter message
      */
-    public function formatBlock($messages, string $style, bool $large = false)
+    public function formatBlock( $messages, string $style, bool $large = false )
     {
-        if (!\is_array($messages)) {
-            $messages = [$messages];
+        if ( ! \is_array( $messages ) ) {
+            $messages = [ $messages ];
         }
 
         $len = 0;
-        $lines = [];
-        foreach ($messages as $message) {
-            $message = OutputFormatter::escape($message);
-            $lines[] = sprintf($large ? '  %s  ' : ' %s ', $message);
-            $len = max(self::width($message) + ($large ? 4 : 2), $len);
+        $lines = [ ];
+        foreach ( $messages as $message ) {
+            $message = OutputFormatter::escape( $message );
+            $lines[ ] = sprintf( $large ? '  %s  ' : ' %s ', $message );
+            $len = max( self::width( $message ) + ( $large ? 4 : 2 ), $len );
         }
 
-        $messages = $large ? [str_repeat(' ', $len)] : [];
-        for ($i = 0; isset($lines[$i]); ++$i) {
-            $messages[] = $lines[$i].str_repeat(' ', $len - self::width($lines[$i]));
+        $messages = $large ? [ str_repeat( ' ', $len ) ] : [ ];
+        for ( $i = 0; isset( $lines[ $i ] ); ++$i ) {
+            $messages[ ] = $lines[ $i ] . str_repeat( ' ', $len - self::width( $lines[ $i ] ) );
         }
-        if ($large) {
-            $messages[] = str_repeat(' ', $len);
+        if ( $large ) {
+            $messages[ ] = str_repeat( ' ', $len );
         }
 
-        for ($i = 0; isset($messages[$i]); ++$i) {
-            $messages[$i] = sprintf('<%s>%s</%s>', $style, $messages[$i], $style);
+        for ( $i = 0; isset( $messages[ $i ] ); ++$i ) {
+            $messages[ $i ] = sprintf( '<%s>%s</%s>', $style, $messages[ $i ], $style );
         }
 
-        return implode("\n", $messages);
+        return implode( "\n", $messages );
     }
 
     /**
@@ -71,15 +71,15 @@ 
      *
      * @return string
      */
-    public function truncate(string $message, int $length, string $suffix = '...')
+    public function truncate( string $message, int $length, string $suffix = '...' )
     {
-        $computedLength = $length - self::width($suffix);
+        $computedLength = $length - self::width( $suffix );
 
-        if ($computedLength > self::width($message)) {
+        if ( $computedLength > self::width( $message ) ) {
             return $message;
         }
 
-        return self::substr($message, 0, $length).$suffix;
+        return self::substr( $message, 0, $length ) . $suffix;
     }
 
     /**

Braces +5 added lines, -10 removed lines

@@ -18,15 +18,13 @@ 
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
-class FormatterHelper extends Helper
-{
+class FormatterHelper extends Helper {
     /**
      * Formats a message within a section.
      *
      * @return string The format section
      */
-    public function formatSection(string $section, string $message, string $style = 'info')
-    {
+    public function formatSection(string $section, string $message, string $style = 'info') {
         return sprintf('<%s>[%s]</%s> %s', $style, $section, $style, $message);
     }
 
@@ -37,8 +35,7 @@ 
      *
      * @return string The formatter message
      */
-    public function formatBlock($messages, string $style, bool $large = false)
-    {
+    public function formatBlock($messages, string $style, bool $large = false) {
         if (!\is_array($messages)) {
             $messages = [$messages];
         }
@@ -71,8 +68,7 @@ 
      *
      * @return string
      */
-    public function truncate(string $message, int $length, string $suffix = '...')
-    {
+    public function truncate(string $message, int $length, string $suffix = '...') {
         $computedLength = $length - self::width($suffix);
 
         if ($computedLength > self::width($message)) {
@@ -85,8 +81,7 @@ 
     /**
      * {@inheritdoc}
      */
-    public function getName()
-    {
+    public function getName() {
         return 'formatter';
     }
 }

vendor/symfony/console/Helper/SymfonyQuestionHelper.php

Indentation +59 added lines, -59 removed lines

@@ -25,85 +25,85 @@
  */
 class SymfonyQuestionHelper extends QuestionHelper
 {
-    /**
-     * {@inheritdoc}
-     */
-    protected function writePrompt(OutputInterface $output, Question $question)
-    {
-        $text = OutputFormatter::escapeTrailingBackslash($question->getQuestion());
-        $default = $question->getDefault();
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function writePrompt(OutputInterface $output, Question $question)
+	{
+		$text = OutputFormatter::escapeTrailingBackslash($question->getQuestion());
+		$default = $question->getDefault();
 
-        if ($question->isMultiline()) {
-            $text .= sprintf(' (press %s to continue)', $this->getEofShortcut());
-        }
+		if ($question->isMultiline()) {
+			$text .= sprintf(' (press %s to continue)', $this->getEofShortcut());
+		}
 
-        switch (true) {
-            case null === $default:
-                $text = sprintf(' <info>%s</info>:', $text);
+		switch (true) {
+			case null === $default:
+				$text = sprintf(' <info>%s</info>:', $text);
 
-                break;
+				break;
 
-            case $question instanceof ConfirmationQuestion:
-                $text = sprintf(' <info>%s (yes/no)</info> [<comment>%s</comment>]:', $text, $default ? 'yes' : 'no');
+			case $question instanceof ConfirmationQuestion:
+				$text = sprintf(' <info>%s (yes/no)</info> [<comment>%s</comment>]:', $text, $default ? 'yes' : 'no');
 
-                break;
+				break;
 
-            case $question instanceof ChoiceQuestion && $question->isMultiselect():
-                $choices = $question->getChoices();
-                $default = explode(',', $default);
+			case $question instanceof ChoiceQuestion && $question->isMultiselect():
+				$choices = $question->getChoices();
+				$default = explode(',', $default);
 
-                foreach ($default as $key => $value) {
-                    $default[$key] = $choices[trim($value)];
-                }
+				foreach ($default as $key => $value) {
+					$default[$key] = $choices[trim($value)];
+				}
 
-                $text = sprintf(' <info>%s</info> [<comment>%s</comment>]:', $text, OutputFormatter::escape(implode(', ', $default)));
+				$text = sprintf(' <info>%s</info> [<comment>%s</comment>]:', $text, OutputFormatter::escape(implode(', ', $default)));
 
-                break;
+				break;
 
-            case $question instanceof ChoiceQuestion:
-                $choices = $question->getChoices();
-                $text = sprintf(' <info>%s</info> [<comment>%s</comment>]:', $text, OutputFormatter::escape($choices[$default] ?? $default));
+			case $question instanceof ChoiceQuestion:
+				$choices = $question->getChoices();
+				$text = sprintf(' <info>%s</info> [<comment>%s</comment>]:', $text, OutputFormatter::escape($choices[$default] ?? $default));
 
-                break;
+				break;
 
-            default:
-                $text = sprintf(' <info>%s</info> [<comment>%s</comment>]:', $text, OutputFormatter::escape($default));
-        }
+			default:
+				$text = sprintf(' <info>%s</info> [<comment>%s</comment>]:', $text, OutputFormatter::escape($default));
+		}
 
-        $output->writeln($text);
+		$output->writeln($text);
 
-        $prompt = ' > ';
+		$prompt = ' > ';
 
-        if ($question instanceof ChoiceQuestion) {
-            $output->writeln($this->formatChoiceQuestionChoices($question, 'comment'));
+		if ($question instanceof ChoiceQuestion) {
+			$output->writeln($this->formatChoiceQuestionChoices($question, 'comment'));
 
-            $prompt = $question->getPrompt();
-        }
+			$prompt = $question->getPrompt();
+		}
 
-        $output->write($prompt);
-    }
+		$output->write($prompt);
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function writeError(OutputInterface $output, \Exception $error)
-    {
-        if ($output instanceof SymfonyStyle) {
-            $output->newLine();
-            $output->error($error->getMessage());
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function writeError(OutputInterface $output, \Exception $error)
+	{
+		if ($output instanceof SymfonyStyle) {
+			$output->newLine();
+			$output->error($error->getMessage());
 
-            return;
-        }
+			return;
+		}
 
-        parent::writeError($output, $error);
-    }
+		parent::writeError($output, $error);
+	}
 
-    private function getEofShortcut(): string
-    {
-        if ('Windows' === \PHP_OS_FAMILY) {
-            return '<comment>Ctrl+Z</comment> then <comment>Enter</comment>';
-        }
+	private function getEofShortcut(): string
+	{
+		if ('Windows' === \PHP_OS_FAMILY) {
+			return '<comment>Ctrl+Z</comment> then <comment>Enter</comment>';
+		}
 
-        return '<comment>Ctrl+D</comment>';
-    }
+		return '<comment>Ctrl+D</comment>';
+	}
 }

Spacing +22 added lines, -22 removed lines

@@ -28,79 +28,79 @@
     /**
      * {@inheritdoc}
      */
-    protected function writePrompt(OutputInterface $output, Question $question)
+    protected function writePrompt( OutputInterface $output, Question $question )
     {
-        $text = OutputFormatter::escapeTrailingBackslash($question->getQuestion());
+        $text = OutputFormatter::escapeTrailingBackslash( $question->getQuestion() );
         $default = $question->getDefault();
 
-        if ($question->isMultiline()) {
-            $text .= sprintf(' (press %s to continue)', $this->getEofShortcut());
+        if ( $question->isMultiline() ) {
+            $text .= sprintf( ' (press %s to continue)', $this->getEofShortcut() );
         }
 
-        switch (true) {
+        switch ( true ) {
             case null === $default:
-                $text = sprintf(' <info>%s</info>:', $text);
+                $text = sprintf( ' <info>%s</info>:', $text );
 
                 break;
 
             case $question instanceof ConfirmationQuestion:
-                $text = sprintf(' <info>%s (yes/no)</info> [<comment>%s</comment>]:', $text, $default ? 'yes' : 'no');
+                $text = sprintf( ' <info>%s (yes/no)</info> [<comment>%s</comment>]:', $text, $default ? 'yes' : 'no' );
 
                 break;
 
             case $question instanceof ChoiceQuestion && $question->isMultiselect():
                 $choices = $question->getChoices();
-                $default = explode(',', $default);
+                $default = explode( ',', $default );
 
-                foreach ($default as $key => $value) {
-                    $default[$key] = $choices[trim($value)];
+                foreach ( $default as $key => $value ) {
+                    $default[ $key ] = $choices[ trim( $value ) ];
                 }
 
-                $text = sprintf(' <info>%s</info> [<comment>%s</comment>]:', $text, OutputFormatter::escape(implode(', ', $default)));
+                $text = sprintf( ' <info>%s</info> [<comment>%s</comment>]:', $text, OutputFormatter::escape( implode( ', ', $default ) ) );
 
                 break;
 
             case $question instanceof ChoiceQuestion:
                 $choices = $question->getChoices();
-                $text = sprintf(' <info>%s</info> [<comment>%s</comment>]:', $text, OutputFormatter::escape($choices[$default] ?? $default));
+                $text = sprintf( ' <info>%s</info> [<comment>%s</comment>]:', $text, OutputFormatter::escape( $choices[ $default ] ?? $default ) );
 
                 break;
 
             default:
-                $text = sprintf(' <info>%s</info> [<comment>%s</comment>]:', $text, OutputFormatter::escape($default));
+                $text = sprintf( ' <info>%s</info> [<comment>%s</comment>]:', $text, OutputFormatter::escape( $default ) );
         }
 
-        $output->writeln($text);
+        $output->writeln( $text );
 
         $prompt = ' > ';
 
-        if ($question instanceof ChoiceQuestion) {
-            $output->writeln($this->formatChoiceQuestionChoices($question, 'comment'));
+        if ( $question instanceof ChoiceQuestion ) {
+            $output->writeln( $this->formatChoiceQuestionChoices( $question, 'comment' ) );
 
             $prompt = $question->getPrompt();
         }
 
-        $output->write($prompt);
+        $output->write( $prompt );
     }
 
     /**
      * {@inheritdoc}
      */
-    protected function writeError(OutputInterface $output, \Exception $error)
+    protected function writeError( OutputInterface $output, \Exception $error )
     {
-        if ($output instanceof SymfonyStyle) {
+        if ( $output instanceof SymfonyStyle ) {
             $output->newLine();
-            $output->error($error->getMessage());
+            $output->error( $error->getMessage() );
 
             return;
         }
 
-        parent::writeError($output, $error);
+        parent::writeError( $output, $error );
     }
 
     private function getEofShortcut(): string
     {
-        if ('Windows' === \PHP_OS_FAMILY) {
+        if ( 'Windows' === \PHP_OS_FAMILY ) {
             return '<comment>Ctrl+Z</comment> then <comment>Enter</comment>';
         }
 

Braces +3 added lines, -6 removed lines

@@ -23,13 +23,11 @@ 
  *
  * @author Kevin Bond <kevinbond@gmail.com>
  */
-class SymfonyQuestionHelper extends QuestionHelper
-{
+class SymfonyQuestionHelper extends QuestionHelper {
     /**
      * {@inheritdoc}
      */
-    protected function writePrompt(OutputInterface $output, Question $question)
-    {
+    protected function writePrompt(OutputInterface $output, Question $question) {
         $text = OutputFormatter::escapeTrailingBackslash($question->getQuestion());
         $default = $question->getDefault();
 
@@ -86,8 +84,7 @@ 
     /**
      * {@inheritdoc}
      */
-    protected function writeError(OutputInterface $output, \Exception $error)
-    {
+    protected function writeError(OutputInterface $output, \Exception $error) {
         if ($output instanceof SymfonyStyle) {
             $output->newLine();
             $output->error($error->getMessage());

vendor/symfony/console/Helper/TableRows.php

Indentation +10 added lines, -10 removed lines

@@ -16,17 +16,17 @@
  */
 class TableRows implements \IteratorAggregate
 {
-    private $generator;
+	private $generator;
 
-    public function __construct(callable $generator)
-    {
-        $this->generator = $generator;
-    }
+	public function __construct(callable $generator)
+	{
+		$this->generator = $generator;
+	}
 
-    public function getIterator(): \Traversable
-    {
-        $g = $this->generator;
+	public function getIterator(): \Traversable
+	{
+		$g = $this->generator;
 
-        return $g();
-    }
+		return $g();
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 {
     private $generator;
 
-    public function __construct(callable $generator)
+    public function __construct( callable $generator )
     {
         $this->generator = $generator;
     }

Braces +2 added lines, -4 removed lines

@@ -14,12 +14,10 @@
 /**
  * @internal
  */
-class TableRows implements \IteratorAggregate
-{
+class TableRows implements \IteratorAggregate {
     private $generator;
 
-    public function __construct(callable $generator)
-    {
+    public function __construct(callable $generator) {
         $this->generator = $generator;
     }
 

vendor/symfony/console/Helper/ProgressBar.php

Indentation +590 added lines, -590 removed lines

@@ -26,594 +26,594 @@
  */
 final class ProgressBar
 {
-    public const FORMAT_VERBOSE = 'verbose';
-    public const FORMAT_VERY_VERBOSE = 'very_verbose';
-    public const FORMAT_DEBUG = 'debug';
-    public const FORMAT_NORMAL = 'normal';
-
-    private const FORMAT_VERBOSE_NOMAX = 'verbose_nomax';
-    private const FORMAT_VERY_VERBOSE_NOMAX = 'very_verbose_nomax';
-    private const FORMAT_DEBUG_NOMAX = 'debug_nomax';
-    private const FORMAT_NORMAL_NOMAX = 'normal_nomax';
-
-    private $barWidth = 28;
-    private $barChar;
-    private $emptyBarChar = '-';
-    private $progressChar = '>';
-    private $format;
-    private $internalFormat;
-    private $redrawFreq = 1;
-    private $writeCount;
-    private $lastWriteTime;
-    private $minSecondsBetweenRedraws = 0;
-    private $maxSecondsBetweenRedraws = 1;
-    private $output;
-    private $step = 0;
-    private $max;
-    private $startTime;
-    private $stepWidth;
-    private $percent = 0.0;
-    private $formatLineCount;
-    private $messages = [];
-    private $overwrite = true;
-    private $terminal;
-    private $previousMessage;
-    private $cursor;
-
-    private static $formatters;
-    private static $formats;
-
-    /**
-     * @param int $max Maximum steps (0 if unknown)
-     */
-    public function __construct(OutputInterface $output, int $max = 0, float $minSecondsBetweenRedraws = 1 / 25)
-    {
-        if ($output instanceof ConsoleOutputInterface) {
-            $output = $output->getErrorOutput();
-        }
-
-        $this->output = $output;
-        $this->setMaxSteps($max);
-        $this->terminal = new Terminal();
-
-        if (0 < $minSecondsBetweenRedraws) {
-            $this->redrawFreq = null;
-            $this->minSecondsBetweenRedraws = $minSecondsBetweenRedraws;
-        }
-
-        if (!$this->output->isDecorated()) {
-            // disable overwrite when output does not support ANSI codes.
-            $this->overwrite = false;
-
-            // set a reasonable redraw frequency so output isn't flooded
-            $this->redrawFreq = null;
-        }
-
-        $this->startTime = time();
-        $this->cursor = new Cursor($output);
-    }
-
-    /**
-     * Sets a placeholder formatter for a given name.
-     *
-     * This method also allow you to override an existing placeholder.
-     *
-     * @param string   $name     The placeholder name (including the delimiter char like %)
-     * @param callable $callable A PHP callable
-     */
-    public static function setPlaceholderFormatterDefinition(string $name, callable $callable): void
-    {
-        if (!self::$formatters) {
-            self::$formatters = self::initPlaceholderFormatters();
-        }
-
-        self::$formatters[$name] = $callable;
-    }
-
-    /**
-     * Gets the placeholder formatter for a given name.
-     *
-     * @param string $name The placeholder name (including the delimiter char like %)
-     *
-     * @return callable|null A PHP callable
-     */
-    public static function getPlaceholderFormatterDefinition(string $name): ?callable
-    {
-        if (!self::$formatters) {
-            self::$formatters = self::initPlaceholderFormatters();
-        }
-
-        return self::$formatters[$name] ?? null;
-    }
-
-    /**
-     * Sets a format for a given name.
-     *
-     * This method also allow you to override an existing format.
-     *
-     * @param string $name   The format name
-     * @param string $format A format string
-     */
-    public static function setFormatDefinition(string $name, string $format): void
-    {
-        if (!self::$formats) {
-            self::$formats = self::initFormats();
-        }
-
-        self::$formats[$name] = $format;
-    }
-
-    /**
-     * Gets the format for a given name.
-     *
-     * @param string $name The format name
-     *
-     * @return string|null A format string
-     */
-    public static function getFormatDefinition(string $name): ?string
-    {
-        if (!self::$formats) {
-            self::$formats = self::initFormats();
-        }
-
-        return self::$formats[$name] ?? null;
-    }
-
-    /**
-     * Associates a text with a named placeholder.
-     *
-     * The text is displayed when the progress bar is rendered but only
-     * when the corresponding placeholder is part of the custom format line
-     * (by wrapping the name with %).
-     *
-     * @param string $message The text to associate with the placeholder
-     * @param string $name    The name of the placeholder
-     */
-    public function setMessage(string $message, string $name = 'message')
-    {
-        $this->messages[$name] = $message;
-    }
-
-    public function getMessage(string $name = 'message')
-    {
-        return $this->messages[$name];
-    }
-
-    public function getStartTime(): int
-    {
-        return $this->startTime;
-    }
-
-    public function getMaxSteps(): int
-    {
-        return $this->max;
-    }
-
-    public function getProgress(): int
-    {
-        return $this->step;
-    }
-
-    private function getStepWidth(): int
-    {
-        return $this->stepWidth;
-    }
-
-    public function getProgressPercent(): float
-    {
-        return $this->percent;
-    }
-
-    public function getBarOffset(): float
-    {
-        return floor($this->max ? $this->percent * $this->barWidth : (null === $this->redrawFreq ? (int) (min(5, $this->barWidth / 15) * $this->writeCount) : $this->step) % $this->barWidth);
-    }
-
-    public function getEstimated(): float
-    {
-        if (!$this->step) {
-            return 0;
-        }
-
-        return round((time() - $this->startTime) / $this->step * $this->max);
-    }
-
-    public function getRemaining(): float
-    {
-        if (!$this->step) {
-            return 0;
-        }
-
-        return round((time() - $this->startTime) / $this->step * ($this->max - $this->step));
-    }
-
-    public function setBarWidth(int $size)
-    {
-        $this->barWidth = max(1, $size);
-    }
-
-    public function getBarWidth(): int
-    {
-        return $this->barWidth;
-    }
-
-    public function setBarCharacter(string $char)
-    {
-        $this->barChar = $char;
-    }
-
-    public function getBarCharacter(): string
-    {
-        if (null === $this->barChar) {
-            return $this->max ? '=' : $this->emptyBarChar;
-        }
-
-        return $this->barChar;
-    }
-
-    public function setEmptyBarCharacter(string $char)
-    {
-        $this->emptyBarChar = $char;
-    }
-
-    public function getEmptyBarCharacter(): string
-    {
-        return $this->emptyBarChar;
-    }
-
-    public function setProgressCharacter(string $char)
-    {
-        $this->progressChar = $char;
-    }
-
-    public function getProgressCharacter(): string
-    {
-        return $this->progressChar;
-    }
-
-    public function setFormat(string $format)
-    {
-        $this->format = null;
-        $this->internalFormat = $format;
-    }
-
-    /**
-     * Sets the redraw frequency.
-     *
-     * @param int|null $freq The frequency in steps
-     */
-    public function setRedrawFrequency(?int $freq)
-    {
-        $this->redrawFreq = null !== $freq ? max(1, $freq) : null;
-    }
-
-    public function minSecondsBetweenRedraws(float $seconds): void
-    {
-        $this->minSecondsBetweenRedraws = $seconds;
-    }
-
-    public function maxSecondsBetweenRedraws(float $seconds): void
-    {
-        $this->maxSecondsBetweenRedraws = $seconds;
-    }
-
-    /**
-     * Returns an iterator that will automatically update the progress bar when iterated.
-     *
-     * @param int|null $max Number of steps to complete the bar (0 if indeterminate), if null it will be inferred from $iterable
-     */
-    public function iterate(iterable $iterable, int $max = null): iterable
-    {
-        $this->start($max ?? (is_countable($iterable) ? \count($iterable) : 0));
-
-        foreach ($iterable as $key => $value) {
-            yield $key => $value;
-
-            $this->advance();
-        }
-
-        $this->finish();
-    }
-
-    /**
-     * Starts the progress output.
-     *
-     * @param int|null $max Number of steps to complete the bar (0 if indeterminate), null to leave unchanged
-     */
-    public function start(int $max = null)
-    {
-        $this->startTime = time();
-        $this->step = 0;
-        $this->percent = 0.0;
-
-        if (null !== $max) {
-            $this->setMaxSteps($max);
-        }
-
-        $this->display();
-    }
-
-    /**
-     * Advances the progress output X steps.
-     *
-     * @param int $step Number of steps to advance
-     */
-    public function advance(int $step = 1)
-    {
-        $this->setProgress($this->step + $step);
-    }
-
-    /**
-     * Sets whether to overwrite the progressbar, false for new line.
-     */
-    public function setOverwrite(bool $overwrite)
-    {
-        $this->overwrite = $overwrite;
-    }
-
-    public function setProgress(int $step)
-    {
-        if ($this->max && $step > $this->max) {
-            $this->max = $step;
-        } elseif ($step < 0) {
-            $step = 0;
-        }
-
-        $redrawFreq = $this->redrawFreq ?? (($this->max ?: 10) / 10);
-        $prevPeriod = (int) ($this->step / $redrawFreq);
-        $currPeriod = (int) ($step / $redrawFreq);
-        $this->step = $step;
-        $this->percent = $this->max ? (float) $this->step / $this->max : 0;
-        $timeInterval = microtime(true) - $this->lastWriteTime;
-
-        // Draw regardless of other limits
-        if ($this->max === $step) {
-            $this->display();
-
-            return;
-        }
-
-        // Throttling
-        if ($timeInterval < $this->minSecondsBetweenRedraws) {
-            return;
-        }
-
-        // Draw each step period, but not too late
-        if ($prevPeriod !== $currPeriod || $timeInterval >= $this->maxSecondsBetweenRedraws) {
-            $this->display();
-        }
-    }
-
-    public function setMaxSteps(int $max)
-    {
-        $this->format = null;
-        $this->max = max(0, $max);
-        $this->stepWidth = $this->max ? Helper::width((string) $this->max) : 4;
-    }
-
-    /**
-     * Finishes the progress output.
-     */
-    public function finish(): void
-    {
-        if (!$this->max) {
-            $this->max = $this->step;
-        }
-
-        if ($this->step === $this->max && !$this->overwrite) {
-            // prevent double 100% output
-            return;
-        }
-
-        $this->setProgress($this->max);
-    }
-
-    /**
-     * Outputs the current progress string.
-     */
-    public function display(): void
-    {
-        if (OutputInterface::VERBOSITY_QUIET === $this->output->getVerbosity()) {
-            return;
-        }
-
-        if (null === $this->format) {
-            $this->setRealFormat($this->internalFormat ?: $this->determineBestFormat());
-        }
-
-        $this->overwrite($this->buildLine());
-    }
-
-    /**
-     * Removes the progress bar from the current line.
-     *
-     * This is useful if you wish to write some output
-     * while a progress bar is running.
-     * Call display() to show the progress bar again.
-     */
-    public function clear(): void
-    {
-        if (!$this->overwrite) {
-            return;
-        }
-
-        if (null === $this->format) {
-            $this->setRealFormat($this->internalFormat ?: $this->determineBestFormat());
-        }
-
-        $this->overwrite('');
-    }
-
-    private function setRealFormat(string $format)
-    {
-        // try to use the _nomax variant if available
-        if (!$this->max && null !== self::getFormatDefinition($format.'_nomax')) {
-            $this->format = self::getFormatDefinition($format.'_nomax');
-        } elseif (null !== self::getFormatDefinition($format)) {
-            $this->format = self::getFormatDefinition($format);
-        } else {
-            $this->format = $format;
-        }
-
-        $this->formatLineCount = substr_count($this->format, "\n");
-    }
-
-    /**
-     * Overwrites a previous message to the output.
-     */
-    private function overwrite(string $message): void
-    {
-        if ($this->previousMessage === $message) {
-            return;
-        }
-
-        $originalMessage = $message;
-
-        if ($this->overwrite) {
-            if (null !== $this->previousMessage) {
-                if ($this->output instanceof ConsoleSectionOutput) {
-                    $messageLines = explode("\n", $message);
-                    $lineCount = \count($messageLines);
-                    foreach ($messageLines as $messageLine) {
-                        $messageLineLength = Helper::width(Helper::removeDecoration($this->output->getFormatter(), $messageLine));
-                        if ($messageLineLength > $this->terminal->getWidth()) {
-                            $lineCount += floor($messageLineLength / $this->terminal->getWidth());
-                        }
-                    }
-                    $this->output->clear($lineCount);
-                } else {
-                    for ($i = 0; $i < $this->formatLineCount; ++$i) {
-                        $this->cursor->moveToColumn(1);
-                        $this->cursor->clearLine();
-                        $this->cursor->moveUp();
-                    }
-
-                    $this->cursor->moveToColumn(1);
-                    $this->cursor->clearLine();
-                }
-            }
-        } elseif ($this->step > 0) {
-            $message = \PHP_EOL.$message;
-        }
-
-        $this->previousMessage = $originalMessage;
-        $this->lastWriteTime = microtime(true);
-
-        $this->output->write($message);
-        ++$this->writeCount;
-    }
-
-    private function determineBestFormat(): string
-    {
-        switch ($this->output->getVerbosity()) {
-            // OutputInterface::VERBOSITY_QUIET: display is disabled anyway
-            case OutputInterface::VERBOSITY_VERBOSE:
-                return $this->max ? self::FORMAT_VERBOSE : self::FORMAT_VERBOSE_NOMAX;
-            case OutputInterface::VERBOSITY_VERY_VERBOSE:
-                return $this->max ? self::FORMAT_VERY_VERBOSE : self::FORMAT_VERY_VERBOSE_NOMAX;
-            case OutputInterface::VERBOSITY_DEBUG:
-                return $this->max ? self::FORMAT_DEBUG : self::FORMAT_DEBUG_NOMAX;
-            default:
-                return $this->max ? self::FORMAT_NORMAL : self::FORMAT_NORMAL_NOMAX;
-        }
-    }
-
-    private static function initPlaceholderFormatters(): array
-    {
-        return [
-            'bar' => function (self $bar, OutputInterface $output) {
-                $completeBars = $bar->getBarOffset();
-                $display = str_repeat($bar->getBarCharacter(), $completeBars);
-                if ($completeBars < $bar->getBarWidth()) {
-                    $emptyBars = $bar->getBarWidth() - $completeBars - Helper::length(Helper::removeDecoration($output->getFormatter(), $bar->getProgressCharacter()));
-                    $display .= $bar->getProgressCharacter().str_repeat($bar->getEmptyBarCharacter(), $emptyBars);
-                }
-
-                return $display;
-            },
-            'elapsed' => function (self $bar) {
-                return Helper::formatTime(time() - $bar->getStartTime());
-            },
-            'remaining' => function (self $bar) {
-                if (!$bar->getMaxSteps()) {
-                    throw new LogicException('Unable to display the remaining time if the maximum number of steps is not set.');
-                }
-
-                return Helper::formatTime($bar->getRemaining());
-            },
-            'estimated' => function (self $bar) {
-                if (!$bar->getMaxSteps()) {
-                    throw new LogicException('Unable to display the estimated time if the maximum number of steps is not set.');
-                }
-
-                return Helper::formatTime($bar->getEstimated());
-            },
-            'memory' => function (self $bar) {
-                return Helper::formatMemory(memory_get_usage(true));
-            },
-            'current' => function (self $bar) {
-                return str_pad($bar->getProgress(), $bar->getStepWidth(), ' ', \STR_PAD_LEFT);
-            },
-            'max' => function (self $bar) {
-                return $bar->getMaxSteps();
-            },
-            'percent' => function (self $bar) {
-                return floor($bar->getProgressPercent() * 100);
-            },
-        ];
-    }
-
-    private static function initFormats(): array
-    {
-        return [
-            self::FORMAT_NORMAL => ' %current%/%max% [%bar%] %percent:3s%%',
-            self::FORMAT_NORMAL_NOMAX => ' %current% [%bar%]',
-
-            self::FORMAT_VERBOSE => ' %current%/%max% [%bar%] %percent:3s%% %elapsed:6s%',
-            self::FORMAT_VERBOSE_NOMAX => ' %current% [%bar%] %elapsed:6s%',
-
-            self::FORMAT_VERY_VERBOSE => ' %current%/%max% [%bar%] %percent:3s%% %elapsed:6s%/%estimated:-6s%',
-            self::FORMAT_VERY_VERBOSE_NOMAX => ' %current% [%bar%] %elapsed:6s%',
-
-            self::FORMAT_DEBUG => ' %current%/%max% [%bar%] %percent:3s%% %elapsed:6s%/%estimated:-6s% %memory:6s%',
-            self::FORMAT_DEBUG_NOMAX => ' %current% [%bar%] %elapsed:6s% %memory:6s%',
-        ];
-    }
-
-    private function buildLine(): string
-    {
-        $regex = "{%([a-z\-_]+)(?:\:([^%]+))?%}i";
-        $callback = function ($matches) {
-            if ($formatter = $this::getPlaceholderFormatterDefinition($matches[1])) {
-                $text = $formatter($this, $this->output);
-            } elseif (isset($this->messages[$matches[1]])) {
-                $text = $this->messages[$matches[1]];
-            } else {
-                return $matches[0];
-            }
-
-            if (isset($matches[2])) {
-                $text = sprintf('%'.$matches[2], $text);
-            }
-
-            return $text;
-        };
-        $line = preg_replace_callback($regex, $callback, $this->format);
-
-        // gets string length for each sub line with multiline format
-        $linesLength = array_map(function ($subLine) {
-            return Helper::width(Helper::removeDecoration($this->output->getFormatter(), rtrim($subLine, "\r")));
-        }, explode("\n", $line));
-
-        $linesWidth = max($linesLength);
-
-        $terminalWidth = $this->terminal->getWidth();
-        if ($linesWidth <= $terminalWidth) {
-            return $line;
-        }
-
-        $this->setBarWidth($this->barWidth - $linesWidth + $terminalWidth);
-
-        return preg_replace_callback($regex, $callback, $this->format);
-    }
+	public const FORMAT_VERBOSE = 'verbose';
+	public const FORMAT_VERY_VERBOSE = 'very_verbose';
+	public const FORMAT_DEBUG = 'debug';
+	public const FORMAT_NORMAL = 'normal';
+
+	private const FORMAT_VERBOSE_NOMAX = 'verbose_nomax';
+	private const FORMAT_VERY_VERBOSE_NOMAX = 'very_verbose_nomax';
+	private const FORMAT_DEBUG_NOMAX = 'debug_nomax';
+	private const FORMAT_NORMAL_NOMAX = 'normal_nomax';
+
+	private $barWidth = 28;
+	private $barChar;
+	private $emptyBarChar = '-';
+	private $progressChar = '>';
+	private $format;
+	private $internalFormat;
+	private $redrawFreq = 1;
+	private $writeCount;
+	private $lastWriteTime;
+	private $minSecondsBetweenRedraws = 0;
+	private $maxSecondsBetweenRedraws = 1;
+	private $output;
+	private $step = 0;
+	private $max;
+	private $startTime;
+	private $stepWidth;
+	private $percent = 0.0;
+	private $formatLineCount;
+	private $messages = [];
+	private $overwrite = true;
+	private $terminal;
+	private $previousMessage;
+	private $cursor;
+
+	private static $formatters;
+	private static $formats;
+
+	/**
+	 * @param int $max Maximum steps (0 if unknown)
+	 */
+	public function __construct(OutputInterface $output, int $max = 0, float $minSecondsBetweenRedraws = 1 / 25)
+	{
+		if ($output instanceof ConsoleOutputInterface) {
+			$output = $output->getErrorOutput();
+		}
+
+		$this->output = $output;
+		$this->setMaxSteps($max);
+		$this->terminal = new Terminal();
+
+		if (0 < $minSecondsBetweenRedraws) {
+			$this->redrawFreq = null;
+			$this->minSecondsBetweenRedraws = $minSecondsBetweenRedraws;
+		}
+
+		if (!$this->output->isDecorated()) {
+			// disable overwrite when output does not support ANSI codes.
+			$this->overwrite = false;
+
+			// set a reasonable redraw frequency so output isn't flooded
+			$this->redrawFreq = null;
+		}
+
+		$this->startTime = time();
+		$this->cursor = new Cursor($output);
+	}
+
+	/**
+	 * Sets a placeholder formatter for a given name.
+	 *
+	 * This method also allow you to override an existing placeholder.
+	 *
+	 * @param string   $name     The placeholder name (including the delimiter char like %)
+	 * @param callable $callable A PHP callable
+	 */
+	public static function setPlaceholderFormatterDefinition(string $name, callable $callable): void
+	{
+		if (!self::$formatters) {
+			self::$formatters = self::initPlaceholderFormatters();
+		}
+
+		self::$formatters[$name] = $callable;
+	}
+
+	/**
+	 * Gets the placeholder formatter for a given name.
+	 *
+	 * @param string $name The placeholder name (including the delimiter char like %)
+	 *
+	 * @return callable|null A PHP callable
+	 */
+	public static function getPlaceholderFormatterDefinition(string $name): ?callable
+	{
+		if (!self::$formatters) {
+			self::$formatters = self::initPlaceholderFormatters();
+		}
+
+		return self::$formatters[$name] ?? null;
+	}
+
+	/**
+	 * Sets a format for a given name.
+	 *
+	 * This method also allow you to override an existing format.
+	 *
+	 * @param string $name   The format name
+	 * @param string $format A format string
+	 */
+	public static function setFormatDefinition(string $name, string $format): void
+	{
+		if (!self::$formats) {
+			self::$formats = self::initFormats();
+		}
+
+		self::$formats[$name] = $format;
+	}
+
+	/**
+	 * Gets the format for a given name.
+	 *
+	 * @param string $name The format name
+	 *
+	 * @return string|null A format string
+	 */
+	public static function getFormatDefinition(string $name): ?string
+	{
+		if (!self::$formats) {
+			self::$formats = self::initFormats();
+		}
+
+		return self::$formats[$name] ?? null;
+	}
+
+	/**
+	 * Associates a text with a named placeholder.
+	 *
+	 * The text is displayed when the progress bar is rendered but only
+	 * when the corresponding placeholder is part of the custom format line
+	 * (by wrapping the name with %).
+	 *
+	 * @param string $message The text to associate with the placeholder
+	 * @param string $name    The name of the placeholder
+	 */
+	public function setMessage(string $message, string $name = 'message')
+	{
+		$this->messages[$name] = $message;
+	}
+
+	public function getMessage(string $name = 'message')
+	{
+		return $this->messages[$name];
+	}
+
+	public function getStartTime(): int
+	{
+		return $this->startTime;
+	}
+
+	public function getMaxSteps(): int
+	{
+		return $this->max;
+	}
+
+	public function getProgress(): int
+	{
+		return $this->step;
+	}
+
+	private function getStepWidth(): int
+	{
+		return $this->stepWidth;
+	}
+
+	public function getProgressPercent(): float
+	{
+		return $this->percent;
+	}
+
+	public function getBarOffset(): float
+	{
+		return floor($this->max ? $this->percent * $this->barWidth : (null === $this->redrawFreq ? (int) (min(5, $this->barWidth / 15) * $this->writeCount) : $this->step) % $this->barWidth);
+	}
+
+	public function getEstimated(): float
+	{
+		if (!$this->step) {
+			return 0;
+		}
+
+		return round((time() - $this->startTime) / $this->step * $this->max);
+	}
+
+	public function getRemaining(): float
+	{
+		if (!$this->step) {
+			return 0;
+		}
+
+		return round((time() - $this->startTime) / $this->step * ($this->max - $this->step));
+	}
+
+	public function setBarWidth(int $size)
+	{
+		$this->barWidth = max(1, $size);
+	}
+
+	public function getBarWidth(): int
+	{
+		return $this->barWidth;
+	}
+
+	public function setBarCharacter(string $char)
+	{
+		$this->barChar = $char;
+	}
+
+	public function getBarCharacter(): string
+	{
+		if (null === $this->barChar) {
+			return $this->max ? '=' : $this->emptyBarChar;
+		}
+
+		return $this->barChar;
+	}
+
+	public function setEmptyBarCharacter(string $char)
+	{
+		$this->emptyBarChar = $char;
+	}
+
+	public function getEmptyBarCharacter(): string
+	{
+		return $this->emptyBarChar;
+	}
+
+	public function setProgressCharacter(string $char)
+	{
+		$this->progressChar = $char;
+	}
+
+	public function getProgressCharacter(): string
+	{
+		return $this->progressChar;
+	}
+
+	public function setFormat(string $format)
+	{
+		$this->format = null;
+		$this->internalFormat = $format;
+	}
+
+	/**
+	 * Sets the redraw frequency.
+	 *
+	 * @param int|null $freq The frequency in steps
+	 */
+	public function setRedrawFrequency(?int $freq)
+	{
+		$this->redrawFreq = null !== $freq ? max(1, $freq) : null;
+	}
+
+	public function minSecondsBetweenRedraws(float $seconds): void
+	{
+		$this->minSecondsBetweenRedraws = $seconds;
+	}
+
+	public function maxSecondsBetweenRedraws(float $seconds): void
+	{
+		$this->maxSecondsBetweenRedraws = $seconds;
+	}
+
+	/**
+	 * Returns an iterator that will automatically update the progress bar when iterated.
+	 *
+	 * @param int|null $max Number of steps to complete the bar (0 if indeterminate), if null it will be inferred from $iterable
+	 */
+	public function iterate(iterable $iterable, int $max = null): iterable
+	{
+		$this->start($max ?? (is_countable($iterable) ? \count($iterable) : 0));
+
+		foreach ($iterable as $key => $value) {
+			yield $key => $value;
+
+			$this->advance();
+		}
+
+		$this->finish();
+	}
+
+	/**
+	 * Starts the progress output.
+	 *
+	 * @param int|null $max Number of steps to complete the bar (0 if indeterminate), null to leave unchanged
+	 */
+	public function start(int $max = null)
+	{
+		$this->startTime = time();
+		$this->step = 0;
+		$this->percent = 0.0;
+
+		if (null !== $max) {
+			$this->setMaxSteps($max);
+		}
+
+		$this->display();
+	}
+
+	/**
+	 * Advances the progress output X steps.
+	 *
+	 * @param int $step Number of steps to advance
+	 */
+	public function advance(int $step = 1)
+	{
+		$this->setProgress($this->step + $step);
+	}
+
+	/**
+	 * Sets whether to overwrite the progressbar, false for new line.
+	 */
+	public function setOverwrite(bool $overwrite)
+	{
+		$this->overwrite = $overwrite;
+	}
+
+	public function setProgress(int $step)
+	{
+		if ($this->max && $step > $this->max) {
+			$this->max = $step;
+		} elseif ($step < 0) {
+			$step = 0;
+		}
+
+		$redrawFreq = $this->redrawFreq ?? (($this->max ?: 10) / 10);
+		$prevPeriod = (int) ($this->step / $redrawFreq);
+		$currPeriod = (int) ($step / $redrawFreq);
+		$this->step = $step;
+		$this->percent = $this->max ? (float) $this->step / $this->max : 0;
+		$timeInterval = microtime(true) - $this->lastWriteTime;
+
+		// Draw regardless of other limits
+		if ($this->max === $step) {
+			$this->display();
+
+			return;
+		}
+
+		// Throttling
+		if ($timeInterval < $this->minSecondsBetweenRedraws) {
+			return;
+		}
+
+		// Draw each step period, but not too late
+		if ($prevPeriod !== $currPeriod || $timeInterval >= $this->maxSecondsBetweenRedraws) {
+			$this->display();
+		}
+	}
+
+	public function setMaxSteps(int $max)
+	{
+		$this->format = null;
+		$this->max = max(0, $max);
+		$this->stepWidth = $this->max ? Helper::width((string) $this->max) : 4;
+	}
+
+	/**
+	 * Finishes the progress output.
+	 */
+	public function finish(): void
+	{
+		if (!$this->max) {
+			$this->max = $this->step;
+		}
+
+		if ($this->step === $this->max && !$this->overwrite) {
+			// prevent double 100% output
+			return;
+		}
+
+		$this->setProgress($this->max);
+	}
+
+	/**
+	 * Outputs the current progress string.
+	 */
+	public function display(): void
+	{
+		if (OutputInterface::VERBOSITY_QUIET === $this->output->getVerbosity()) {
+			return;
+		}
+
+		if (null === $this->format) {
+			$this->setRealFormat($this->internalFormat ?: $this->determineBestFormat());
+		}
+
+		$this->overwrite($this->buildLine());
+	}
+
+	/**
+	 * Removes the progress bar from the current line.
+	 *
+	 * This is useful if you wish to write some output
+	 * while a progress bar is running.
+	 * Call display() to show the progress bar again.
+	 */
+	public function clear(): void
+	{
+		if (!$this->overwrite) {
+			return;
+		}
+
+		if (null === $this->format) {
+			$this->setRealFormat($this->internalFormat ?: $this->determineBestFormat());
+		}
+
+		$this->overwrite('');
+	}
+
+	private function setRealFormat(string $format)
+	{
+		// try to use the _nomax variant if available
+		if (!$this->max && null !== self::getFormatDefinition($format.'_nomax')) {
+			$this->format = self::getFormatDefinition($format.'_nomax');
+		} elseif (null !== self::getFormatDefinition($format)) {
+			$this->format = self::getFormatDefinition($format);
+		} else {
+			$this->format = $format;
+		}
+
+		$this->formatLineCount = substr_count($this->format, "\n");
+	}
+
+	/**
+	 * Overwrites a previous message to the output.
+	 */
+	private function overwrite(string $message): void
+	{
+		if ($this->previousMessage === $message) {
+			return;
+		}
+
+		$originalMessage = $message;
+
+		if ($this->overwrite) {
+			if (null !== $this->previousMessage) {
+				if ($this->output instanceof ConsoleSectionOutput) {
+					$messageLines = explode("\n", $message);
+					$lineCount = \count($messageLines);
+					foreach ($messageLines as $messageLine) {
+						$messageLineLength = Helper::width(Helper::removeDecoration($this->output->getFormatter(), $messageLine));
+						if ($messageLineLength > $this->terminal->getWidth()) {
+							$lineCount += floor($messageLineLength / $this->terminal->getWidth());
+						}
+					}
+					$this->output->clear($lineCount);
+				} else {
+					for ($i = 0; $i < $this->formatLineCount; ++$i) {
+						$this->cursor->moveToColumn(1);
+						$this->cursor->clearLine();
+						$this->cursor->moveUp();
+					}
+
+					$this->cursor->moveToColumn(1);
+					$this->cursor->clearLine();
+				}
+			}
+		} elseif ($this->step > 0) {
+			$message = \PHP_EOL.$message;
+		}
+
+		$this->previousMessage = $originalMessage;
+		$this->lastWriteTime = microtime(true);
+
+		$this->output->write($message);
+		++$this->writeCount;
+	}
+
+	private function determineBestFormat(): string
+	{
+		switch ($this->output->getVerbosity()) {
+			// OutputInterface::VERBOSITY_QUIET: display is disabled anyway
+			case OutputInterface::VERBOSITY_VERBOSE:
+				return $this->max ? self::FORMAT_VERBOSE : self::FORMAT_VERBOSE_NOMAX;
+			case OutputInterface::VERBOSITY_VERY_VERBOSE:
+				return $this->max ? self::FORMAT_VERY_VERBOSE : self::FORMAT_VERY_VERBOSE_NOMAX;
+			case OutputInterface::VERBOSITY_DEBUG:
+				return $this->max ? self::FORMAT_DEBUG : self::FORMAT_DEBUG_NOMAX;
+			default:
+				return $this->max ? self::FORMAT_NORMAL : self::FORMAT_NORMAL_NOMAX;
+		}
+	}
+
+	private static function initPlaceholderFormatters(): array
+	{
+		return [
+			'bar' => function (self $bar, OutputInterface $output) {
+				$completeBars = $bar->getBarOffset();
+				$display = str_repeat($bar->getBarCharacter(), $completeBars);
+				if ($completeBars < $bar->getBarWidth()) {
+					$emptyBars = $bar->getBarWidth() - $completeBars - Helper::length(Helper::removeDecoration($output->getFormatter(), $bar->getProgressCharacter()));
+					$display .= $bar->getProgressCharacter().str_repeat($bar->getEmptyBarCharacter(), $emptyBars);
+				}
+
+				return $display;
+			},
+			'elapsed' => function (self $bar) {
+				return Helper::formatTime(time() - $bar->getStartTime());
+			},
+			'remaining' => function (self $bar) {
+				if (!$bar->getMaxSteps()) {
+					throw new LogicException('Unable to display the remaining time if the maximum number of steps is not set.');
+				}
+
+				return Helper::formatTime($bar->getRemaining());
+			},
+			'estimated' => function (self $bar) {
+				if (!$bar->getMaxSteps()) {
+					throw new LogicException('Unable to display the estimated time if the maximum number of steps is not set.');
+				}
+
+				return Helper::formatTime($bar->getEstimated());
+			},
+			'memory' => function (self $bar) {
+				return Helper::formatMemory(memory_get_usage(true));
+			},
+			'current' => function (self $bar) {
+				return str_pad($bar->getProgress(), $bar->getStepWidth(), ' ', \STR_PAD_LEFT);
+			},
+			'max' => function (self $bar) {
+				return $bar->getMaxSteps();
+			},
+			'percent' => function (self $bar) {
+				return floor($bar->getProgressPercent() * 100);
+			},
+		];
+	}
+
+	private static function initFormats(): array
+	{
+		return [
+			self::FORMAT_NORMAL => ' %current%/%max% [%bar%] %percent:3s%%',
+			self::FORMAT_NORMAL_NOMAX => ' %current% [%bar%]',
+
+			self::FORMAT_VERBOSE => ' %current%/%max% [%bar%] %percent:3s%% %elapsed:6s%',
+			self::FORMAT_VERBOSE_NOMAX => ' %current% [%bar%] %elapsed:6s%',
+
+			self::FORMAT_VERY_VERBOSE => ' %current%/%max% [%bar%] %percent:3s%% %elapsed:6s%/%estimated:-6s%',
+			self::FORMAT_VERY_VERBOSE_NOMAX => ' %current% [%bar%] %elapsed:6s%',
+
+			self::FORMAT_DEBUG => ' %current%/%max% [%bar%] %percent:3s%% %elapsed:6s%/%estimated:-6s% %memory:6s%',
+			self::FORMAT_DEBUG_NOMAX => ' %current% [%bar%] %elapsed:6s% %memory:6s%',
+		];
+	}
+
+	private function buildLine(): string
+	{
+		$regex = "{%([a-z\-_]+)(?:\:([^%]+))?%}i";
+		$callback = function ($matches) {
+			if ($formatter = $this::getPlaceholderFormatterDefinition($matches[1])) {
+				$text = $formatter($this, $this->output);
+			} elseif (isset($this->messages[$matches[1]])) {
+				$text = $this->messages[$matches[1]];
+			} else {
+				return $matches[0];
+			}
+
+			if (isset($matches[2])) {
+				$text = sprintf('%'.$matches[2], $text);
+			}
+
+			return $text;
+		};
+		$line = preg_replace_callback($regex, $callback, $this->format);
+
+		// gets string length for each sub line with multiline format
+		$linesLength = array_map(function ($subLine) {
+			return Helper::width(Helper::removeDecoration($this->output->getFormatter(), rtrim($subLine, "\r")));
+		}, explode("\n", $line));
+
+		$linesWidth = max($linesLength);
+
+		$terminalWidth = $this->terminal->getWidth();
+		if ($linesWidth <= $terminalWidth) {
+			return $line;
+		}
+
+		$this->setBarWidth($this->barWidth - $linesWidth + $terminalWidth);
+
+		return preg_replace_callback($regex, $callback, $this->format);
+	}
 }

Spacing +137 added lines, -137 removed lines

@@ -54,7 +54,7 @@ 
     private $stepWidth;
     private $percent = 0.0;
     private $formatLineCount;
-    private $messages = [];
+    private $messages = [ ];
     private $overwrite = true;
     private $terminal;
     private $previousMessage;
@@ -66,22 +66,22 @@ 
     /**
      * @param int $max Maximum steps (0 if unknown)
      */
-    public function __construct(OutputInterface $output, int $max = 0, float $minSecondsBetweenRedraws = 1 / 25)
+    public function __construct( OutputInterface $output, int $max = 0, float $minSecondsBetweenRedraws = 1 / 25 )
     {
-        if ($output instanceof ConsoleOutputInterface) {
+        if ( $output instanceof ConsoleOutputInterface ) {
             $output = $output->getErrorOutput();
         }
 
         $this->output = $output;
-        $this->setMaxSteps($max);
+        $this->setMaxSteps( $max );
         $this->terminal = new Terminal();
 
-        if (0 < $minSecondsBetweenRedraws) {
+        if ( 0 < $minSecondsBetweenRedraws ) {
             $this->redrawFreq = null;
             $this->minSecondsBetweenRedraws = $minSecondsBetweenRedraws;
         }
 
-        if (!$this->output->isDecorated()) {
+        if ( ! $this->output->isDecorated() ) {
             // disable overwrite when output does not support ANSI codes.
             $this->overwrite = false;
 
@@ -90,7 +90,7 @@ 
         }
 
         $this->startTime = time();
-        $this->cursor = new Cursor($output);
+        $this->cursor = new Cursor( $output );
     }
 
     /**
@@ -101,13 +101,13 @@ 
      * @param string   $name     The placeholder name (including the delimiter char like %)
      * @param callable $callable A PHP callable
      */
-    public static function setPlaceholderFormatterDefinition(string $name, callable $callable): void
+    public static function setPlaceholderFormatterDefinition( string $name, callable $callable ): void
     {
-        if (!self::$formatters) {
+        if ( ! self::$formatters ) {
             self::$formatters = self::initPlaceholderFormatters();
         }
 
-        self::$formatters[$name] = $callable;
+        self::$formatters[ $name ] = $callable;
     }
 
     /**
@@ -117,13 +117,13 @@ 
      *
      * @return callable|null A PHP callable
      */
-    public static function getPlaceholderFormatterDefinition(string $name): ?callable
+    public static function getPlaceholderFormatterDefinition( string $name ): ?callable
     {
-        if (!self::$formatters) {
+        if ( ! self::$formatters ) {
             self::$formatters = self::initPlaceholderFormatters();
         }
 
-        return self::$formatters[$name] ?? null;
+        return self::$formatters[ $name ] ?? null;
     }
 
     /**
@@ -134,13 +134,13 @@ 
      * @param string $name   The format name
      * @param string $format A format string
      */
-    public static function setFormatDefinition(string $name, string $format): void
+    public static function setFormatDefinition( string $name, string $format ): void
     {
-        if (!self::$formats) {
+        if ( ! self::$formats ) {
             self::$formats = self::initFormats();
         }
 
-        self::$formats[$name] = $format;
+        self::$formats[ $name ] = $format;
     }
 
     /**
@@ -150,13 +150,13 @@ 
      *
      * @return string|null A format string
      */
-    public static function getFormatDefinition(string $name): ?string
+    public static function getFormatDefinition( string $name ): ?string
     {
-        if (!self::$formats) {
+        if ( ! self::$formats ) {
             self::$formats = self::initFormats();
         }
 
-        return self::$formats[$name] ?? null;
+        return self::$formats[ $name ] ?? null;
     }
 
     /**
@@ -169,14 +169,14 @@ 
      * @param string $message The text to associate with the placeholder
      * @param string $name    The name of the placeholder
      */
-    public function setMessage(string $message, string $name = 'message')
+    public function setMessage( string $message, string $name = 'message' )
     {
-        $this->messages[$name] = $message;
+        $this->messages[ $name ] = $message;
     }
 
-    public function getMessage(string $name = 'message')
+    public function getMessage( string $name = 'message' )
     {
-        return $this->messages[$name];
+        return $this->messages[ $name ];
     }
 
     public function getStartTime(): int
@@ -206,30 +206,30 @@ 
 
     public function getBarOffset(): float
     {
-        return floor($this->max ? $this->percent * $this->barWidth : (null === $this->redrawFreq ? (int) (min(5, $this->barWidth / 15) * $this->writeCount) : $this->step) % $this->barWidth);
+        return floor( $this->max ? $this->percent * $this->barWidth : ( null === $this->redrawFreq ? (int)( min( 5, $this->barWidth / 15 ) * $this->writeCount ) : $this->step ) % $this->barWidth );
     }
 
     public function getEstimated(): float
     {
-        if (!$this->step) {
+        if ( ! $this->step ) {
             return 0;
         }
 
-        return round((time() - $this->startTime) / $this->step * $this->max);
+        return round( ( time() - $this->startTime ) / $this->step * $this->max );
     }
 
     public function getRemaining(): float
     {
-        if (!$this->step) {
+        if ( ! $this->step ) {
             return 0;
         }
 
-        return round((time() - $this->startTime) / $this->step * ($this->max - $this->step));
+        return round( ( time() - $this->startTime ) / $this->step * ( $this->max - $this->step ) );
     }
 
-    public function setBarWidth(int $size)
+    public function setBarWidth( int $size )
     {
-        $this->barWidth = max(1, $size);
+        $this->barWidth = max( 1, $size );
     }
 
     public function getBarWidth(): int
@@ -237,21 +237,21 @@ 
         return $this->barWidth;
     }
 
-    public function setBarCharacter(string $char)
+    public function setBarCharacter( string $char )
     {
         $this->barChar = $char;
     }
 
     public function getBarCharacter(): string
     {
-        if (null === $this->barChar) {
+        if ( null === $this->barChar ) {
             return $this->max ? '=' : $this->emptyBarChar;
         }
 
         return $this->barChar;
     }
 
-    public function setEmptyBarCharacter(string $char)
+    public function setEmptyBarCharacter( string $char )
     {
         $this->emptyBarChar = $char;
     }
@@ -261,7 +261,7 @@ 
         return $this->emptyBarChar;
     }
 
-    public function setProgressCharacter(string $char)
+    public function setProgressCharacter( string $char )
     {
         $this->progressChar = $char;
     }
@@ -271,7 +271,7 @@ 
         return $this->progressChar;
     }
 
-    public function setFormat(string $format)
+    public function setFormat( string $format )
     {
         $this->format = null;
         $this->internalFormat = $format;
@@ -282,17 +282,17 @@ 
      *
      * @param int|null $freq The frequency in steps
      */
-    public function setRedrawFrequency(?int $freq)
+    public function setRedrawFrequency( ?int $freq )
     {
-        $this->redrawFreq = null !== $freq ? max(1, $freq) : null;
+        $this->redrawFreq = null !== $freq ? max( 1, $freq ) : null;
     }
 
-    public function minSecondsBetweenRedraws(float $seconds): void
+    public function minSecondsBetweenRedraws( float $seconds ): void
     {
         $this->minSecondsBetweenRedraws = $seconds;
     }
 
-    public function maxSecondsBetweenRedraws(float $seconds): void
+    public function maxSecondsBetweenRedraws( float $seconds ): void
     {
         $this->maxSecondsBetweenRedraws = $seconds;
     }
@@ -302,11 +302,11 @@ 
      *
      * @param int|null $max Number of steps to complete the bar (0 if indeterminate), if null it will be inferred from $iterable
      */
-    public function iterate(iterable $iterable, int $max = null): iterable
+    public function iterate( iterable $iterable, int $max = null ): iterable
     {
-        $this->start($max ?? (is_countable($iterable) ? \count($iterable) : 0));
+        $this->start( $max ?? ( is_countable( $iterable ) ? \count( $iterable ) : 0 ) );
 
-        foreach ($iterable as $key => $value) {
+        foreach ( $iterable as $key => $value ) {
             yield $key => $value;
 
             $this->advance();
@@ -320,14 +320,14 @@ 
      *
      * @param int|null $max Number of steps to complete the bar (0 if indeterminate), null to leave unchanged
      */
-    public function start(int $max = null)
+    public function start( int $max = null )
     {
         $this->startTime = time();
         $this->step = 0;
         $this->percent = 0.0;
 
-        if (null !== $max) {
-            $this->setMaxSteps($max);
+        if ( null !== $max ) {
+            $this->setMaxSteps( $max );
         }
 
         $this->display();
@@ -338,57 +338,57 @@ 
      *
      * @param int $step Number of steps to advance
      */
-    public function advance(int $step = 1)
+    public function advance( int $step = 1 )
     {
-        $this->setProgress($this->step + $step);
+        $this->setProgress( $this->step + $step );
     }
 
     /**
      * Sets whether to overwrite the progressbar, false for new line.
      */
-    public function setOverwrite(bool $overwrite)
+    public function setOverwrite( bool $overwrite )
     {
         $this->overwrite = $overwrite;
     }
 
-    public function setProgress(int $step)
+    public function setProgress( int $step )
     {
-        if ($this->max && $step > $this->max) {
+        if ( $this->max && $step > $this->max ) {
             $this->max = $step;
-        } elseif ($step < 0) {
+        } elseif ( $step < 0 ) {
             $step = 0;
         }
 
-        $redrawFreq = $this->redrawFreq ?? (($this->max ?: 10) / 10);
-        $prevPeriod = (int) ($this->step / $redrawFreq);
-        $currPeriod = (int) ($step / $redrawFreq);
+        $redrawFreq = $this->redrawFreq ?? ( ( $this->max ?: 10 ) / 10 );
+        $prevPeriod = (int)( $this->step / $redrawFreq );
+        $currPeriod = (int)( $step / $redrawFreq );
         $this->step = $step;
-        $this->percent = $this->max ? (float) $this->step / $this->max : 0;
-        $timeInterval = microtime(true) - $this->lastWriteTime;
+        $this->percent = $this->max ? (float)$this->step / $this->max : 0;
+        $timeInterval = microtime( true ) - $this->lastWriteTime;
 
         // Draw regardless of other limits
-        if ($this->max === $step) {
+        if ( $this->max === $step ) {
             $this->display();
 
             return;
         }
 
         // Throttling
-        if ($timeInterval < $this->minSecondsBetweenRedraws) {
+        if ( $timeInterval < $this->minSecondsBetweenRedraws ) {
             return;
         }
 
         // Draw each step period, but not too late
-        if ($prevPeriod !== $currPeriod || $timeInterval >= $this->maxSecondsBetweenRedraws) {
+        if ( $prevPeriod !== $currPeriod || $timeInterval >= $this->maxSecondsBetweenRedraws ) {
             $this->display();
         }
     }
 
-    public function setMaxSteps(int $max)
+    public function setMaxSteps( int $max )
     {
         $this->format = null;
-        $this->max = max(0, $max);
-        $this->stepWidth = $this->max ? Helper::width((string) $this->max) : 4;
+        $this->max = max( 0, $max );
+        $this->stepWidth = $this->max ? Helper::width( (string)$this->max ) : 4;
     }
 
     /**
@@ -396,16 +396,16 @@ 
      */
     public function finish(): void
     {
-        if (!$this->max) {
+        if ( ! $this->max ) {
             $this->max = $this->step;
         }
 
-        if ($this->step === $this->max && !$this->overwrite) {
+        if ( $this->step === $this->max && ! $this->overwrite ) {
             // prevent double 100% output
             return;
         }
 
-        $this->setProgress($this->max);
+        $this->setProgress( $this->max );
     }
 
     /**
@@ -413,15 +413,15 @@ 
      */
     public function display(): void
     {
-        if (OutputInterface::VERBOSITY_QUIET === $this->output->getVerbosity()) {
+        if ( OutputInterface::VERBOSITY_QUIET === $this->output->getVerbosity() ) {
             return;
         }
 
-        if (null === $this->format) {
-            $this->setRealFormat($this->internalFormat ?: $this->determineBestFormat());
+        if ( null === $this->format ) {
+            $this->setRealFormat( $this->internalFormat ?: $this->determineBestFormat() );
         }
 
-        $this->overwrite($this->buildLine());
+        $this->overwrite( $this->buildLine() );
     }
 
     /**
@@ -433,79 +433,79 @@ 
      */
     public function clear(): void
     {
-        if (!$this->overwrite) {
+        if ( ! $this->overwrite ) {
             return;
         }
 
-        if (null === $this->format) {
-            $this->setRealFormat($this->internalFormat ?: $this->determineBestFormat());
+        if ( null === $this->format ) {
+            $this->setRealFormat( $this->internalFormat ?: $this->determineBestFormat() );
         }
 
-        $this->overwrite('');
+        $this->overwrite( '' );
     }
 
-    private function setRealFormat(string $format)
+    private function setRealFormat( string $format )
     {
         // try to use the _nomax variant if available
-        if (!$this->max && null !== self::getFormatDefinition($format.'_nomax')) {
-            $this->format = self::getFormatDefinition($format.'_nomax');
-        } elseif (null !== self::getFormatDefinition($format)) {
-            $this->format = self::getFormatDefinition($format);
+        if ( ! $this->max && null !== self::getFormatDefinition( $format . '_nomax' ) ) {
+            $this->format = self::getFormatDefinition( $format . '_nomax' );
+        } elseif ( null !== self::getFormatDefinition( $format ) ) {
+            $this->format = self::getFormatDefinition( $format );
         } else {
             $this->format = $format;
         }
 
-        $this->formatLineCount = substr_count($this->format, "\n");
+        $this->formatLineCount = substr_count( $this->format, "\n" );
     }
 
     /**
      * Overwrites a previous message to the output.
      */
-    private function overwrite(string $message): void
+    private function overwrite( string $message ): void
     {
-        if ($this->previousMessage === $message) {
+        if ( $this->previousMessage === $message ) {
             return;
         }
 
         $originalMessage = $message;
 
-        if ($this->overwrite) {
-            if (null !== $this->previousMessage) {
-                if ($this->output instanceof ConsoleSectionOutput) {
-                    $messageLines = explode("\n", $message);
-                    $lineCount = \count($messageLines);
-                    foreach ($messageLines as $messageLine) {
-                        $messageLineLength = Helper::width(Helper::removeDecoration($this->output->getFormatter(), $messageLine));
-                        if ($messageLineLength > $this->terminal->getWidth()) {
-                            $lineCount += floor($messageLineLength / $this->terminal->getWidth());
+        if ( $this->overwrite ) {
+            if ( null !== $this->previousMessage ) {
+                if ( $this->output instanceof ConsoleSectionOutput ) {
+                    $messageLines = explode( "\n", $message );
+                    $lineCount = \count( $messageLines );
+                    foreach ( $messageLines as $messageLine ) {
+                        $messageLineLength = Helper::width( Helper::removeDecoration( $this->output->getFormatter(), $messageLine ) );
+                        if ( $messageLineLength > $this->terminal->getWidth() ) {
+                            $lineCount += floor( $messageLineLength / $this->terminal->getWidth() );
                         }
                     }
-                    $this->output->clear($lineCount);
+                    $this->output->clear( $lineCount );
                 } else {
-                    for ($i = 0; $i < $this->formatLineCount; ++$i) {
-                        $this->cursor->moveToColumn(1);
+                    for ( $i = 0; $i < $this->formatLineCount; ++$i ) {
+                        $this->cursor->moveToColumn( 1 );
                         $this->cursor->clearLine();
                         $this->cursor->moveUp();
                     }
 
-                    $this->cursor->moveToColumn(1);
+                    $this->cursor->moveToColumn( 1 );
                     $this->cursor->clearLine();
                 }
             }
-        } elseif ($this->step > 0) {
-            $message = \PHP_EOL.$message;
+        } elseif ( $this->step > 0 ) {
+            $message = \PHP_EOL . $message;
         }
 
         $this->previousMessage = $originalMessage;
-        $this->lastWriteTime = microtime(true);
+        $this->lastWriteTime = microtime( true );
 
-        $this->output->write($message);
+        $this->output->write( $message );
         ++$this->writeCount;
     }
 
     private function determineBestFormat(): string
     {
-        switch ($this->output->getVerbosity()) {
+        switch ( $this->output->getVerbosity() ) {
             // OutputInterface::VERBOSITY_QUIET: display is disabled anyway
             case OutputInterface::VERBOSITY_VERBOSE:
                 return $this->max ? self::FORMAT_VERBOSE : self::FORMAT_VERBOSE_NOMAX;
@@ -521,44 +521,44 @@ 
     private static function initPlaceholderFormatters(): array
     {
         return [
-            'bar' => function (self $bar, OutputInterface $output) {
+            'bar' => function( self $bar, OutputInterface $output ) {
                 $completeBars = $bar->getBarOffset();
-                $display = str_repeat($bar->getBarCharacter(), $completeBars);
-                if ($completeBars < $bar->getBarWidth()) {
-                    $emptyBars = $bar->getBarWidth() - $completeBars - Helper::length(Helper::removeDecoration($output->getFormatter(), $bar->getProgressCharacter()));
-                    $display .= $bar->getProgressCharacter().str_repeat($bar->getEmptyBarCharacter(), $emptyBars);
+                $display = str_repeat( $bar->getBarCharacter(), $completeBars );
+                if ( $completeBars < $bar->getBarWidth() ) {
+                    $emptyBars = $bar->getBarWidth() - $completeBars - Helper::length( Helper::removeDecoration( $output->getFormatter(), $bar->getProgressCharacter() ) );
+                    $display .= $bar->getProgressCharacter() . str_repeat( $bar->getEmptyBarCharacter(), $emptyBars );
                 }
 
                 return $display;
             },
-            'elapsed' => function (self $bar) {
-                return Helper::formatTime(time() - $bar->getStartTime());
+            'elapsed' => function( self $bar ) {
+                return Helper::formatTime( time() - $bar->getStartTime() );
             },
-            'remaining' => function (self $bar) {
-                if (!$bar->getMaxSteps()) {
-                    throw new LogicException('Unable to display the remaining time if the maximum number of steps is not set.');
+            'remaining' => function( self $bar ) {
+                if ( ! $bar->getMaxSteps() ) {
+                    throw new LogicException( 'Unable to display the remaining time if the maximum number of steps is not set.' );
                 }
 
-                return Helper::formatTime($bar->getRemaining());
+                return Helper::formatTime( $bar->getRemaining() );
             },
-            'estimated' => function (self $bar) {
-                if (!$bar->getMaxSteps()) {
-                    throw new LogicException('Unable to display the estimated time if the maximum number of steps is not set.');
+            'estimated' => function( self $bar ) {
+                if ( ! $bar->getMaxSteps() ) {
+                    throw new LogicException( 'Unable to display the estimated time if the maximum number of steps is not set.' );
                 }
 
-                return Helper::formatTime($bar->getEstimated());
+                return Helper::formatTime( $bar->getEstimated() );
             },
-            'memory' => function (self $bar) {
-                return Helper::formatMemory(memory_get_usage(true));
+            'memory' => function( self $bar ) {
+                return Helper::formatMemory( memory_get_usage( true ) );
             },
-            'current' => function (self $bar) {
-                return str_pad($bar->getProgress(), $bar->getStepWidth(), ' ', \STR_PAD_LEFT);
+            'current' => function( self $bar ) {
+                return str_pad( $bar->getProgress(), $bar->getStepWidth(), ' ', \STR_PAD_LEFT );
             },
-            'max' => function (self $bar) {
+            'max' => function( self $bar ) {
                 return $bar->getMaxSteps();
             },
-            'percent' => function (self $bar) {
-                return floor($bar->getProgressPercent() * 100);
+            'percent' => function( self $bar ) {
+                return floor( $bar->getProgressPercent() * 100 );
             },
         ];
     }
@@ -583,37 +583,37 @@ 
     private function buildLine(): string
     {
         $regex = "{%([a-z\-_]+)(?:\:([^%]+))?%}i";
-        $callback = function ($matches) {
-            if ($formatter = $this::getPlaceholderFormatterDefinition($matches[1])) {
-                $text = $formatter($this, $this->output);
-            } elseif (isset($this->messages[$matches[1]])) {
-                $text = $this->messages[$matches[1]];
+        $callback = function( $matches ) {
+            if ( $formatter = $this::getPlaceholderFormatterDefinition( $matches[ 1 ] ) ) {
+                $text = $formatter( $this, $this->output );
+            } elseif ( isset( $this->messages[ $matches[ 1 ] ] ) ) {
+                $text = $this->messages[ $matches[ 1 ] ];
             } else {
-                return $matches[0];
+                return $matches[ 0 ];
             }
 
-            if (isset($matches[2])) {
-                $text = sprintf('%'.$matches[2], $text);
+            if ( isset( $matches[ 2 ] ) ) {
+                $text = sprintf( '%' . $matches[ 2 ], $text );
             }
 
             return $text;
         };
-        $line = preg_replace_callback($regex, $callback, $this->format);
+        $line = preg_replace_callback( $regex, $callback, $this->format );
 
         // gets string length for each sub line with multiline format
-        $linesLength = array_map(function ($subLine) {
-            return Helper::width(Helper::removeDecoration($this->output->getFormatter(), rtrim($subLine, "\r")));
-        }, explode("\n", $line));
+        $linesLength = array_map( function( $subLine ) {
+            return Helper::width( Helper::removeDecoration( $this->output->getFormatter(), rtrim( $subLine, "\r" ) ) );
+        }, explode( "\n", $line ) );
 
-        $linesWidth = max($linesLength);
+        $linesWidth = max( $linesLength );
 
         $terminalWidth = $this->terminal->getWidth();
-        if ($linesWidth <= $terminalWidth) {
+        if ( $linesWidth <= $terminalWidth ) {
             return $line;
         }
 
-        $this->setBarWidth($this->barWidth - $linesWidth + $terminalWidth);
+        $this->setBarWidth( $this->barWidth - $linesWidth + $terminalWidth );
 
-        return preg_replace_callback($regex, $callback, $this->format);
+        return preg_replace_callback( $regex, $callback, $this->format );
     }
 }

Braces +16 added lines, -32 removed lines

@@ -24,8 +24,7 @@ 
  * @author Fabien Potencier <fabien@symfony.com>
  * @author Chris Jones <leeked@gmail.com>
  */
-final class ProgressBar
-{
+final class ProgressBar {
     public const FORMAT_VERBOSE = 'verbose';
     public const FORMAT_VERY_VERBOSE = 'very_verbose';
     public const FORMAT_DEBUG = 'debug';
@@ -66,8 +65,7 @@ 
     /**
      * @param int $max Maximum steps (0 if unknown)
      */
-    public function __construct(OutputInterface $output, int $max = 0, float $minSecondsBetweenRedraws = 1 / 25)
-    {
+    public function __construct(OutputInterface $output, int $max = 0, float $minSecondsBetweenRedraws = 1 / 25) {
         if ($output instanceof ConsoleOutputInterface) {
             $output = $output->getErrorOutput();
         }
@@ -169,13 +167,11 @@ 
      * @param string $message The text to associate with the placeholder
      * @param string $name    The name of the placeholder
      */
-    public function setMessage(string $message, string $name = 'message')
-    {
+    public function setMessage(string $message, string $name = 'message') {
         $this->messages[$name] = $message;
     }
 
-    public function getMessage(string $name = 'message')
-    {
+    public function getMessage(string $name = 'message') {
         return $this->messages[$name];
     }
 
@@ -227,8 +223,7 @@ 
         return round((time() - $this->startTime) / $this->step * ($this->max - $this->step));
     }
 
-    public function setBarWidth(int $size)
-    {
+    public function setBarWidth(int $size) {
         $this->barWidth = max(1, $size);
     }
 
@@ -237,8 +232,7 @@ 
         return $this->barWidth;
     }
 
-    public function setBarCharacter(string $char)
-    {
+    public function setBarCharacter(string $char) {
         $this->barChar = $char;
     }
 
@@ -251,8 +245,7 @@ 
         return $this->barChar;
     }
 
-    public function setEmptyBarCharacter(string $char)
-    {
+    public function setEmptyBarCharacter(string $char) {
         $this->emptyBarChar = $char;
     }
 
@@ -261,8 +254,7 @@ 
         return $this->emptyBarChar;
     }
 
-    public function setProgressCharacter(string $char)
-    {
+    public function setProgressCharacter(string $char) {
         $this->progressChar = $char;
     }
 
@@ -271,8 +263,7 @@ 
         return $this->progressChar;
     }
 
-    public function setFormat(string $format)
-    {
+    public function setFormat(string $format) {
         $this->format = null;
         $this->internalFormat = $format;
     }
@@ -282,8 +273,7 @@ 
      *
      * @param int|null $freq The frequency in steps
      */
-    public function setRedrawFrequency(?int $freq)
-    {
+    public function setRedrawFrequency(?int $freq) {
         $this->redrawFreq = null !== $freq ? max(1, $freq) : null;
     }
 
@@ -320,8 +310,7 @@ 
      *
      * @param int|null $max Number of steps to complete the bar (0 if indeterminate), null to leave unchanged
      */
-    public function start(int $max = null)
-    {
+    public function start(int $max = null) {
         $this->startTime = time();
         $this->step = 0;
         $this->percent = 0.0;
@@ -338,21 +327,18 @@ 
      *
      * @param int $step Number of steps to advance
      */
-    public function advance(int $step = 1)
-    {
+    public function advance(int $step = 1) {
         $this->setProgress($this->step + $step);
     }
 
     /**
      * Sets whether to overwrite the progressbar, false for new line.
      */
-    public function setOverwrite(bool $overwrite)
-    {
+    public function setOverwrite(bool $overwrite) {
         $this->overwrite = $overwrite;
     }
 
-    public function setProgress(int $step)
-    {
+    public function setProgress(int $step) {
         if ($this->max && $step > $this->max) {
             $this->max = $step;
         } elseif ($step < 0) {
@@ -384,8 +370,7 @@ 
         }
     }
 
-    public function setMaxSteps(int $max)
-    {
+    public function setMaxSteps(int $max) {
         $this->format = null;
         $this->max = max(0, $max);
         $this->stepWidth = $this->max ? Helper::width((string) $this->max) : 4;
@@ -444,8 +429,7 @@ 
         $this->overwrite('');
     }
 
-    private function setRealFormat(string $format)
-    {
+    private function setRealFormat(string $format) {
         // try to use the _nomax variant if available
         if (!$this->max && null !== self::getFormatDefinition($format.'_nomax')) {
             $this->format = self::getFormatDefinition($format.'_nomax');

vendor/symfony/console/Helper/TableCellStyle.php

Indentation +55 added lines, -55 removed lines

@@ -18,69 +18,69 @@
  */
 class TableCellStyle
 {
-    public const DEFAULT_ALIGN = 'left';
+	public const DEFAULT_ALIGN = 'left';
 
-    private $options = [
-        'fg' => 'default',
-        'bg' => 'default',
-        'options' => null,
-        'align' => self::DEFAULT_ALIGN,
-        'cellFormat' => null,
-    ];
+	private $options = [
+		'fg' => 'default',
+		'bg' => 'default',
+		'options' => null,
+		'align' => self::DEFAULT_ALIGN,
+		'cellFormat' => null,
+	];
 
-    private $tagOptions = [
-        'fg',
-        'bg',
-        'options',
-    ];
+	private $tagOptions = [
+		'fg',
+		'bg',
+		'options',
+	];
 
-    private $alignMap = [
-        'left' => \STR_PAD_RIGHT,
-        'center' => \STR_PAD_BOTH,
-        'right' => \STR_PAD_LEFT,
-    ];
+	private $alignMap = [
+		'left' => \STR_PAD_RIGHT,
+		'center' => \STR_PAD_BOTH,
+		'right' => \STR_PAD_LEFT,
+	];
 
-    public function __construct(array $options = [])
-    {
-        if ($diff = array_diff(array_keys($options), array_keys($this->options))) {
-            throw new InvalidArgumentException(sprintf('The TableCellStyle does not support the following options: \'%s\'.', implode('\', \'', $diff)));
-        }
+	public function __construct(array $options = [])
+	{
+		if ($diff = array_diff(array_keys($options), array_keys($this->options))) {
+			throw new InvalidArgumentException(sprintf('The TableCellStyle does not support the following options: \'%s\'.', implode('\', \'', $diff)));
+		}
 
-        if (isset($options['align']) && !\array_key_exists($options['align'], $this->alignMap)) {
-            throw new InvalidArgumentException(sprintf('Wrong align value. Value must be following: \'%s\'.', implode('\', \'', array_keys($this->alignMap))));
-        }
+		if (isset($options['align']) && !\array_key_exists($options['align'], $this->alignMap)) {
+			throw new InvalidArgumentException(sprintf('Wrong align value. Value must be following: \'%s\'.', implode('\', \'', array_keys($this->alignMap))));
+		}
 
-        $this->options = array_merge($this->options, $options);
-    }
+		$this->options = array_merge($this->options, $options);
+	}
 
-    public function getOptions(): array
-    {
-        return $this->options;
-    }
+	public function getOptions(): array
+	{
+		return $this->options;
+	}
 
-    /**
-     * Gets options we need for tag for example fg, bg.
-     *
-     * @return string[]
-     */
-    public function getTagOptions()
-    {
-        return array_filter(
-            $this->getOptions(),
-            function ($key) {
-                return \in_array($key, $this->tagOptions) && isset($this->options[$key]);
-            },
-            \ARRAY_FILTER_USE_KEY
-        );
-    }
+	/**
+	 * Gets options we need for tag for example fg, bg.
+	 *
+	 * @return string[]
+	 */
+	public function getTagOptions()
+	{
+		return array_filter(
+			$this->getOptions(),
+			function ($key) {
+				return \in_array($key, $this->tagOptions) && isset($this->options[$key]);
+			},
+			\ARRAY_FILTER_USE_KEY
+		);
+	}
 
-    public function getPadByAlign()
-    {
-        return $this->alignMap[$this->getOptions()['align']];
-    }
+	public function getPadByAlign()
+	{
+		return $this->alignMap[$this->getOptions()['align']];
+	}
 
-    public function getCellFormat(): ?string
-    {
-        return $this->getOptions()['cellFormat'];
-    }
+	public function getCellFormat(): ?string
+	{
+		return $this->getOptions()['cellFormat'];
+	}
 }

Spacing +10 added lines, -10 removed lines

@@ -40,17 +40,17 @@ 
         'right' => \STR_PAD_LEFT,
     ];
 
-    public function __construct(array $options = [])
+    public function __construct( array $options = [ ] )
     {
-        if ($diff = array_diff(array_keys($options), array_keys($this->options))) {
-            throw new InvalidArgumentException(sprintf('The TableCellStyle does not support the following options: \'%s\'.', implode('\', \'', $diff)));
+        if ( $diff = array_diff( array_keys( $options ), array_keys( $this->options ) ) ) {
+            throw new InvalidArgumentException( sprintf( 'The TableCellStyle does not support the following options: \'%s\'.', implode( '\', \'', $diff ) ) );
         }
 
-        if (isset($options['align']) && !\array_key_exists($options['align'], $this->alignMap)) {
-            throw new InvalidArgumentException(sprintf('Wrong align value. Value must be following: \'%s\'.', implode('\', \'', array_keys($this->alignMap))));
+        if ( isset( $options[ 'align' ] ) && ! \array_key_exists( $options[ 'align' ], $this->alignMap ) ) {
+            throw new InvalidArgumentException( sprintf( 'Wrong align value. Value must be following: \'%s\'.', implode( '\', \'', array_keys( $this->alignMap ) ) ) );
         }
 
-        $this->options = array_merge($this->options, $options);
+        $this->options = array_merge( $this->options, $options );
     }
 
     public function getOptions(): array
@@ -67,8 +67,8 @@ 
     {
         return array_filter(
             $this->getOptions(),
-            function ($key) {
-                return \in_array($key, $this->tagOptions) && isset($this->options[$key]);
+            function( $key ) {
+                return \in_array( $key, $this->tagOptions ) && isset( $this->options[ $key ] );
             },
             \ARRAY_FILTER_USE_KEY
         );
@@ -76,11 +76,11 @@ 
 
     public function getPadByAlign()
     {
-        return $this->alignMap[$this->getOptions()['align']];
+        return $this->alignMap[ $this->getOptions()[ 'align' ] ];
     }
 
     public function getCellFormat(): ?string
     {
-        return $this->getOptions()['cellFormat'];
+        return $this->getOptions()[ 'cellFormat' ];
     }
 }

Braces +4 added lines, -8 removed lines

@@ -16,8 +16,7 @@ 
 /**
  * @author Yewhen Khoptynskyi <khoptynskyi@gmail.com>
  */
-class TableCellStyle
-{
+class TableCellStyle {
     public const DEFAULT_ALIGN = 'left';
 
     private $options = [
@@ -40,8 +39,7 @@ 
         'right' => \STR_PAD_LEFT,
     ];
 
-    public function __construct(array $options = [])
-    {
+    public function __construct(array $options = []) {
         if ($diff = array_diff(array_keys($options), array_keys($this->options))) {
             throw new InvalidArgumentException(sprintf('The TableCellStyle does not support the following options: \'%s\'.', implode('\', \'', $diff)));
         }
@@ -63,8 +61,7 @@ 
      *
      * @return string[]
      */
-    public function getTagOptions()
-    {
+    public function getTagOptions() {
         return array_filter(
             $this->getOptions(),
             function ($key) {
@@ -74,8 +71,7 @@ 
         );
     }
 
-    public function getPadByAlign()
-    {
+    public function getPadByAlign() {
         return $this->alignMap[$this->getOptions()['align']];
     }
 

vendor/symfony/console/Helper/TableStyle.php

Indentation +338 added lines, -338 removed lines

@@ -23,342 +23,342 @@
  */
 class TableStyle
 {
-    private $paddingChar = ' ';
-    private $horizontalOutsideBorderChar = '-';
-    private $horizontalInsideBorderChar = '-';
-    private $verticalOutsideBorderChar = '|';
-    private $verticalInsideBorderChar = '|';
-    private $crossingChar = '+';
-    private $crossingTopRightChar = '+';
-    private $crossingTopMidChar = '+';
-    private $crossingTopLeftChar = '+';
-    private $crossingMidRightChar = '+';
-    private $crossingBottomRightChar = '+';
-    private $crossingBottomMidChar = '+';
-    private $crossingBottomLeftChar = '+';
-    private $crossingMidLeftChar = '+';
-    private $crossingTopLeftBottomChar = '+';
-    private $crossingTopMidBottomChar = '+';
-    private $crossingTopRightBottomChar = '+';
-    private $headerTitleFormat = '<fg=black;bg=white;options=bold> %s </>';
-    private $footerTitleFormat = '<fg=black;bg=white;options=bold> %s </>';
-    private $cellHeaderFormat = '<info>%s</info>';
-    private $cellRowFormat = '%s';
-    private $cellRowContentFormat = ' %s ';
-    private $borderFormat = '%s';
-    private $padType = \STR_PAD_RIGHT;
-
-    /**
-     * Sets padding character, used for cell padding.
-     *
-     * @return $this
-     */
-    public function setPaddingChar(string $paddingChar)
-    {
-        if (!$paddingChar) {
-            throw new LogicException('The padding char must not be empty.');
-        }
-
-        $this->paddingChar = $paddingChar;
-
-        return $this;
-    }
-
-    /**
-     * Gets padding character, used for cell padding.
-     *
-     * @return string
-     */
-    public function getPaddingChar()
-    {
-        return $this->paddingChar;
-    }
-
-    /**
-     * Sets horizontal border characters.
-     *
-     * <code>
-     * ╔═══════════════╤══════════════════════════╤══════════════════╗
-     * 1 ISBN          2 Title                    │ Author           ║
-     * ╠═══════════════╪══════════════════════════╪══════════════════╣
-     * ║ 99921-58-10-7 │ Divine Comedy            │ Dante Alighieri  ║
-     * ║ 9971-5-0210-0 │ A Tale of Two Cities     │ Charles Dickens  ║
-     * ║ 960-425-059-0 │ The Lord of the Rings    │ J. R. R. Tolkien ║
-     * ║ 80-902734-1-6 │ And Then There Were None │ Agatha Christie  ║
-     * ╚═══════════════╧══════════════════════════╧══════════════════╝
-     * </code>
-     */
-    public function setHorizontalBorderChars(string $outside, string $inside = null): self
-    {
-        $this->horizontalOutsideBorderChar = $outside;
-        $this->horizontalInsideBorderChar = $inside ?? $outside;
-
-        return $this;
-    }
-
-    /**
-     * Sets vertical border characters.
-     *
-     * <code>
-     * ╔═══════════════╤══════════════════════════╤══════════════════╗
-     * ║ ISBN          │ Title                    │ Author           ║
-     * ╠═══════1═══════╪══════════════════════════╪══════════════════╣
-     * ║ 99921-58-10-7 │ Divine Comedy            │ Dante Alighieri  ║
-     * ║ 9971-5-0210-0 │ A Tale of Two Cities     │ Charles Dickens  ║
-     * ╟───────2───────┼──────────────────────────┼──────────────────╢
-     * ║ 960-425-059-0 │ The Lord of the Rings    │ J. R. R. Tolkien ║
-     * ║ 80-902734-1-6 │ And Then There Were None │ Agatha Christie  ║
-     * ╚═══════════════╧══════════════════════════╧══════════════════╝
-     * </code>
-     */
-    public function setVerticalBorderChars(string $outside, string $inside = null): self
-    {
-        $this->verticalOutsideBorderChar = $outside;
-        $this->verticalInsideBorderChar = $inside ?? $outside;
-
-        return $this;
-    }
-
-    /**
-     * Gets border characters.
-     *
-     * @internal
-     */
-    public function getBorderChars(): array
-    {
-        return [
-            $this->horizontalOutsideBorderChar,
-            $this->verticalOutsideBorderChar,
-            $this->horizontalInsideBorderChar,
-            $this->verticalInsideBorderChar,
-        ];
-    }
-
-    /**
-     * Sets crossing characters.
-     *
-     * Example:
-     * <code>
-     * 1═══════════════2══════════════════════════2══════════════════3
-     * ║ ISBN          │ Title                    │ Author           ║
-     * 8'══════════════0'═════════════════════════0'═════════════════4'
-     * ║ 99921-58-10-7 │ Divine Comedy            │ Dante Alighieri  ║
-     * ║ 9971-5-0210-0 │ A Tale of Two Cities     │ Charles Dickens  ║
-     * 8───────────────0──────────────────────────0──────────────────4
-     * ║ 960-425-059-0 │ The Lord of the Rings    │ J. R. R. Tolkien ║
-     * ║ 80-902734-1-6 │ And Then There Were None │ Agatha Christie  ║
-     * 7═══════════════6══════════════════════════6══════════════════5
-     * </code>
-     *
-     * @param string      $cross          Crossing char (see #0 of example)
-     * @param string      $topLeft        Top left char (see #1 of example)
-     * @param string      $topMid         Top mid char (see #2 of example)
-     * @param string      $topRight       Top right char (see #3 of example)
-     * @param string      $midRight       Mid right char (see #4 of example)
-     * @param string      $bottomRight    Bottom right char (see #5 of example)
-     * @param string      $bottomMid      Bottom mid char (see #6 of example)
-     * @param string      $bottomLeft     Bottom left char (see #7 of example)
-     * @param string      $midLeft        Mid left char (see #8 of example)
-     * @param string|null $topLeftBottom  Top left bottom char (see #8' of example), equals to $midLeft if null
-     * @param string|null $topMidBottom   Top mid bottom char (see #0' of example), equals to $cross if null
-     * @param string|null $topRightBottom Top right bottom char (see #4' of example), equals to $midRight if null
-     */
-    public function setCrossingChars(string $cross, string $topLeft, string $topMid, string $topRight, string $midRight, string $bottomRight, string $bottomMid, string $bottomLeft, string $midLeft, string $topLeftBottom = null, string $topMidBottom = null, string $topRightBottom = null): self
-    {
-        $this->crossingChar = $cross;
-        $this->crossingTopLeftChar = $topLeft;
-        $this->crossingTopMidChar = $topMid;
-        $this->crossingTopRightChar = $topRight;
-        $this->crossingMidRightChar = $midRight;
-        $this->crossingBottomRightChar = $bottomRight;
-        $this->crossingBottomMidChar = $bottomMid;
-        $this->crossingBottomLeftChar = $bottomLeft;
-        $this->crossingMidLeftChar = $midLeft;
-        $this->crossingTopLeftBottomChar = $topLeftBottom ?? $midLeft;
-        $this->crossingTopMidBottomChar = $topMidBottom ?? $cross;
-        $this->crossingTopRightBottomChar = $topRightBottom ?? $midRight;
-
-        return $this;
-    }
-
-    /**
-     * Sets default crossing character used for each cross.
-     *
-     * @see {@link setCrossingChars()} for setting each crossing individually.
-     */
-    public function setDefaultCrossingChar(string $char): self
-    {
-        return $this->setCrossingChars($char, $char, $char, $char, $char, $char, $char, $char, $char);
-    }
-
-    /**
-     * Gets crossing character.
-     *
-     * @return string
-     */
-    public function getCrossingChar()
-    {
-        return $this->crossingChar;
-    }
-
-    /**
-     * Gets crossing characters.
-     *
-     * @internal
-     */
-    public function getCrossingChars(): array
-    {
-        return [
-            $this->crossingChar,
-            $this->crossingTopLeftChar,
-            $this->crossingTopMidChar,
-            $this->crossingTopRightChar,
-            $this->crossingMidRightChar,
-            $this->crossingBottomRightChar,
-            $this->crossingBottomMidChar,
-            $this->crossingBottomLeftChar,
-            $this->crossingMidLeftChar,
-            $this->crossingTopLeftBottomChar,
-            $this->crossingTopMidBottomChar,
-            $this->crossingTopRightBottomChar,
-        ];
-    }
-
-    /**
-     * Sets header cell format.
-     *
-     * @return $this
-     */
-    public function setCellHeaderFormat(string $cellHeaderFormat)
-    {
-        $this->cellHeaderFormat = $cellHeaderFormat;
-
-        return $this;
-    }
-
-    /**
-     * Gets header cell format.
-     *
-     * @return string
-     */
-    public function getCellHeaderFormat()
-    {
-        return $this->cellHeaderFormat;
-    }
-
-    /**
-     * Sets row cell format.
-     *
-     * @return $this
-     */
-    public function setCellRowFormat(string $cellRowFormat)
-    {
-        $this->cellRowFormat = $cellRowFormat;
-
-        return $this;
-    }
-
-    /**
-     * Gets row cell format.
-     *
-     * @return string
-     */
-    public function getCellRowFormat()
-    {
-        return $this->cellRowFormat;
-    }
-
-    /**
-     * Sets row cell content format.
-     *
-     * @return $this
-     */
-    public function setCellRowContentFormat(string $cellRowContentFormat)
-    {
-        $this->cellRowContentFormat = $cellRowContentFormat;
-
-        return $this;
-    }
-
-    /**
-     * Gets row cell content format.
-     *
-     * @return string
-     */
-    public function getCellRowContentFormat()
-    {
-        return $this->cellRowContentFormat;
-    }
-
-    /**
-     * Sets table border format.
-     *
-     * @return $this
-     */
-    public function setBorderFormat(string $borderFormat)
-    {
-        $this->borderFormat = $borderFormat;
-
-        return $this;
-    }
-
-    /**
-     * Gets table border format.
-     *
-     * @return string
-     */
-    public function getBorderFormat()
-    {
-        return $this->borderFormat;
-    }
-
-    /**
-     * Sets cell padding type.
-     *
-     * @return $this
-     */
-    public function setPadType(int $padType)
-    {
-        if (!\in_array($padType, [\STR_PAD_LEFT, \STR_PAD_RIGHT, \STR_PAD_BOTH], true)) {
-            throw new InvalidArgumentException('Invalid padding type. Expected one of (STR_PAD_LEFT, STR_PAD_RIGHT, STR_PAD_BOTH).');
-        }
-
-        $this->padType = $padType;
-
-        return $this;
-    }
-
-    /**
-     * Gets cell padding type.
-     *
-     * @return int
-     */
-    public function getPadType()
-    {
-        return $this->padType;
-    }
-
-    public function getHeaderTitleFormat(): string
-    {
-        return $this->headerTitleFormat;
-    }
-
-    public function setHeaderTitleFormat(string $format): self
-    {
-        $this->headerTitleFormat = $format;
-
-        return $this;
-    }
-
-    public function getFooterTitleFormat(): string
-    {
-        return $this->footerTitleFormat;
-    }
-
-    public function setFooterTitleFormat(string $format): self
-    {
-        $this->footerTitleFormat = $format;
-
-        return $this;
-    }
+	private $paddingChar = ' ';
+	private $horizontalOutsideBorderChar = '-';
+	private $horizontalInsideBorderChar = '-';
+	private $verticalOutsideBorderChar = '|';
+	private $verticalInsideBorderChar = '|';
+	private $crossingChar = '+';
+	private $crossingTopRightChar = '+';
+	private $crossingTopMidChar = '+';
+	private $crossingTopLeftChar = '+';
+	private $crossingMidRightChar = '+';
+	private $crossingBottomRightChar = '+';
+	private $crossingBottomMidChar = '+';
+	private $crossingBottomLeftChar = '+';
+	private $crossingMidLeftChar = '+';
+	private $crossingTopLeftBottomChar = '+';
+	private $crossingTopMidBottomChar = '+';
+	private $crossingTopRightBottomChar = '+';
+	private $headerTitleFormat = '<fg=black;bg=white;options=bold> %s </>';
+	private $footerTitleFormat = '<fg=black;bg=white;options=bold> %s </>';
+	private $cellHeaderFormat = '<info>%s</info>';
+	private $cellRowFormat = '%s';
+	private $cellRowContentFormat = ' %s ';
+	private $borderFormat = '%s';
+	private $padType = \STR_PAD_RIGHT;
+
+	/**
+	 * Sets padding character, used for cell padding.
+	 *
+	 * @return $this
+	 */
+	public function setPaddingChar(string $paddingChar)
+	{
+		if (!$paddingChar) {
+			throw new LogicException('The padding char must not be empty.');
+		}
+
+		$this->paddingChar = $paddingChar;
+
+		return $this;
+	}
+
+	/**
+	 * Gets padding character, used for cell padding.
+	 *
+	 * @return string
+	 */
+	public function getPaddingChar()
+	{
+		return $this->paddingChar;
+	}
+
+	/**
+	 * Sets horizontal border characters.
+	 *
+	 * <code>
+	 * ╔═══════════════╤══════════════════════════╤══════════════════╗
+	 * 1 ISBN          2 Title                    │ Author           ║
+	 * ╠═══════════════╪══════════════════════════╪══════════════════╣
+	 * ║ 99921-58-10-7 │ Divine Comedy            │ Dante Alighieri  ║
+	 * ║ 9971-5-0210-0 │ A Tale of Two Cities     │ Charles Dickens  ║
+	 * ║ 960-425-059-0 │ The Lord of the Rings    │ J. R. R. Tolkien ║
+	 * ║ 80-902734-1-6 │ And Then There Were None │ Agatha Christie  ║
+	 * ╚═══════════════╧══════════════════════════╧══════════════════╝
+	 * </code>
+	 */
+	public function setHorizontalBorderChars(string $outside, string $inside = null): self
+	{
+		$this->horizontalOutsideBorderChar = $outside;
+		$this->horizontalInsideBorderChar = $inside ?? $outside;
+
+		return $this;
+	}
+
+	/**
+	 * Sets vertical border characters.
+	 *
+	 * <code>
+	 * ╔═══════════════╤══════════════════════════╤══════════════════╗
+	 * ║ ISBN          │ Title                    │ Author           ║
+	 * ╠═══════1═══════╪══════════════════════════╪══════════════════╣
+	 * ║ 99921-58-10-7 │ Divine Comedy            │ Dante Alighieri  ║
+	 * ║ 9971-5-0210-0 │ A Tale of Two Cities     │ Charles Dickens  ║
+	 * ╟───────2───────┼──────────────────────────┼──────────────────╢
+	 * ║ 960-425-059-0 │ The Lord of the Rings    │ J. R. R. Tolkien ║
+	 * ║ 80-902734-1-6 │ And Then There Were None │ Agatha Christie  ║
+	 * ╚═══════════════╧══════════════════════════╧══════════════════╝
+	 * </code>
+	 */
+	public function setVerticalBorderChars(string $outside, string $inside = null): self
+	{
+		$this->verticalOutsideBorderChar = $outside;
+		$this->verticalInsideBorderChar = $inside ?? $outside;
+
+		return $this;
+	}
+
+	/**
+	 * Gets border characters.
+	 *
+	 * @internal
+	 */
+	public function getBorderChars(): array
+	{
+		return [
+			$this->horizontalOutsideBorderChar,
+			$this->verticalOutsideBorderChar,
+			$this->horizontalInsideBorderChar,
+			$this->verticalInsideBorderChar,
+		];
+	}
+
+	/**
+	 * Sets crossing characters.
+	 *
+	 * Example:
+	 * <code>
+	 * 1═══════════════2══════════════════════════2══════════════════3
+	 * ║ ISBN          │ Title                    │ Author           ║
+	 * 8'══════════════0'═════════════════════════0'═════════════════4'
+	 * ║ 99921-58-10-7 │ Divine Comedy            │ Dante Alighieri  ║
+	 * ║ 9971-5-0210-0 │ A Tale of Two Cities     │ Charles Dickens  ║
+	 * 8───────────────0──────────────────────────0──────────────────4
+	 * ║ 960-425-059-0 │ The Lord of the Rings    │ J. R. R. Tolkien ║
+	 * ║ 80-902734-1-6 │ And Then There Were None │ Agatha Christie  ║
+	 * 7═══════════════6══════════════════════════6══════════════════5
+	 * </code>
+	 *
+	 * @param string      $cross          Crossing char (see #0 of example)
+	 * @param string      $topLeft        Top left char (see #1 of example)
+	 * @param string      $topMid         Top mid char (see #2 of example)
+	 * @param string      $topRight       Top right char (see #3 of example)
+	 * @param string      $midRight       Mid right char (see #4 of example)
+	 * @param string      $bottomRight    Bottom right char (see #5 of example)
+	 * @param string      $bottomMid      Bottom mid char (see #6 of example)
+	 * @param string      $bottomLeft     Bottom left char (see #7 of example)
+	 * @param string      $midLeft        Mid left char (see #8 of example)
+	 * @param string|null $topLeftBottom  Top left bottom char (see #8' of example), equals to $midLeft if null
+	 * @param string|null $topMidBottom   Top mid bottom char (see #0' of example), equals to $cross if null
+	 * @param string|null $topRightBottom Top right bottom char (see #4' of example), equals to $midRight if null
+	 */
+	public function setCrossingChars(string $cross, string $topLeft, string $topMid, string $topRight, string $midRight, string $bottomRight, string $bottomMid, string $bottomLeft, string $midLeft, string $topLeftBottom = null, string $topMidBottom = null, string $topRightBottom = null): self
+	{
+		$this->crossingChar = $cross;
+		$this->crossingTopLeftChar = $topLeft;
+		$this->crossingTopMidChar = $topMid;
+		$this->crossingTopRightChar = $topRight;
+		$this->crossingMidRightChar = $midRight;
+		$this->crossingBottomRightChar = $bottomRight;
+		$this->crossingBottomMidChar = $bottomMid;
+		$this->crossingBottomLeftChar = $bottomLeft;
+		$this->crossingMidLeftChar = $midLeft;
+		$this->crossingTopLeftBottomChar = $topLeftBottom ?? $midLeft;
+		$this->crossingTopMidBottomChar = $topMidBottom ?? $cross;
+		$this->crossingTopRightBottomChar = $topRightBottom ?? $midRight;
+
+		return $this;
+	}
+
+	/**
+	 * Sets default crossing character used for each cross.
+	 *
+	 * @see {@link setCrossingChars()} for setting each crossing individually.
+	 */
+	public function setDefaultCrossingChar(string $char): self
+	{
+		return $this->setCrossingChars($char, $char, $char, $char, $char, $char, $char, $char, $char);
+	}
+
+	/**
+	 * Gets crossing character.
+	 *
+	 * @return string
+	 */
+	public function getCrossingChar()
+	{
+		return $this->crossingChar;
+	}
+
+	/**
+	 * Gets crossing characters.
+	 *
+	 * @internal
+	 */
+	public function getCrossingChars(): array
+	{
+		return [
+			$this->crossingChar,
+			$this->crossingTopLeftChar,
+			$this->crossingTopMidChar,
+			$this->crossingTopRightChar,
+			$this->crossingMidRightChar,
+			$this->crossingBottomRightChar,
+			$this->crossingBottomMidChar,
+			$this->crossingBottomLeftChar,
+			$this->crossingMidLeftChar,
+			$this->crossingTopLeftBottomChar,
+			$this->crossingTopMidBottomChar,
+			$this->crossingTopRightBottomChar,
+		];
+	}
+
+	/**
+	 * Sets header cell format.
+	 *
+	 * @return $this
+	 */
+	public function setCellHeaderFormat(string $cellHeaderFormat)
+	{
+		$this->cellHeaderFormat = $cellHeaderFormat;
+
+		return $this;
+	}
+
+	/**
+	 * Gets header cell format.
+	 *
+	 * @return string
+	 */
+	public function getCellHeaderFormat()
+	{
+		return $this->cellHeaderFormat;
+	}
+
+	/**
+	 * Sets row cell format.
+	 *
+	 * @return $this
+	 */
+	public function setCellRowFormat(string $cellRowFormat)
+	{
+		$this->cellRowFormat = $cellRowFormat;
+
+		return $this;
+	}
+
+	/**
+	 * Gets row cell format.
+	 *
+	 * @return string
+	 */
+	public function getCellRowFormat()
+	{
+		return $this->cellRowFormat;
+	}
+
+	/**
+	 * Sets row cell content format.
+	 *
+	 * @return $this
+	 */
+	public function setCellRowContentFormat(string $cellRowContentFormat)
+	{
+		$this->cellRowContentFormat = $cellRowContentFormat;
+
+		return $this;
+	}
+
+	/**
+	 * Gets row cell content format.
+	 *
+	 * @return string
+	 */
+	public function getCellRowContentFormat()
+	{
+		return $this->cellRowContentFormat;
+	}
+
+	/**
+	 * Sets table border format.
+	 *
+	 * @return $this
+	 */
+	public function setBorderFormat(string $borderFormat)
+	{
+		$this->borderFormat = $borderFormat;
+
+		return $this;
+	}
+
+	/**
+	 * Gets table border format.
+	 *
+	 * @return string
+	 */
+	public function getBorderFormat()
+	{
+		return $this->borderFormat;
+	}
+
+	/**
+	 * Sets cell padding type.
+	 *
+	 * @return $this
+	 */
+	public function setPadType(int $padType)
+	{
+		if (!\in_array($padType, [\STR_PAD_LEFT, \STR_PAD_RIGHT, \STR_PAD_BOTH], true)) {
+			throw new InvalidArgumentException('Invalid padding type. Expected one of (STR_PAD_LEFT, STR_PAD_RIGHT, STR_PAD_BOTH).');
+		}
+
+		$this->padType = $padType;
+
+		return $this;
+	}
+
+	/**
+	 * Gets cell padding type.
+	 *
+	 * @return int
+	 */
+	public function getPadType()
+	{
+		return $this->padType;
+	}
+
+	public function getHeaderTitleFormat(): string
+	{
+		return $this->headerTitleFormat;
+	}
+
+	public function setHeaderTitleFormat(string $format): self
+	{
+		$this->headerTitleFormat = $format;
+
+		return $this;
+	}
+
+	public function getFooterTitleFormat(): string
+	{
+		return $this->footerTitleFormat;
+	}
+
+	public function setFooterTitleFormat(string $format): self
+	{
+		$this->footerTitleFormat = $format;
+
+		return $this;
+	}
 }

Spacing +17 added lines, -17 removed lines

@@ -53,10 +53,10 @@ 
      *
      * @return $this
      */
-    public function setPaddingChar(string $paddingChar)
+    public function setPaddingChar( string $paddingChar )
     {
-        if (!$paddingChar) {
-            throw new LogicException('The padding char must not be empty.');
+        if ( ! $paddingChar ) {
+            throw new LogicException( 'The padding char must not be empty.' );
         }
 
         $this->paddingChar = $paddingChar;
@@ -88,7 +88,7 @@ 
      * ╚═══════════════╧══════════════════════════╧══════════════════╝
      * </code>
      */
-    public function setHorizontalBorderChars(string $outside, string $inside = null): self
+    public function setHorizontalBorderChars( string $outside, string $inside = null ): self
     {
         $this->horizontalOutsideBorderChar = $outside;
         $this->horizontalInsideBorderChar = $inside ?? $outside;
@@ -111,7 +111,7 @@ 
      * ╚═══════════════╧══════════════════════════╧══════════════════╝
      * </code>
      */
-    public function setVerticalBorderChars(string $outside, string $inside = null): self
+    public function setVerticalBorderChars( string $outside, string $inside = null ): self
     {
         $this->verticalOutsideBorderChar = $outside;
         $this->verticalInsideBorderChar = $inside ?? $outside;
@@ -163,7 +163,7 @@ 
      * @param string|null $topMidBottom   Top mid bottom char (see #0' of example), equals to $cross if null
      * @param string|null $topRightBottom Top right bottom char (see #4' of example), equals to $midRight if null
      */
-    public function setCrossingChars(string $cross, string $topLeft, string $topMid, string $topRight, string $midRight, string $bottomRight, string $bottomMid, string $bottomLeft, string $midLeft, string $topLeftBottom = null, string $topMidBottom = null, string $topRightBottom = null): self
+    public function setCrossingChars( string $cross, string $topLeft, string $topMid, string $topRight, string $midRight, string $bottomRight, string $bottomMid, string $bottomLeft, string $midLeft, string $topLeftBottom = null, string $topMidBottom = null, string $topRightBottom = null ): self
     {
         $this->crossingChar = $cross;
         $this->crossingTopLeftChar = $topLeft;
@@ -186,9 +186,9 @@ 
      *
      * @see {@link setCrossingChars()} for setting each crossing individually.
      */
-    public function setDefaultCrossingChar(string $char): self
+    public function setDefaultCrossingChar( string $char ): self
     {
-        return $this->setCrossingChars($char, $char, $char, $char, $char, $char, $char, $char, $char);
+        return $this->setCrossingChars( $char, $char, $char, $char, $char, $char, $char, $char, $char );
     }
 
     /**
@@ -229,7 +229,7 @@ 
      *
      * @return $this
      */
-    public function setCellHeaderFormat(string $cellHeaderFormat)
+    public function setCellHeaderFormat( string $cellHeaderFormat )
     {
         $this->cellHeaderFormat = $cellHeaderFormat;
 
@@ -251,7 +251,7 @@ 
      *
      * @return $this
      */
-    public function setCellRowFormat(string $cellRowFormat)
+    public function setCellRowFormat( string $cellRowFormat )
     {
         $this->cellRowFormat = $cellRowFormat;
 
@@ -273,7 +273,7 @@ 
      *
      * @return $this
      */
-    public function setCellRowContentFormat(string $cellRowContentFormat)
+    public function setCellRowContentFormat( string $cellRowContentFormat )
     {
         $this->cellRowContentFormat = $cellRowContentFormat;
 
@@ -295,7 +295,7 @@ 
      *
      * @return $this
      */
-    public function setBorderFormat(string $borderFormat)
+    public function setBorderFormat( string $borderFormat )
     {
         $this->borderFormat = $borderFormat;
 
@@ -317,10 +317,10 @@ 
      *
      * @return $this
      */
-    public function setPadType(int $padType)
+    public function setPadType( int $padType )
     {
-        if (!\in_array($padType, [\STR_PAD_LEFT, \STR_PAD_RIGHT, \STR_PAD_BOTH], true)) {
-            throw new InvalidArgumentException('Invalid padding type. Expected one of (STR_PAD_LEFT, STR_PAD_RIGHT, STR_PAD_BOTH).');
+        if ( ! \in_array( $padType, [ \STR_PAD_LEFT, \STR_PAD_RIGHT, \STR_PAD_BOTH ], true ) ) {
+            throw new InvalidArgumentException( 'Invalid padding type. Expected one of (STR_PAD_LEFT, STR_PAD_RIGHT, STR_PAD_BOTH).' );
         }
 
         $this->padType = $padType;
@@ -343,7 +343,7 @@ 
         return $this->headerTitleFormat;
     }
 
-    public function setHeaderTitleFormat(string $format): self
+    public function setHeaderTitleFormat( string $format ): self
     {
         $this->headerTitleFormat = $format;
 
@@ -355,7 +355,7 @@ 
         return $this->footerTitleFormat;
     }
 
-    public function setFooterTitleFormat(string $format): self
+    public function setFooterTitleFormat( string $format ): self
     {
         $this->footerTitleFormat = $format;
 

Braces +14 added lines, -28 removed lines

@@ -21,8 +21,7 @@ 
  * @author Саша Стаменковић <umpirsky@gmail.com>
  * @author Dany Maillard <danymaillard93b@gmail.com>
  */
-class TableStyle
-{
+class TableStyle {
     private $paddingChar = ' ';
     private $horizontalOutsideBorderChar = '-';
     private $horizontalInsideBorderChar = '-';
@@ -53,8 +52,7 @@ 
      *
      * @return $this
      */
-    public function setPaddingChar(string $paddingChar)
-    {
+    public function setPaddingChar(string $paddingChar) {
         if (!$paddingChar) {
             throw new LogicException('The padding char must not be empty.');
         }
@@ -69,8 +67,7 @@ 
      *
      * @return string
      */
-    public function getPaddingChar()
-    {
+    public function getPaddingChar() {
         return $this->paddingChar;
     }
 
@@ -196,8 +193,7 @@ 
      *
      * @return string
      */
-    public function getCrossingChar()
-    {
+    public function getCrossingChar() {
         return $this->crossingChar;
     }
 
@@ -229,8 +225,7 @@ 
      *
      * @return $this
      */
-    public function setCellHeaderFormat(string $cellHeaderFormat)
-    {
+    public function setCellHeaderFormat(string $cellHeaderFormat) {
         $this->cellHeaderFormat = $cellHeaderFormat;
 
         return $this;
@@ -241,8 +236,7 @@ 
      *
      * @return string
      */
-    public function getCellHeaderFormat()
-    {
+    public function getCellHeaderFormat() {
         return $this->cellHeaderFormat;
     }
 
@@ -251,8 +245,7 @@ 
      *
      * @return $this
      */
-    public function setCellRowFormat(string $cellRowFormat)
-    {
+    public function setCellRowFormat(string $cellRowFormat) {
         $this->cellRowFormat = $cellRowFormat;
 
         return $this;
@@ -263,8 +256,7 @@ 
      *
      * @return string
      */
-    public function getCellRowFormat()
-    {
+    public function getCellRowFormat() {
         return $this->cellRowFormat;
     }
 
@@ -273,8 +265,7 @@ 
      *
      * @return $this
      */
-    public function setCellRowContentFormat(string $cellRowContentFormat)
-    {
+    public function setCellRowContentFormat(string $cellRowContentFormat) {
         $this->cellRowContentFormat = $cellRowContentFormat;
 
         return $this;
@@ -285,8 +276,7 @@ 
      *
      * @return string
      */
-    public function getCellRowContentFormat()
-    {
+    public function getCellRowContentFormat() {
         return $this->cellRowContentFormat;
     }
 
@@ -295,8 +285,7 @@ 
      *
      * @return $this
      */
-    public function setBorderFormat(string $borderFormat)
-    {
+    public function setBorderFormat(string $borderFormat) {
         $this->borderFormat = $borderFormat;
 
         return $this;
@@ -307,8 +296,7 @@ 
      *
      * @return string
      */
-    public function getBorderFormat()
-    {
+    public function getBorderFormat() {
         return $this->borderFormat;
     }
 
@@ -317,8 +305,7 @@ 
      *
      * @return $this
      */
-    public function setPadType(int $padType)
-    {
+    public function setPadType(int $padType) {
         if (!\in_array($padType, [\STR_PAD_LEFT, \STR_PAD_RIGHT, \STR_PAD_BOTH], true)) {
             throw new InvalidArgumentException('Invalid padding type. Expected one of (STR_PAD_LEFT, STR_PAD_RIGHT, STR_PAD_BOTH).');
         }
@@ -333,8 +320,7 @@ 
      *
      * @return int
      */
-    public function getPadType()
-    {
+    public function getPadType() {
         return $this->padType;
     }