Mocking improvements

Author: michalbundyra

test/Generic/Prototype/PrototypeClassFactoryTest.php

@@ -56,7 +56,7 @@ public function testSetNameOnGenericIsCalledOnce()
         $mockProto = $this->getMockBuilder(PrototypeGenericClass::class)
             ->setMethods(['setName'])
             ->getMock();
-        $mockProto->expects($this->once())->method('setName')->will($this->returnValue('notexist'));
+        $mockProto->expects($this->once())->method('setName')->willReturn('notexist');
         $this->prototypeFactory->setGenericPrototype($mockProto);
         $this->prototypeFactory->getClonedPrototype('notexist');
     }

test/Reflection/ClassReflectionTest.php

@@ -172,9 +172,8 @@ public function testGetAnnotationsWithNoNameInformations()
 
         $reflectionClass->setFileScanner($fileScanner);
 
-        $fileScanner->expects($this->any())
-                    ->method('getClassNameInformation')
-                    ->will($this->returnValue(false));
+        $fileScanner->method('getClassNameInformation')
+                    ->willReturn(false);
 
         self::assertFalse($reflectionClass->getAnnotations($annotationManager));
     }

test/Reflection/MethodReflectionTest.php

@@ -312,9 +312,8 @@ public function testGetAnnotationsWithNoNameInformations()
 
         $reflectionMethod->setFileScanner($fileScanner);
 
-        $fileScanner->expects($this->any())
-                    ->method('getClassNameInformation')
-                    ->will($this->returnValue(false));
+        $fileScanner->method('getClassNameInformation')
+                    ->willReturn(false);
 
         self::assertFalse($reflectionMethod->getAnnotations($annotationManager));
     }

test/Reflection/PropertyReflectionTest.php

@@ -73,9 +73,8 @@ public function testGetAnnotationsWithNoNameInformations()
 
         $reflectionProperty->setFileScanner($fileScanner);
 
-        $fileScanner->expects($this->any())
-                    ->method('getClassNameInformation')
-                    ->will($this->returnValue(false));
+        $fileScanner->method('getClassNameInformation')
+                    ->willReturn(false);
 
         self::assertFalse($reflectionProperty->getAnnotations($annotationManager));
     }