Merge branch '2.7' into 2.8

nicolas-grekas · nicolas-grekas · commit da43c535fc65 · 2017-01-10T15:03:07.000+01:00
* 2.7:
  [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
@@ -628,7 +628,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
`@@ -628,7 +628,7 @@ private function assertUrlPackage(ContainerBuilder $container, DefinitionDecorat`
`628`	`628`
`629`	`629`	`private function assertVersionStrategy(ContainerBuilder $container, Reference $reference, $version, $format)`
`630`	`630`	`{`
`631`		`- $versionStrategy = $container->getDefinition($reference);`
	`631`	`+ $versionStrategy = $container->getDefinition((string) $reference);`
`632`	`632`	`if (null === $version) {`
`633`	`633`	`$this->assertEquals('assets.empty_version_strategy', (string) $reference);`
`634`	`634`	`} else {`