diff --git a/.gitignore b/.gitignore index fc75387..aa692a3 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ phpunit.phar composer.lock .phpunit.result.cache .idea +.phpunit* diff --git a/phpunit.xml b/phpunit.xml index 410cf16..ec9d395 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -1,25 +1,19 @@ - - - - tests - - - - - ./src - - - - - + + + + + + + + + tests + + + + + + ./src + + diff --git a/tests/ModelTest.php b/tests/ModelTest.php index 18ef7fc..a2cec0b 100644 --- a/tests/ModelTest.php +++ b/tests/ModelTest.php @@ -224,11 +224,11 @@ public function testGuardedCallback() { ModelStub::unguard(); $mock = $this->getMockBuilder('stdClass') - ->setMethods(['callback']) + ->addMethods(['callback']) ->getMock(); $mock->expects($this->once()) ->method('callback') - ->will($this->returnValue('foo')); + ->willReturn('foo'); $string = ModelStub::unguarded([$mock, 'callback']); $this->assertEquals('foo', $string); ModelStub::reguard();