Merge branch '3.2'
* 3.2: fix getMock usage fix merge [DependencyInjection] Fixed variadic method parameter in autowired classes update German translation [Validator] Improved error message for missing upload_tmp_dir
This commit is contained in:
commit
61475b5596
@ -21,15 +21,20 @@ class ExtensionPassTest extends \PHPUnit_Framework_TestCase
|
|||||||
{
|
{
|
||||||
$container = new ContainerBuilder();
|
$container = new ContainerBuilder();
|
||||||
$container->setParameter('kernel.debug', false);
|
$container->setParameter('kernel.debug', false);
|
||||||
|
$container->setParameter('kernel.root_dir', __DIR__);
|
||||||
|
|
||||||
$container->register('twig.app_variable', '\Symfony\Bridge\Twig\AppVariable');
|
$container->register('twig.app_variable', '\Symfony\Bridge\Twig\AppVariable');
|
||||||
$container->register('templating', '\Symfony\Bundle\TwigBundle\TwigEngine');
|
$container->register('templating', '\Symfony\Bundle\TwigBundle\TwigEngine');
|
||||||
|
$container->register('twig.extension.yaml');
|
||||||
|
$container->register('twig.extension.debug.stopwatch');
|
||||||
|
$container->register('twig.extension.expression');
|
||||||
|
|
||||||
$nativeTwigLoader = new Definition('\Twig_Loader_Filesystem');
|
$nativeTwigLoader = new Definition('\Twig_Loader_Filesystem');
|
||||||
$nativeTwigLoader->addMethodCall('addPath', array());
|
$nativeTwigLoader->addMethodCall('addPath', array());
|
||||||
$container->setDefinition('twig.loader.native_filesystem', $nativeTwigLoader);
|
$container->setDefinition('twig.loader.native_filesystem', $nativeTwigLoader);
|
||||||
|
|
||||||
$filesystemLoader = new Definition('\Symfony\Bundle\TwigBundle\Loader\FilesystemLoader');
|
$filesystemLoader = new Definition('\Symfony\Bundle\TwigBundle\Loader\FilesystemLoader');
|
||||||
|
$filesystemLoader->setArguments(array(null, null, null));
|
||||||
$filesystemLoader->addMethodCall('addPath', array());
|
$filesystemLoader->addMethodCall('addPath', array());
|
||||||
$container->setDefinition('twig.loader.filesystem', $filesystemLoader);
|
$container->setDefinition('twig.loader.filesystem', $filesystemLoader);
|
||||||
|
|
||||||
|
@ -255,7 +255,7 @@ class FlattenExceptionTest extends \PHPUnit_Framework_TestCase
|
|||||||
|
|
||||||
// assertEquals() does not like NAN values.
|
// assertEquals() does not like NAN values.
|
||||||
$this->assertEquals($array[$i][0], 'float');
|
$this->assertEquals($array[$i][0], 'float');
|
||||||
$this->assertNan($array[$i++][1]);
|
$this->assertTrue(is_nan($array[$i++][1]));
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testRecursionInArguments()
|
public function testRecursionInArguments()
|
||||||
|
@ -428,10 +428,11 @@ class AutowirePass implements CompilerPassInterface
|
|||||||
$class = false;
|
$class = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$isVariadic = method_exists($parameter, 'isVariadic') && $parameter->isVariadic();
|
||||||
$methodArgumentsMetadata[] = array(
|
$methodArgumentsMetadata[] = array(
|
||||||
'class' => $class,
|
'class' => $class,
|
||||||
'isOptional' => $parameter->isOptional(),
|
'isOptional' => $parameter->isOptional(),
|
||||||
'defaultValue' => $parameter->isOptional() ? $parameter->getDefaultValue() : null,
|
'defaultValue' => ($parameter->isOptional() && !$isVariadic) ? $parameter->getDefaultValue() : null,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -14,6 +14,7 @@ namespace Symfony\Component\DependencyInjection\Tests\Compiler;
|
|||||||
use Symfony\Component\DependencyInjection\Compiler\AutowirePass;
|
use Symfony\Component\DependencyInjection\Compiler\AutowirePass;
|
||||||
use Symfony\Component\DependencyInjection\ContainerBuilder;
|
use Symfony\Component\DependencyInjection\ContainerBuilder;
|
||||||
use Symfony\Component\DependencyInjection\Reference;
|
use Symfony\Component\DependencyInjection\Reference;
|
||||||
|
use Symfony\Component\DependencyInjection\Tests\Fixtures\includes\FooVariadic;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Kévin Dunglas <dunglas@gmail.com>
|
* @author Kévin Dunglas <dunglas@gmail.com>
|
||||||
@ -35,6 +36,23 @@ class AutowirePassTest extends \PHPUnit_Framework_TestCase
|
|||||||
$this->assertEquals('foo', (string) $container->getDefinition('bar')->getArgument(0));
|
$this->assertEquals('foo', (string) $container->getDefinition('bar')->getArgument(0));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @requires PHP 5.6
|
||||||
|
*/
|
||||||
|
public function testProcessVariadic()
|
||||||
|
{
|
||||||
|
$container = new ContainerBuilder();
|
||||||
|
$container->register('foo', Foo::class);
|
||||||
|
$definition = $container->register('fooVariadic', FooVariadic::class);
|
||||||
|
$definition->setAutowired(true);
|
||||||
|
|
||||||
|
$pass = new AutowirePass();
|
||||||
|
$pass->process($container);
|
||||||
|
|
||||||
|
$this->assertCount(1, $container->getDefinition('fooVariadic')->getArguments());
|
||||||
|
$this->assertEquals('foo', (string) $container->getDefinition('fooVariadic')->getArgument(0));
|
||||||
|
}
|
||||||
|
|
||||||
public function testProcessAutowireParent()
|
public function testProcessAutowireParent()
|
||||||
{
|
{
|
||||||
$container = new ContainerBuilder();
|
$container = new ContainerBuilder();
|
||||||
|
@ -0,0 +1,16 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Symfony\Component\DependencyInjection\Tests\Fixtures\includes;
|
||||||
|
|
||||||
|
use Symfony\Component\DependencyInjection\Tests\Compiler\Foo;
|
||||||
|
|
||||||
|
class FooVariadic
|
||||||
|
{
|
||||||
|
public function __construct(Foo $foo)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
public function bar(...$arguments)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
}
|
@ -156,14 +156,14 @@ class LdapUserProviderTest extends \PHPUnit_Framework_TestCase
|
|||||||
*/
|
*/
|
||||||
public function testLoadUserByUsernameFailsIfEntryHasNoUidKeyAttribute()
|
public function testLoadUserByUsernameFailsIfEntryHasNoUidKeyAttribute()
|
||||||
{
|
{
|
||||||
$result = $this->getMock(CollectionInterface::class);
|
$result = $this->getMockBuilder(CollectionInterface::class)->getMock();
|
||||||
$query = $this->getMock(QueryInterface::class);
|
$query = $this->getMockBuilder(QueryInterface::class)->getMock();
|
||||||
$query
|
$query
|
||||||
->expects($this->once())
|
->expects($this->once())
|
||||||
->method('execute')
|
->method('execute')
|
||||||
->will($this->returnValue($result))
|
->will($this->returnValue($result))
|
||||||
;
|
;
|
||||||
$ldap = $this->getMock(LdapInterface::class);
|
$ldap = $this->getMockBuilder(LdapInterface::class)->getMock();
|
||||||
$result
|
$result
|
||||||
->expects($this->once())
|
->expects($this->once())
|
||||||
->method('offsetGet')
|
->method('offsetGet')
|
||||||
@ -321,14 +321,14 @@ class LdapUserProviderTest extends \PHPUnit_Framework_TestCase
|
|||||||
|
|
||||||
public function testLoadUserByUsernameIsSuccessfulWithPasswordAttribute()
|
public function testLoadUserByUsernameIsSuccessfulWithPasswordAttribute()
|
||||||
{
|
{
|
||||||
$result = $this->getMock(CollectionInterface::class);
|
$result = $this->getMockBuilder(CollectionInterface::class)->getMock();
|
||||||
$query = $this->getMock(QueryInterface::class);
|
$query = $this->getMockBuilder(QueryInterface::class)->getMock();
|
||||||
$query
|
$query
|
||||||
->expects($this->once())
|
->expects($this->once())
|
||||||
->method('execute')
|
->method('execute')
|
||||||
->will($this->returnValue($result))
|
->will($this->returnValue($result))
|
||||||
;
|
;
|
||||||
$ldap = $this->getMock(LdapInterface::class);
|
$ldap = $this->getMockBuilder(LdapInterface::class)->getMock();
|
||||||
$result
|
$result
|
||||||
->expects($this->once())
|
->expects($this->once())
|
||||||
->method('offsetGet')
|
->method('offsetGet')
|
||||||
|
@ -192,7 +192,7 @@
|
|||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="51">
|
<trans-unit id="51">
|
||||||
<source>No temporary folder was configured in php.ini.</source>
|
<source>No temporary folder was configured in php.ini.</source>
|
||||||
<target>Es wurde kein temporärer Ordner in der php.ini konfiguriert.</target>
|
<target>Es wurde kein temporärer Ordner in der php.ini konfiguriert oder der temporäre Ordner existiert nicht.</target>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="52">
|
<trans-unit id="52">
|
||||||
<source>Cannot write temporary file to disk.</source>
|
<source>Cannot write temporary file to disk.</source>
|
||||||
|
@ -192,7 +192,7 @@
|
|||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="51">
|
<trans-unit id="51">
|
||||||
<source>No temporary folder was configured in php.ini.</source>
|
<source>No temporary folder was configured in php.ini.</source>
|
||||||
<target>No temporary folder was configured in php.ini.</target>
|
<target>No temporary folder was configured in php.ini, or the configured folder does not exist.</target>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="52">
|
<trans-unit id="52">
|
||||||
<source>Cannot write temporary file to disk.</source>
|
<source>Cannot write temporary file to disk.</source>
|
||||||
|
@ -192,7 +192,7 @@
|
|||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="51">
|
<trans-unit id="51">
|
||||||
<source>No temporary folder was configured in php.ini.</source>
|
<source>No temporary folder was configured in php.ini.</source>
|
||||||
<target>Er is geen tijdelijke map geconfigureerd in php.ini.</target>
|
<target>Er is geen tijdelijke map geconfigureerd in php.ini, of de gespecificeerde map bestaat niet.</target>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="52">
|
<trans-unit id="52">
|
||||||
<source>Cannot write temporary file to disk.</source>
|
<source>Cannot write temporary file to disk.</source>
|
||||||
|
@ -192,7 +192,7 @@
|
|||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="51">
|
<trans-unit id="51">
|
||||||
<source>No temporary folder was configured in php.ini.</source>
|
<source>No temporary folder was configured in php.ini.</source>
|
||||||
<target>Nie skonfigurowano folderu tymczasowego w php.ini.</target>
|
<target>Nie skonfigurowano folderu tymczasowego w php.ini, lub skonfigurowany folder nie istnieje.</target>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="52">
|
<trans-unit id="52">
|
||||||
<source>Cannot write temporary file to disk.</source>
|
<source>Cannot write temporary file to disk.</source>
|
||||||
|
Reference in New Issue
Block a user