symfony
diff --git a/‎src/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php
+4Lines changed: 4 additions & 0 deletions b/‎src/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php
+4Lines changed: 4 additions & 0 deletions
diff --git a/‎src/Symfony/Component/DependencyInjection/Tests/Compiler/ReplaceAliasByActualDefinitionPassTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/Compiler/ReplaceAliasByActualDefinitionPassTest.php
+3Lines changed: 3 additions & 0 deletions b/‎src/Symfony/Component/DependencyInjection/Tests/Compiler/ReplaceAliasByActualDefinitionPassTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/Compiler/ReplaceAliasByActualDefinitionPassTest.php
+3Lines changed: 3 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php
+4Lines changed: 4 additions & 0 deletions b/‎src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php
+4Lines changed: 4 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php
+8-1Lines changed: 8 additions & 1 deletion b/‎src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php
+8-1Lines changed: 8 additions & 1 deletion
@@ -42,6 +42,10 @@ public function process(ContainerBuilder $container)
         foreach ($container->getAliases() as $id => $alias) {
             $aliasId = (string) $alias;
 
+            if ('service_container' === $aliasId) {
+                continue;
+            }
+
             try {
                 $definition = $container->getDefinition($aliasId);
             } catch (InvalidArgumentException $e) {
 
@@ -36,6 +36,8 @@ public function testProcess()
         $container->setAlias('a_alias', 'a');
         $container->setAlias('b_alias', 'b');
 
+        $container->setAlias('container', 'service_container');
+
         $this->process($container);
 
         $this->assertTrue($container->has('a'), '->process() does nothing to public definitions.');
@@ -47,6 +49,7 @@ public function testProcess()
         );
 
         $this->assertSame('b_alias', $aDefinition->getFactoryService(false));
+        $this->assertTrue($container->has('container'));
 
         $resolvedFactory = $aDefinition->getFactory(false);
         $this->assertSame('b_alias', (string) $resolvedFactory[0]);
 
@@ -205,6 +205,10 @@ public function reverseTransform($value)
             throw new TransformationFailedException('I don\'t have a clear idea what infinity looks like');
         }
 
+        if (is_int($result) && $result === (int) $float = (float) $result) {
+            $result = $float;
+        }
+
         if (function_exists('mb_detect_encoding') && false !== $encoding = mb_detect_encoding($value, null, true)) {
             $length = mb_strlen($value, $encoding);
             $remainder = mb_substr($value, $position, $length, $encoding);
 
@@ -642,10 +642,17 @@ public function testReverseTransformDisallowsTrailingExtraCharactersMultibyte()
         $transformer->reverseTransform("12\xc2\xa0345,678foo");
     }
 
-    public function testReverseTransformBigint()
+    public function testReverseTransformBigInt()
     {
         $transformer = new NumberToLocalizedStringTransformer(null, true);
 
         $this->assertEquals(PHP_INT_MAX - 1, (int) $transformer->reverseTransform((string) (PHP_INT_MAX - 1)));
     }
+
+    public function testReverseTransformSmallInt()
+    {
+        $transformer = new NumberToLocalizedStringTransformer(null, true);
+
+        $this->assertSame(1.0, $transformer->reverseTransform('1'));
+    }
 }
Original file line number	Diff line number	Diff line change
`@@ -642,10 +642,17 @@ public function testReverseTransformDisallowsTrailingExtraCharactersMultibyte()`
`642`	`642`	`$transformer->reverseTransform("12\xc2\xa0345,678foo");`
`643`	`643`	`}`
`644`	`644`
`645`		`- public function testReverseTransformBigint()`
	`645`	`+ public function testReverseTransformBigInt()`
`646`	`646`	`{`
`647`	`647`	`$transformer = new NumberToLocalizedStringTransformer(null, true);`
`648`	`648`
`649`	`649`	`$this->assertEquals(PHP_INT_MAX - 1, (int) $transformer->reverseTransform((string) (PHP_INT_MAX - 1)));`
`650`	`650`	`}`
	`651`	`+`
	`652`	`+ public function testReverseTransformSmallInt()`
	`653`	`+ {`
	`654`	`+ $transformer = new NumberToLocalizedStringTransformer(null, true);`
	`655`	`+`
	`656`	`+ $this->assertSame(1.0, $transformer->reverseTransform('1'));`
	`657`	`+ }`
`651`	`658`	`}`