fixed obsolete getMock() usage

fabpot · fabpot · commit 727bf35da839 · 2016-12-19T16:22:46.000+01:00
diff --git a/Tests/Mapping/ClassMetadataTest.php b/Tests/Mapping/ClassMetadataTest.php
@@ -28,10 +28,10 @@ public function testAttributeMetadata()
     {
         $classMetadata = new ClassMetadata('c');
 
-        $a1 = $this->getMock('Symfony\Component\Serializer\Mapping\AttributeMetadataInterface');
+        $a1 = $this->getMockBuilder('Symfony\Component\Serializer\Mapping\AttributeMetadataInterface')->getMock();
         $a1->method('getName')->willReturn('a1');
 
-        $a2 = $this->getMock('Symfony\Component\Serializer\Mapping\AttributeMetadataInterface');
+        $a2 = $this->getMockBuilder('Symfony\Component\Serializer\Mapping\AttributeMetadataInterface')->getMock();
         $a2->method('getName')->willReturn('a2');
 
         $classMetadata->addAttributeMetadata($a1);
@@ -45,11 +45,11 @@ public function testMerge()
         $classMetadata1 = new ClassMetadata('c1');
         $classMetadata2 = new ClassMetadata('c2');
 
-        $ac1 = $this->getMock('Symfony\Component\Serializer\Mapping\AttributeMetadataInterface');
+        $ac1 = $this->getMockBuilder('Symfony\Component\Serializer\Mapping\AttributeMetadataInterface')->getMock();
         $ac1->method('getName')->willReturn('a1');
         $ac1->method('getGroups')->willReturn(array('a', 'b'));
 
-        $ac2 = $this->getMock('Symfony\Component\Serializer\Mapping\AttributeMetadataInterface');
+        $ac2 = $this->getMockBuilder('Symfony\Component\Serializer\Mapping\AttributeMetadataInterface')->getMock();
         $ac2->method('getName')->willReturn('a1');
         $ac2->method('getGroups')->willReturn(array('b', 'c'));
 
@@ -67,10 +67,10 @@ public function testSerialize()
     {
         $classMetadata = new ClassMetadata('a');
 
-        $a1 = $this->getMock('Symfony\Component\Serializer\Mapping\AttributeMetadataInterface');
+        $a1 = $this->getMockBuilder('Symfony\Component\Serializer\Mapping\AttributeMetadataInterface')->getMock();
         $a1->method('getName')->willReturn('b1');
 
-        $a2 = $this->getMock('Symfony\Component\Serializer\Mapping\AttributeMetadataInterface');
+        $a2 = $this->getMockBuilder('Symfony\Component\Serializer\Mapping\AttributeMetadataInterface')->getMock();
         $a2->method('getName')->willReturn('b2');
 
         $classMetadata->addAttributeMetadata($a1);
diff --git a/Tests/Mapping/Factory/ClassMetadataFactoryTest.php b/Tests/Mapping/Factory/ClassMetadataFactoryTest.php
@@ -47,7 +47,7 @@ public function testHasMetadataFor()
 
     public function testCacheExists()
     {
-        $cache = $this->getMock('Doctrine\Common\Cache\Cache');
+        $cache = $this->getMockBuilder('Doctrine\Common\Cache\Cache')->getMock();
         $cache
             ->expects($this->once())
             ->method('fetch')
@@ -60,7 +60,7 @@ public function testCacheExists()
 
     public function testCacheNotExists()
     {
-        $cache = $this->getMock('Doctrine\Common\Cache\Cache');
+        $cache = $this->getMockBuilder('Doctrine\Common\Cache\Cache')->getMock();
         $cache
             ->method('fetch')
             ->will($this->returnValue(false))
diff --git a/Tests/Normalizer/AbstractNormalizerTest.php b/Tests/Normalizer/AbstractNormalizerTest.php
@@ -29,8 +29,8 @@ class AbstractNormalizerTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $loader = $this->getMock('Symfony\Component\Serializer\Mapping\Loader\LoaderChain', array(), array(array()));
-        $this->classMetadata = $this->getMock('Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactory', array(), array($loader));
+        $loader = $this->getMockBuilder('Symfony\Component\Serializer\Mapping\Loader\LoaderChain')->setConstructorArgs(array(array()))->getMock();
+        $this->classMetadata = $this->getMockBuilder('Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactory')->setConstructorArgs(array($loader))->getMock();
         $this->normalizer = new AbstractNormalizerDummy($this->classMetadata);
     }
 
diff --git a/Tests/Normalizer/GetSetMethodNormalizerTest.php b/Tests/Normalizer/GetSetMethodNormalizerTest.php
@@ -36,7 +36,7 @@ class GetSetMethodNormalizerTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->serializer = $this->getMock(__NAMESPACE__.'\SerializerNormalizer');
+        $this->serializer = $this->getMockBuilder(__NAMESPACE__.'\SerializerNormalizer')->getMock();
         $this->normalizer = new GetSetMethodNormalizer();
         $this->normalizer->setSerializer($this->serializer);
     }
@@ -470,7 +470,7 @@ public function provideCallbacks()
      */
     public function testUnableToNormalizeObjectAttribute()
     {
-        $serializer = $this->getMock('Symfony\Component\Serializer\SerializerInterface');
+        $serializer = $this->getMockBuilder('Symfony\Component\Serializer\SerializerInterface')->getMock();
         $this->normalizer->setSerializer($serializer);
 
         $obj = new GetSetDummy();
diff --git a/Tests/Normalizer/ObjectNormalizerTest.php b/Tests/Normalizer/ObjectNormalizerTest.php
@@ -39,7 +39,7 @@ class ObjectNormalizerTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->serializer = $this->getMock(__NAMESPACE__.'\ObjectSerializerNormalizer');
+        $this->serializer = $this->getMockBuilder(__NAMESPACE__.'\ObjectSerializerNormalizer')->getMock();
         $this->normalizer = new ObjectNormalizer();
         $this->normalizer->setSerializer($this->serializer);
     }
@@ -404,7 +404,7 @@ public function provideCallbacks()
      */
     public function testUnableToNormalizeObjectAttribute()
     {
-        $serializer = $this->getMock('Symfony\Component\Serializer\SerializerInterface');
+        $serializer = $this->getMockBuilder('Symfony\Component\Serializer\SerializerInterface')->getMock();
         $this->normalizer->setSerializer($serializer);
 
         $obj = new ObjectDummy();
diff --git a/Tests/Normalizer/PropertyNormalizerTest.php b/Tests/Normalizer/PropertyNormalizerTest.php
@@ -35,7 +35,7 @@ class PropertyNormalizerTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->serializer = $this->getMock('Symfony\Component\Serializer\SerializerInterface');
+        $this->serializer = $this->getMockBuilder('Symfony\Component\Serializer\SerializerInterface')->getMock();
         $this->normalizer = new PropertyNormalizer();
         $this->normalizer->setSerializer($this->serializer);
     }
@@ -423,7 +423,7 @@ public function testDenormalizeShouldIgnoreStaticProperty()
      */
     public function testUnableToNormalizeObjectAttribute()
     {
-        $serializer = $this->getMock('Symfony\Component\Serializer\SerializerInterface');
+        $serializer = $this->getMockBuilder('Symfony\Component\Serializer\SerializerInterface')->getMock();
         $this->normalizer->setSerializer($serializer);
 
         $obj = new PropertyDummy();
diff --git a/Tests/SerializerTest.php b/Tests/SerializerTest.php
@@ -38,7 +38,7 @@ public function testInterface()
      */
     public function testNormalizeNoMatch()
     {
-        $serializer = new Serializer(array($this->getMock('Symfony\Component\Serializer\Normalizer\CustomNormalizer')));
+        $serializer = new Serializer(array($this->getMockBuilder('Symfony\Component\Serializer\Normalizer\CustomNormalizer')->getMock()));
         $serializer->normalize(new \stdClass(), 'xml');
     }
 
@@ -70,7 +70,7 @@ public function testNormalizeOnDenormalizer()
      */
     public function testDenormalizeNoMatch()
     {
-        $serializer = new Serializer(array($this->getMock('Symfony\Component\Serializer\Normalizer\CustomNormalizer')));
+        $serializer = new Serializer(array($this->getMockBuilder('Symfony\Component\Serializer\Normalizer\CustomNormalizer')->getMock()));
         $serializer->denormalize('foo', 'stdClass');
     }
 
@@ -95,14 +95,14 @@ public function testCustomNormalizerCanNormalizeCollectionsAndScalar()
 
     public function testNormalizeWithSupportOnData()
     {
-        $normalizer1 = $this->getMock('Symfony\Component\Serializer\Normalizer\NormalizerInterface');
+        $normalizer1 = $this->getMockBuilder('Symfony\Component\Serializer\Normalizer\NormalizerInterface')->getMock();
         $normalizer1->method('supportsNormalization')
             ->willReturnCallback(function ($data, $format) {
                 return isset($data->test);
             });
         $normalizer1->method('normalize')->willReturn('test1');
 
-        $normalizer2 = $this->getMock('Symfony\Component\Serializer\Normalizer\NormalizerInterface');
+        $normalizer2 = $this->getMockBuilder('Symfony\Component\Serializer\Normalizer\NormalizerInterface')->getMock();
         $normalizer2->method('supportsNormalization')
             ->willReturn(true);
         $normalizer2->method('normalize')->willReturn('test2');
@@ -118,14 +118,14 @@ public function testNormalizeWithSupportOnData()
 
     public function testDenormalizeWithSupportOnData()
     {
-        $denormalizer1 = $this->getMock('Symfony\Component\Serializer\Normalizer\DenormalizerInterface');
+        $denormalizer1 = $this->getMockBuilder('Symfony\Component\Serializer\Normalizer\DenormalizerInterface')->getMock();
         $denormalizer1->method('supportsDenormalization')
             ->willReturnCallback(function ($data, $type, $format) {
                 return isset($data['test1']);
             });
         $denormalizer1->method('denormalize')->willReturn('test1');
 
-        $denormalizer2 = $this->getMock('Symfony\Component\Serializer\Normalizer\DenormalizerInterface');
+        $denormalizer2 = $this->getMockBuilder('Symfony\Component\Serializer\Normalizer\DenormalizerInterface')->getMock();
         $denormalizer2->method('supportsDenormalization')
             ->willReturn(true);
         $denormalizer2->method('denormalize')->willReturn('test2');

Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,8 @@ class AbstractNormalizerTest extends \PHPUnit_Framework_TestCase`
`29`	`29`
`30`	`30`	`protected function setUp()`
`31`	`31`	`{`
`32`		`- $loader = $this->getMock('Symfony\Component\Serializer\Mapping\Loader\LoaderChain', array(), array(array()));`
`33`		`- $this->classMetadata = $this->getMock('Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactory', array(), array($loader));`
	`32`	`+ $loader = $this->getMockBuilder('Symfony\Component\Serializer\Mapping\Loader\LoaderChain')->setConstructorArgs(array(array()))->getMock();`
	`33`	`+ $this->classMetadata = $this->getMockBuilder('Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactory')->setConstructorArgs(array($loader))->getMock();`
`34`	`34`	`$this->normalizer = new AbstractNormalizerDummy($this->classMetadata);`
`35`	`35`	`}`
`36`	`36`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ class GetSetMethodNormalizerTest extends \PHPUnit_Framework_TestCase`
`36`	`36`
`37`	`37`	`protected function setUp()`
`38`	`38`	`{`
`39`		`- $this->serializer = $this->getMock(__NAMESPACE__.'\SerializerNormalizer');`
	`39`	`+ $this->serializer = $this->getMockBuilder(__NAMESPACE__.'\SerializerNormalizer')->getMock();`
`40`	`40`	`$this->normalizer = new GetSetMethodNormalizer();`
`41`	`41`	`$this->normalizer->setSerializer($this->serializer);`
`42`	`42`	`}`
`@@ -470,7 +470,7 @@ public function provideCallbacks()`
`470`	`470`	`*/`
`471`	`471`	`public function testUnableToNormalizeObjectAttribute()`
`472`	`472`	`{`
`473`		`- $serializer = $this->getMock('Symfony\Component\Serializer\SerializerInterface');`
	`473`	`+ $serializer = $this->getMockBuilder('Symfony\Component\Serializer\SerializerInterface')->getMock();`
`474`	`474`	`$this->normalizer->setSerializer($serializer);`
`475`	`475`
`476`	`476`	`$obj = new GetSetDummy();`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ class ObjectNormalizerTest extends \PHPUnit_Framework_TestCase`
`39`	`39`
`40`	`40`	`protected function setUp()`
`41`	`41`	`{`
`42`		`- $this->serializer = $this->getMock(__NAMESPACE__.'\ObjectSerializerNormalizer');`
	`42`	`+ $this->serializer = $this->getMockBuilder(__NAMESPACE__.'\ObjectSerializerNormalizer')->getMock();`
`43`	`43`	`$this->normalizer = new ObjectNormalizer();`
`44`	`44`	`$this->normalizer->setSerializer($this->serializer);`
`45`	`45`	`}`
`@@ -404,7 +404,7 @@ public function provideCallbacks()`
`404`	`404`	`*/`
`405`	`405`	`public function testUnableToNormalizeObjectAttribute()`
`406`	`406`	`{`
`407`		`- $serializer = $this->getMock('Symfony\Component\Serializer\SerializerInterface');`
	`407`	`+ $serializer = $this->getMockBuilder('Symfony\Component\Serializer\SerializerInterface')->getMock();`
`408`	`408`	`$this->normalizer->setSerializer($serializer);`
`409`	`409`
`410`	`410`	`$obj = new ObjectDummy();`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ class PropertyNormalizerTest extends \PHPUnit_Framework_TestCase`
`35`	`35`
`36`	`36`	`protected function setUp()`
`37`	`37`	`{`
`38`		`- $this->serializer = $this->getMock('Symfony\Component\Serializer\SerializerInterface');`
	`38`	`+ $this->serializer = $this->getMockBuilder('Symfony\Component\Serializer\SerializerInterface')->getMock();`
`39`	`39`	`$this->normalizer = new PropertyNormalizer();`
`40`	`40`	`$this->normalizer->setSerializer($this->serializer);`
`41`	`41`	`}`
`@@ -423,7 +423,7 @@ public function testDenormalizeShouldIgnoreStaticProperty()`
`423`	`423`	`*/`
`424`	`424`	`public function testUnableToNormalizeObjectAttribute()`
`425`	`425`	`{`
`426`		`- $serializer = $this->getMock('Symfony\Component\Serializer\SerializerInterface');`
	`426`	`+ $serializer = $this->getMockBuilder('Symfony\Component\Serializer\SerializerInterface')->getMock();`
`427`	`427`	`$this->normalizer->setSerializer($serializer);`
`428`	`428`
`429`	`429`	`$obj = new PropertyDummy();`