Merge branch '2.4'
* 2.4: fixed CS fixed CS
This commit is contained in:
commit
6764f91ce9
@ -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()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
@ -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;
|
||||||
|
@ -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;
|
||||||
|
Reference in New Issue
Block a user