Use willReturn() instead of will(returnValue()).

Author: derrabus

Test/ConstraintValidatorTestCase.php

@@ -109,7 +109,7 @@ protected function createContext()
         $validator->expects($this->any())
             ->method('inContext')
             ->with($context)
-            ->will($this->returnValue($contextualValidator));
+            ->willReturn($contextualValidator);
 
         return $context;
     }
@@ -174,7 +174,7 @@ protected function expectValidateAt($i, $propertyPath, $value, $group)
         $validator->expects($this->at(2 * $i))
             ->method('atPath')
             ->with($propertyPath)
-            ->will($this->returnValue($validator));
+            ->willReturn($validator);
         $validator->expects($this->at(2 * $i + 1))
             ->method('validate')
             ->with($value, $this->logicalOr(null, [], $this->isInstanceOf('\Symfony\Component\Validator\Constraints\Valid')), $group);
@@ -186,7 +186,7 @@ protected function expectValidateValueAt($i, $propertyPath, $value, $constraints
         $contextualValidator->expects($this->at(2 * $i))
             ->method('atPath')
             ->with($propertyPath)
-            ->will($this->returnValue($contextualValidator));
+            ->willReturn($contextualValidator);
         $contextualValidator->expects($this->at(2 * $i + 1))
             ->method('validate')
             ->with($value, $constraints, $group);

Tests/Constraints/ExpressionValidatorTest.php

@@ -258,11 +258,11 @@ public function testExpressionLanguageUsage()
         $used = false;
 
         $expressionLanguage->method('evaluate')
-            ->will($this->returnCallback(function () use (&$used) {
+            ->willReturnCallback(function () use (&$used) {
                 $used = true;
 
                 return true;
-            }));
+            });
 
         $validator = new ExpressionValidator(null, $expressionLanguage);
         $validator->initialize($this->createContext());

Tests/Constraints/FileValidatorTest.php

@@ -291,11 +291,11 @@ public function testValidMimeType()
         $file
             ->expects($this->once())
             ->method('getPathname')
-            ->will($this->returnValue($this->path));
+            ->willReturn($this->path);
         $file
             ->expects($this->once())
             ->method('getMimeType')
-            ->will($this->returnValue('image/jpg'));
+            ->willReturn('image/jpg');
 
         $constraint = new File([
             'mimeTypes' => ['image/png', 'image/jpg'],
@@ -315,11 +315,11 @@ public function testValidWildcardMimeType()
         $file
             ->expects($this->once())
             ->method('getPathname')
-            ->will($this->returnValue($this->path));
+            ->willReturn($this->path);
         $file
             ->expects($this->once())
             ->method('getMimeType')
-            ->will($this->returnValue('image/jpg'));
+            ->willReturn('image/jpg');
 
         $constraint = new File([
             'mimeTypes' => ['image/*'],
@@ -339,11 +339,11 @@ public function testInvalidMimeType()
         $file
             ->expects($this->once())
             ->method('getPathname')
-            ->will($this->returnValue($this->path));
+            ->willReturn($this->path);
         $file
             ->expects($this->once())
             ->method('getMimeType')
-            ->will($this->returnValue('application/pdf'));
+            ->willReturn('application/pdf');
 
         $constraint = new File([
             'mimeTypes' => ['image/png', 'image/jpg'],
@@ -369,11 +369,11 @@ public function testInvalidWildcardMimeType()
         $file
             ->expects($this->once())
             ->method('getPathname')
-            ->will($this->returnValue($this->path));
+            ->willReturn($this->path);
         $file
             ->expects($this->once())
             ->method('getMimeType')
-            ->will($this->returnValue('application/pdf'));
+            ->willReturn('application/pdf');
 
         $constraint = new File([
             'mimeTypes' => ['image/*', 'image/jpg'],

Tests/ContainerConstraintValidatorFactoryTest.php

@@ -54,7 +54,7 @@ public function testGetInstanceInvalidValidatorClass()
         $constraint
             ->expects($this->once())
             ->method('validatedBy')
-            ->will($this->returnValue('Fully\\Qualified\\ConstraintValidator\\Class\\Name'));
+            ->willReturn('Fully\\Qualified\\ConstraintValidator\\Class\\Name');
 
         $factory = new ContainerConstraintValidatorFactory(new Container());
         $factory->getInstance($constraint);

Tests/Mapping/Cache/AbstractCacheTest.php

@@ -31,7 +31,7 @@ public function testWrite()
 
         $meta->expects($this->once())
             ->method('getClassName')
-            ->will($this->returnValue('Foo\\Bar'));
+            ->willReturn('Foo\\Bar');
 
         $this->cache->write($meta);
 
@@ -51,7 +51,7 @@ public function testHas()
 
         $meta->expects($this->once())
             ->method('getClassName')
-            ->will($this->returnValue('Foo\\Bar'));
+            ->willReturn('Foo\\Bar');
 
         $this->assertFalse($this->cache->has('Foo\\Bar'), 'has() returns false when there is no entry');
 
@@ -68,7 +68,7 @@ public function testRead()
 
         $meta->expects($this->once())
             ->method('getClassName')
-            ->will($this->returnValue('Foo\\Bar'));
+            ->willReturn('Foo\\Bar');
 
         $this->assertFalse($this->cache->read('Foo\\Bar'), 'read() returns false when there is no entry');
 

Tests/Mapping/Factory/LazyLoadingMetadataFactoryTest.php

@@ -97,7 +97,7 @@ public function testWriteMetadataToCache()
                   [$this->equalTo(self::PARENT_CLASS)],
                   [$this->equalTo(self::INTERFACE_A_CLASS)]
               )
-              ->will($this->returnValue(false));
+              ->willReturn(false);
         $cache->expects($this->exactly(2))
               ->method('write')
               ->withConsecutive(
@@ -172,12 +172,12 @@ public function testMetadataCacheWithRuntimeConstraint()
         $cache
             ->expects($this->any())
             ->method('write')
-            ->will($this->returnCallback(function ($metadata) { serialize($metadata); }))
+            ->willReturnCallback(function ($metadata) { serialize($metadata); })
         ;
 
         $cache->expects($this->any())
             ->method('read')
-            ->will($this->returnValue(false));
+            ->willReturn(false);
 
         $metadata = $factory->getMetadataFor(self::PARENT_CLASS);
         $metadata->addConstraint(new Callback(function () {}));

Tests/Mapping/Loader/LoaderChainTest.php

@@ -46,12 +46,12 @@ public function testReturnsTrueIfAnyLoaderReturnedTrue()
         $loader1 = $this->getMockBuilder('Symfony\Component\Validator\Mapping\Loader\LoaderInterface')->getMock();
         $loader1->expects($this->any())
             ->method('loadClassMetadata')
-            ->will($this->returnValue(true));
+            ->willReturn(true);
 
         $loader2 = $this->getMockBuilder('Symfony\Component\Validator\Mapping\Loader\LoaderInterface')->getMock();
         $loader2->expects($this->any())
             ->method('loadClassMetadata')
-            ->will($this->returnValue(false));
+            ->willReturn(false);
 
         $chain = new LoaderChain([
             $loader1,
@@ -68,12 +68,12 @@ public function testReturnsFalseIfNoLoaderReturnedTrue()
         $loader1 = $this->getMockBuilder('Symfony\Component\Validator\Mapping\Loader\LoaderInterface')->getMock();
         $loader1->expects($this->any())
             ->method('loadClassMetadata')
-            ->will($this->returnValue(false));
+            ->willReturn(false);
 
         $loader2 = $this->getMockBuilder('Symfony\Component\Validator\Mapping\Loader\LoaderInterface')->getMock();
         $loader2->expects($this->any())
             ->method('loadClassMetadata')
-            ->will($this->returnValue(false));
+            ->willReturn(false);
 
         $chain = new LoaderChain([
             $loader1,

Tests/Validator/AbstractTest.php

@@ -610,9 +610,9 @@ public function testInitializeObjectsOnFirstValidation()
         $initializer1->expects($this->once())
             ->method('initialize')
             ->with($entity)
-            ->will($this->returnCallback(function ($object) {
+            ->willReturnCallback(function ($object) {
                 $object->initialized = true;
-            }));
+            });
 
         $initializer2->expects($this->once())
             ->method('initialize')