Merge branch '2.7' into 2.8

* 2.7:
  Fix license headers
  Ensure the ClockMock is loaded before using it in the testsuite
  Fix with_minutes option in time widget
  Fixed properties not explicitily declared

src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/DoctrineExtensionTest.php

@@ -2,12 +2,12 @@
 
 /*
  * This file is part of the Symfony package.
-*
+ *
-* (c) Fabien Potencier <fabien@symfony.com>
+ * (c) Fabien Potencier <fabien@symfony.com>
-*
+ *
-* For the full copyright and license information, please view the LICENSE
+ * For the full copyright and license information, please view the LICENSE
-* file that was distributed with this source code.
+ * file that was distributed with this source code.
-*/
+ */
 
 namespace Symfony\Bridge\Doctrine\Tests\DependencyInjection;
 

src/Symfony/Bridge/PhpUnit/bootstrap.php

@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 use Doctrine\Common\Annotations\AnnotationRegistry;
 use Symfony\Bridge\PhpUnit\DeprecationErrorHandler;
 

src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig

@@ -80,7 +80,7 @@
         {% if datetime is not defined or false == datetime -%}
             <div {{ block('widget_container_attributes') -}}>
         {%- endif -%}
-        {{- form_widget(form.hour) }}:{{ form_widget(form.minute) }}{% if with_seconds %}:{{ form_widget(form.second) }}{% endif %}
+        {{- form_widget(form.hour) }}{% if with_minutes %}:{{ form_widget(form.minute) }}{% endif %}{% if with_seconds %}:{{ form_widget(form.second) }}{% endif %}
         {% if datetime is not defined or false == datetime -%}
             </div>
         {%- endif -%}

src/Symfony/Bundle/FrameworkBundle/Command/YamlLintCommand.php

@@ -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());
         }

src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/Fixture/TestAppKernel.php

@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Bundle\FrameworkBundle\Tests\Command\CacheClearCommand\Fixture;
 
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;

src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/ConfigDump/bundles.php

@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 use Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\TestBundle;
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 

src/Symfony/Bundle/SecurityBundle/Tests/Functional/SetAclCommandTest.php

@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Bundle\SecurityBundle\Tests\Functional;
 
 /*

src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/Acl/bundles.php

@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 return array(
     new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
     new Symfony\Bundle\SecurityBundle\SecurityBundle(),

src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/PasswordEncode/bundles.php

@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 return array(
     new Symfony\Bundle\SecurityBundle\SecurityBundle(),
     new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),

src/Symfony/Component/Console/Tests/Helper/ProgressBarTest.php

@@ -16,6 +16,8 @@ use Symfony\Component\Console\Helper\Helper;
 use Symfony\Component\Console\Output\StreamOutput;
 use Symfony\Component\Console\Tests;
 
+require_once __DIR__.'/../ClockMock.php';
+
 class ProgressBarTest extends \PHPUnit_Framework_TestCase
 {
     protected function setUp()

src/Symfony/Component/Console/Tests/Style/SymfonyStyleTest.php

@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Console\Tests\Style;
 
 use PHPUnit_Framework_TestCase;

src/Symfony/Component/DependencyInjection/Compiler/CheckReferenceValidityPass.php

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

src/Symfony/Component/DependencyInjection/Compiler/ExtensionCompilerPass.php

@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;

src/Symfony/Component/DependencyInjection/Tests/Compiler/DecoratorServicePassTest.php

@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\DependencyInjection\Tests\Compiler;
 
 use Symfony\Component\DependencyInjection\Alias;

src/Symfony/Component/DependencyInjection/Tests/Compiler/ExtensionCompilerPassTest.php

@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\DependencyInjection\Tests\Compiler;
 
 use Symfony\Component\DependencyInjection\Compiler\ExtensionCompilerPass;

src/Symfony/Component/ExpressionLanguage/Resources/bin/generate_operator_regex.php

@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 $operators = array('not', '!', 'or', '||', '&&', 'and', '|', '^', '&', '==', '===', '!=', '!==', '<', '>', '>=', '<=', 'not in', 'in', '..', '+', '-', '~', '*', '/', '%', 'matches', '**');
 $operators = array_combine($operators, array_map('strlen', $operators));
 arsort($operators);

src/Symfony/Component/ExpressionLanguage/Tests/ExpressionTest.php

@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\ExpressionLanguage\Tests;
 
 use Symfony\Component\ExpressionLanguage\Expression;

src/Symfony/Component/ExpressionLanguage/Tests/ParsedExpressionTest.php

@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\ExpressionLanguage\Tests;
 
 use Symfony\Component\ExpressionLanguage\Node\ConstantNode;

src/Symfony/Component/Filesystem/Tests/LockHandlerTest.php

@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Filesystem\Tests;
 
 use Symfony\Component\Filesystem\LockHandler;

src/Symfony/Component/Form/Tests/Extension/Validator/ValidatorExtensionTest.php

@@ -1,13 +1,13 @@
 <?php
 
 /*
-* This file is part of the Symfony package.
+ * This file is part of the Symfony package.
-*
+ *
-* (c) Fabien Potencier <fabien@symfony.com>
+ * (c) Fabien Potencier <fabien@symfony.com>
-*
+ *
-* For the full copyright and license information, please view the LICENSE
+ * For the full copyright and license information, please view the LICENSE
-* file that was distributed with this source code.
+ * file that was distributed with this source code.
-*/
+ */
 
 namespace Symfony\Component\Form\Tests\Extension\Validator;
 

src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php

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

src/Symfony/Component/HttpKernel/HttpCache/Esi.php

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

src/Symfony/Component/HttpKernel/HttpCache/Ssi.php

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

src/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTestCase.php

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

src/Symfony/Component/HttpKernel/Tests/HttpCache/TestMultipleHttpKernel.php

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

src/Symfony/Component/Serializer/Tests/Encoder/JsonEncoderTest.php

@@ -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();

src/Symfony/Component/Serializer/Tests/SerializerTest.php

@@ -41,21 +41,21 @@ class SerializerTest extends \PHPUnit_Framework_TestCase
      */
     public function testNormalizeNoMatch()
     {
-        $this->serializer = new Serializer(array($this->getMock('Symfony\Component\Serializer\Normalizer\CustomNormalizer')));
+        $serializer = new Serializer(array($this->getMock('Symfony\Component\Serializer\Normalizer\CustomNormalizer')));
-        $this->serializer->normalize(new \stdClass(), 'xml');
+        $serializer->normalize(new \stdClass(), 'xml');
     }
 
     public function testNormalizeTraversable()
     {
-        $this->serializer = new Serializer(array(), array('json' => new JsonEncoder()));
+        $serializer = new Serializer(array(), array('json' => new JsonEncoder()));
-        $result = $this->serializer->serialize(new TraversableDummy(), 'json');
+        $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()));
+        $serializer = new Serializer(array(new CustomNormalizer()), array('json' => new JsonEncoder()));
-        $result = $this->serializer->serialize(new NormalizableTraversableDummy(), 'json');
+        $result = $serializer->serialize(new NormalizableTraversableDummy(), 'json');
         $this->assertEquals('{"foo":"normalizedFoo","bar":"normalizedBar"}', $result);
     }
 
@@ -64,8 +64,8 @@ class SerializerTest extends \PHPUnit_Framework_TestCase
      */
     public function testNormalizeOnDenormalizer()
     {
-        $this->serializer = new Serializer(array(new TestDenormalizer()), array());
+        $serializer = new Serializer(array(new TestDenormalizer()), array());
-        $this->assertTrue($this->serializer->normalize(new \stdClass(), 'json'));
+        $this->assertTrue($serializer->normalize(new \stdClass(), 'json'));
     }
 
     /**
@@ -73,8 +73,8 @@ class SerializerTest extends \PHPUnit_Framework_TestCase
      */
     public function testDenormalizeNoMatch()
     {
-        $this->serializer = new Serializer(array($this->getMock('Symfony\Component\Serializer\Normalizer\CustomNormalizer')));
+        $serializer = new Serializer(array($this->getMock('Symfony\Component\Serializer\Normalizer\CustomNormalizer')));
-        $this->serializer->denormalize('foo', 'stdClass');
+        $serializer->denormalize('foo', 'stdClass');
     }
 
     /**
@@ -82,40 +82,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());
+        $serializer = new Serializer(array(new TestNormalizer()), array());
-        $this->assertNull($this->serializer->normalize(array('a', 'b')));
+        $this->assertNull($serializer->normalize(array('a', 'b')));
-        $this->assertNull($this->serializer->normalize(new \ArrayObject(array('c', 'd'))));
+        $this->assertNull($serializer->normalize(new \ArrayObject(array('c', 'd'))));
-        $this->assertNull($this->serializer->normalize(array()));
+        $this->assertNull($serializer->normalize(array()));
-        $this->assertNull($this->serializer->normalize('test'));
+        $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()));
+        $serializer = new Serializer(array(), array('json' => new JsonEncoder()));
-        $result = $this->serializer->serialize('foo', 'json');
+        $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);
     }
 
@@ -124,9 +124,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');
     }
 
     /**
@@ -134,26 +134,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());
     }
 
@@ -162,9 +162,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');
     }
 
     /**
@@ -172,9 +172,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');
     }
 
     /**
@@ -182,45 +182,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);
     }
 

src/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php

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

src/Symfony/Component/VarDumper/Exception/ThrowingCasterException.php

@@ -1,13 +1,13 @@
 <?php
 
 /*
-* This file is part of the Symfony package.
+ * This file is part of the Symfony package.
-*
+ *
-* (c) Fabien Potencier <fabien@symfony.com>
+ * (c) Fabien Potencier <fabien@symfony.com>
-*
+ *
-* For the full copyright and license information, please view the LICENSE
+ * For the full copyright and license information, please view the LICENSE
-* file that was distributed with this source code.
+ * file that was distributed with this source code.
-*/
+ */
 
 namespace Symfony\Component\VarDumper\Exception;