Merge branch '2.3' into 2.7
* 2.3: [PropertyAccess] Fix for PHP 7.0.7 Conflicts: src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorCollectionTest.php src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
This commit is contained in:
commit
a350459d70
@ -242,7 +242,9 @@ class PropertyAccessorTest extends \PHPUnit_Framework_TestCase
|
|||||||
*/
|
*/
|
||||||
public function testSetValueThrowsExceptionIfNotArrayAccess()
|
public function testSetValueThrowsExceptionIfNotArrayAccess()
|
||||||
{
|
{
|
||||||
$this->propertyAccessor->setValue(new \stdClass(), '[index]', 'Updated');
|
$object = new \stdClass();
|
||||||
|
|
||||||
|
$this->propertyAccessor->setValue($object, '[index]', 'Updated');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testSetValueUpdatesMagicSet()
|
public function testSetValueUpdatesMagicSet()
|
||||||
@ -259,7 +261,9 @@ class PropertyAccessorTest extends \PHPUnit_Framework_TestCase
|
|||||||
*/
|
*/
|
||||||
public function testSetValueThrowsExceptionIfThereAreMissingParameters()
|
public function testSetValueThrowsExceptionIfThereAreMissingParameters()
|
||||||
{
|
{
|
||||||
$this->propertyAccessor->setValue(new TestClass('Bernhard'), 'publicAccessorWithMoreRequiredParameters', 'Updated');
|
$object = new TestClass('Bernhard');
|
||||||
|
|
||||||
|
$this->propertyAccessor->setValue($object, 'publicAccessorWithMoreRequiredParameters', 'Updated');
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -527,7 +531,9 @@ class PropertyAccessorTest extends \PHPUnit_Framework_TestCase
|
|||||||
*/
|
*/
|
||||||
public function testThrowTypeError()
|
public function testThrowTypeError()
|
||||||
{
|
{
|
||||||
$this->propertyAccessor->setValue(new TypeHinted(), 'date', 'This is a string, \DateTime expected.');
|
$object = new TypeHinted();
|
||||||
|
|
||||||
|
$this->propertyAccessor->setValue($object, 'date', 'This is a string, \DateTime expected.');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testSetTypeHint()
|
public function testSetTypeHint()
|
||||||
|
Reference in New Issue
Block a user