Skip to content

Commit fbd6375

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '2.7' into 2.8
* 2.7: CS: adjust chaining indentation
2 parents 22d7c51 + 3758788 commit fbd6375

File tree

5 files changed

+54
-54
lines changed

5 files changed

+54
-54
lines changed

‎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

‎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

‎Tests/Extension/Core/Type/FormTypeTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -163,9 +163,9 @@ public function testReadOnlyFormWithNonReadOnlyParentIsReadOnly()
163163
public function testLegacyNonReadOnlyFormWithNonReadOnlyParentIsNotReadOnly()
164164
{
165165
$view = $this->factory->createNamedBuilder('parent', static::TESTED_TYPE)
166-
->add('child', static::TESTED_TYPE)
167-
->getForm()
168-
->createView();
166+
->add('child', static::TESTED_TYPE)
167+
->getForm()
168+
->createView();
169169

170170
$this->assertFalse($view['child']->vars['read_only']);
171171
}
@@ -527,9 +527,9 @@ public function testPassMultipartTrueIfAnyChildIsMultipartToView()
527527
public function testViewIsNotRenderedByDefault()
528528
{
529529
$view = $this->factory->createBuilder(static::TESTED_TYPE)
530-
->add('foo', static::TESTED_TYPE)
531-
->getForm()
532-
->createView();
530+
->add('foo', static::TESTED_TYPE)
531+
->getForm()
532+
->createView();
533533

534534
$this->assertFalse($view->isRendered());
535535
}

‎Tests/Extension/Csrf/CsrfProvider/LegacySessionCsrfProviderTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ protected function tearDown()
3737
public function testGenerateCsrfToken()
3838
{
3939
$this->session->expects($this->once())
40-
->method('getId')
41-
->will($this->returnValue('ABCDEF'));
40+
->method('getId')
41+
->will($this->returnValue('ABCDEF'));
4242

4343
$token = $this->provider->generateCsrfToken('foo');
4444

@@ -48,8 +48,8 @@ public function testGenerateCsrfToken()
4848
public function testIsCsrfTokenValidSucceeds()
4949
{
5050
$this->session->expects($this->once())
51-
->method('getId')
52-
->will($this->returnValue('ABCDEF'));
51+
->method('getId')
52+
->will($this->returnValue('ABCDEF'));
5353

5454
$token = sha1('SECRET'.'foo'.'ABCDEF');
5555

@@ -59,8 +59,8 @@ public function testIsCsrfTokenValidSucceeds()
5959
public function testIsCsrfTokenValidFails()
6060
{
6161
$this->session->expects($this->once())
62-
->method('getId')
63-
->will($this->returnValue('ABCDEF'));
62+
->method('getId')
63+
->will($this->returnValue('ABCDEF'));
6464

6565
$token = sha1('SECRET'.'bar'.'ABCDEF');
6666

‎Tests/FormFactoryTest.php

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -663,9 +663,9 @@ public function testCreateBuilderForPropertyCreatesFormWithHighestConfidence()
663663
public function testCreateBuilderCreatesTextFormIfNoGuess()
664664
{
665665
$this->guesser1->expects($this->once())
666-
->method('guessType')
667-
->with('Application\Author', 'firstName')
668-
->will($this->returnValue(null));
666+
->method('guessType')
667+
->with('Application\Author', 'firstName')
668+
->will($this->returnValue(null));
669669

670670
$factory = $this->getMockFactory(array('createNamedBuilder'));
671671

@@ -682,13 +682,13 @@ public function testCreateBuilderCreatesTextFormIfNoGuess()
682682
public function testOptionsCanBeOverridden()
683683
{
684684
$this->guesser1->expects($this->once())
685-
->method('guessType')
686-
->with('Application\Author', 'firstName')
687-
->will($this->returnValue(new TypeGuess(
688-
'Symfony\Component\Form\Extension\Core\Type\TextType',
689-
array('attr' => array('maxlength' => 10)),
690-
Guess::MEDIUM_CONFIDENCE
691-
)));
685+
->method('guessType')
686+
->with('Application\Author', 'firstName')
687+
->will($this->returnValue(new TypeGuess(
688+
'Symfony\Component\Form\Extension\Core\Type\TextType',
689+
array('attr' => array('maxlength' => 10)),
690+
Guess::MEDIUM_CONFIDENCE
691+
)));
692692

693693
$factory = $this->getMockFactory(array('createNamedBuilder'));
694694

@@ -710,17 +710,17 @@ public function testOptionsCanBeOverridden()
710710
public function testCreateBuilderUsesMaxLengthIfFound()
711711
{
712712
$this->guesser1->expects($this->once())
713-
->method('guessMaxLength')
714-
->with('Application\Author', 'firstName')
715-
->will($this->returnValue(new ValueGuess(
713+
->method('guessMaxLength')
714+
->with('Application\Author', 'firstName')
715+
->will($this->returnValue(new ValueGuess(
716716
15,
717717
Guess::MEDIUM_CONFIDENCE
718718
)));
719719

720720
$this->guesser2->expects($this->once())
721-
->method('guessMaxLength')
722-
->with('Application\Author', 'firstName')
723-
->will($this->returnValue(new ValueGuess(
721+
->method('guessMaxLength')
722+
->with('Application\Author', 'firstName')
723+
->will($this->returnValue(new ValueGuess(
724724
20,
725725
Guess::HIGH_CONFIDENCE
726726
)));
@@ -778,17 +778,17 @@ public function testCreateBuilderUsesMaxLengthAndPattern()
778778
public function testCreateBuilderUsesRequiredSettingWithHighestConfidence()
779779
{
780780
$this->guesser1->expects($this->once())
781-
->method('guessRequired')
782-
->with('Application\Author', 'firstName')
783-
->will($this->returnValue(new ValueGuess(
781+
->method('guessRequired')
782+
->with('Application\Author', 'firstName')
783+
->will($this->returnValue(new ValueGuess(
784784
true,
785785
Guess::MEDIUM_CONFIDENCE
786786
)));
787787

788788
$this->guesser2->expects($this->once())
789-
->method('guessRequired')
790-
->with('Application\Author', 'firstName')
791-
->will($this->returnValue(new ValueGuess(
789+
->method('guessRequired')
790+
->with('Application\Author', 'firstName')
791+
->will($this->returnValue(new ValueGuess(
792792
false,
793793
Guess::HIGH_CONFIDENCE
794794
)));
@@ -811,17 +811,17 @@ public function testCreateBuilderUsesRequiredSettingWithHighestConfidence()
811811
public function testCreateBuilderUsesPatternIfFound()
812812
{
813813
$this->guesser1->expects($this->once())
814-
->method('guessPattern')
815-
->with('Application\Author', 'firstName')
816-
->will($this->returnValue(new ValueGuess(
814+
->method('guessPattern')
815+
->with('Application\Author', 'firstName')
816+
->will($this->returnValue(new ValueGuess(
817817
'[a-z]',
818818
Guess::MEDIUM_CONFIDENCE
819819
)));
820820

821821
$this->guesser2->expects($this->once())
822-
->method('guessPattern')
823-
->with('Application\Author', 'firstName')
824-
->will($this->returnValue(new ValueGuess(
822+
->method('guessPattern')
823+
->with('Application\Author', 'firstName')
824+
->will($this->returnValue(new ValueGuess(
825825
'[a-zA-Z]',
826826
Guess::HIGH_CONFIDENCE
827827
)));

0 commit comments

Comments
 (0)