From b1b52ada41adda3522984c7b5da9891ded993869 Mon Sep 17 00:00:00 2001 From: Ilya Antipenko Date: Thu, 9 Jul 2015 21:38:49 +0300 Subject: [PATCH 1/3] Remove excess whitespace --- src/Symfony/Component/Form/Form.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/Form/Form.php b/src/Symfony/Component/Form/Form.php index de229064d5..7a18dcb800 100644 --- a/src/Symfony/Component/Form/Form.php +++ b/src/Symfony/Component/Form/Form.php @@ -357,7 +357,7 @@ class Form implements \IteratorAggregate, FormInterface if (!FormUtil::isEmpty($viewData)) { $dataClass = $this->config->getDataClass(); - $actualType = is_object($viewData) ? 'an instance of class '.get_class($viewData) : ' a(n) '.gettype($viewData); + $actualType = is_object($viewData) ? 'an instance of class '.get_class($viewData) : 'a(n) '.gettype($viewData); if (null === $dataClass && is_object($viewData) && !$viewData instanceof \ArrayAccess) { $expectedType = 'scalar, array or an instance of \ArrayAccess'; From 88a2b562fef002c348172acfc3ee0c42dac64cfd Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 13 Jul 2015 11:08:56 +0200 Subject: [PATCH 2/3] fixed some tests --- .../Console/Tests/Formatter/OutputFormatterStyleTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/Console/Tests/Formatter/OutputFormatterStyleTest.php b/src/Symfony/Component/Console/Tests/Formatter/OutputFormatterStyleTest.php index d0ebb27512..7cff68e5eb 100644 --- a/src/Symfony/Component/Console/Tests/Formatter/OutputFormatterStyleTest.php +++ b/src/Symfony/Component/Console/Tests/Formatter/OutputFormatterStyleTest.php @@ -38,7 +38,7 @@ class OutputFormatterStyleTest extends \PHPUnit_Framework_TestCase $this->assertEquals("\033[34mfoo\033[0m", $style->apply('foo')); $style->setForeground('default'); - $this->assertEquals("\033[39mfoo\033[39m", $style->apply('foo')); + $this->assertEquals("\033[39mfoo\033[0m", $style->apply('foo')); $this->setExpectedException('InvalidArgumentException'); $style->setForeground('undefined-color'); @@ -55,7 +55,7 @@ class OutputFormatterStyleTest extends \PHPUnit_Framework_TestCase $this->assertEquals("\033[43mfoo\033[0m", $style->apply('foo')); $style->setBackground('default'); - $this->assertEquals("\033[49mfoo\033[49m", $style->apply('foo')); + $this->assertEquals("\033[49mfoo\033[0m", $style->apply('foo')); $this->setExpectedException('InvalidArgumentException'); $style->setBackground('undefined-color'); From c57c3f547922e8602bd9a8ff4db2265ae7082615 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 13 Jul 2015 11:09:47 +0200 Subject: [PATCH 3/3] fixed tests --- .../Console/Tests/Formatter/OutputFormatterStyleTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/Console/Tests/Formatter/OutputFormatterStyleTest.php b/src/Symfony/Component/Console/Tests/Formatter/OutputFormatterStyleTest.php index cb9b7d28ba..0abfb3ce27 100644 --- a/src/Symfony/Component/Console/Tests/Formatter/OutputFormatterStyleTest.php +++ b/src/Symfony/Component/Console/Tests/Formatter/OutputFormatterStyleTest.php @@ -38,7 +38,7 @@ class OutputFormatterStyleTest extends \PHPUnit_Framework_TestCase $this->assertEquals("\033[34mfoo\033[39m", $style->apply('foo')); $style->setForeground('default'); - $this->assertEquals("\033[39mfoo\033[0m", $style->apply('foo')); + $this->assertEquals("\033[39mfoo\033[39m", $style->apply('foo')); $this->setExpectedException('InvalidArgumentException'); $style->setForeground('undefined-color'); @@ -55,7 +55,7 @@ class OutputFormatterStyleTest extends \PHPUnit_Framework_TestCase $this->assertEquals("\033[43mfoo\033[49m", $style->apply('foo')); $style->setBackground('default'); - $this->assertEquals("\033[49mfoo\033[0m", $style->apply('foo')); + $this->assertEquals("\033[49mfoo\033[49m", $style->apply('foo')); $this->setExpectedException('InvalidArgumentException'); $style->setBackground('undefined-color');