symfony
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/DependencyInjection/ContainerBuilder.php
Lines changed: 5 additions & 5 deletions b/‎src/Symfony/Component/DependencyInjection/ContainerBuilder.php
Lines changed: 5 additions & 5 deletions
diff --git a/‎src/Symfony/Component/HttpKernel/Tests/Bundle/BundleTest.php
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/HttpKernel/Tests/Bundle/BundleTest.php
Lines changed: 1 addition & 1 deletion
@@ -587,7 +587,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 {
 
@@ -162,7 +162,7 @@ public function testAccess()
                 );
             } elseif (3 === $i) {
                 $this->assertEquals('IS_AUTHENTICATED_ANONYMOUSLY', $attributes[0]);
-                $expression = $container->getDefinition($attributes[1])->getArgument(0);
+                $expression = $container->getDefinition((string) $attributes[1])->getArgument(0);
                 $this->assertEquals("token.getUsername() matches '/^admin/'", $expression);
             }
         }
 
@@ -430,7 +430,7 @@ public function get($id, $invalidBehavior = ContainerInterface::EXCEPTION_ON_INV
         }
 
         if (!array_key_exists($id, $this->definitions) && isset($this->aliasDefinitions[$id])) {
-            return $this->get($this->aliasDefinitions[$id], $invalidBehavior);
+            return $this->get((string) $this->aliasDefinitions[$id], $invalidBehavior);
         }
 
         try {
@@ -1099,15 +1099,15 @@ private function callMethod($service, $call)
     /**
      * Shares a given service in the container.
      *
-     * @param Definition $definition
-     * @param mixed      $service
-     * @param string     $id
+     * @param Definition  $definition
+     * @param mixed       $service
+     * @param string|null $id
      *
      * @throws InactiveScopeException
      */
     private function shareService(Definition $definition, $service, $id)
     {
-        if (self::SCOPE_PROTOTYPE !== $scope = $definition->getScope()) {
+        if (null !== $id && self::SCOPE_PROTOTYPE !== $scope = $definition->getScope()) {
             if (self::SCOPE_CONTAINER !== $scope && !isset($this->scopedServices[$scope])) {
                 throw new InactiveScopeException($id, $scope);
             }
 
@@ -46,7 +46,7 @@ public function testGetContainerExtensionWithInvalidClass()
     public function testHttpKernelRegisterCommandsIgnoresCommandsThatAreRegisteredAsServices()
     {
         $container = new ContainerBuilder();
-        $container->register('console.command.Symfony_Component_HttpKernel_Tests_Fixtures_ExtensionPresentBundle_Command_FooCommand', 'Symfony\Component\HttpKernel\Tests\Fixtures\ExtensionPresentBundle\Command\FooCommand');
+        $container->register('console.command.symfony_component_httpkernel_tests_fixtures_extensionpresentbundle_command_foocommand', 'Symfony\Component\HttpKernel\Tests\Fixtures\ExtensionPresentBundle\Command\FooCommand');
 
         $application = $this->getMockBuilder('Symfony\Component\Console\Application')->getMock();
         // add() is never called when the found command classes are already registered as services
Original file line number	Diff line number	Diff line change
`@@ -587,7 +587,7 @@ private function assertUrlPackage(ContainerBuilder $container, DefinitionDecorat`
`587`	`587`
`588`	`588`	`private function assertVersionStrategy(ContainerBuilder $container, Reference $reference, $version, $format)`
`589`	`589`	`{`
`590`		`- $versionStrategy = $container->getDefinition($reference);`
	`590`	`+ $versionStrategy = $container->getDefinition((string) $reference);`
`591`	`591`	`if (null === $version) {`
`592`	`592`	`$this->assertEquals('assets.empty_version_strategy', (string) $reference);`
`593`	`593`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ public function testAccess()`
`162`	`162`	`);`
`163`	`163`	`} elseif (3 === $i) {`
`164`	`164`	`$this->assertEquals('IS_AUTHENTICATED_ANONYMOUSLY', $attributes[0]);`
`165`		`- $expression = $container->getDefinition($attributes[1])->getArgument(0);`
	`165`	`+ $expression = $container->getDefinition((string) $attributes[1])->getArgument(0);`
`166`	`166`	`$this->assertEquals("token.getUsername() matches '/^admin/'", $expression);`
`167`	`167`	`}`
`168`	`168`	`}`
Original file line number	Diff line number	Diff line change
`@@ -430,7 +430,7 @@ public function get($id, $invalidBehavior = ContainerInterface::EXCEPTION_ON_INV`
`430`	`430`	`}`
`431`	`431`
`432`	`432`	`if (!array_key_exists($id, $this->definitions) && isset($this->aliasDefinitions[$id])) {`
`433`		`- return $this->get($this->aliasDefinitions[$id], $invalidBehavior);`
	`433`	`+ return $this->get((string) $this->aliasDefinitions[$id], $invalidBehavior);`
`434`	`434`	`}`
`435`	`435`
`436`	`436`	`try {`
`@@ -1099,15 +1099,15 @@ private function callMethod($service, $call)`
`1099`	`1099`	`/**`
`1100`	`1100`	`* Shares a given service in the container.`
`1101`	`1101`	`*`
`1102`		`- * @param Definition $definition`
`1103`		`- * @param mixed $service`
`1104`		`- * @param string $id`
	`1102`	`+ * @param Definition $definition`
	`1103`	`+ * @param mixed $service`
	`1104`	`+ * @param string\|null $id`
`1105`	`1105`	`*`
`1106`	`1106`	`* @throws InactiveScopeException`
`1107`	`1107`	`*/`
`1108`	`1108`	`private function shareService(Definition $definition, $service, $id)`
`1109`	`1109`	`{`
`1110`		`- if (self::SCOPE_PROTOTYPE !== $scope = $definition->getScope()) {`
	`1110`	`+ if (null !== $id && self::SCOPE_PROTOTYPE !== $scope = $definition->getScope()) {`
`1111`	`1111`	`if (self::SCOPE_CONTAINER !== $scope && !isset($this->scopedServices[$scope])) {`
`1112`	`1112`	`throw new InactiveScopeException($id, $scope);`
`1113`	`1113`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public function testGetContainerExtensionWithInvalidClass()`
`46`	`46`	`public function testHttpKernelRegisterCommandsIgnoresCommandsThatAreRegisteredAsServices()`
`47`	`47`	`{`
`48`	`48`	`$container = new ContainerBuilder();`
`49`		`- $container->register('console.command.Symfony_Component_HttpKernel_Tests_Fixtures_ExtensionPresentBundle_Command_FooCommand', 'Symfony\Component\HttpKernel\Tests\Fixtures\ExtensionPresentBundle\Command\FooCommand');`
	`49`	`+ $container->register('console.command.symfony_component_httpkernel_tests_fixtures_extensionpresentbundle_command_foocommand', 'Symfony\Component\HttpKernel\Tests\Fixtures\ExtensionPresentBundle\Command\FooCommand');`
`50`	`50`
`51`	`51`	`$application = $this->getMockBuilder('Symfony\Component\Console\Application')->getMock();`
`52`	`52`	`// add() is never called when the found command classes are already registered as services`