Merge branch '2.3' into 2.4
* 2.3: fixed CS
This commit is contained in:
commit
c2c3504472
@ -57,7 +57,7 @@ class TwigEngine extends BaseEngine implements EngineInterface
|
||||
if ('js' === $format) {
|
||||
return 'js';
|
||||
}
|
||||
|
||||
|
||||
if ('txt' === $format) {
|
||||
return false;
|
||||
}
|
||||
|
@ -31,13 +31,15 @@ class ErrorHandlerTest extends \PHPUnit_Framework_TestCase
|
||||
*/
|
||||
protected $displayErrors;
|
||||
|
||||
public function setUp() {
|
||||
public function setUp()
|
||||
{
|
||||
$this->errorReporting = error_reporting(E_ALL | E_STRICT);
|
||||
$this->displayErrors = ini_get('display_errors');
|
||||
ini_set('display_errors', '1');
|
||||
}
|
||||
|
||||
public function tearDown() {
|
||||
public function tearDown()
|
||||
{
|
||||
ini_set('display_errors', $this->displayErrors);
|
||||
error_reporting($this->errorReporting);
|
||||
}
|
||||
|
@ -11,7 +11,6 @@
|
||||
|
||||
namespace Symfony\Component\Form\Extension\Validator\Constraints;
|
||||
|
||||
use Symfony\Component\Form\ClickableInterface;
|
||||
use Symfony\Component\Form\FormInterface;
|
||||
use Symfony\Component\Form\Extension\Validator\Util\ServerParams;
|
||||
use Symfony\Component\Validator\Constraint;
|
||||
|
@ -13,7 +13,6 @@ namespace Symfony\Component\Form\Tests;
|
||||
|
||||
use Symfony\Component\Form\Extension\Core\DataMapper\PropertyPathMapper;
|
||||
use Symfony\Component\Form\Extension\HttpFoundation\HttpFoundationRequestHandler;
|
||||
use Symfony\Component\Form\FormBuilder;
|
||||
use Symfony\Component\Form\FormError;
|
||||
use Symfony\Component\Form\Forms;
|
||||
use Symfony\Component\Form\FormView;
|
||||
|
@ -778,14 +778,14 @@ class DateTypeTest extends TypeTestCase
|
||||
$this->assertSame(array(), $form['day']->getErrors());
|
||||
$this->assertSame(array($error), $form->getErrors());
|
||||
}
|
||||
|
||||
|
||||
public function testYearsFor32BitsMachines()
|
||||
{
|
||||
if (4 !== PHP_INT_SIZE) {
|
||||
$this->markTestSkipped(
|
||||
'PHP must be compiled in 32 bit mode to run this test');
|
||||
}
|
||||
|
||||
|
||||
$form = $this->factory->create('date', null, array(
|
||||
'years' => range(1900, 2040),
|
||||
));
|
||||
@ -793,10 +793,10 @@ class DateTypeTest extends TypeTestCase
|
||||
$view = $form->createView();
|
||||
|
||||
$listChoices = array();
|
||||
foreach(range(1902, 2037) as $y) {
|
||||
foreach (range(1902, 2037) as $y) {
|
||||
$listChoices[] = new ChoiceView($y, $y, $y);
|
||||
}
|
||||
|
||||
|
||||
$this->assertEquals($listChoices, $view['year']->vars['choices']);
|
||||
}
|
||||
}
|
||||
|
@ -24,7 +24,7 @@ abstract class AbstractIntlDateFormatterTest extends \PHPUnit_Framework_TestCase
|
||||
{
|
||||
|
||||
protected function setUp()
|
||||
{
|
||||
{
|
||||
\Locale::setDefault('en');
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user