10000 Merge branch '2.3' into 2.4 · ddeboer/symfony@c2c3504 · GitHub
[go: up one dir, main page]
Skip to content

Commit c2c3504

Browse files
fabpotfabpot
committed
Merge branch '2.3' into 2.4
* 2.3: fixed CS
2 parents 4147141 + 3062681 commit c2c3504

File tree

6 files changed

+10
-10
lines changed

6 files changed

+10
-10
lines changed

‎src/Symfony/Bundle/TwigBundle/TwigEngine.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public function guessDefaultEscapingStrategy($filename)
5757
if ('js' === $format) {
5858
return 'js';
5959
}
60-
60+
6161
if ('txt' === $format) {
6262
return false;
6363
}

‎src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,15 @@ class ErrorHandlerTest extends \PHPUnit_Framework_TestCase
3131
*/
3232
protected $displayErrors;
3333

34-
public function setUp() {
34+
public function setUp()
35+
{
3536
$this->errorReporting = error_reporting(E_ALL | E_STRICT);
3637
$this->displayErrors = ini_get('display_errors');
3738
ini_set('display_errors', '1');
3839
}
3940

40-
public function tearDown() {
41+
public function tearDown()
42+
{
4143
ini_set('display_errors', $this->displayErrors);
4244
error_reporting($this->errorReporting);
4345
}

‎src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
namespace Symfony\Component\Form\Extension\Validator\Constraints;
1313

14-
use Symfony\Component\Form\ClickableInterface;
1514
use Symfony\Component\Form\FormInterface;
1615
use Symfony\Component\Form\Extension\Validator\Util\ServerParams;
1716
use Symfony\Component\Validator\Constraint;

‎src/Symfony/Component/Form/Tests/CompoundFormTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313

1414
use Symfony\Component\Form\Extension\Core\DataMapper\PropertyPathMapper;
1515
use Symfony\Component\Form\Extension\HttpFoundation\HttpFoundationRequestHandler;
16-
use Symfony\Component\Form\FormBuilder;
1716
use Symfony\Component\Form\FormError;
1817
use Symfony\Component\Form\Forms;
1918
use Symfony\Component\Form\FormView;

‎src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -778,25 +778,25 @@ public function testDayErrorsBubbleUp($widget)
778778
$this->assertSame(array(), $form['day']->getErrors());
779779
$this->assertSame(array($error), $form->getErrors());
780780
}
781-
781+
782782
public function testYearsFor32BitsMachines()
783783
{
784784
if (4 !== PHP_INT_SIZE) {
785785
$this->markTestSkipped(
786786
'PHP must be compiled in 32 bit mode to run this test');
787787
}
788-
788+
789789
$form = $this->factory->create('date', null, array(
790790
'years' => range(1900, 2040),
791791
));
792792

793793
$view = $form->createView();
794794

795795
$listChoices = array();
796-
foreach(range(1902, 2037) as $y) {
796+
foreach (range(1902, 2037) as $y) {
797797
$listChoices[] = new ChoiceView($y, $y, $y);
798798
}
799-
799+
800800
$this->assertEquals($listChoices, $view['year']->vars['choices']);
801801
}
802802
}

‎src/Symfony/Component/Intl/Tests/DateFormatter/AbstractIntlDateFormatterTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ abstract class AbstractIntlDateFormatterTest extends \PHPUnit_Framework_TestCase
2424
{
2525

2626
protected function setUp()
27-
{
27+
{
2828
\Locale::setDefault('en');
2929
}
3030

0 commit comments

Comments
 (0)
0