Merge branch '3.1' into 3.2

nicolas-grekas · nicolas-grekas · commit 5c3bb318c908 · 2017-01-10T15:14:38.000+01:00
* 3.1:
  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
@@ -850,7 +850,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
`@@ -850,7 +850,7 @@ private function assertUrlPackage(ContainerBuilder $container, DefinitionDecorat`
`850`	`850`
`851`	`851`	`private function assertVersionStrategy(ContainerBuilder $container, Reference $reference, $version, $format)`
`852`	`852`	`{`
`853`		`- $versionStrategy = $container->getDefinition($reference);`
	`853`	`+ $versionStrategy = $container->getDefinition((string) $reference);`
`854`	`854`	`if (null === $version) {`
`855`	`855`	`$this->assertEquals('assets.empty_version_strategy', (string) $reference);`
`856`	`856`	`} else {`