Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 89c3f5c

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '2.8' into 3.2
* 2.8: typo CS: adjust chaining indentation
2 parents fe4d885 + 0057459 commit 89c3f5c

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
@@ -142,13 +142,13 @@ private function createCollector($queries)
142142

143143
$registry = $this->getMockBuilder('Doctrine\Common\Persistence\ManagerRegistry')->getMock();
144144
$registry
145-
->expects($this->any())
146-
->method('getConnectionNames')
147-
->will($this->returnValue(array('default' => 'doctrine.dbal.default_connection')));
145+
->expects($this->any())
146+
->method('getConnectionNames')
147+
->will($this->returnValue(array('default' => 'doctrine.dbal.default_connection')));
148148
$registry
149-
->expects($this->any())
150-
->method('getManagerNames')
151-
->will($this->returnValue(array('default' => 'doctrine.orm.default_entity_manager')));
149+
->expects($this->any())
150+
->method('getManagerNames')
151+
->will($this->returnValue(array('default' => 'doctrine.orm.default_entity_manager')));
152152
$registry->expects($this->any())
153153
->method('getConnection')
154154
->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
@@ -105,8 +105,8 @@ protected function createEntityManagerMock($repositoryMock)
105105
->getMock()
106106
;
107107
$em->expects($this->any())
108-
->method('getRepository')
109-
->will($this->returnValue($repositoryMock))
108+
->method('getRepository')
109+
->will($this->returnValue($repositoryMock))
110110
;
111111

112112
$classMetadata = $this->getMockBuilder('Doctrine\Common\Persistence\Mapping\ClassMetadata')->getMock();
@@ -131,8 +131,8 @@ protected function createEntityManagerMock($repositoryMock)
131131
;
132132
$classMetadata->reflFields = array('name' => $refl);
133133
$em->expects($this->any())
134-
->method('getClassMetadata')
135-
->will($this->returnValue($classMetadata))
134+
->method('getClassMetadata')
135+
->will($this->returnValue($classMetadata))
136136
;
137137

138138
return $em;
@@ -363,8 +363,8 @@ public function testValidateUniquenessUsingCustomRepositoryMethod()
363363

364364
$repository = $this->createRepositoryMock();
365365
$repository->expects($this->once())
366-
->method('findByCustom')
367-
->will($this->returnValue(array()))
366+
->method('findByCustom')
367+
->will($this->returnValue(array()))
368368
;
369369
$this->em = $this->createEntityManagerMock($repository);
370370
$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
@@ -293,9 +293,9 @@ public function testCreateBuilderForPropertyCreatesFormWithHighestConfidence()
293293
public function testCreateBuilderCreatesTextFormIfNoGuess()
294294
{
295295
$this->guesser1->expects($this->once())
296-
->method('guessType')
297-
->with('Application\Author', 'firstName')
298-
->will($this->returnValue(null));
296+
->method('guessType')
297+
->with('Application\Author', 'firstName')
298+
->will($this->returnValue(null));
299299

300300
$factory = $this->getMockFactory(array('createNamedBuilder'));
301301

@@ -312,13 +312,13 @@ public function testCreateBuilderCreatesTextFormIfNoGuess()
312312
public function testOptionsCanBeOverridden()
313313
{
314314
$this->guesser1->expects($this->once())
315-
->method('guessType')
316-
->with('Application\Author', 'firstName')
317-
->will($this->returnValue(new TypeGuess(
318-
'Symfony\Component\Form\Extension\Core\Type\TextType',
319-
array('attr' => array('maxlength' => 10)),
320-
Guess::MEDIUM_CONFIDENCE
321-
)));
315+
->method('guessType')
316+
->with('Application\Author', 'firstName')
317+
->will($this->returnValue(new TypeGuess(
318+
'Symfony\Component\Form\Extension\Core\Type\TextType',
319+
array('attr' => array('maxlength' => 10)),
320+
Guess::MEDIUM_CONFIDENCE
321+
)));
322322

323323
$factory = $this->getMockFactory(array('createNamedBuilder'));
324324

@@ -340,17 +340,17 @@ public function testOptionsCanBeOverridden()
340340
public function testCreateBuilderUsesMaxLengthIfFound()
341341
{
342342
$this->guesser1->expects($this->once())
343-
->method('guessMaxLength')
344-
->with('Application\Author', 'firstName')
345-
->will($this->returnValue(new ValueGuess(
343+
->method('guessMaxLength')
344+
->with('Application\Author', 'firstName')
345+
->will($this->returnValue(new ValueGuess(
346346
15,
347347
Guess::MEDIUM_CONFIDENCE
348348
)));
349349

350350
$this->guesser2->expects($this->once())
351-
->method('guessMaxLength')
352-
->with('Application\Author', 'firstName')
353-
->will($this->returnValue(new ValueGuess(
351+
->method('guessMaxLength')
352+
->with('Application\Author', 'firstName')
353+
->will($this->returnValue(new ValueGuess(
354354
20,
355355
Guess::HIGH_CONFIDENCE
356356
)));
@@ -408,17 +408,17 @@ public function testCreateBuilderUsesMaxLengthAndPattern()
408408
public function testCreateBuilderUsesRequiredSettingWithHighestConfidence()
409409
{
410410
$this->guesser1->expects($this->once())
411-
->method('guessRequired')
412-
->with('Application\Author', 'firstName')
413-
->will($this->returnValue(new ValueGuess(
411+
->method('guessRequired')
412+
->with('Application\Author', 'firstName')
413+
->will($this->returnValue(new ValueGuess(
414414
true,
415415
Guess::MEDIUM_CONFIDENCE
416416
)));
417417

418418
$this->guesser2->expects($this->once())
419-
->method('guessRequired')
420-
->with('Application\Author', 'firstName')
421-
->will($this->returnValue(new ValueGuess(
419+
->method('guessRequired')
420+
->with('Application\Author', 'firstName')
421+
->will($this->returnValue(new ValueGuess(
422422
false,
423423
Guess::HIGH_CONFIDENCE
424424
)));
@@ -441,17 +441,17 @@ public function testCreateBuilderUsesRequiredSettingWithHighestConfidence()
441441
public function testCreateBuilderUsesPatternIfFound()
442442
{
443443
$this->guesser1->expects($this->once())
444-
->method('guessPattern')
445-
->with('Application\Author', 'firstName')
446-
->will($this->returnValue(new ValueGuess(
444+
->method('guessPattern')
445+
->with('Application\Author', 'firstName')
446+
->will($this->returnValue(new ValueGuess(
447447
'[a-z]',
448448
Guess::MEDIUM_CONFIDENCE
449449
)));
450450

451451
$this->guesser2->expects($this->once())
452-
->method('guessPattern')
453-
->with('Application\Author', 'firstName')
454-
->will($this->returnValue(new ValueGuess(
452+
->method('guessPattern')
453+
->with('Application\Author', 'firstName')
454+
->will($this->returnValue(new ValueGuess(
455455
'[a-zA-Z]',
456456
Guess::HIGH_CONFIDENCE
457457
)));

‎src/Symfony/Component/HttpKernel/Tests/EventListener/RouterListenerTest.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@ protected function setUp()
3333
public function testPort($defaultHttpPort, $defaultHttpsPort, $uri, $expectedHttpPort, $expectedHttpsPort)
3434
{
3535
$urlMatcher = $this->getMockBuilder('Symfony\Component\Routing\Matcher\UrlMatcherInterface')
36-
->disableOriginalConstructor()
37-
->getMock();
36+
->disableOriginalConstructor()
37+
->getMock();
3838
$context = new RequestContext();
3939
$context->setHttpPort($defaultHttpPort);
4040
$context->setHttpsPort($defaultHttpsPort);
4141
$urlMatcher->expects($this->any())
42-
->method('getContext')
43-
->will($this->returnValue($context));
42+
->method('getContext')
43+
->will($this->returnValue($context));
4444

4545
$listener = new RouterListener($urlMatcher, $this->requestStack);
4646
$event = $this->createGetResponseEventForUri($uri);
@@ -133,13 +133,13 @@ public function testLoggingParameter($parameter, $log, $parameters)
133133
{
134134
$requestMatcher = $this->getMockBuilder('Symfony\Component\Routing\Matcher\RequestMatcherInterface')->getMock();
135135
$requestMatcher->expects($this->once())
136-
->method('matchRequest')
137-
->will($this->returnValue($parameter));
136+
->method('matchRequest')
137+
->will($this->returnValue($parameter));
138138

139139
$logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
140140
$logger->expects($this->once())
141-
->method('info')
142-
->with($this->equalTo($log), $this->equalTo($parameters));
141+
->method('info')
142+
->with($this->equalTo($log), $this->equalTo($parameters));
143143

144144
$kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
145145
$request = Request::create('http://localhost/');

‎src/Symfony/Component/Validator/Tests/Mapping/Loader/LoaderChainTest.php

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ public function testAllLoadersAreCalled()
2323

2424
$loader1 = $this->getMockBuilder('Symfony\Component\Validator\Mapping\Loader\LoaderInterface')->getMock();
2525
$loader1->expects($this->once())
26-
->method('loadClassMetadata')
27-
->with($this->equalTo($metadata));
26+
->method('loadClassMetadata')
27+
->with($this->equalTo($metadata));
2828

2929
$loader2 = $this->getMockBuilder('Symfony\Component\Validator\Mapping\Loader\LoaderInterface')->getMock();
3030
$loader2->expects($this->once())
31-
->method('loadClassMetadata')
32-
->with($this->equalTo($metadata));
31+
->method('loadClassMetadata')
32+
->with($this->equalTo($metadata));
3333

3434
$chain = new LoaderChain(array(
3535
$loader1,
@@ -45,13 +45,13 @@ public function testReturnsTrueIfAnyLoaderReturnedTrue()
4545

4646
$loader1 = $this->getMockBuilder('Symfony\Component\Validator\Mapping\Loader\LoaderInterface')->getMock();
4747
$loader1->expects($this->any())
48-
->method('loadClassMetadata')
49-
->will($this->returnValue(true));
48+
->method('loadClassMetadata')
49+
->will($this->returnValue(true));
5050

5151
$loader2 = $this->getMockBuilder('Symfony\Component\Validator\Mapping\Loader\LoaderInterface')->getMock();
5252
$loader2->expects($this->any())
53-
->method('loadClassMetadata')
54-
->will($this->returnValue(false));
53+
->method('loadClassMetadata')
54+
->will($this->returnValue(false));
5555

5656
$chain = new LoaderChain(array(
5757
$loader1,
@@ -67,13 +67,13 @@ public function testReturnsFalseIfNoLoaderReturnedTrue()
6767

6868
$loader1 = $this->getMockBuilder('Symfony\Component\Validator\Mapping\Loader\LoaderInterface')->getMock();
6969
$loader1->expects($this->any())
70-
->method('loadClassMetadata')
71-
->will($this->returnValue(false));
70+
->method('loadClassMetadata')
71+
->will($this->returnValue(false));
7272

7373
$loader2 = $this->getMockBuilder('Symfony\Component\Validator\Mapping\Loader\LoaderInterface')->getMock();
7474
$loader2->expects($this->any())
75-
->method('loadClassMetadata')
76-
->will($this->returnValue(false));
75+
->method('loadClassMetadata')
76+
->will($this->returnValue(false));
7777

7878
$chain = new LoaderChain(array(
7979
$loader1,

0 commit comments

Comments
 (0)