Merge branch '0.9' into 0.10

Jeremiah VALERIE · Jeremiah VALERIE · commit 22822a6ca501 · 2018-01-26T17:18:10.000+01:00
diff --git a/Resolver/TypeResolver.php b/Resolver/TypeResolver.php
@@ -122,7 +122,7 @@ protected function postLoadSolution($solution)
         if ($solution && !$this->hasSolution($solution->name)) {
             $this->addSolution($solution->name, function () use ($solution) {
                 return $solution;
-            });
+            }, [], ['id' => get_class($solution), 'alias' => $solution->name]);
         }
     }
 
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -30,7 +30,7 @@
 
     <php>
         <ini name="error_reporting" value="E_ALL"/>
-        <env name="SYMFONY_DEPRECATIONS_HELPER" value="50" />
+        <env name="SYMFONY_DEPRECATIONS_HELPER" value="weak" />
     </php>
 
 </phpunit>

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ protected function postLoadSolution($solution)`
`122`	`122`	`if ($solution && !$this->hasSolution($solution->name)) {`
`123`	`123`	`$this->addSolution($solution->name, function () use ($solution) {`
`124`	`124`	`return $solution;`
`125`		`- });`
	`125`	`+ }, [], ['id' => get_class($solution), 'alias' => $solution->name]);`
`126`	`126`	`}`
`127`	`127`	`}`
`128`	`128`