Skip to content

Commit c77d806

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '3.3' into 3.4
* 3.3: typo CS: adjust chaining indentation
2 parents 434f0b0 + 349e5fe commit c77d806

File tree

12 files changed

+86
-87
lines changed

12 files changed

+86
-87
lines changed

‎src/Symfony/Bridge/Doctrine/Tests/DataCollector/DoctrineDataCollectorTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -148,13 +148,13 @@ private function createCollector($queries)
148148

149149
$registry = $this->getMockBuilder('Doctrine\Common\Persistence\ManagerRegistry')->getMock();
150150
$registry
151-
->expects($this->any())
152-
->method('getConnectionNames')
153-
->will($this->returnValue(array('default' => 'doctrine.dbal.default_connection')));
151+
->expects($this->any())
152+
->method('getConnectionNames')
153+
->will($this->returnValue(array('default' => 'doctrine.dbal.default_connection')));
154154
$registry
155-
->expects($this->any())
156-
->method('getManagerNames')
157-
->will($this->returnValue(array('default' => 'doctrine.orm.default_entity_manager')));
155+
->expects($this->any())
156+
->method('getManagerNames')
157+
->will($this->returnValue(array('default' => 'doctrine.orm.default_entity_manager')));
158158
$registry->expects($this->any())
159159
->method('getConnection')
160160
->will($this->returnValue($connection));

‎src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineDummy.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
namespace Symfony\Bridge\Doctrine\Tests\PropertyInfo\Fixtures;
1313

14-
use Doctrine\ORM\Mapping as ORM;
1514
use Doctrine\ORM\Mapping\Column;
1615
use Doctrine\ORM\Mapping\Entity;
1716
use Doctrine\ORM\Mapping\Id;

‎src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ protected function createEntityManagerMock($repositoryMock)
103103
->getMock()
104104
;
105105
$em->expects($this->any())
106-
->method('getRepository')
107-
->will($this->returnValue($repositoryMock))
106+
->method('getRepository')
107+
->will($this->returnValue($repositoryMock))
108108
;
109109

110110
$classMetadata = $this->getMockBuilder('Doctrine\Common\Persistence\Mapping\ClassMetadata')->getMock();
@@ -129,8 +129,8 @@ protected function createEntityManagerMock($repositoryMock)
129129
;
130130
$classMetadata->reflFields = array('name' => $refl);
131131
$em->expects($this->any())
132-
->method('getClassMetadata')
133-
->will($this->returnValue($classMetadata))
132+
->method('getClassMetadata')
133+
->will($this->returnValue($classMetadata))
134134
;
135135

136136
return $em;
@@ -361,8 +361,8 @@ public function testValidateUniquenessUsingCustomRepositoryMethod()
361361

362362
$repository = $this->createRepositoryMock();
363363
$repository->expects($this->once())
364-
->method('findByCustom')
365-
->will($this->returnValue(array()))
364+
->method('findByCustom')
365+
->will($this->returnValue(array()))
366366
;
367367
$this->em = $this->createEntityManagerMock($repository);
368368
$this->registry = $this->createRegistryMock($this->em);

‎src/Symfony/Bundle/FrameworkBundle/Tests/Command/RouterDebugCommandTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ private function getContainer()
7272
;
7373

7474
$loader = $this->getMockBuilder('Symfony\Bundle\FrameworkBundle\Routing\DelegatingLoader')
75-
->disableOriginalConstructor()
76-
->getMock();
75+
->disableOriginalConstructor()
76+
->getMock();
7777

7878
$container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
7979
$container

‎src/Symfony/Bundle/FrameworkBundle/Tests/Command/RouterMatchCommandTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ private function getContainer()
7676
;
7777

7878
$loader = $this->getMockBuilder('Symfony\Bundle\FrameworkBundle\Routing\DelegatingLoader')
79-
->disableOriginalConstructor()
80-
->getMock();
79+
->disableOriginalConstructor()
80+
->getMock();
8181

8282
$container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
8383
$container

‎src/Symfony/Component/DependencyInjection/Tests/Compiler/AutoAliasServicePassTest.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public function testProcessWithMissingParameter()
2525
$container = new ContainerBuilder();
2626

2727
$container->register('example')
28-
->addTag('auto_alias', array('format' => '%non_existing%.example'));
28+
->addTag('auto_alias', array('format' => '%non_existing%.example'));
2929

3030
$pass = new AutoAliasServicePass();
3131
$pass->process($container);
@@ -39,7 +39,7 @@ public function testProcessWithMissingFormat()
3939
$container = new ContainerBuilder();
4040

4141
$container->register('example')
42-
->addTag('auto_alias', array());
42+
->addTag('auto_alias', array());
4343
$container->setParameter('existing', 'mysql');
4444

4545
$pass = new AutoAliasServicePass();
@@ -51,7 +51,7 @@ public function testProcessWithNonExistingAlias()
5151
$container = new ContainerBuilder();
5252

5353
$container->register('example', 'Symfony\Component\DependencyInjection\Tests\Compiler\ServiceClassDefault')
54-
->addTag('auto_alias', array('format' => '%existing%.example'));
54+
->addTag('auto_alias', array('format' => '%existing%.example'));
5555
$container->setParameter('existing', 'mysql');
5656

5757
$pass = new AutoAliasServicePass();
@@ -65,7 +65,7 @@ public function testProcessWithExistingAlias()
6565
$container = new ContainerBuilder();
6666

6767
$container->register('example', 'Symfony\Component\DependencyInjection\Tests\Compiler\ServiceClassDefault')
68-
->addTag('auto_alias', array('format' => '%existing%.example'));
68+
->addTag('auto_alias', array('format' => '%existing%.example'));
6969

7070
$container->register('mysql.example', 'Symfony\Component\DependencyInjection\Tests\Compiler\ServiceClassMysql');
7171
$container->setParameter('existing', 'mysql');
@@ -83,7 +83,7 @@ public function testProcessWithManualAlias()
8383
$container = new ContainerBuilder();
8484

8585
$container->register('example', 'Symfony\Component\DependencyInjection\Tests\Compiler\ServiceClassDefault')
86-
->addTag('auto_alias', array('format' => '%existing%.example'));
86+
->addTag('auto_alias', array('format' => '%existing%.example'));
8787

8888
$container->register('mysql.example', 'Symfony\Component\DependencyInjection\Tests\Compiler\ServiceClassMysql');
8989
$container->register('mariadb.example', 'Symfony\Component\DependencyInjection\Tests\Compiler\ServiceClassMariaDb');

‎src/Symfony/Component/Form/Tests/AbstractDivLayoutTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -345,8 +345,8 @@ public function testCollectionRow()
345345
);
346346

347347
$form = $this->factory->createNamedBuilder('form', 'Symfony\Component\Form\Extension\Core\Type\FormType')
348-
->add($collection)
349-
->getForm();
348+
->add($collection)
349+
->getForm();
350350

351351
$this->assertWidgetMatchesXpath($form->createView(), array(),
352352
'/div

‎src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DataTransformerChainTest.php

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ public function testTransform()
2020
{
2121
$transformer1 = $this->getMockBuilder('Symfony\Component\Form\DataTransformerInterface')->getMock();
2222
$transformer1->expects($this->once())
23-
->method('transform')
24-
->with($this->identicalTo('foo'))
25-
->will($this->returnValue('bar'));
23+
->method('transform')
24+
->with($this->identicalTo('foo'))
25+
->will($this->returnValue('bar'));
2626
$transformer2 = $this->getMockBuilder('Symfony\Component\Form\DataTransformerInterface')->getMock();
2727
$transformer2->expects($this->once())
28-
->method('transform')
29-
->with($this->identicalTo('bar'))
30-
->will($this->returnValue('baz'));
28+
->method('transform')
29+
->with($this->identicalTo('bar'))
30+
->will($this->returnValue('baz'));
3131

3232
$chain = new DataTransformerChain(array($transformer1, $transformer2));
3333

@@ -38,14 +38,14 @@ public function testReverseTransform()
3838
{
3939
$transformer2 = $this->getMockBuilder('Symfony\Component\Form\DataTransformerInterface')->getMock();
4040
$transformer2->expects($this->once())
41-
->method('reverseTransform')
42-
->with($this->identicalTo('foo'))
43-
->will($this->returnValue('bar'));
41+
->method('reverseTransform')
42+
->with($this->identicalTo('foo'))
43+
->will($this->returnValue('bar'));
4444
$transformer1 = $this->getMockBuilder('Symfony\Component\Form\DataTransformerInterface')->getMock();
4545
$transformer1->expects($this->once())
46-
->method('reverseTransform')
47-
->with($this->identicalTo('bar'))
48-
->will($this->returnValue('baz'));
46+
->method('reverseTransform')
47+
->with($this->identicalTo('bar'))
48+
->will($this->returnValue('baz'));
4949

5050
$chain = new DataTransformerChain(array($transformer1, $transformer2));
5151

‎src/Symfony/Component/Form/Tests/Extension/Core/Type/FormTypeTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -470,9 +470,9 @@ public function testPassMultipartTrueIfAnyChildIsMultipartToView()
470470
public function testViewIsNotRenderedByDefault()
471471
{
472472
$view = $this->factory->createBuilder(static::TESTED_TYPE)
473-
->add('foo', static::TESTED_TYPE)
474-
->getForm()
475-
->createView();
473+
->add('foo', static::TESTED_TYPE)
474+
->getForm()
475+
->createView();
476476

477477
$this->assertFalse($view->isRendered());
478478
}

‎src/Symfony/Component/Form/Tests/FormFactoryTest.php

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -287,9 +287,9 @@ public function testCreateBuilderForPropertyCreatesFormWithHighestConfidence()
287287
public function testCreateBuilderCreatesTextFormIfNoGuess()
288288
{
289289
$this->guesser1->expects($this->once())
290-
->method('guessType')
291-
->with('Application\Author', 'firstName')
292-
->will($this->returnValue(null));
290+
->method('guessType')
291+
->with('Application\Author', 'firstName')
292+
->will($this->returnValue(null));
293293

294294
$factory = $this->getMockFactory(array('createNamedBuilder'));
295295

@@ -306,13 +306,13 @@ public function testCreateBuilderCreatesTextFormIfNoGuess()
306306
public function testOptionsCanBeOverridden()
307307
{
308308
$this->guesser1->expects($this->once())
309-
->method('guessType')
310-
->with('Application\Author', 'firstName')
311-
->will($this->returnValue(new TypeGuess(
312-
'Symfony\Component\Form\Extension\Core\Type\TextType',
313-
array('attr' => array('maxlength' => 10)),
314-
Guess::MEDIUM_CONFIDENCE
315-
)));
309+
->method('guessType')
310+
->with('Application\Author', 'firstName')
311+
->will($this->returnValue(new TypeGuess(
312+
'Symfony\Component\Form\Extension\Core\Type\TextType',
313+
array('attr' => array('maxlength' => 10)),
314+
Guess::MEDIUM_CONFIDENCE
315+
)));
316316

317317
$factory = $this->getMockFactory(array('createNamedBuilder'));
318318

@@ -334,17 +334,17 @@ public function testOptionsCanBeOverridden()
334334
public function testCreateBuilderUsesMaxLengthIfFound()
335335
{
336336
$this->guesser1->expects($this->once())
337-
->method('guessMaxLength')
338-
->with('Application\Author', 'firstName')
339-
->will($this->returnValue(new ValueGuess(
337+
->method('guessMaxLength')
338+
->with('Application\Author', 'firstName')
339+
->will($this->returnValue(new ValueGuess(
340340
15,
341341
Guess::MEDIUM_CONFIDENCE
342342
)));
343343

344344
$this->guesser2->expects($this->once())
345-
->method('guessMaxLength')
346-
->with('Application\Author', 'firstName')
347-
->will($this->returnValue(new ValueGuess(
345+
->method('guessMaxLength')
346+
->with('Application\Author', 'firstName')
347+
->will($this->returnValue(new ValueGuess(
348348
20,
349349
Guess::HIGH_CONFIDENCE
350350
)));
@@ -402,17 +402,17 @@ public function testCreateBuilderUsesMaxLengthAndPattern()
402402
public function testCreateBuilderUsesRequiredSettingWithHighestConfidence()
403403
{
404404
$this->guesser1->expects($this->once())
405-
->method('guessRequired')
406-
->with('Application\Author', 'firstName')
407-
->will($this->returnValue(new ValueGuess(
405+
->method('guessRequired')
406+
->with('Application\Author', 'firstName')
407+
->will($this->returnValue(new ValueGuess(
408408
true,
409409
Guess::MEDIUM_CONFIDENCE
410410
)));
411411

412412
$this->guesser2->expects($this->once())
413-
->method('guessRequired')
414-
->with('Application\Author', 'firstName')
415-
->will($this->returnValue(new ValueGuess(
413+
->method('guessRequired')
414+
->with('Application\Author', 'firstName')
415+
->will($this->returnValue(new ValueGuess(
416416
false,
417417
Guess::HIGH_CONFIDENCE
418418
)));
@@ -435,17 +435,17 @@ public function testCreateBuilderUsesRequiredSettingWithHighestConfidence()
435435
public function testCreateBuilderUsesPatternIfFound()
436436
{
437437
$this->guesser1->expects($this->once())
438-
->method('guessPattern')
439-
->with('Application\Author', 'firstName')
440-
->will($this->returnValue(new ValueGuess(
438+
->method('guessPattern')
439+
->with('Application\Author', 'firstName')
440+
->will($this->returnValue(new ValueGuess(
441441
'[a-z]',
442442
Guess::MEDIUM_CONFIDENCE
443443
)));
444444

445445
$this->guesser2->expects($this->once())
446-
->method('guessPattern')
447-
->with('Application\Author', 'firstName')
448-
->will($this->returnValue(new ValueGuess(
446+
->method('guessPattern')
447+
->with('Application\Author', 'firstName')
448+
->will($this->returnValue(new ValueGuess(
449449
'[a-zA-Z]',
450450
Guess::HIGH_CONFIDENCE
451451
)));

0 commit comments

Comments
 (0)