Merge branch '2.7' into 2.8

fabpot · fabpot · commit 77b5fc4c4ba3 · 2016-07-28T12:56:28.000-04:00
* 2.7: undefined offset fix (#19406) [EventDispatcher] Removed unused variable
diff --git a/src/Symfony/Component/Console/Helper/Table.php b/src/Symfony/Component/Console/Helper/Table.php
@@ -108,11 +108,11 @@ public static function getStyleDefinition($name)
             self::$styles = self::initStyles();
         }
 
-        if (!self::$styles[$name]) {
-            throw new InvalidArgumentException(sprintf('Style "%s" is not defined.', $name));
+        if (isset(self::$styles[$name])) {
+            return self::$styles[$name];
         }
 
-        return self::$styles[$name];
+        throw new InvalidArgumentException(sprintf('Style "%s" is not defined.', $name));
     }
 
     /**
@@ -124,13 +124,7 @@ public static function getStyleDefinition($name)
      */
     public function setStyle($name)
     {
-        if ($name instanceof TableStyle) {
-            $this->style = $name;
-        } elseif (isset(self::$styles[$name])) {
-            $this->style = self::$styles[$name];
-        } else {
-            throw new InvalidArgumentException(sprintf('Style "%s" is not defined.', $name));
-        }
+        $this->style = $this->resolveStyle($name);
 
         return $this;
     }
@@ -660,4 +654,17 @@ private static function initStyles()
             'symfony-style-guide' => $styleGuide,
         );
     }
+
+    private function resolveStyle($name)
+    {
+        if ($name instanceof TableStyle) {
+            return $name;
+        }
+
+        if (isset(self::$styles[$name])) {
+            return self::$styles[$name];
+        }
+
+        throw new InvalidArgumentException(sprintf('Style "%s" is not defined.', $name));
+    }
 }
diff --git a/src/Symfony/Component/Console/Tests/Helper/TableTest.php b/src/Symfony/Component/Console/Tests/Helper/TableTest.php
@@ -631,6 +631,25 @@ public function testColumnStyle()
         $this->assertEquals($expected, $this->getOutputContent($output));
     }
 
+    /**
+     * @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);
diff --git a/src/Symfony/Component/EventDispatcher/Tests/AbstractEventDispatcherTest.php b/src/Symfony/Component/EventDispatcher/Tests/AbstractEventDispatcherTest.php
@@ -142,7 +142,7 @@ public function testDispatch()
     public function testLegacyDispatch()
     {
         $event = new Event();
-        $return = $this->dispatcher->dispatch(self::preFoo, $event);
+        $this->dispatcher->dispatch(self::preFoo, $event);
         $this->assertEquals('pre.foo', $event->getName());
     }
 

Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ public function testDispatch()`
`142`	`142`	`public function testLegacyDispatch()`
`143`	`143`	`{`
`144`	`144`	`$event = new Event();`
`145`		`- $return = $this->dispatcher->dispatch(self::preFoo, $event);`
	`145`	`+ $this->dispatcher->dispatch(self::preFoo, $event);`
`146`	`146`	`$this->assertEquals('pre.foo', $event->getName());`
`147`	`147`	`}`
`148`	`148`