diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '2.4'

Browse Source 
* 2.4:
  fixed CS
  fixed CS
This commit is contained in:
Fabien Potencier 2013-12-12 17:10:54 +01:00
commit 6764f91ce9
7 changed files with 89 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
View File

@ -31,13 +31,15 @@ class ErrorHandlerTest extends \PHPUnit_Framework_TestCase
*/ */
protected $displayErrors; protected $displayErrors;
public function setUp() { public function setUp()
{
$this->errorReporting = error_reporting(E_ALL | E_STRICT); $this->errorReporting = error_reporting(E_ALL | E_STRICT);
$this->displayErrors = ini_get('display_errors'); $this->displayErrors = ini_get('display_errors');
ini_set('display_errors', '1'); ini_set('display_errors', '1');
} }
public function tearDown() { public function tearDown()
{
ini_set('display_errors', $this->displayErrors); ini_set('display_errors', $this->displayErrors);
error_reporting($this->errorReporting); error_reporting($this->errorReporting);
} }
@ -287,7 +289,6 @@ PHP
} }
} }
function test_namespaced_function_again() function test_namespaced_function_again()
{ {
} }

1
src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php
View File

@ -11,7 +11,6 @@
namespace Symfony\Component\Form\Extension\Validator\Constraints; namespace Symfony\Component\Form\Extension\Validator\Constraints;
use Symfony\Component\Form\ClickableInterface;
use Symfony\Component\Form\FormInterface; use Symfony\Component\Form\FormInterface;
use Symfony\Component\Form\Extension\Validator\Util\ServerParams; use Symfony\Component\Form\Extension\Validator\Util\ServerParams;
use Symfony\Component\Validator\Constraint; use Symfony\Component\Validator\Constraint;

1
src/Symfony/Component/Form/Tests/CompoundFormTest.php
View File

@ -13,7 +13,6 @@ namespace Symfony\Component\Form\Tests;
use Symfony\Component\Form\Extension\Core\DataMapper\PropertyPathMapper; use Symfony\Component\Form\Extension\Core\DataMapper\PropertyPathMapper;
use Symfony\Component\Form\Extension\HttpFoundation\HttpFoundationRequestHandler; use Symfony\Component\Form\Extension\HttpFoundation\HttpFoundationRequestHandler;
use Symfony\Component\Form\FormBuilder;
use Symfony\Component\Form\FormError; use Symfony\Component\Form\FormError;
use Symfony\Component\Form\Forms; use Symfony\Component\Form\Forms;
use Symfony\Component\Form\FormView; use Symfony\Component\Form\FormView;

2
src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php
View File

@ -793,7 +793,7 @@ class DateTypeTest extends TypeTestCase
$view = $form->createView(); $view = $form->createView();
$listChoices = array(); $listChoices = array();
foreach(range(1902, 2037) as $y) { foreach (range(1902, 2037) as $y) {
$listChoices[] = new ChoiceView($y, $y, $y); $listChoices[] = new ChoiceView($y, $y, $y);
} }