This commit is contained in:
Fabien Potencier 2016-01-21 09:36:03 +01:00
parent 9afd7e02e0
commit 06b958a17e
11 changed files with 10 additions and 14 deletions

View File

@ -224,7 +224,7 @@ class DebugClassLoader
$i = count($tail) - 1; $i = count($tail) - 1;
$j = count($real) - 1; $j = count($real) - 1;
while (isset($tail[$i], $real[$j]) && $tail[$i] === $real[$j]) { while (isset($tail[$i], $real[$j]) && $tail[$i] === $real[$j]) {
--$i; --$i;
--$j; --$j;
} }

View File

@ -175,7 +175,7 @@ class DebugClassLoaderTest extends \PHPUnit_Framework_TestCase
*/ */
public function testDeprecatedSuper($class, $super, $type) public function testDeprecatedSuper($class, $super, $type)
{ {
set_error_handler(function() { return false; }); set_error_handler(function () { return false; });
$e = error_reporting(0); $e = error_reporting(0);
trigger_error('', E_USER_DEPRECATED); trigger_error('', E_USER_DEPRECATED);
@ -205,7 +205,7 @@ class DebugClassLoaderTest extends \PHPUnit_Framework_TestCase
public function testDeprecatedSuperInSameNamespace() public function testDeprecatedSuperInSameNamespace()
{ {
set_error_handler(function() { return false; }); set_error_handler(function () { return false; });
$e = error_reporting(0); $e = error_reporting(0);
trigger_error('', E_USER_NOTICE); trigger_error('', E_USER_NOTICE);
@ -231,7 +231,7 @@ class DebugClassLoaderTest extends \PHPUnit_Framework_TestCase
$this->markTestSkipped('PHP7 already prevents using reserved names.'); $this->markTestSkipped('PHP7 already prevents using reserved names.');
} }
set_error_handler(function() { return false; }); set_error_handler(function () { return false; });
$e = error_reporting(0); $e = error_reporting(0);
trigger_error('', E_USER_NOTICE); trigger_error('', E_USER_NOTICE);

View File

@ -78,7 +78,6 @@ class DefinitionDecorator extends Definition
/** /**
* {@inheritdoc} * {@inheritdoc}
*
*/ */
public function setFactoryClass($class) public function setFactoryClass($class)
{ {

View File

@ -69,7 +69,7 @@ class LockHandler
} }
// Silence error reporting // Silence error reporting
set_error_handler(function() {}); set_error_handler(function () {});
if (!$this->handle = fopen($this->file, 'r')) { if (!$this->handle = fopen($this->file, 'r')) {
if ($this->handle = fopen($this->file, 'x')) { if ($this->handle = fopen($this->file, 'x')) {

View File

@ -16,7 +16,7 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
/** /**
* @author Paráda József <joczy.parada@gmail.com> * @author Paráda József <joczy.parada@gmail.com>
*/ */
class ChoiceSubType extends AbstractType class ChoiceSubType extends AbstractType
{ {
/** /**

View File

@ -1102,7 +1102,7 @@ class OptionsResolver2Dot6Test extends \PHPUnit_Framework_TestCase
$this->resolver->setNormalizer('catcher', function (Options $options) { $this->resolver->setNormalizer('catcher', function (Options $options) {
try { try {
return $options['thrower']; return $options['thrower'];
} catch(\Exception $e) { } catch (\Exception $e) {
return false; return false;
} }
}); });
@ -1126,7 +1126,7 @@ class OptionsResolver2Dot6Test extends \PHPUnit_Framework_TestCase
$this->resolver->setDefault('catcher', function (Options $options) { $this->resolver->setDefault('catcher', function (Options $options) {
try { try {
return $options['thrower']; return $options['thrower'];
} catch(\Exception $e) { } catch (\Exception $e) {
return false; return false;
} }
}); });

View File

@ -160,7 +160,7 @@ class RouteCompilerTest extends \PHPUnit_Framework_TestCase
array('variable', '.', '[^/]++', '_format'), array('variable', '.', '[^/]++', '_format'),
array('variable', '/', '[^/\.]++', 'bar'), array('variable', '/', '[^/\.]++', 'bar'),
array('text', '/foo'), array('text', '/foo'),
), ),
), ),
); );
} }

View File

@ -510,4 +510,3 @@ class StaticPropertyDummy
{ {
private static $property = 'value'; private static $property = 'value';
} }

View File

@ -60,7 +60,6 @@ interface ConstraintViolationInterface
* that appear in the message template. * that appear in the message template.
* *
* @see getMessageTemplate() * @see getMessageTemplate()
*
* @deprecated since version 2.7, to be replaced by getParameters() in 3.0. * @deprecated since version 2.7, to be replaced by getParameters() in 3.0.
*/ */
public function getMessageParameters(); public function getMessageParameters();

View File

@ -14,7 +14,7 @@ namespace Symfony\Component\VarDumper\Tests\Test;
use Symfony\Component\VarDumper\Test\VarDumperTestCase; use Symfony\Component\VarDumper\Test\VarDumperTestCase;
use Symfony\Component\VarDumper\Test\VarDumperTestTrait; use Symfony\Component\VarDumper\Test\VarDumperTestTrait;
class VarDumperTestTraitTest extends VarDumperTestCase class VarDumperTestTraitRequire54 extends VarDumperTestCase
{ {
use VarDumperTestTrait; use VarDumperTestTrait;

View File

@ -13,4 +13,3 @@
if (PHP_VERSION_ID >= 50400) { if (PHP_VERSION_ID >= 50400) {
require __DIR__.'/VarDumperTestTraitRequire54.php'; require __DIR__.'/VarDumperTestTraitRequire54.php';
} }