Merge branch '2.3' into 2.7

Tobion · Tobion · commit 4ecbc7053da1 · 2015-09-09T20:00:08.000+02:00
Conflicts:
	src/Symfony/Component/Form/Tests/FormFactoryTest.php
	src/Symfony/Component/HttpKernel/Kernel.php
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataMapper/PropertyPathMapperTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataMapper/PropertyPathMapperTest.php
@@ -77,14 +77,6 @@ private function getForm(FormConfigInterface $config, $synchronized = true, $sub
         return $form;
     }
 
-    /**
-     * @return \PHPUnit_Framework_MockObject_MockObject
-     */
-    private function getDataMapper()
-    {
-        return $this->getMock('Symfony\Component\Form\DataMapperInterface');
-    }
-
     public function testMapDataToFormsPassesObjectRefIfByReference()
     {
         $car = new \stdClass();
diff --git a/src/Symfony/Component/Form/Tests/FormFactoryTest.php b/src/Symfony/Component/Form/Tests/FormFactoryTest.php
@@ -616,9 +616,4 @@ private function getMockResolvedType()
     {
         return $this->getMock('Symfony\Component\Form\ResolvedFormTypeInterface');
     }
-
-    private function getMockType()
-    {
-        return $this->getMock('Symfony\Component\Form\FormTypeInterface');
-    }
 }
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -61,10 +61,10 @@ abstract class Kernel implements KernelInterface, TerminableInterface
     protected $loadClassCache;
 
     const VERSION = '2.7.5-DEV';
-    const VERSION_ID = '20705';
-    const MAJOR_VERSION = '2';
-    const MINOR_VERSION = '7';
-    const RELEASE_VERSION = '5';
+    const VERSION_ID = 20705;
+    const MAJOR_VERSION = 2;
+    const MINOR_VERSION = 7;
+    const RELEASE_VERSION = 5;
     const EXTRA_VERSION = 'DEV';
 
     const END_OF_MAINTENANCE = '05/2018';

Original file line number	Diff line number	Diff line change
`@@ -77,14 +77,6 @@ private function getForm(FormConfigInterface $config, $synchronized = true, $sub`
`77`	`77`	`return $form;`
`78`	`78`	`}`
`79`	`79`
`80`		`- /**`
`81`		`- * @return \PHPUnit_Framework_MockObject_MockObject`
`82`		`- */`
`83`		`- private function getDataMapper()`
`84`		`- {`
`85`		`- return $this->getMock('Symfony\Component\Form\DataMapperInterface');`
`86`		`- }`
`87`		`-`
`88`	`80`	`public function testMapDataToFormsPassesObjectRefIfByReference()`
`89`	`81`	`{`
`90`	`82`	`$car = new \stdClass();`
Original file line number	Diff line number	Diff line change
`@@ -616,9 +616,4 @@ private function getMockResolvedType()`
`616`	`616`	`{`
`617`	`617`	`return $this->getMock('Symfony\Component\Form\ResolvedFormTypeInterface');`
`618`	`618`	`}`
`619`		`-`
`620`		`- private function getMockType()`
`621`		`- {`
`622`		`- return $this->getMock('Symfony\Component\Form\FormTypeInterface');`
`623`		`- }`
`624`	`619`	`}`