This commit is contained in:
Fabien Potencier 2015-08-24 09:31:10 +02:00
parent aad7963ede
commit 1d53ca9c92
8 changed files with 9 additions and 12 deletions

View File

@ -225,7 +225,7 @@ class EntityTypeTest extends TypeTestCase
'em' => 'default', 'em' => 'default',
'class' => self::SINGLE_IDENT_CLASS, 'class' => self::SINGLE_IDENT_CLASS,
'query_builder' => function () { 'query_builder' => function () {
return null; return;
}, },
)); ));

View File

@ -45,6 +45,6 @@ class AddSecurityVotersPass implements CompilerPassInterface
throw new LogicException('No security voters found. You need to tag at least one with "security.voter"'); throw new LogicException('No security voters found. You need to tag at least one with "security.voter"');
} }
$container->getDefinition('security.access.decision_manager')->addMethodCall('setVoters', array(array_values($voters))); $container->getDefinition('security.access.decision_manager')->addMethodCall('setVoters', array(array_values($voters)));
} }
} }

View File

@ -513,7 +513,7 @@ class Table
*/ */
private function calculateColumnsWidth($rows) private function calculateColumnsWidth($rows)
{ {
for ($column = 0; $column < $this->numberOfColumns; $column++) { for ($column = 0; $column < $this->numberOfColumns; ++$column) {
$lengths = array(); $lengths = array();
foreach ($rows as $row) { foreach ($rows as $row) {
if ($row instanceof TableSeparator) { if ($row instanceof TableSeparator) {

View File

@ -365,8 +365,7 @@ class CommandTest extends \PHPUnit_Framework_TestCase
// scope. // scope.
function createClosure() function createClosure()
{ {
return function(InputInterface $input, OutputInterface $output) return function (InputInterface $input, OutputInterface $output) {
{
$output->writeln($this instanceof Command ? 'bound to the command' : 'not bound to the command'); $output->writeln($this instanceof Command ? 'bound to the command' : 'not bound to the command');
}; };
} }

View File

@ -868,8 +868,8 @@ EOF;
if (count($scopes = $this->container->getScopes(false)) > 0) { if (count($scopes = $this->container->getScopes(false)) > 0) {
$code .= "\n"; $code .= "\n";
$code .= " \$this->scopes = ".$this->dumpValue($scopes).";\n"; $code .= ' $this->scopes = '.$this->dumpValue($scopes).";\n";
$code .= " \$this->scopeChildren = ".$this->dumpValue($this->container->getScopeChildren(false)).";\n"; $code .= ' $this->scopeChildren = '.$this->dumpValue($this->container->getScopeChildren(false)).";\n";
} }
$code .= $this->addMethodMap(); $code .= $this->addMethodMap();
@ -914,8 +914,8 @@ EOF;
$code .= "\n"; $code .= "\n";
if (count($scopes = $this->container->getScopes(false)) > 0) { if (count($scopes = $this->container->getScopes(false)) > 0) {
$code .= " \$this->scopes = ".$this->dumpValue($scopes).";\n"; $code .= ' $this->scopes = '.$this->dumpValue($scopes).";\n";
$code .= " \$this->scopeChildren = ".$this->dumpValue($this->container->getScopeChildren(false)).";\n"; $code .= ' $this->scopeChildren = '.$this->dumpValue($this->container->getScopeChildren(false)).";\n";
} else { } else {
$code .= " \$this->scopes = array();\n"; $code .= " \$this->scopes = array();\n";
$code .= " \$this->scopeChildren = array();\n"; $code .= " \$this->scopeChildren = array();\n";

View File

@ -12,7 +12,6 @@
namespace Symfony\Component\Form\Tests; namespace Symfony\Component\Form\Tests;
use Symfony\Component\Form\FormError; use Symfony\Component\Form\FormError;
use Symfony\Component\Form\Tests\Fixtures\AlternatingRowType;
use Symfony\Component\Security\Csrf\CsrfToken; use Symfony\Component\Security\Csrf\CsrfToken;
abstract class AbstractDivLayoutTest extends AbstractLayoutTest abstract class AbstractDivLayoutTest extends AbstractLayoutTest

View File

@ -13,7 +13,6 @@ namespace Symfony\Component\Form\Tests\Extension\Core\Type;
use Symfony\Component\Form\Form; use Symfony\Component\Form\Form;
use Symfony\Component\Form\Tests\Fixtures\Author; use Symfony\Component\Form\Tests\Fixtures\Author;
use Symfony\Component\Form\Tests\Fixtures\AuthorType;
class CollectionTypeTest extends \Symfony\Component\Form\Test\TypeTestCase class CollectionTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
{ {

View File

@ -57,7 +57,7 @@ class DirectoryLoaderTest extends AbstractAnnotationLoaderTest
$this->assertCount(3, $routes, 'Three routes are loaded'); $this->assertCount(3, $routes, 'Three routes are loaded');
$this->assertContainsOnly('Symfony\Component\Routing\Route', $routes); $this->assertContainsOnly('Symfony\Component\Routing\Route', $routes);
for ($i = 1; $i <= 3; $i++) { for ($i = 1; $i <= 3; ++$i) {
$this->assertSame('/route/'.$i, $routes['route'.$i]->getPath()); $this->assertSame('/route/'.$i, $routes['route'.$i]->getPath());
} }
} }