Merge branch '2.7' into 2.8

nicolas-grekas · nicolas-grekas · commit 415e6f658f50 · 2015-07-24T10:37:00.000+02:00
* 2.7: [Twig+FrameworkBundle] Fix forward compat with Form 2.8 [2.6] Static Code Analysis for Components [Security/Http] Fix test relying on a private property [Serializer] Fix bugs reported in b5990be#commitcomment-12301266 Conflicts: src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/widget_attributes.html.php src/Symfony/Component/Security/Http/Tests/Firewall/AnonymousAuthenticationListenerTest.php
diff --git a/src/Symfony/Component/HttpKernel/Client.php b/src/Symfony/Component/HttpKernel/Client.php
@@ -101,7 +101,7 @@ protected function getScript($request)
 
         $r = new \ReflectionClass('\\Symfony\\Component\\ClassLoader\\ClassLoader');
         $requirePath = str_replace("'", "\\'", $r->getFileName());
-        $symfonyPath = str_replace("'", "\\'", realpath(__DIR__.'/../../..'));
+        $symfonyPath = str_replace("'", "\\'", dirname(dirname(dirname(__DIR__))));
         $errorReporting = error_reporting();
 
         $code = <<<EOF
diff --git a/src/Symfony/Component/Intl/Resources/bin/update-data.php b/src/Symfony/Component/Intl/Resources/bin/update-data.php
@@ -178,8 +178,7 @@
 $compiler = new GenrbCompiler($genrb, $genrbEnv);
 $config = new GeneratorConfig($sourceDir.'/data', $icuVersionInDownload);
 
-// Don't wrap "/data" in realpath(), in case the directory does not exist
-$baseDir = realpath(__DIR__.'/..').'/data';
+$baseDir = dirname(__DIR__).'/data';
 
 //$txtDir = $baseDir.'/txt';
 $jsonDir = $baseDir;
diff --git a/src/Symfony/Component/Security/Http/Tests/Firewall/AnonymousAuthenticationListenerTest.php b/src/Symfony/Component/Security/Http/Tests/Firewall/AnonymousAuthenticationListenerTest.php
@@ -54,10 +54,9 @@ public function testHandleWithTokenStorageHavingNoToken()
         $authenticationManager
             ->expects($this->once())
             ->method('authenticate')
-            ->with(self::logicalAnd(
-                       $this->isInstanceOf('Symfony\Component\Security\Core\Authentication\Token\AnonymousToken'),
-                       $this->attributeEqualTo('secret', 'TheSecret')
-            ))
+            ->with($this->callback(function ($token) {
+                return 'TheSecret' === $token->getSecret();
+            }))
             ->will($this->returnValue($anonymousToken))
         ;
 
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
@@ -291,7 +291,7 @@ protected function prepareForDenormalization($data)
      *
      * @throws RuntimeException
      */
-    protected function instantiateObject(array $data, $class, array &$context, \ReflectionClass $reflectionClass, $allowedAttributes)
+    protected function instantiateObject(array &$data, $class, array &$context, \ReflectionClass $reflectionClass, $allowedAttributes)
     {
         if (
             isset($context['object_to_populate']) &&
diff --git a/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
@@ -102,6 +102,7 @@ public function denormalize($data, $class, $format = null, array $context = arra
         $reflectionClass = new \ReflectionClass($class);
         $object = $this->instantiateObject($normalizedData, $class, $context, $reflectionClass, $allowedAttributes);
 
+        $classMethods = get_class_methods($object);
         foreach ($normalizedData as $attribute => $value) {
             if ($this->nameConverter) {
                 $attribute = $this->nameConverter->denormalize($attribute);
@@ -113,7 +114,7 @@ public function denormalize($data, $class, $format = null, array $context = arra
             if ($allowed && !$ignored) {
                 $setter = 'set'.ucfirst($attribute);
 
-                if (method_exists($object, $setter)) {
+                if (in_array($setter, $classMethods)) {
                     $object->$setter($value);
                 }
             }
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php
@@ -228,6 +228,12 @@ public function testConstructorWithObjectDenormalize()
         $this->assertEquals('bar', $obj->getBar());
     }
 
+    public function testConstructorWArgWithPrivateMutator()
+    {
+        $obj = $this->normalizer->denormalize(array('foo' => 'bar'), __NAMESPACE__.'\ObjectConstructorArgsWithPrivateMutatorDummy', 'any');
+        $this->assertEquals('bar', $obj->getFoo());
+    }
+
     public function testGroupsNormalize()
     {
         $classMetadataFactory = new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader()));
@@ -511,15 +517,21 @@ public function testObjectToPopulate()
     public function testDenormalizeNonExistingAttribute()
     {
         $this->assertEquals(
-            new PropertyDummy(),
-            $this->normalizer->denormalize(array('non_existing' => true), __NAMESPACE__.'\PropertyDummy')
+            new GetSetDummy(),
+            $this->normalizer->denormalize(array('non_existing' => true), __NAMESPACE__.'\GetSetDummy')
         );
     }
 
     public function testNoTraversableSupport()
     {
         $this->assertFalse($this->normalizer->supportsNormalization(new \ArrayObject()));
     }
+
+    public function testPrivateSetter()
+    {
+        $obj = $this->normalizer->denormalize(array('foo' => 'foobar'), __NAMESPACE__.'\ObjectWithPrivateSetterDummy');
+        $this->assertEquals('bar', $obj->getFoo());
+    }
 }
 
 class GetSetDummy
@@ -726,3 +738,37 @@ public function getBar_foo()
         return $this->bar_foo;
     }
 }
+
+class ObjectConstructorArgsWithPrivateMutatorDummy
+{
+    private $foo;
+
+    public function __construct($foo)
+    {
+        $this->setFoo($foo);
+    }
+
+    public function getFoo()
+    {
+        return $this->foo;
+    }
+
+    private function setFoo($foo)
+    {
+        $this->foo = $foo;
+    }
+}
+
+class ObjectWithPrivateSetterDummy
+{
+    private $foo = 'bar';
+
+    public function getFoo()
+    {
+        return $this->foo;
+    }
+
+    private function setFoo($foo)
+    {
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -291,7 +291,7 @@ protected function prepareForDenormalization($data)`
`291`	`291`	`*`
`292`	`292`	`* @throws RuntimeException`
`293`	`293`	`*/`
`294`		`- protected function instantiateObject(array $data, $class, array &$context, \ReflectionClass $reflectionClass, $allowedAttributes)`
	`294`	`+ protected function instantiateObject(array &$data, $class, array &$context, \ReflectionClass $reflectionClass, $allowedAttributes)`
`295`	`295`	`{`
`296`	`296`	`if (`
`297`	`297`	`isset($context['object_to_populate']) &&`
Original file line number	Diff line number	Diff line change
`@@ -102,6 +102,7 @@ public function denormalize($data, $class, $format = null, array $context = arra`
`102`	`102`	`$reflectionClass = new \ReflectionClass($class);`
`103`	`103`	`$object = $this->instantiateObject($normalizedData, $class, $context, $reflectionClass, $allowedAttributes);`
`104`	`104`
	`105`	`+ $classMethods = get_class_methods($object);`
`105`	`106`	`foreach ($normalizedData as $attribute => $value) {`
`106`	`107`	`if ($this->nameConverter) {`
`107`	`108`	`$attribute = $this->nameConverter->denormalize($attribute);`
`@@ -113,7 +114,7 @@ public function denormalize($data, $class, $format = null, array $context = arra`
`113`	`114`	`if ($allowed && !$ignored) {`
`114`	`115`	`$setter = 'set'.ucfirst($attribute);`
`115`	`116`
`116`		`- if (method_exists($object, $setter)) {`
	`117`	`+ if (in_array($setter, $classMethods)) {`
`117`	`118`	`$object->$setter($value);`
`118`	`119`	`}`
`119`	`120`	`}`