Merge branch '2.8' into 3.1

nicolas-grekas · nicolas-grekas · commit 4d7bfb93304b · 2017-01-10T15:09:41.000+01:00
* 2.8:
  Fix merge
  [DI] Dont share service when no id provided
  Fix Container and PhpDumper test inaccuracies
  [DI] Fix missing new line after private alias
  [ClassLoader] Throw an exception if the cache is not writeable
  Fixing regression in TwigEngine exception handling.
diff --git a/Tests/DependencyInjection/FrameworkExtensionTest.php b/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -717,7 +717,7 @@ private function assertUrlPackage(ContainerBuilder $container, DefinitionDecorat
 
     private function assertVersionStrategy(ContainerBuilder $container, Reference $reference, $version, $format)
     {
-        $versionStrategy = $container->getDefinition($reference);
+        $versionStrategy = $container->getDefinition((string) $reference);
         if (null === $version) {
             $this->assertEquals('assets.empty_version_strategy', (string) $reference);
         } else {

Original file line number	Diff line number	Diff line change
`@@ -717,7 +717,7 @@ private function assertUrlPackage(ContainerBuilder $container, DefinitionDecorat`
`717`	`717`
`718`	`718`	`private function assertVersionStrategy(ContainerBuilder $container, Reference $reference, $version, $format)`
`719`	`719`	`{`
`720`		`- $versionStrategy = $container->getDefinition($reference);`
	`720`	`+ $versionStrategy = $container->getDefinition((string) $reference);`
`721`	`721`	`if (null === $version) {`
`722`	`722`	`$this->assertEquals('assets.empty_version_strategy', (string) $reference);`
`723`	`723`	`} else {`