minor #12772 PSR-2 Fixes (GrahamCampbell)
This PR was merged into the 2.3 branch.
Discussion
----------
PSR-2 Fixes
| Q | A
| ------------- | ---
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | N/A
| License | MIT
| Doc PR | N/A
##### This pull request brings symfony 2.3 back inline with PSR-2.
Commits
-------
eda746b
PSR-2 fixes
This commit is contained in:
commit
be81a1d11b
@ -351,8 +351,7 @@ EOF
|
|||||||
public function testHtml()
|
public function testHtml()
|
||||||
{
|
{
|
||||||
$this->assertEquals('<img alt="Bar">', $this->createTestCrawler()->filterXPath('//a[5]')->html());
|
$this->assertEquals('<img alt="Bar">', $this->createTestCrawler()->filterXPath('//a[5]')->html());
|
||||||
$this->assertEquals('<input type="text" value="TextValue" name="TextName"><input type="submit" value="FooValue" name="FooName" id="FooId"><input type="button" value="BarValue" name="BarName" id="BarId"><button value="ButtonValue" name="ButtonName" id="ButtonId"></button>'
|
$this->assertEquals('<input type="text" value="TextValue" name="TextName"><input type="submit" value="FooValue" name="FooName" id="FooId"><input type="button" value="BarValue" name="BarName" id="BarId"><button value="ButtonValue" name="ButtonName" id="ButtonId"></button>', trim($this->createTestCrawler()->filterXPath('//form[@id="FooFormId"]')->html()));
|
||||||
, trim($this->createTestCrawler()->filterXPath('//form[@id="FooFormId"]')->html()));
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$this->createTestCrawler()->filterXPath('//ol')->html();
|
$this->createTestCrawler()->filterXPath('//ol')->html();
|
||||||
|
@ -212,12 +212,12 @@ class ParameterBagTest extends \PHPUnit_Framework_TestCase
|
|||||||
|
|
||||||
$this->assertFalse($bag->filter('dec', '', false, FILTER_VALIDATE_INT, array(
|
$this->assertFalse($bag->filter('dec', '', false, FILTER_VALIDATE_INT, array(
|
||||||
'flags' => FILTER_FLAG_ALLOW_HEX,
|
'flags' => FILTER_FLAG_ALLOW_HEX,
|
||||||
'options' => array('min_range' => 1, 'max_range' => 0xff),)
|
'options' => array('min_range' => 1, 'max_range' => 0xff))
|
||||||
), '->filter() gets a value of parameter as integer between boundaries');
|
), '->filter() gets a value of parameter as integer between boundaries');
|
||||||
|
|
||||||
$this->assertFalse($bag->filter('hex', '', false, FILTER_VALIDATE_INT, array(
|
$this->assertFalse($bag->filter('hex', '', false, FILTER_VALIDATE_INT, array(
|
||||||
'flags' => FILTER_FLAG_ALLOW_HEX,
|
'flags' => FILTER_FLAG_ALLOW_HEX,
|
||||||
'options' => array('min_range' => 1, 'max_range' => 0xff),)
|
'options' => array('min_range' => 1, 'max_range' => 0xff))
|
||||||
), '->filter() gets a value of parameter as integer between boundaries');
|
), '->filter() gets a value of parameter as integer between boundaries');
|
||||||
|
|
||||||
$this->assertEquals(array('bang'), $bag->filter('array', '', false), '->filter() gets a value of parameter as an array');
|
$this->assertEquals(array('bang'), $bag->filter('array', '', false), '->filter() gets a value of parameter as an array');
|
||||||
|
@ -62,7 +62,7 @@ class StopwatchTest extends \PHPUnit_Framework_TestCase
|
|||||||
'foo' =>
|
'foo' =>
|
||||||
$this->getMockBuilder('Symfony\Component\Stopwatch\StopwatchEvent')
|
$this->getMockBuilder('Symfony\Component\Stopwatch\StopwatchEvent')
|
||||||
->setConstructorArgs(array(microtime(true) * 1000))
|
->setConstructorArgs(array(microtime(true) * 1000))
|
||||||
->getMock(),)
|
->getMock())
|
||||||
);
|
);
|
||||||
|
|
||||||
$this->assertFalse($stopwatch->isStarted('foo'));
|
$this->assertFalse($stopwatch->isStarted('foo'));
|
||||||
|
Reference in New Issue
Block a user