[Console] make it possible to pass a style directly to Table::setStyle()

fabpot · fabpot · commit 21784ced7a51 · 2014-03-03T14:12:10.000+01:00
diff --git a/src/Symfony/Component/Console/Helper/Table.php b/src/Symfony/Component/Console/Helper/Table.php
@@ -110,19 +110,19 @@ public static function getStyleDefinition($name)
     /**
      * Sets table style.
      *
-     * @param string $name The style name
+     * @param TableStyle|string $name The style name or a TableStyle instance
      *
      * @return Table
      */
     public function setStyle($name)
     {
-        if (isset(self::$styles[$name])) {
+        if ($name instanceof TableStyle) {
+            $this->style = $name;
+        } elseif (isset(self::$styles[$name])) {
             $this->style = self::$styles[$name];
-
-            return $this;
+        } else {
+            throw new \InvalidArgumentException(sprintf('Style "%s" is not defined.', $name));
         }
-
-        throw new \InvalidArgumentException(sprintf('Style "%s" is not defined.', $name));
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -110,19 +110,19 @@ public static function getStyleDefinition($name)`
`110`	`110`	`/**`
`111`	`111`	`* Sets table style.`
`112`	`112`	`*`
`113`		`- * @param string $name The style name`
	`113`	`+ * @param TableStyle\|string $name The style name or a TableStyle instance`
`114`	`114`	`*`
`115`	`115`	`* @return Table`
`116`	`116`	`*/`
`117`	`117`	`public function setStyle($name)`
`118`	`118`	`{`
`119`		`- if (isset(self::$styles[$name])) {`
	`119`	`+ if ($name instanceof TableStyle) {`
	`120`	`+ $this->style = $name;`
	`121`	`+ } elseif (isset(self::$styles[$name])) {`
`120`	`122`	`$this->style = self::$styles[$name];`
`121`		`-`
`122`		`- return $this;`
	`123`	`+ } else {`
	`124`	`+ throw new \InvalidArgumentException(sprintf('Style "%s" is not defined.', $name));`
`123`	`125`	`}`
`124`		`-`
`125`		`- throw new \InvalidArgumentException(sprintf('Style "%s" is not defined.', $name));`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`/**`