diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '2.3' into 2.7

Browse Source 
Conflicts:
	src/Symfony/Component/Form/Tests/FormFactoryTest.php
	src/Symfony/Component/HttpKernel/Kernel.php
This commit is contained in:
Tobias Schultze 2015-09-09 20:00:08 +02:00
commit 4ecbc7053d
3 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Symfony/Component/Form/Tests/Extension/Core/DataMapper/PropertyPathMapperTest.php
View File

@ -77,14 +77,6 @@ class PropertyPathMapperTest extends \PHPUnit_Framework_TestCase
return $form;
}
/**
* @return \PHPUnit_Framework_MockObject_MockObject
*/
private function getDataMapper()
{
return $this->getMock('Symfony\Component\Form\DataMapperInterface');
}
public function testMapDataToFormsPassesObjectRefIfByReference()
{
$car = new \stdClass();

5
src/Symfony/Component/Form/Tests/FormFactoryTest.php
View File

@ -616,9 +616,4 @@ class FormFactoryTest extends \PHPUnit_Framework_TestCase
{
return $this->getMock('Symfony\Component\Form\ResolvedFormTypeInterface');
}
private function getMockType()
{
return $this->getMock('Symfony\Component\Form\FormTypeInterface');
}
}

8
src/Symfony/Component/HttpKernel/Kernel.php
View File

@ -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';