minor symfony#19406 Console table cleanup (ReenExe)

fabpot · fabpot · commit 998fbd015e30 · 2016-07-28T12:57:43.000-04:00
This PR was submitted for the master branch but it was merged into the 2.8 branch instead (closes symfony#19406). Discussion ---------- Console table cleanup | Q | A | ------------- | --- | Branch? | master | Bug fix? | yes `notice` | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Commits ------- 217274b Console table cleanup
diff --git a/src/Symfony/Component/Console/Helper/Table.php b/src/Symfony/Component/Console/Helper/Table.php
@@ -151,13 +151,7 @@ public function setColumnStyle($columnIndex, $name)
     {
         $columnIndex = intval($columnIndex);
 
-        if ($name instanceof TableStyle) {
-            $this->columnStyles[$columnIndex] = $name;
-        } elseif (isset(self::$styles[$name])) {
-            $this->columnStyles[$columnIndex] = self::$styles[$name];
-        } else {
-            throw new InvalidArgumentException(sprintf('Style "%s" is not defined.', $name));
-        }
+        $this->columnStyles[$columnIndex] = $this->resolveStyle($name);
 
         return $this;
     }
diff --git a/src/Symfony/Component/Console/Tests/Helper/TableTest.php b/src/Symfony/Component/Console/Tests/Helper/TableTest.php
@@ -650,6 +650,25 @@ public function testGetStyleDefinition()
         Table::getStyleDefinition('absent');
     }
 
+    /**
+     * @expectedException \Symfony\Component\Console\Exception\InvalidArgumentException
+     * @expectedExceptionMessage Style "absent" is not defined.
+     */
+    public function testIsNotDefinedStyleException()
+    {
+        $table = new Table($this->getOutputStream());
+        $table->setStyle('absent');
+    }
+
+    /**
+     * @expectedException \Symfony\Component\Console\Exception\InvalidArgumentException
+     * @expectedExceptionMessage Style "absent" is not defined.
+     */
+    public function testGetStyleDefinition()
+    {
+        Table::getStyleDefinition('absent');
+    }
+
     protected function getOutputStream()
     {
         return new StreamOutput($this->stream, StreamOutput::VERBOSITY_NORMAL, false);

Original file line number	Diff line number	Diff line change
`@@ -151,13 +151,7 @@ public function setColumnStyle($columnIndex, $name)`
`151`	`151`	`{`
`152`	`152`	`$columnIndex = intval($columnIndex);`
`153`	`153`
`154`		`- if ($name instanceof TableStyle) {`
`155`		`- $this->columnStyles[$columnIndex] = $name;`
`156`		`- } elseif (isset(self::$styles[$name])) {`
`157`		`- $this->columnStyles[$columnIndex] = self::$styles[$name];`
`158`		`- } else {`
`159`		`- throw new InvalidArgumentException(sprintf('Style "%s" is not defined.', $name));`
`160`		`- }`
	`154`	`+ $this->columnStyles[$columnIndex] = $this->resolveStyle($name);`
`161`	`155`
`162`	`156`	`return $this;`
`163`	`157`	`}`