diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '3.4' into 4.0 

* 3.4:
  [DI] Dont tell about autoregistration in strict autowiring mode
  [PHPunit] suite variable should be used
This commit is contained in:
Nicolas Grekas 2018-03-22 14:42:36 +01:00
parent 07512bbd8f 723d26fee1
commit 0c8ca6acdb
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Bridge/PhpUnit/Legacy/CoverageListenerForV7.php
View File

@ -36,6 +36,6 @@ class CoverageListenerForV7 implements TestListener
public function startTestSuite(TestSuite $suite): void
{
$this->trait->startTest($test);
$this->trait->startTest($suite);
}
}

7
src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
View File

@ -28,7 +28,7 @@ use Symfony\Component\DependencyInjection\TypedReference;
class AutowirePass extends AbstractRecursivePass
{
private $types;
private $ambiguousServiceTypes = array();
private $ambiguousServiceTypes;
private $lastFailure;
private $throwOnAutowiringException;
@ -46,7 +46,7 @@ class AutowirePass extends AbstractRecursivePass
parent::process($container);
} finally {
$this->types = null;
$this->ambiguousServiceTypes = array();
$this->ambiguousServiceTypes = null;
}
}
@ -238,6 +238,7 @@ class AutowirePass extends AbstractRecursivePass
private function populateAvailableTypes()
{
$this->types = array();
$this->ambiguousServiceTypes = array();
foreach ($this->container->getDefinitions() as $id => $definition) {
$this->populateAvailableType($id, $definition);
@ -333,7 +334,7 @@ class AutowirePass extends AbstractRecursivePass
if ($message = $this->getAliasesSuggestionForType($type = $reference->getType())) {
return ' '.$message;
}
if (null === $this->types) {
if (null === $this->ambiguousServiceTypes) {
$this->populateAvailableTypes();
}