Merge branch '2.7' into 2.8
* 2.7: CS: adjust chaining indentation
This commit is contained in:
commit
0057459882
@ -142,13 +142,13 @@ class DoctrineDataCollectorTest extends TestCase
|
||||
|
||||
$registry = $this->getMockBuilder('Doctrine\Common\Persistence\ManagerRegistry')->getMock();
|
||||
$registry
|
||||
->expects($this->any())
|
||||
->method('getConnectionNames')
|
||||
->will($this->returnValue(array('default' => 'doctrine.dbal.default_connection')));
|
||||
->expects($this->any())
|
||||
->method('getConnectionNames')
|
||||
->will($this->returnValue(array('default' => 'doctrine.dbal.default_connection')));
|
||||
$registry
|
||||
->expects($this->any())
|
||||
->method('getManagerNames')
|
||||
->will($this->returnValue(array('default' => 'doctrine.orm.default_entity_manager')));
|
||||
->expects($this->any())
|
||||
->method('getManagerNames')
|
||||
->will($this->returnValue(array('default' => 'doctrine.orm.default_entity_manager')));
|
||||
$registry->expects($this->any())
|
||||
->method('getConnection')
|
||||
->will($this->returnValue($connection));
|
||||
|
@ -89,8 +89,8 @@ class UniqueEntityValidatorTest extends AbstractConstraintValidatorTest
|
||||
->getMock()
|
||||
;
|
||||
$em->expects($this->any())
|
||||
->method('getRepository')
|
||||
->will($this->returnValue($repositoryMock))
|
||||
->method('getRepository')
|
||||
->will($this->returnValue($repositoryMock))
|
||||
;
|
||||
|
||||
$classMetadata = $this->getMockBuilder('Doctrine\Common\Persistence\Mapping\ClassMetadata')->getMock();
|
||||
@ -115,8 +115,8 @@ class UniqueEntityValidatorTest extends AbstractConstraintValidatorTest
|
||||
;
|
||||
$classMetadata->reflFields = array('name' => $refl);
|
||||
$em->expects($this->any())
|
||||
->method('getClassMetadata')
|
||||
->will($this->returnValue($classMetadata))
|
||||
->method('getClassMetadata')
|
||||
->will($this->returnValue($classMetadata))
|
||||
;
|
||||
|
||||
return $em;
|
||||
@ -337,8 +337,8 @@ class UniqueEntityValidatorTest extends AbstractConstraintValidatorTest
|
||||
|
||||
$repository = $this->createRepositoryMock();
|
||||
$repository->expects($this->once())
|
||||
->method('findByCustom')
|
||||
->will($this->returnValue(array()))
|
||||
->method('findByCustom')
|
||||
->will($this->returnValue(array()))
|
||||
;
|
||||
$this->em = $this->createEntityManagerMock($repository);
|
||||
$this->registry = $this->createRegistryMock($this->em);
|
||||
|
@ -72,8 +72,8 @@ class RouterDebugCommandTest extends TestCase
|
||||
;
|
||||
|
||||
$loader = $this->getMockBuilder('Symfony\Bundle\FrameworkBundle\Routing\DelegatingLoader')
|
||||
->disableOriginalConstructor()
|
||||
->getMock();
|
||||
->disableOriginalConstructor()
|
||||
->getMock();
|
||||
|
||||
$container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
|
||||
$container
|
||||
|
@ -76,8 +76,8 @@ class RouterMatchCommandTest extends TestCase
|
||||
;
|
||||
|
||||
$loader = $this->getMockBuilder('Symfony\Bundle\FrameworkBundle\Routing\DelegatingLoader')
|
||||
->disableOriginalConstructor()
|
||||
->getMock();
|
||||
->disableOriginalConstructor()
|
||||
->getMock();
|
||||
|
||||
$container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
|
||||
$container
|
||||
|
@ -739,8 +739,8 @@ class ApplicationTest extends TestCase
|
||||
$application = $this->getMockBuilder('Symfony\Component\Console\Application')->setMethods(array('doRun'))->getMock();
|
||||
$application->setAutoExit(false);
|
||||
$application->expects($this->once())
|
||||
->method('doRun')
|
||||
->will($this->throwException($exception));
|
||||
->method('doRun')
|
||||
->will($this->throwException($exception));
|
||||
|
||||
$exitCode = $application->run(new ArrayInput(array()), new NullOutput());
|
||||
|
||||
@ -754,8 +754,8 @@ class ApplicationTest extends TestCase
|
||||
$application = $this->getMockBuilder('Symfony\Component\Console\Application')->setMethods(array('doRun'))->getMock();
|
||||
$application->setAutoExit(false);
|
||||
$application->expects($this->once())
|
||||
->method('doRun')
|
||||
->will($this->throwException($exception));
|
||||
->method('doRun')
|
||||
->will($this->throwException($exception));
|
||||
|
||||
$exitCode = $application->run(new ArrayInput(array()), new NullOutput());
|
||||
|
||||
|
@ -25,7 +25,7 @@ class AutoAliasServicePassTest extends TestCase
|
||||
$container = new ContainerBuilder();
|
||||
|
||||
$container->register('example')
|
||||
->addTag('auto_alias', array('format' => '%non_existing%.example'));
|
||||
->addTag('auto_alias', array('format' => '%non_existing%.example'));
|
||||
|
||||
$pass = new AutoAliasServicePass();
|
||||
$pass->process($container);
|
||||
@ -39,7 +39,7 @@ class AutoAliasServicePassTest extends TestCase
|
||||
$container = new ContainerBuilder();
|
||||
|
||||
$container->register('example')
|
||||
->addTag('auto_alias', array());
|
||||
->addTag('auto_alias', array());
|
||||
$container->setParameter('existing', 'mysql');
|
||||
|
||||
$pass = new AutoAliasServicePass();
|
||||
@ -51,7 +51,7 @@ class AutoAliasServicePassTest extends TestCase
|
||||
$container = new ContainerBuilder();
|
||||
|
||||
$container->register('example', 'Symfony\Component\DependencyInjection\Tests\Compiler\ServiceClassDefault')
|
||||
->addTag('auto_alias', array('format' => '%existing%.example'));
|
||||
->addTag('auto_alias', array('format' => '%existing%.example'));
|
||||
$container->setParameter('existing', 'mysql');
|
||||
|
||||
$pass = new AutoAliasServicePass();
|
||||
@ -66,7 +66,7 @@ class AutoAliasServicePassTest extends TestCase
|
||||
$container = new ContainerBuilder();
|
||||
|
||||
$container->register('example', 'Symfony\Component\DependencyInjection\Tests\Compiler\ServiceClassDefault')
|
||||
->addTag('auto_alias', array('format' => '%existing%.example'));
|
||||
->addTag('auto_alias', array('format' => '%existing%.example'));
|
||||
|
||||
$container->register('mysql.example', 'Symfony\Component\DependencyInjection\Tests\Compiler\ServiceClassMysql');
|
||||
$container->setParameter('existing', 'mysql');
|
||||
@ -84,7 +84,7 @@ class AutoAliasServicePassTest extends TestCase
|
||||
$container = new ContainerBuilder();
|
||||
|
||||
$container->register('example', 'Symfony\Component\DependencyInjection\Tests\Compiler\ServiceClassDefault')
|
||||
->addTag('auto_alias', array('format' => '%existing%.example'));
|
||||
->addTag('auto_alias', array('format' => '%existing%.example'));
|
||||
|
||||
$container->register('mysql.example', 'Symfony\Component\DependencyInjection\Tests\Compiler\ServiceClassMysql');
|
||||
$container->register('mariadb.example', 'Symfony\Component\DependencyInjection\Tests\Compiler\ServiceClassMariadb');
|
||||
|
@ -345,8 +345,8 @@ abstract class AbstractDivLayoutTest extends AbstractLayoutTest
|
||||
);
|
||||
|
||||
$form = $this->factory->createNamedBuilder('form', 'Symfony\Component\Form\Extension\Core\Type\FormType')
|
||||
->add($collection)
|
||||
->getForm();
|
||||
->add($collection)
|
||||
->getForm();
|
||||
|
||||
$this->assertWidgetMatchesXpath($form->createView(), array(),
|
||||
'/div
|
||||
|
@ -20,14 +20,14 @@ class DataTransformerChainTest extends TestCase
|
||||
{
|
||||
$transformer1 = $this->getMockBuilder('Symfony\Component\Form\DataTransformerInterface')->getMock();
|
||||
$transformer1->expects($this->once())
|
||||
->method('transform')
|
||||
->with($this->identicalTo('foo'))
|
||||
->will($this->returnValue('bar'));
|
||||
->method('transform')
|
||||
->with($this->identicalTo('foo'))
|
||||
->will($this->returnValue('bar'));
|
||||
$transformer2 = $this->getMockBuilder('Symfony\Component\Form\DataTransformerInterface')->getMock();
|
||||
$transformer2->expects($this->once())
|
||||
->method('transform')
|
||||
->with($this->identicalTo('bar'))
|
||||
->will($this->returnValue('baz'));
|
||||
->method('transform')
|
||||
->with($this->identicalTo('bar'))
|
||||
->will($this->returnValue('baz'));
|
||||
|
||||
$chain = new DataTransformerChain(array($transformer1, $transformer2));
|
||||
|
||||
@ -38,14 +38,14 @@ class DataTransformerChainTest extends TestCase
|
||||
{
|
||||
$transformer2 = $this->getMockBuilder('Symfony\Component\Form\DataTransformerInterface')->getMock();
|
||||
$transformer2->expects($this->once())
|
||||
->method('reverseTransform')
|
||||
->with($this->identicalTo('foo'))
|
||||
->will($this->returnValue('bar'));
|
||||
->method('reverseTransform')
|
||||
->with($this->identicalTo('foo'))
|
||||
->will($this->returnValue('bar'));
|
||||
$transformer1 = $this->getMockBuilder('Symfony\Component\Form\DataTransformerInterface')->getMock();
|
||||
$transformer1->expects($this->once())
|
||||
->method('reverseTransform')
|
||||
->with($this->identicalTo('bar'))
|
||||
->will($this->returnValue('baz'));
|
||||
->method('reverseTransform')
|
||||
->with($this->identicalTo('bar'))
|
||||
->will($this->returnValue('baz'));
|
||||
|
||||
$chain = new DataTransformerChain(array($transformer1, $transformer2));
|
||||
|
||||
|
@ -163,9 +163,9 @@ class FormTypeTest extends BaseTypeTest
|
||||
public function testLegacyNonReadOnlyFormWithNonReadOnlyParentIsNotReadOnly()
|
||||
{
|
||||
$view = $this->factory->createNamedBuilder('parent', static::TESTED_TYPE)
|
||||
->add('child', static::TESTED_TYPE)
|
||||
->getForm()
|
||||
->createView();
|
||||
->add('child', static::TESTED_TYPE)
|
||||
->getForm()
|
||||
->createView();
|
||||
|
||||
$this->assertFalse($view['child']->vars['read_only']);
|
||||
}
|
||||
@ -527,9 +527,9 @@ class FormTypeTest extends BaseTypeTest
|
||||
public function testViewIsNotRenderedByDefault()
|
||||
{
|
||||
$view = $this->factory->createBuilder(static::TESTED_TYPE)
|
||||
->add('foo', static::TESTED_TYPE)
|
||||
->getForm()
|
||||
->createView();
|
||||
->add('foo', static::TESTED_TYPE)
|
||||
->getForm()
|
||||
->createView();
|
||||
|
||||
$this->assertFalse($view->isRendered());
|
||||
}
|
||||
|
@ -37,8 +37,8 @@ class LegacySessionCsrfProviderTest extends TestCase
|
||||
public function testGenerateCsrfToken()
|
||||
{
|
||||
$this->session->expects($this->once())
|
||||
->method('getId')
|
||||
->will($this->returnValue('ABCDEF'));
|
||||
->method('getId')
|
||||
->will($this->returnValue('ABCDEF'));
|
||||
|
||||
$token = $this->provider->generateCsrfToken('foo');
|
||||
|
||||
@ -48,8 +48,8 @@ class LegacySessionCsrfProviderTest extends TestCase
|
||||
public function testIsCsrfTokenValidSucceeds()
|
||||
{
|
||||
$this->session->expects($this->once())
|
||||
->method('getId')
|
||||
->will($this->returnValue('ABCDEF'));
|
||||
->method('getId')
|
||||
->will($this->returnValue('ABCDEF'));
|
||||
|
||||
$token = sha1('SECRET'.'foo'.'ABCDEF');
|
||||
|
||||
@ -59,8 +59,8 @@ class LegacySessionCsrfProviderTest extends TestCase
|
||||
public function testIsCsrfTokenValidFails()
|
||||
{
|
||||
$this->session->expects($this->once())
|
||||
->method('getId')
|
||||
->will($this->returnValue('ABCDEF'));
|
||||
->method('getId')
|
||||
->will($this->returnValue('ABCDEF'));
|
||||
|
||||
$token = sha1('SECRET'.'bar'.'ABCDEF');
|
||||
|
||||
|
@ -663,9 +663,9 @@ class FormFactoryTest extends TestCase
|
||||
public function testCreateBuilderCreatesTextFormIfNoGuess()
|
||||
{
|
||||
$this->guesser1->expects($this->once())
|
||||
->method('guessType')
|
||||
->with('Application\Author', 'firstName')
|
||||
->will($this->returnValue(null));
|
||||
->method('guessType')
|
||||
->with('Application\Author', 'firstName')
|
||||
->will($this->returnValue(null));
|
||||
|
||||
$factory = $this->getMockFactory(array('createNamedBuilder'));
|
||||
|
||||
@ -682,13 +682,13 @@ class FormFactoryTest extends TestCase
|
||||
public function testOptionsCanBeOverridden()
|
||||
{
|
||||
$this->guesser1->expects($this->once())
|
||||
->method('guessType')
|
||||
->with('Application\Author', 'firstName')
|
||||
->will($this->returnValue(new TypeGuess(
|
||||
'Symfony\Component\Form\Extension\Core\Type\TextType',
|
||||
array('attr' => array('maxlength' => 10)),
|
||||
Guess::MEDIUM_CONFIDENCE
|
||||
)));
|
||||
->method('guessType')
|
||||
->with('Application\Author', 'firstName')
|
||||
->will($this->returnValue(new TypeGuess(
|
||||
'Symfony\Component\Form\Extension\Core\Type\TextType',
|
||||
array('attr' => array('maxlength' => 10)),
|
||||
Guess::MEDIUM_CONFIDENCE
|
||||
)));
|
||||
|
||||
$factory = $this->getMockFactory(array('createNamedBuilder'));
|
||||
|
||||
@ -710,17 +710,17 @@ class FormFactoryTest extends TestCase
|
||||
public function testCreateBuilderUsesMaxLengthIfFound()
|
||||
{
|
||||
$this->guesser1->expects($this->once())
|
||||
->method('guessMaxLength')
|
||||
->with('Application\Author', 'firstName')
|
||||
->will($this->returnValue(new ValueGuess(
|
||||
->method('guessMaxLength')
|
||||
->with('Application\Author', 'firstName')
|
||||
->will($this->returnValue(new ValueGuess(
|
||||
15,
|
||||
Guess::MEDIUM_CONFIDENCE
|
||||
)));
|
||||
|
||||
$this->guesser2->expects($this->once())
|
||||
->method('guessMaxLength')
|
||||
->with('Application\Author', 'firstName')
|
||||
->will($this->returnValue(new ValueGuess(
|
||||
->method('guessMaxLength')
|
||||
->with('Application\Author', 'firstName')
|
||||
->will($this->returnValue(new ValueGuess(
|
||||
20,
|
||||
Guess::HIGH_CONFIDENCE
|
||||
)));
|
||||
@ -778,17 +778,17 @@ class FormFactoryTest extends TestCase
|
||||
public function testCreateBuilderUsesRequiredSettingWithHighestConfidence()
|
||||
{
|
||||
$this->guesser1->expects($this->once())
|
||||
->method('guessRequired')
|
||||
->with('Application\Author', 'firstName')
|
||||
->will($this->returnValue(new ValueGuess(
|
||||
->method('guessRequired')
|
||||
->with('Application\Author', 'firstName')
|
||||
->will($this->returnValue(new ValueGuess(
|
||||
true,
|
||||
Guess::MEDIUM_CONFIDENCE
|
||||
)));
|
||||
|
||||
$this->guesser2->expects($this->once())
|
||||
->method('guessRequired')
|
||||
->with('Application\Author', 'firstName')
|
||||
->will($this->returnValue(new ValueGuess(
|
||||
->method('guessRequired')
|
||||
->with('Application\Author', 'firstName')
|
||||
->will($this->returnValue(new ValueGuess(
|
||||
false,
|
||||
Guess::HIGH_CONFIDENCE
|
||||
)));
|
||||
@ -811,17 +811,17 @@ class FormFactoryTest extends TestCase
|
||||
public function testCreateBuilderUsesPatternIfFound()
|
||||
{
|
||||
$this->guesser1->expects($this->once())
|
||||
->method('guessPattern')
|
||||
->with('Application\Author', 'firstName')
|
||||
->will($this->returnValue(new ValueGuess(
|
||||
->method('guessPattern')
|
||||
->with('Application\Author', 'firstName')
|
||||
->will($this->returnValue(new ValueGuess(
|
||||
'[a-z]',
|
||||
Guess::MEDIUM_CONFIDENCE
|
||||
)));
|
||||
|
||||
$this->guesser2->expects($this->once())
|
||||
->method('guessPattern')
|
||||
->with('Application\Author', 'firstName')
|
||||
->will($this->returnValue(new ValueGuess(
|
||||
->method('guessPattern')
|
||||
->with('Application\Author', 'firstName')
|
||||
->will($this->returnValue(new ValueGuess(
|
||||
'[a-zA-Z]',
|
||||
Guess::HIGH_CONFIDENCE
|
||||
)));
|
||||
|
@ -33,14 +33,14 @@ class RouterListenerTest extends TestCase
|
||||
public function testPort($defaultHttpPort, $defaultHttpsPort, $uri, $expectedHttpPort, $expectedHttpsPort)
|
||||
{
|
||||
$urlMatcher = $this->getMockBuilder('Symfony\Component\Routing\Matcher\UrlMatcherInterface')
|
||||
->disableOriginalConstructor()
|
||||
->getMock();
|
||||
->disableOriginalConstructor()
|
||||
->getMock();
|
||||
$context = new RequestContext();
|
||||
$context->setHttpPort($defaultHttpPort);
|
||||
$context->setHttpsPort($defaultHttpsPort);
|
||||
$urlMatcher->expects($this->any())
|
||||
->method('getContext')
|
||||
->will($this->returnValue($context));
|
||||
->method('getContext')
|
||||
->will($this->returnValue($context));
|
||||
|
||||
$listener = new RouterListener($urlMatcher, $this->requestStack);
|
||||
$event = $this->createGetResponseEventForUri($uri);
|
||||
@ -133,13 +133,13 @@ class RouterListenerTest extends TestCase
|
||||
{
|
||||
$requestMatcher = $this->getMockBuilder('Symfony\Component\Routing\Matcher\RequestMatcherInterface')->getMock();
|
||||
$requestMatcher->expects($this->once())
|
||||
->method('matchRequest')
|
||||
->will($this->returnValue($parameter));
|
||||
->method('matchRequest')
|
||||
->will($this->returnValue($parameter));
|
||||
|
||||
$logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
|
||||
$logger->expects($this->once())
|
||||
->method('info')
|
||||
->with($this->equalTo($log));
|
||||
->method('info')
|
||||
->with($this->equalTo($log));
|
||||
|
||||
$kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
|
||||
$request = Request::create('http://localhost/');
|
||||
|
@ -23,13 +23,13 @@ class LoaderChainTest extends TestCase
|
||||
|
||||
$loader1 = $this->getMockBuilder('Symfony\Component\Validator\Mapping\Loader\LoaderInterface')->getMock();
|
||||
$loader1->expects($this->once())
|
||||
->method('loadClassMetadata')
|
||||
->with($this->equalTo($metadata));
|
||||
->method('loadClassMetadata')
|
||||
->with($this->equalTo($metadata));
|
||||
|
||||
$loader2 = $this->getMockBuilder('Symfony\Component\Validator\Mapping\Loader\LoaderInterface')->getMock();
|
||||
$loader2->expects($this->once())
|
||||
->method('loadClassMetadata')
|
||||
->with($this->equalTo($metadata));
|
||||
->method('loadClassMetadata')
|
||||
->with($this->equalTo($metadata));
|
||||
|
||||
$chain = new LoaderChain(array(
|
||||
$loader1,
|
||||
@ -45,13 +45,13 @@ class LoaderChainTest extends TestCase
|
||||
|
||||
$loader1 = $this->getMockBuilder('Symfony\Component\Validator\Mapping\Loader\LoaderInterface')->getMock();
|
||||
$loader1->expects($this->any())
|
||||
->method('loadClassMetadata')
|
||||
->will($this->returnValue(true));
|
||||
->method('loadClassMetadata')
|
||||
->will($this->returnValue(true));
|
||||
|
||||
$loader2 = $this->getMockBuilder('Symfony\Component\Validator\Mapping\Loader\LoaderInterface')->getMock();
|
||||
$loader2->expects($this->any())
|
||||
->method('loadClassMetadata')
|
||||
->will($this->returnValue(false));
|
||||
->method('loadClassMetadata')
|
||||
->will($this->returnValue(false));
|
||||
|
||||
$chain = new LoaderChain(array(
|
||||
$loader1,
|
||||
@ -67,13 +67,13 @@ class LoaderChainTest extends TestCase
|
||||
|
||||
$loader1 = $this->getMockBuilder('Symfony\Component\Validator\Mapping\Loader\LoaderInterface')->getMock();
|
||||
$loader1->expects($this->any())
|
||||
->method('loadClassMetadata')
|
||||
->will($this->returnValue(false));
|
||||
->method('loadClassMetadata')
|
||||
->will($this->returnValue(false));
|
||||
|
||||
$loader2 = $this->getMockBuilder('Symfony\Component\Validator\Mapping\Loader\LoaderInterface')->getMock();
|
||||
$loader2->expects($this->any())
|
||||
->method('loadClassMetadata')
|
||||
->will($this->returnValue(false));
|
||||
->method('loadClassMetadata')
|
||||
->will($this->returnValue(false));
|
||||
|
||||
$chain = new LoaderChain(array(
|
||||
$loader1,
|
||||
|
Reference in New Issue
Block a user