minor #15765 Fixed properties not explicitily declared (deguif)

This PR was merged into the 2.7 branch.

Discussion
----------

Fixed properties not explicitily declared

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | n/a
| License       | MIT

Commits
-------

d2b3fe4 Fixed properties not explicitily declared
This commit is contained in:
Fabien Potencier 2015-09-26 10:14:04 +02:00
commit 61550dc564
10 changed files with 67 additions and 55 deletions

View File

@ -105,9 +105,9 @@ EOF
private function validate($content, $file = null)
{
$this->parser = new Parser();
$parser = new Parser();
try {
$this->parser->parse($content);
$parser->parse($content);
} catch (ParseException $e) {
return array('file' => $file, 'valid' => false, 'message' => $e->getMessage());
}

View File

@ -64,7 +64,6 @@ class CheckReferenceValidityPass implements CompilerPassInterface
}
$this->currentId = $id;
$this->currentDefinition = $definition;
$this->currentScope = $scope = $definition->getScope();
if (ContainerInterface::SCOPE_CONTAINER === $scope) {

View File

@ -34,6 +34,7 @@ class DumpDataCollector extends DataCollector implements DataDumperInterface
private $clonesIndex = 0;
private $rootRefs;
private $charset;
private $requestStack;
private $dumper;
private $dumperIsInjected;

View File

@ -200,7 +200,6 @@ class Esi implements SurrogateInterface
*/
public function process(Request $request, Response $response)
{
$this->request = $request;
$type = $response->headers->get('Content-Type');
if (empty($type)) {
$type = 'text/html';

View File

@ -113,7 +113,6 @@ class Ssi implements SurrogateInterface
*/
public function process(Request $request, Response $response)
{
$this->request = $request;
$type = $response->headers->get('Content-Type');
if (empty($type)) {
$type = 'text/html';

View File

@ -28,6 +28,7 @@ class HttpCacheTestCase extends \PHPUnit_Framework_TestCase
protected $responses;
protected $catch;
protected $esi;
protected $store;
protected function setUp()
{

View File

@ -23,7 +23,7 @@ class TestMultipleHttpKernel extends HttpKernel implements ControllerResolverInt
protected $bodies = array();
protected $statuses = array();
protected $headers = array();
protected $call = false;
protected $called = false;
protected $backendRequest;
public function __construct($responses)
@ -75,6 +75,6 @@ class TestMultipleHttpKernel extends HttpKernel implements ControllerResolverInt
public function reset()
{
$this->call = false;
$this->called = false;
}
}

View File

@ -17,6 +17,9 @@ use Symfony\Component\Serializer\Normalizer\CustomNormalizer;
class JsonEncoderTest extends \PHPUnit_Framework_TestCase
{
private $encoder;
private $serializer;
protected function setUp()
{
$this->encoder = new JsonEncoder();

View File

@ -38,21 +38,21 @@ class SerializerTest extends \PHPUnit_Framework_TestCase
*/
public function testNormalizeNoMatch()
{
$this->serializer = new Serializer(array($this->getMock('Symfony\Component\Serializer\Normalizer\CustomNormalizer')));
$this->serializer->normalize(new \stdClass(), 'xml');
$serializer = new Serializer(array($this->getMock('Symfony\Component\Serializer\Normalizer\CustomNormalizer')));
$serializer->normalize(new \stdClass(), 'xml');
}
public function testNormalizeTraversable()
{
$this->serializer = new Serializer(array(), array('json' => new JsonEncoder()));
$result = $this->serializer->serialize(new TraversableDummy(), 'json');
$serializer = new Serializer(array(), array('json' => new JsonEncoder()));
$result = $serializer->serialize(new TraversableDummy(), 'json');
$this->assertEquals('{"foo":"foo","bar":"bar"}', $result);
}
public function testNormalizeGivesPriorityToInterfaceOverTraversable()
{
$this->serializer = new Serializer(array(new CustomNormalizer()), array('json' => new JsonEncoder()));
$result = $this->serializer->serialize(new NormalizableTraversableDummy(), 'json');
$serializer = new Serializer(array(new CustomNormalizer()), array('json' => new JsonEncoder()));
$result = $serializer->serialize(new NormalizableTraversableDummy(), 'json');
$this->assertEquals('{"foo":"normalizedFoo","bar":"normalizedBar"}', $result);
}
@ -61,8 +61,8 @@ class SerializerTest extends \PHPUnit_Framework_TestCase
*/
public function testNormalizeOnDenormalizer()
{
$this->serializer = new Serializer(array(new TestDenormalizer()), array());
$this->assertTrue($this->serializer->normalize(new \stdClass(), 'json'));
$serializer = new Serializer(array(new TestDenormalizer()), array());
$this->assertTrue($serializer->normalize(new \stdClass(), 'json'));
}
/**
@ -70,8 +70,8 @@ class SerializerTest extends \PHPUnit_Framework_TestCase
*/
public function testDenormalizeNoMatch()
{
$this->serializer = new Serializer(array($this->getMock('Symfony\Component\Serializer\Normalizer\CustomNormalizer')));
$this->serializer->denormalize('foo', 'stdClass');
$serializer = new Serializer(array($this->getMock('Symfony\Component\Serializer\Normalizer\CustomNormalizer')));
$serializer->denormalize('foo', 'stdClass');
}
/**
@ -79,40 +79,40 @@ class SerializerTest extends \PHPUnit_Framework_TestCase
*/
public function testDenormalizeOnNormalizer()
{
$this->serializer = new Serializer(array(new TestNormalizer()), array());
$serializer = new Serializer(array(new TestNormalizer()), array());
$data = array('title' => 'foo', 'numbers' => array(5, 3));
$this->assertTrue($this->serializer->denormalize(json_encode($data), 'stdClass', 'json'));
$this->assertTrue($serializer->denormalize(json_encode($data), 'stdClass', 'json'));
}
public function testCustomNormalizerCanNormalizeCollectionsAndScalar()
{
$this->serializer = new Serializer(array(new TestNormalizer()), array());
$this->assertNull($this->serializer->normalize(array('a', 'b')));
$this->assertNull($this->serializer->normalize(new \ArrayObject(array('c', 'd'))));
$this->assertNull($this->serializer->normalize(array()));
$this->assertNull($this->serializer->normalize('test'));
$serializer = new Serializer(array(new TestNormalizer()), array());
$this->assertNull($serializer->normalize(array('a', 'b')));
$this->assertNull($serializer->normalize(new \ArrayObject(array('c', 'd'))));
$this->assertNull($serializer->normalize(array()));
$this->assertNull($serializer->normalize('test'));
}
public function testSerialize()
{
$this->serializer = new Serializer(array(new GetSetMethodNormalizer()), array('json' => new JsonEncoder()));
$serializer = new Serializer(array(new GetSetMethodNormalizer()), array('json' => new JsonEncoder()));
$data = array('title' => 'foo', 'numbers' => array(5, 3));
$result = $this->serializer->serialize(Model::fromArray($data), 'json');
$result = $serializer->serialize(Model::fromArray($data), 'json');
$this->assertEquals(json_encode($data), $result);
}
public function testSerializeScalar()
{
$this->serializer = new Serializer(array(), array('json' => new JsonEncoder()));
$result = $this->serializer->serialize('foo', 'json');
$serializer = new Serializer(array(), array('json' => new JsonEncoder()));
$result = $serializer->serialize('foo', 'json');
$this->assertEquals('"foo"', $result);
}
public function testSerializeArrayOfScalars()
{
$this->serializer = new Serializer(array(), array('json' => new JsonEncoder()));
$serializer = new Serializer(array(), array('json' => new JsonEncoder()));
$data = array('foo', array(5, 3));
$result = $this->serializer->serialize($data, 'json');
$result = $serializer->serialize($data, 'json');
$this->assertEquals(json_encode($data), $result);
}
@ -121,9 +121,9 @@ class SerializerTest extends \PHPUnit_Framework_TestCase
*/
public function testSerializeNoEncoder()
{
$this->serializer = new Serializer(array(), array());
$serializer = new Serializer(array(), array());
$data = array('title' => 'foo', 'numbers' => array(5, 3));
$this->serializer->serialize($data, 'json');
$serializer->serialize($data, 'json');
}
/**
@ -131,26 +131,26 @@ class SerializerTest extends \PHPUnit_Framework_TestCase
*/
public function testSerializeNoNormalizer()
{
$this->serializer = new Serializer(array(), array('json' => new JsonEncoder()));
$serializer = new Serializer(array(), array('json' => new JsonEncoder()));
$data = array('title' => 'foo', 'numbers' => array(5, 3));
$this->serializer->serialize(Model::fromArray($data), 'json');
$serializer->serialize(Model::fromArray($data), 'json');
}
public function testDeserialize()
{
$this->serializer = new Serializer(array(new GetSetMethodNormalizer()), array('json' => new JsonEncoder()));
$serializer = new Serializer(array(new GetSetMethodNormalizer()), array('json' => new JsonEncoder()));
$data = array('title' => 'foo', 'numbers' => array(5, 3));
$result = $this->serializer->deserialize(json_encode($data), '\Symfony\Component\Serializer\Tests\Model', 'json');
$result = $serializer->deserialize(json_encode($data), '\Symfony\Component\Serializer\Tests\Model', 'json');
$this->assertEquals($data, $result->toArray());
}
public function testDeserializeUseCache()
{
$this->serializer = new Serializer(array(new GetSetMethodNormalizer()), array('json' => new JsonEncoder()));
$serializer = new Serializer(array(new GetSetMethodNormalizer()), array('json' => new JsonEncoder()));
$data = array('title' => 'foo', 'numbers' => array(5, 3));
$this->serializer->deserialize(json_encode($data), '\Symfony\Component\Serializer\Tests\Model', 'json');
$serializer->deserialize(json_encode($data), '\Symfony\Component\Serializer\Tests\Model', 'json');
$data = array('title' => 'bar', 'numbers' => array(2, 8));
$result = $this->serializer->deserialize(json_encode($data), '\Symfony\Component\Serializer\Tests\Model', 'json');
$result = $serializer->deserialize(json_encode($data), '\Symfony\Component\Serializer\Tests\Model', 'json');
$this->assertEquals($data, $result->toArray());
}
@ -159,9 +159,9 @@ class SerializerTest extends \PHPUnit_Framework_TestCase
*/
public function testDeserializeNoNormalizer()
{
$this->serializer = new Serializer(array(), array('json' => new JsonEncoder()));
$serializer = new Serializer(array(), array('json' => new JsonEncoder()));
$data = array('title' => 'foo', 'numbers' => array(5, 3));
$this->serializer->deserialize(json_encode($data), '\Symfony\Component\Serializer\Tests\Model', 'json');
$serializer->deserialize(json_encode($data), '\Symfony\Component\Serializer\Tests\Model', 'json');
}
/**
@ -169,9 +169,9 @@ class SerializerTest extends \PHPUnit_Framework_TestCase
*/
public function testDeserializeWrongNormalizer()
{
$this->serializer = new Serializer(array(new CustomNormalizer()), array('json' => new JsonEncoder()));
$serializer = new Serializer(array(new CustomNormalizer()), array('json' => new JsonEncoder()));
$data = array('title' => 'foo', 'numbers' => array(5, 3));
$this->serializer->deserialize(json_encode($data), '\Symfony\Component\Serializer\Tests\Model', 'json');
$serializer->deserialize(json_encode($data), '\Symfony\Component\Serializer\Tests\Model', 'json');
}
/**
@ -179,45 +179,45 @@ class SerializerTest extends \PHPUnit_Framework_TestCase
*/
public function testDeserializeNoEncoder()
{
$this->serializer = new Serializer(array(), array());
$serializer = new Serializer(array(), array());
$data = array('title' => 'foo', 'numbers' => array(5, 3));
$this->serializer->deserialize(json_encode($data), '\Symfony\Component\Serializer\Tests\Model', 'json');
$serializer->deserialize(json_encode($data), '\Symfony\Component\Serializer\Tests\Model', 'json');
}
public function testDeserializeSupported()
{
$this->serializer = new Serializer(array(new GetSetMethodNormalizer()), array());
$serializer = new Serializer(array(new GetSetMethodNormalizer()), array());
$data = array('title' => 'foo', 'numbers' => array(5, 3));
$this->assertTrue($this->serializer->supportsDenormalization(json_encode($data), '\Symfony\Component\Serializer\Tests\Model', 'json'));
$this->assertTrue($serializer->supportsDenormalization(json_encode($data), '\Symfony\Component\Serializer\Tests\Model', 'json'));
}
public function testDeserializeNotSupported()
{
$this->serializer = new Serializer(array(new GetSetMethodNormalizer()), array());
$serializer = new Serializer(array(new GetSetMethodNormalizer()), array());
$data = array('title' => 'foo', 'numbers' => array(5, 3));
$this->assertFalse($this->serializer->supportsDenormalization(json_encode($data), 'stdClass', 'json'));
$this->assertFalse($serializer->supportsDenormalization(json_encode($data), 'stdClass', 'json'));
}
public function testDeserializeNotSupportedMissing()
{
$this->serializer = new Serializer(array(), array());
$serializer = new Serializer(array(), array());
$data = array('title' => 'foo', 'numbers' => array(5, 3));
$this->assertFalse($this->serializer->supportsDenormalization(json_encode($data), '\Symfony\Component\Serializer\Tests\Model', 'json'));
$this->assertFalse($serializer->supportsDenormalization(json_encode($data), '\Symfony\Component\Serializer\Tests\Model', 'json'));
}
public function testEncode()
{
$this->serializer = new Serializer(array(), array('json' => new JsonEncoder()));
$serializer = new Serializer(array(), array('json' => new JsonEncoder()));
$data = array('foo', array(5, 3));
$result = $this->serializer->encode($data, 'json');
$result = $serializer->encode($data, 'json');
$this->assertEquals(json_encode($data), $result);
}
public function testDecode()
{
$this->serializer = new Serializer(array(), array('json' => new JsonEncoder()));
$serializer = new Serializer(array(), array('json' => new JsonEncoder()));
$data = array('foo', array(5, 3));
$result = $this->serializer->decode(json_encode($data), 'json');
$result = $serializer->decode(json_encode($data), 'json');
$this->assertEquals($data, $result);
}
}

View File

@ -44,6 +44,16 @@ class RecursiveContextualValidator implements ContextualValidatorInterface
*/
private $context;
/**
* @var string
*/
private $defaultPropertyPath;
/**
* @var array
*/
private $defaultGroups;
/**
* @var MetadataFactoryInterface
*/