Merge branch '3.4' into 4.0
* 3.4: [2.7] Fix issues found by PHPStan [Command] Fix upgrade guide example Add php_unit_dedicate_assert to PHPCS [WebProfilerBundle] Let fetch() cast URL to string improve FormType::getType exception message details [Intl] Update ICU data to 60.2 [Console] fix a bug when you are passing a default value and passing -n would ouput the index [FrameworkBundle] fix merge of 3.3 into 3.4 bumped Symfony version to 3.4.3 updated VERSION for 3.4.2 updated CHANGELOG for 3.4.2
This commit is contained in:
commit
1a6cdfec91
@ -10,6 +10,7 @@ return PhpCsFixer\Config::create()
|
|||||||
'@Symfony:risky' => true,
|
'@Symfony:risky' => true,
|
||||||
'array_syntax' => array('syntax' => 'long'),
|
'array_syntax' => array('syntax' => 'long'),
|
||||||
'protected_to_private' => false,
|
'protected_to_private' => false,
|
||||||
|
'php_unit_dedicate_assert' => array('target' => '3.5'),
|
||||||
))
|
))
|
||||||
->setRiskyAllowed(true)
|
->setRiskyAllowed(true)
|
||||||
->setFinder(
|
->setFinder(
|
||||||
|
@ -627,7 +627,7 @@ HttpKernel
|
|||||||
# ...
|
# ...
|
||||||
|
|
||||||
# explicit commands registration
|
# explicit commands registration
|
||||||
AppBundle\Command:
|
AppBundle\Command\:
|
||||||
resource: '../../src/AppBundle/Command/*'
|
resource: '../../src/AppBundle/Command/*'
|
||||||
tags: ['console.command']
|
tags: ['console.command']
|
||||||
```
|
```
|
||||||
|
@ -12,7 +12,6 @@
|
|||||||
namespace Symfony\Bridge\Doctrine;
|
namespace Symfony\Bridge\Doctrine;
|
||||||
|
|
||||||
use ProxyManager\Proxy\LazyLoadingInterface;
|
use ProxyManager\Proxy\LazyLoadingInterface;
|
||||||
use Psr\Container\ContainerInterface;
|
|
||||||
use Symfony\Component\DependencyInjection\Container;
|
use Symfony\Component\DependencyInjection\Container;
|
||||||
use Doctrine\Common\Persistence\AbstractManagerRegistry;
|
use Doctrine\Common\Persistence\AbstractManagerRegistry;
|
||||||
|
|
||||||
@ -24,7 +23,7 @@ use Doctrine\Common\Persistence\AbstractManagerRegistry;
|
|||||||
abstract class ManagerRegistry extends AbstractManagerRegistry
|
abstract class ManagerRegistry extends AbstractManagerRegistry
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* @var ContainerInterface
|
* @var Container
|
||||||
*/
|
*/
|
||||||
protected $container;
|
protected $container;
|
||||||
|
|
||||||
@ -58,7 +57,7 @@ abstract class ManagerRegistry extends AbstractManagerRegistry
|
|||||||
$name = $this->aliases[$name];
|
$name = $this->aliases[$name];
|
||||||
}
|
}
|
||||||
if (isset($this->fileMap[$name])) {
|
if (isset($this->fileMap[$name])) {
|
||||||
$wrappedInstance = $this->load($this->fileMap[$name], false);
|
$wrappedInstance = $this->load($this->fileMap[$name]);
|
||||||
} else {
|
} else {
|
||||||
$method = $this->methodMap[$name] ?? 'get'.strtr($name, $this->underscoreMap).'Service'; // BC with DI v3.4
|
$method = $this->methodMap[$name] ?? 'get'.strtr($name, $this->underscoreMap).'Service'; // BC with DI v3.4
|
||||||
$wrappedInstance = $this->{$method}(false);
|
$wrappedInstance = $this->{$method}(false);
|
||||||
|
@ -15,8 +15,7 @@ class RegisterMappingsPassTest extends TestCase
|
|||||||
*/
|
*/
|
||||||
public function testNoDriverParmeterException()
|
public function testNoDriverParmeterException()
|
||||||
{
|
{
|
||||||
$container = $this->createBuilder(array(
|
$container = $this->createBuilder();
|
||||||
));
|
|
||||||
$this->process($container, array(
|
$this->process($container, array(
|
||||||
'manager.param.one',
|
'manager.param.one',
|
||||||
'manager.param.two',
|
'manager.param.two',
|
||||||
|
@ -19,12 +19,18 @@ use Symfony\Bridge\Doctrine\Form\ChoiceList\DoctrineChoiceLoader;
|
|||||||
use Symfony\Bridge\Doctrine\Form\ChoiceList\EntityLoaderInterface;
|
use Symfony\Bridge\Doctrine\Form\ChoiceList\EntityLoaderInterface;
|
||||||
use Symfony\Bridge\Doctrine\Form\ChoiceList\IdReader;
|
use Symfony\Bridge\Doctrine\Form\ChoiceList\IdReader;
|
||||||
use Symfony\Component\Form\ChoiceList\ArrayChoiceList;
|
use Symfony\Component\Form\ChoiceList\ArrayChoiceList;
|
||||||
|
use Symfony\Component\Form\ChoiceList\Factory\ChoiceListFactoryInterface;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Bernhard Schussek <bschussek@gmail.com>
|
* @author Bernhard Schussek <bschussek@gmail.com>
|
||||||
*/
|
*/
|
||||||
class DoctrineChoiceLoaderTest extends TestCase
|
class DoctrineChoiceLoaderTest extends TestCase
|
||||||
{
|
{
|
||||||
|
/**
|
||||||
|
* @var ChoiceListFactoryInterface|\PHPUnit_Framework_MockObject_MockObject
|
||||||
|
*/
|
||||||
|
private $factory;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @var ObjectManager|\PHPUnit_Framework_MockObject_MockObject
|
* @var ObjectManager|\PHPUnit_Framework_MockObject_MockObject
|
||||||
*/
|
*/
|
||||||
|
@ -31,7 +31,6 @@ use Symfony\Component\Form\ChoiceList\View\ChoiceView;
|
|||||||
use Symfony\Component\Form\Forms;
|
use Symfony\Component\Form\Forms;
|
||||||
use Symfony\Component\Form\Tests\Extension\Core\Type\BaseTypeTest;
|
use Symfony\Component\Form\Tests\Extension\Core\Type\BaseTypeTest;
|
||||||
use Symfony\Component\Form\Tests\Extension\Core\Type\FormTypeTest;
|
use Symfony\Component\Form\Tests\Extension\Core\Type\FormTypeTest;
|
||||||
use Symfony\Component\PropertyAccess\PropertyAccess;
|
|
||||||
use Symfony\Bridge\Doctrine\Tests\Fixtures\SingleAssociationToIntIdEntity;
|
use Symfony\Bridge\Doctrine\Tests\Fixtures\SingleAssociationToIntIdEntity;
|
||||||
use Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdNoToStringEntity;
|
use Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdNoToStringEntity;
|
||||||
|
|
||||||
@ -1120,10 +1119,7 @@ class EntityTypeTest extends BaseTypeTest
|
|||||||
|
|
||||||
$repo = $this->em->getRepository(self::SINGLE_IDENT_CLASS);
|
$repo = $this->em->getRepository(self::SINGLE_IDENT_CLASS);
|
||||||
|
|
||||||
$entityType = new EntityType(
|
$entityType = new EntityType($this->emRegistry);
|
||||||
$this->emRegistry,
|
|
||||||
PropertyAccess::createPropertyAccessor()
|
|
||||||
);
|
|
||||||
|
|
||||||
$entityTypeGuesser = new DoctrineOrmTypeGuesser($this->emRegistry);
|
$entityTypeGuesser = new DoctrineOrmTypeGuesser($this->emRegistry);
|
||||||
|
|
||||||
@ -1183,10 +1179,7 @@ class EntityTypeTest extends BaseTypeTest
|
|||||||
|
|
||||||
$repo = $this->em->getRepository(self::SINGLE_IDENT_CLASS);
|
$repo = $this->em->getRepository(self::SINGLE_IDENT_CLASS);
|
||||||
|
|
||||||
$entityType = new EntityType(
|
$entityType = new EntityType($this->emRegistry);
|
||||||
$this->emRegistry,
|
|
||||||
PropertyAccess::createPropertyAccessor()
|
|
||||||
);
|
|
||||||
|
|
||||||
$entityTypeGuesser = new DoctrineOrmTypeGuesser($this->emRegistry);
|
$entityTypeGuesser = new DoctrineOrmTypeGuesser($this->emRegistry);
|
||||||
|
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
* file that was distributed with this source code.
|
* file that was distributed with this source code.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
namespace Symfony\Bridge\Doctrine\PropertyInfo\Tests;
|
namespace Symfony\Bridge\Doctrine\Tests\PropertyInfo;
|
||||||
|
|
||||||
use Doctrine\DBAL\Types\Type as DBALType;
|
use Doctrine\DBAL\Types\Type as DBALType;
|
||||||
use Doctrine\ORM\EntityManager;
|
use Doctrine\ORM\EntityManager;
|
||||||
|
@ -116,7 +116,7 @@ class CodeHelper extends Helper
|
|||||||
{
|
{
|
||||||
if (is_readable($file)) {
|
if (is_readable($file)) {
|
||||||
if (extension_loaded('fileinfo')) {
|
if (extension_loaded('fileinfo')) {
|
||||||
$finfo = new \Finfo();
|
$finfo = new \finfo();
|
||||||
|
|
||||||
// Check if the file is an application/octet-stream (eg. Phar file) because highlight_file cannot parse these files
|
// Check if the file is an application/octet-stream (eg. Phar file) because highlight_file cannot parse these files
|
||||||
if ('application/octet-stream' === $finfo->file($file, FILEINFO_MIME_TYPE)) {
|
if ('application/octet-stream' === $finfo->file($file, FILEINFO_MIME_TYPE)) {
|
||||||
|
@ -141,13 +141,6 @@ abstract class FrameworkExtensionTest extends TestCase
|
|||||||
$container = $this->createContainerFromFile('esi_disabled');
|
$container = $this->createContainerFromFile('esi_disabled');
|
||||||
|
|
||||||
$this->assertFalse($container->hasDefinition('fragment.renderer.esi'), 'The ESI fragment renderer is not registered');
|
$this->assertFalse($container->hasDefinition('fragment.renderer.esi'), 'The ESI fragment renderer is not registered');
|
||||||
}
|
|
||||||
|
|
||||||
public function testEsiInactive()
|
|
||||||
{
|
|
||||||
$container = $this->createContainerFromFile('default_config');
|
|
||||||
|
|
||||||
$this->assertFalse($container->hasDefinition('fragment.renderer.esi'));
|
|
||||||
$this->assertFalse($container->hasDefinition('esi'));
|
$this->assertFalse($container->hasDefinition('esi'));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -164,6 +157,7 @@ abstract class FrameworkExtensionTest extends TestCase
|
|||||||
$container = $this->createContainerFromFile('ssi_disabled');
|
$container = $this->createContainerFromFile('ssi_disabled');
|
||||||
|
|
||||||
$this->assertFalse($container->hasDefinition('fragment.renderer.ssi'), 'The SSI fragment renderer is not registered');
|
$this->assertFalse($container->hasDefinition('fragment.renderer.ssi'), 'The SSI fragment renderer is not registered');
|
||||||
|
$this->assertFalse($container->hasDefinition('ssi'));
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testEsiAndSsiWithoutFragments()
|
public function testEsiAndSsiWithoutFragments()
|
||||||
@ -175,14 +169,6 @@ abstract class FrameworkExtensionTest extends TestCase
|
|||||||
$this->assertTrue($container->hasDefinition('fragment.renderer.ssi'), 'The SSI fragment renderer is registered');
|
$this->assertTrue($container->hasDefinition('fragment.renderer.ssi'), 'The SSI fragment renderer is registered');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testSsiInactive()
|
|
||||||
{
|
|
||||||
$container = $this->createContainerFromFile('default_config');
|
|
||||||
|
|
||||||
$this->assertFalse($container->hasDefinition('fragment.renderer.ssi'));
|
|
||||||
$this->assertFalse($container->hasDefinition('ssi'));
|
|
||||||
}
|
|
||||||
|
|
||||||
public function testEnabledProfiler()
|
public function testEnabledProfiler()
|
||||||
{
|
{
|
||||||
$container = $this->createContainerFromFile('profiler');
|
$container = $this->createContainerFromFile('profiler');
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
* file that was distributed with this source code.
|
* file that was distributed with this source code.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
namespace Symfony\Bundle\SecurityBundle\Tests;
|
namespace Symfony\Bundle\SecurityBundle\Tests\Debug;
|
||||||
|
|
||||||
use PHPUnit\Framework\TestCase;
|
use PHPUnit\Framework\TestCase;
|
||||||
use Symfony\Bundle\SecurityBundle\Debug\TraceableFirewallListener;
|
use Symfony\Bundle\SecurityBundle\Debug\TraceableFirewallListener;
|
||||||
|
@ -9,12 +9,13 @@
|
|||||||
* file that was distributed with this source code.
|
* file that was distributed with this source code.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
namespace Symfony\Bundle\TwigBundle\Tests;
|
namespace Symfony\Bundle\TwigBundle\Tests\Functional;
|
||||||
|
|
||||||
use Symfony\Component\HttpKernel\Kernel;
|
use Symfony\Component\HttpKernel\Kernel;
|
||||||
use Symfony\Component\Config\Loader\LoaderInterface;
|
use Symfony\Component\Config\Loader\LoaderInterface;
|
||||||
use Symfony\Component\Filesystem\Filesystem;
|
use Symfony\Component\Filesystem\Filesystem;
|
||||||
use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
|
use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
|
||||||
|
use Symfony\Bundle\TwigBundle\Tests\TestCase;
|
||||||
use Symfony\Bundle\TwigBundle\TwigBundle;
|
use Symfony\Bundle\TwigBundle\TwigBundle;
|
||||||
|
|
||||||
class CacheWarmingTest extends TestCase
|
class CacheWarmingTest extends TestCase
|
||||||
|
@ -9,12 +9,13 @@
|
|||||||
* file that was distributed with this source code.
|
* file that was distributed with this source code.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
namespace Symfony\Bundle\TwigBundle\Tests;
|
namespace Symfony\Bundle\TwigBundle\Tests\Functional;
|
||||||
|
|
||||||
use Symfony\Component\HttpKernel\Kernel;
|
use Symfony\Component\HttpKernel\Kernel;
|
||||||
use Symfony\Component\Config\Loader\LoaderInterface;
|
use Symfony\Component\Config\Loader\LoaderInterface;
|
||||||
use Symfony\Component\Filesystem\Filesystem;
|
use Symfony\Component\Filesystem\Filesystem;
|
||||||
use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
|
use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
|
||||||
|
use Symfony\Bundle\TwigBundle\Tests\TestCase;
|
||||||
use Symfony\Bundle\TwigBundle\TwigBundle;
|
use Symfony\Bundle\TwigBundle\TwigBundle;
|
||||||
|
|
||||||
class NoTemplatingEntryTest extends TestCase
|
class NoTemplatingEntryTest extends TestCase
|
||||||
|
@ -250,6 +250,8 @@
|
|||||||
mode: arguments[0].mode,
|
mode: arguments[0].mode,
|
||||||
redirect: arguments[0].redirect
|
redirect: arguments[0].redirect
|
||||||
};
|
};
|
||||||
|
} else {
|
||||||
|
url = String(url);
|
||||||
}
|
}
|
||||||
if (!url.match(new RegExp({{ excluded_ajax_paths|json_encode|raw }}))) {
|
if (!url.match(new RegExp({{ excluded_ajax_paths|json_encode|raw }}))) {
|
||||||
var method = 'GET';
|
var method = 'GET';
|
||||||
|
@ -12,13 +12,9 @@
|
|||||||
namespace Symfony\Component\Config\Tests\Definition\Builder;
|
namespace Symfony\Component\Config\Tests\Definition\Builder;
|
||||||
|
|
||||||
use PHPUnit\Framework\TestCase;
|
use PHPUnit\Framework\TestCase;
|
||||||
use Symfony\Component\Config\Tests\Definition\Builder\NodeBuilder as CustomNodeBuilder;
|
use Symfony\Component\Config\Tests\Fixtures\Builder\NodeBuilder as CustomNodeBuilder;
|
||||||
use Symfony\Component\Config\Definition\Builder\TreeBuilder;
|
use Symfony\Component\Config\Definition\Builder\TreeBuilder;
|
||||||
|
|
||||||
require __DIR__.'/../../Fixtures/Builder/NodeBuilder.php';
|
|
||||||
require __DIR__.'/../../Fixtures/Builder/BarNodeDefinition.php';
|
|
||||||
require __DIR__.'/../../Fixtures/Builder/VariableNodeDefinition.php';
|
|
||||||
|
|
||||||
class TreeBuilderTest extends TestCase
|
class TreeBuilderTest extends TestCase
|
||||||
{
|
{
|
||||||
public function testUsingACustomNodeBuilder()
|
public function testUsingACustomNodeBuilder()
|
||||||
@ -28,11 +24,11 @@ class TreeBuilderTest extends TestCase
|
|||||||
|
|
||||||
$nodeBuilder = $root->children();
|
$nodeBuilder = $root->children();
|
||||||
|
|
||||||
$this->assertInstanceOf('Symfony\Component\Config\Tests\Definition\Builder\NodeBuilder', $nodeBuilder);
|
$this->assertInstanceOf('Symfony\Component\Config\Tests\Fixtures\Builder\NodeBuilder', $nodeBuilder);
|
||||||
|
|
||||||
$nodeBuilder = $nodeBuilder->arrayNode('deeper')->children();
|
$nodeBuilder = $nodeBuilder->arrayNode('deeper')->children();
|
||||||
|
|
||||||
$this->assertInstanceOf('Symfony\Component\Config\Tests\Definition\Builder\NodeBuilder', $nodeBuilder);
|
$this->assertInstanceOf('Symfony\Component\Config\Tests\Fixtures\Builder\NodeBuilder', $nodeBuilder);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testOverrideABuiltInNodeType()
|
public function testOverrideABuiltInNodeType()
|
||||||
@ -42,7 +38,7 @@ class TreeBuilderTest extends TestCase
|
|||||||
|
|
||||||
$definition = $root->children()->variableNode('variable');
|
$definition = $root->children()->variableNode('variable');
|
||||||
|
|
||||||
$this->assertInstanceOf('Symfony\Component\Config\Tests\Definition\Builder\VariableNodeDefinition', $definition);
|
$this->assertInstanceOf('Symfony\Component\Config\Tests\Fixtures\Builder\VariableNodeDefinition', $definition);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testAddANodeType()
|
public function testAddANodeType()
|
||||||
@ -52,7 +48,7 @@ class TreeBuilderTest extends TestCase
|
|||||||
|
|
||||||
$definition = $root->children()->barNode('variable');
|
$definition = $root->children()->barNode('variable');
|
||||||
|
|
||||||
$this->assertInstanceOf('Symfony\Component\Config\Tests\Definition\Builder\BarNodeDefinition', $definition);
|
$this->assertInstanceOf('Symfony\Component\Config\Tests\Fixtures\Builder\BarNodeDefinition', $definition);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testCreateABuiltInNodeTypeWithACustomNodeBuilder()
|
public function testCreateABuiltInNodeTypeWithACustomNodeBuilder()
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
* file that was distributed with this source code.
|
* file that was distributed with this source code.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
namespace Symfony\Component\Config\Tests\Definition\Builder;
|
namespace Symfony\Component\Config\Tests\Fixtures\Builder;
|
||||||
|
|
||||||
use Symfony\Component\Config\Definition\Builder\NodeDefinition;
|
use Symfony\Component\Config\Definition\Builder\NodeDefinition;
|
||||||
use Symfony\Component\Config\Tests\Fixtures\BarNode;
|
use Symfony\Component\Config\Tests\Fixtures\BarNode;
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
* file that was distributed with this source code.
|
* file that was distributed with this source code.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
namespace Symfony\Component\Config\Tests\Definition\Builder;
|
namespace Symfony\Component\Config\Tests\Fixtures\Builder;
|
||||||
|
|
||||||
use Symfony\Component\Config\Definition\Builder\NodeBuilder as BaseNodeBuilder;
|
use Symfony\Component\Config\Definition\Builder\NodeBuilder as BaseNodeBuilder;
|
||||||
|
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
* file that was distributed with this source code.
|
* file that was distributed with this source code.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
namespace Symfony\Component\Config\Tests\Definition\Builder;
|
namespace Symfony\Component\Config\Tests\Fixtures\Builder;
|
||||||
|
|
||||||
use Symfony\Component\Config\Definition\Builder\VariableNodeDefinition as BaseVariableNodeDefinition;
|
use Symfony\Component\Config\Definition\Builder\VariableNodeDefinition as BaseVariableNodeDefinition;
|
||||||
|
|
||||||
|
@ -46,6 +46,12 @@ class QuestionHelper extends Helper
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!$input->isInteractive()) {
|
if (!$input->isInteractive()) {
|
||||||
|
if ($question instanceof ChoiceQuestion) {
|
||||||
|
$choices = $question->getChoices();
|
||||||
|
|
||||||
|
return $choices[$question->getDefault()];
|
||||||
|
}
|
||||||
|
|
||||||
return $question->getDefault();
|
return $question->getDefault();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -83,6 +83,10 @@ class QuestionHelperTest extends AbstractQuestionHelperTest
|
|||||||
$question->setMultiselect(true);
|
$question->setMultiselect(true);
|
||||||
|
|
||||||
$this->assertEquals(array('Superman', 'Batman'), $questionHelper->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
|
$this->assertEquals(array('Superman', 'Batman'), $questionHelper->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
|
||||||
|
|
||||||
|
$question = new ChoiceQuestion('What is your favorite superhero?', $heroes, 0);
|
||||||
|
// We are supposed to get the default value since we are not in interactive mode
|
||||||
|
$this->assertEquals('Superman', $questionHelper->ask($this->createStreamableInputInterfaceMock($inputStream, true), $this->createOutputInterface(), $question));
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testAsk()
|
public function testAsk()
|
||||||
|
@ -258,6 +258,7 @@ class FlattenExceptionTest extends TestCase
|
|||||||
|
|
||||||
public function testRecursionInArguments()
|
public function testRecursionInArguments()
|
||||||
{
|
{
|
||||||
|
$a = null;
|
||||||
$a = array('foo', array(2, &$a));
|
$a = array('foo', array(2, &$a));
|
||||||
$exception = $this->createException($a);
|
$exception = $this->createException($a);
|
||||||
|
|
||||||
|
@ -26,7 +26,7 @@ class RegisterEnvVarProcessorsPassTest extends TestCase
|
|||||||
(new RegisterEnvVarProcessorsPass())->process($container);
|
(new RegisterEnvVarProcessorsPass())->process($container);
|
||||||
|
|
||||||
$this->assertTrue($container->has('container.env_var_processors_locator'));
|
$this->assertTrue($container->has('container.env_var_processors_locator'));
|
||||||
$this->assertInstanceof(SimpleProcessor::class, $container->get('container.env_var_processors_locator')->get('foo'));
|
$this->assertInstanceOf(SimpleProcessor::class, $container->get('container.env_var_processors_locator')->get('foo'));
|
||||||
|
|
||||||
$expected = array(
|
$expected = array(
|
||||||
'foo' => array('string'),
|
'foo' => array('string'),
|
||||||
|
@ -32,7 +32,7 @@ class ResolveInstanceofConditionalsPassTest extends TestCase
|
|||||||
$parent = 'instanceof.'.parent::class.'.0.foo';
|
$parent = 'instanceof.'.parent::class.'.0.foo';
|
||||||
$def = $container->getDefinition('foo');
|
$def = $container->getDefinition('foo');
|
||||||
$this->assertEmpty($def->getInstanceofConditionals());
|
$this->assertEmpty($def->getInstanceofConditionals());
|
||||||
$this->assertInstanceof(ChildDefinition::class, $def);
|
$this->assertInstanceOf(ChildDefinition::class, $def);
|
||||||
$this->assertTrue($def->isAutowired());
|
$this->assertTrue($def->isAutowired());
|
||||||
$this->assertSame($parent, $def->getParent());
|
$this->assertSame($parent, $def->getParent());
|
||||||
$this->assertSame(array('tag' => array(array()), 'baz' => array(array('attr' => 123))), $def->getTags());
|
$this->assertSame(array('tag' => array(array()), 'baz' => array(array('attr' => 123))), $def->getTags());
|
||||||
|
@ -412,6 +412,7 @@ class ProjectServiceContainer extends Container
|
|||||||
public $__foo_bar;
|
public $__foo_bar;
|
||||||
public $__foo_baz;
|
public $__foo_baz;
|
||||||
public $__internal;
|
public $__internal;
|
||||||
|
protected $privates;
|
||||||
protected $methodMap = array(
|
protected $methodMap = array(
|
||||||
'bar' => 'getBarService',
|
'bar' => 'getBarService',
|
||||||
'foo_bar' => 'getFooBarService',
|
'foo_bar' => 'getFooBarService',
|
||||||
|
@ -1519,7 +1519,7 @@ class FilesystemTest extends FilesystemTestCase
|
|||||||
|
|
||||||
// skip mode check on Windows
|
// skip mode check on Windows
|
||||||
if ('\\' !== DIRECTORY_SEPARATOR) {
|
if ('\\' !== DIRECTORY_SEPARATOR) {
|
||||||
$this->assertFilePermissions(664, $filename, 'The written file should keep the same permissions as before.');
|
$this->assertFilePermissions(664, $filename);
|
||||||
umask($oldMask);
|
umask($oldMask);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -82,11 +82,14 @@ class FormRegistry implements FormRegistryInterface
|
|||||||
|
|
||||||
if (!$type) {
|
if (!$type) {
|
||||||
// Support fully-qualified class names
|
// Support fully-qualified class names
|
||||||
if (class_exists($name) && in_array('Symfony\Component\Form\FormTypeInterface', class_implements($name))) {
|
if (!class_exists($name)) {
|
||||||
$type = new $name();
|
throw new InvalidArgumentException(sprintf('Could not load type "%s": class does not exist.', $name));
|
||||||
} else {
|
|
||||||
throw new InvalidArgumentException(sprintf('Could not load type "%s"', $name));
|
|
||||||
}
|
}
|
||||||
|
if (!is_subclass_of($name, 'Symfony\Component\Form\FormTypeInterface')) {
|
||||||
|
throw new InvalidArgumentException(sprintf('Could not load type "%s": class does not implement "Symfony\Component\Form\FormTypeInterface".', $name));
|
||||||
|
}
|
||||||
|
|
||||||
|
$type = new $name();
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->types[$name] = $this->resolveType($type);
|
$this->types[$name] = $this->resolveType($type);
|
||||||
|
@ -989,7 +989,7 @@ class ResponseTest extends ResponseTestCase
|
|||||||
|
|
||||||
$ianaCodesReasonPhrases = array();
|
$ianaCodesReasonPhrases = array();
|
||||||
|
|
||||||
$xpath = new \DomXPath($ianaHttpStatusCodes);
|
$xpath = new \DOMXPath($ianaHttpStatusCodes);
|
||||||
$xpath->registerNamespace('ns', 'http://www.iana.org/assignments');
|
$xpath->registerNamespace('ns', 'http://www.iana.org/assignments');
|
||||||
|
|
||||||
$records = $xpath->query('//ns:record');
|
$records = $xpath->query('//ns:record');
|
||||||
|
@ -24,8 +24,8 @@ class StrictSessionHandlerTest extends TestCase
|
|||||||
->with('path', 'name')->willReturn(true);
|
->with('path', 'name')->willReturn(true);
|
||||||
$proxy = new StrictSessionHandler($handler);
|
$proxy = new StrictSessionHandler($handler);
|
||||||
|
|
||||||
$this->assertInstanceof('SessionUpdateTimestampHandlerInterface', $proxy);
|
$this->assertInstanceOf('SessionUpdateTimestampHandlerInterface', $proxy);
|
||||||
$this->assertInstanceof(AbstractSessionHandler::class, $proxy);
|
$this->assertInstanceOf(AbstractSessionHandler::class, $proxy);
|
||||||
$this->assertTrue($proxy->open('path', 'name'));
|
$this->assertTrue($proxy->open('path', 'name'));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -234,7 +234,7 @@ final class Intl
|
|||||||
*/
|
*/
|
||||||
public static function getIcuStubVersion()
|
public static function getIcuStubVersion()
|
||||||
{
|
{
|
||||||
return '60.1';
|
return '60.2';
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -15,4 +15,4 @@
|
|||||||
57 = http://source.icu-project.org/repos/icu/icu/tags/release-57-1/source
|
57 = http://source.icu-project.org/repos/icu/icu/tags/release-57-1/source
|
||||||
58 = http://source.icu-project.org/repos/icu/tags/release-58-2/icu4c/source
|
58 = http://source.icu-project.org/repos/icu/tags/release-58-2/icu4c/source
|
||||||
59 = http://source.icu-project.org/repos/icu/tags/release-59-1/icu4c/source
|
59 = http://source.icu-project.org/repos/icu/tags/release-59-1/icu4c/source
|
||||||
60 = http://source.icu-project.org/repos/icu/tags/release-60-1/icu4c/source
|
60 = http://source.icu-project.org/repos/icu/tags/release-60-2/icu4c/source
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"Version": "2.1.37.11",
|
"Version": "2.1.37.96",
|
||||||
"Names": {
|
"Names": {
|
||||||
"ADP": [
|
"ADP": [
|
||||||
"ADP",
|
"ADP",
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"Version": "2.1.37.28",
|
"Version": "2.1.37.69",
|
||||||
"Names": {
|
"Names": {
|
||||||
"AED": [
|
"AED": [
|
||||||
"AED",
|
"AED",
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"Version": "2.1.37.11",
|
"Version": "2.1.37.96",
|
||||||
"Names": {
|
"Names": {
|
||||||
"aa": "Afar",
|
"aa": "Afar",
|
||||||
"ab": "Abchasisch",
|
"ab": "Abchasisch",
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"Version": "2.1.37.28",
|
"Version": "2.1.37.69",
|
||||||
"Names": {
|
"Names": {
|
||||||
"aa": "افار",
|
"aa": "افار",
|
||||||
"ab": "ابقازیان",
|
"ab": "ابقازیان",
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"Version": "2.1.37.11",
|
"Version": "2.1.37.96",
|
||||||
"Names": {
|
"Names": {
|
||||||
"AC": "Ascension",
|
"AC": "Ascension",
|
||||||
"AD": "Andorra",
|
"AD": "Andorra",
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"Version": "2.1.37.28",
|
"Version": "2.1.37.69",
|
||||||
"Names": {
|
"Names": {
|
||||||
"AC": "اسینشن آئلینڈ",
|
"AC": "اسینشن آئلینڈ",
|
||||||
"AD": "انڈورا",
|
"AD": "انڈورا",
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"Version": "2.1.37.11",
|
"Version": "2.1.37.96",
|
||||||
"Names": {
|
"Names": {
|
||||||
"Afak": "Afaka",
|
"Afak": "Afaka",
|
||||||
"Aghb": "Kaukasisch-Albanisch",
|
"Aghb": "Kaukasisch-Albanisch",
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"Version": "2.1.37.28",
|
"Version": "2.1.37.69",
|
||||||
"Names": {
|
"Names": {
|
||||||
"Arab": "عربی",
|
"Arab": "عربی",
|
||||||
"Armn": "آرمینیائی",
|
"Armn": "آرمینیائی",
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
SVN information
|
SVN information
|
||||||
===============
|
===============
|
||||||
|
|
||||||
URL: http://source.icu-project.org/repos/icu/tags/release-60-1/icu4c/source
|
URL: http://source.icu-project.org/repos/icu/tags/release-60-2/icu4c/source
|
||||||
Revision: 40662
|
Revision: 40727
|
||||||
Author: yoshito
|
Author: yoshito
|
||||||
Date: 2017-10-31T15:14:15.305164Z
|
Date: 2017-12-13T20:01:38.026283Z
|
||||||
|
@ -1 +1 @@
|
|||||||
60.1
|
60.2
|
||||||
|
@ -852,7 +852,9 @@ abstract class AbstractIntlDateFormatterTest extends TestCase
|
|||||||
$position = null;
|
$position = null;
|
||||||
$formatter = $this->getDefaultDateFormatter('y');
|
$formatter = $this->getDefaultDateFormatter('y');
|
||||||
$this->assertSame(0, $formatter->parse('1970', $position));
|
$this->assertSame(0, $formatter->parse('1970', $position));
|
||||||
$this->assertNull($position);
|
// Since $position is not supported by the Symfony implementation, the following won't work.
|
||||||
|
// The intl implementation works this way since 60.2.
|
||||||
|
// $this->assertSame(4, $position);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testSetPattern()
|
public function testSetPattern()
|
||||||
|
@ -75,7 +75,7 @@ class PhpMatcherDumperTest extends TestCase
|
|||||||
->setMethods(array('redirect'))
|
->setMethods(array('redirect'))
|
||||||
->setConstructorArgs(array(new RequestContext()))
|
->setConstructorArgs(array(new RequestContext()))
|
||||||
->getMock();
|
->getMock();
|
||||||
|
|
||||||
$matcher->expects($this->once())->method('redirect')->with('/foo%3Abar/', 'foo')->willReturn(array());
|
$matcher->expects($this->once())->method('redirect')->with('/foo%3Abar/', 'foo')->willReturn(array());
|
||||||
|
|
||||||
$matcher->match('/foo%3Abar');
|
$matcher->match('/foo%3Abar');
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
namespace Symfony\Component\Workflow\Tests;
|
namespace Symfony\Component\Workflow\Tests\DependencyInjection;
|
||||||
|
|
||||||
use PHPUnit\Framework\TestCase;
|
use PHPUnit\Framework\TestCase;
|
||||||
use Symfony\Component\DependencyInjection\ContainerBuilder;
|
use Symfony\Component\DependencyInjection\ContainerBuilder;
|
||||||
|
Reference in New Issue
Block a user