Skip to content

Commit c7d40ad

Browse files
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
2 parents d2fa088 + 601f2c5 commit c7d40ad

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

Tests/Compiler/RegisterEnvVarProcessorsPassTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public function testSimpleProcessor()
2626
(new RegisterEnvVarProcessorsPass())->process($container);
2727

2828
$this->assertTrue($container->has('container.env_var_processors_locator'));
29-
$this->assertInstanceof(SimpleProcessor::class, $container->get('container.env_var_processors_locator')->get('foo'));
29+
$this->assertInstanceOf(SimpleProcessor::class, $container->get('container.env_var_processors_locator')->get('foo'));
3030

3131
$expected = array(
3232
'foo' => array('string'),

Tests/Compiler/ResolveInstanceofConditionalsPassTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public function testProcess()
3232
$parent = 'instanceof.'.parent::class.'.0.foo';
3333
$def = $container->getDefinition('foo');
3434
$this->assertEmpty($def->getInstanceofConditionals());
35-
$this->assertInstanceof(ChildDefinition::class, $def);
35+
$this->assertInstanceOf(ChildDefinition::class, $def);
3636
$this->assertTrue($def->isAutowired());
3737
$this->assertSame($parent, $def->getParent());
3838
$this->assertSame(array('tag' => array(array()), 'baz' => array(array('attr' => 123))), $def->getTags());

Tests/ContainerTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -412,6 +412,7 @@ class ProjectServiceContainer extends Container
412412
public $__foo_bar;
413413
public $__foo_baz;
414414
public $__internal;
415+
protected $privates;
415416
protected $methodMap = array(
416417
'bar' => 'getBarService',
417418
'foo_bar' => 'getFooBarService',

0 commit comments

Comments
 (0)