Phpunit deprecations

composer.json

@@ -34,7 +34,7 @@
     },
     "require-dev": {
         "composer/composer": "^1.0-alpha",
-        "phpunit/phpunit": "^5.1",
+        "phpunit/phpunit": "^5.4",
         "squizlabs/php_codesniffer": "^2.4"
     },
     "autoload" : {

test/Check/CheckRepositoryTest.php

@@ -16,7 +16,7 @@ class CheckRepositoryTest extends PHPUnit_Framework_TestCase
 {
     public function testRegisterViaConstructor()
     {
-        $check = $this->getMock(CheckInterface::class);
+        $check = $this->createMock(CheckInterface::class);
         $repository = new CheckRepository([$check]);
         $this->assertEquals([$check], $repository->getAll());
     }
@@ -26,17 +26,17 @@ public function testRegisterCheck()
         $repository = new CheckRepository;
         $this->assertEquals([], $repository->getAll());
 
-        $check = $this->getMock(CheckInterface::class);
+        $check = $this->createMock(CheckInterface::class);
         $repository->registerCheck($check);
         $this->assertEquals([$check], $repository->getAll());
     }
 
     public function testHas()
     {
         $repository = new CheckRepository;
-        $repository->registerCheck($this->getMock(CheckInterface::class));
+        $repository->registerCheck($this->createMock(CheckInterface::class));
 
-        $check = $this->getMock(CheckInterface::class);
+        $check = $this->createMock(CheckInterface::class);
         $repository->registerCheck($check);
 
         $this->assertTrue($repository->has(get_class($check)));
@@ -46,22 +46,20 @@ public function testHas()
     public function testGetByClassThrowsExceptionIfNotExist()
     {
         $repository = new CheckRepository;
-        $repository->registerCheck($this->getMock(CheckInterface::class));
+        $repository->registerCheck($this->createMock(CheckInterface::class));
 
-        $this->setExpectedException(
-            InvalidArgumentException::class,
-            'Check: "SomeClassWhichDoesNotExist" does not exist'
-        );
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('Check: "SomeClassWhichDoesNotExist" does not exist');
 
         $repository->getByClass('SomeClassWhichDoesNotExist');
     }
 
     public function testGetByClass()
     {
         $repository = new CheckRepository;
-        $repository->registerCheck($this->getMock(CheckInterface::class));
+        $repository->registerCheck($this->createMock(CheckInterface::class));
 
-        $check = $this->getMock(CheckInterface::class);
+        $check = $this->createMock(CheckInterface::class);
         $repository->registerCheck($check);
 
         $this->assertSame($check, $repository->getByClass(get_class($check)));

test/Check/CodeParseCheckTest.php

@@ -48,7 +48,7 @@ public function testUnParseableCodeReturnsFailure()
     {
         file_put_contents($this->file, '<?php $lol');
 
-        $result = $this->check->check($this->getMock(ExerciseInterface::class), $this->file);
+        $result = $this->check->check($this->createMock(ExerciseInterface::class), $this->file);
         $this->assertInstanceOf(Failure::class, $result);
 
         $this->assertEquals('Code Parse Check', $result->getCheckName());
@@ -62,7 +62,7 @@ public function testParseableCodeReturnsSuccess()
     {
         file_put_contents($this->file, '<?php $lol = "lol";');
 
-        $result = $this->check->check($this->getMock(ExerciseInterface::class), $this->file);
+        $result = $this->check->check($this->createMock(ExerciseInterface::class), $this->file);
         $this->assertInstanceOf(Success::class, $result);
 
         $this->assertEquals('Code Parse Check', $result->getCheckName());

test/Check/ComposerCheckTest.php

@@ -45,8 +45,8 @@ public function setUp()
 
     public function testExceptionIsThrownIfNotValidExercise()
     {
-        $exercise = $this->getMock(ExerciseInterface::class);
-        $this->setExpectedException(InvalidArgumentException::class);
+        $exercise = $this->createMock(ExerciseInterface::class);
+        $this->expectException(InvalidArgumentException::class);
 
         $this->check->check($exercise, '');
     }
@@ -77,7 +77,7 @@ public function testCheckReturnsFailureIfNoComposerLockFile()
      */
     public function testCheckReturnsFailureIfDependencyNotRequired($dependency, $solutionFile)
     {
-        $exercise = $this->getMock(ComposerExercise::class);
+        $exercise = $this->createMock(ComposerExercise::class);
         $exercise->expects($this->once())
             ->method('getRequiredPackages')
             ->will($this->returnValue([$dependency]));

test/Check/DatabaseCheckTest.php

@@ -45,7 +45,7 @@ class DatabaseCheckTest extends PHPUnit_Framework_TestCase
     public function setUp()
     {
         $this->check = new DatabaseCheck;
-        $this->exercise = $this->getMock(DatabaseExerciseInterface::class);
+        $this->exercise = $this->createMock(DatabaseExerciseInterface::class);
         $this->dbDir = sprintf(
             '%s/PhpSchool_PhpWorkshop_Check_DatabaseCheck',
             str_replace('\\', '/', realpath(sys_get_temp_dir()))
@@ -194,7 +194,7 @@ public function testRunExercise()
         $dispatcher->run(
             $this->exercise,
             __DIR__ . '/../res/database/user-solution-alter-db.php',
-            $this->getMock(OutputInterface::class)
+            $this->createMock(OutputInterface::class)
         );
     }
 

test/Check/FileExistsCheckTest.php

@@ -37,7 +37,7 @@ public function setUp()
         $this->testDir = sprintf('%s/%s', sys_get_temp_dir(), $this->getName());
         mkdir($this->testDir, 0777, true);
         $this->check = new FileExistsCheck;
-        $this->exercise = $this->getMock(ExerciseInterface::class);
+        $this->exercise = $this->createMock(ExerciseInterface::class);
         $this->assertEquals('File Exists Check', $this->check->getName());
         $this->assertEquals(ExerciseInterface::class, $this->check->getExerciseInterface());
         $this->assertEquals(SimpleCheckInterface::CHECK_BEFORE, $this->check->getPosition());

test/Check/FunctionRequirementsCheckTest.php

@@ -54,8 +54,8 @@ public function setUp()
 
     public function testExceptionIsThrownIfNotValidExercise()
     {
-        $exercise = $this->getMock(ExerciseInterface::class);
-        $this->setExpectedException(InvalidArgumentException::class);
+        $exercise = $this->createMock(ExerciseInterface::class);
+        $this->expectException(InvalidArgumentException::class);
 
         $this->check->check($exercise, '');
     }
@@ -84,7 +84,7 @@ public function testFailureIsReturnedIfBannedFunctionsAreUsed()
 
     public function testFailureIsReturnedIfNotAllRequiredFunctionsHaveBeenUsed()
     {
-        $exercise = $this->getMock(FunctionRequirementsExercise::class);
+        $exercise = $this->createMock(FunctionRequirementsExercise::class);
         $exercise
             ->expects($this->once())
             ->method('getBannedFunctions')
@@ -107,7 +107,7 @@ public function testFailureIsReturnedIfNotAllRequiredFunctionsHaveBeenUsed()
 
     public function testSuccess()
     {
-        $exercise = $this->getMock(FunctionRequirementsExercise::class);
+        $exercise = $this->createMock(FunctionRequirementsExercise::class);
         $exercise
             ->expects($this->once())
             ->method('getBannedFunctions')

test/Check/PhpLintCheckTest.php

@@ -31,7 +31,7 @@ class PhpLintCheckTest extends PHPUnit_Framework_TestCase
     public function setUp()
     {
         $this->check = new PhpLintCheck;
-        $this->exercise = $this->getMock(ExerciseInterface::class);
+        $this->exercise = $this->createMock(ExerciseInterface::class);
         $this->assertEquals('PHP Code Check', $this->check->getName());
         $this->assertEquals(ExerciseInterface::class, $this->check->getExerciseInterface());
         $this->assertEquals(SimpleCheckInterface::CHECK_BEFORE, $this->check->getPosition());

test/CodeInsertionTest.php

@@ -15,13 +15,13 @@ class CodeInsertionTest extends PHPUnit_Framework_TestCase
 {
     public function testInvalidType()
     {
-        $this->setExpectedException(InvalidArgumentException::class);
+        $this->expectException(InvalidArgumentException::class);
         new CodeInsertion('notatype', '');
     }
 
     public function testInvalidCode()
     {
-        $this->setExpectedException(InvalidArgumentException::class);
+        $this->expectException(InvalidArgumentException::class);
         new CodeInsertion(CodeInsertion::TYPE_BEFORE, new \stdClass);
     }
 

test/CodePatcherTest.php

@@ -29,7 +29,7 @@ public function testDefaultPatchIsAppliedIfAvailable()
             ->withInsertion(new Insertion(Insertion::TYPE_BEFORE, 'ini_set("display_errors", 1);'));
 
         $patcher = new CodePatcher((new ParserFactory)->create(ParserFactory::PREFER_PHP7), new Standard, $patch);
-        $exercise = $this->getMock(ExerciseInterface::class);
+        $exercise = $this->createMock(ExerciseInterface::class);
 
         $expected = "<?php\n\nini_set(\"display_errors\", 1);\n\$original = true;";
         $this->assertEquals($expected, $patcher->patch($exercise, '<?php $original = true;'));
@@ -39,7 +39,7 @@ public function testDefaultPatchIsAppliedIfAvailable()
     public function testPatcherDoesNotApplyPatchIfNotPatchableExercise()
     {
         $patcher = new CodePatcher((new ParserFactory)->create(ParserFactory::PREFER_PHP7), new Standard);
-        $exercise = $this->getMock(ExerciseInterface::class);
+        $exercise = $this->createMock(ExerciseInterface::class);
 
         $code = '<?php $original = true;';
         $this->assertEquals($code, $patcher->patch($exercise, $code));
@@ -56,7 +56,7 @@ public function testPatcher($code, Patch $patch, $expectedResult)
     {
         $patcher = new CodePatcher((new ParserFactory)->create(ParserFactory::PREFER_PHP7), new Standard);
 
-        $exercise = $this->getMock(PatchableExercise::class);
+        $exercise = $this->createMock(PatchableExercise::class);
 
         $exercise
             ->expects($this->once())

test/Command/CreditsCommandTest.php

@@ -36,7 +36,7 @@ public function testInvoke()
                 '@AydinHassan' => 'Aydin Hassan',
                 '@mikeymike'   => 'Michael Woodward',
             ],
-            new StdOutput($color, $this->getMock(TerminalInterface::class)),
+            new StdOutput($color, $this->createMock(TerminalInterface::class)),
             $color
         );
 
@@ -58,7 +58,7 @@ public function testWithOnlyCoreContributors()
                 '@chris3ailey' => 'Chris Bailey'
             ],
             [],
-            new StdOutput($color, $this->getMock(TerminalInterface::class)),
+            new StdOutput($color, $this->createMock(TerminalInterface::class)),
             $color
         );
 
@@ -75,7 +75,7 @@ public function testWithNoContributors()
         $command = new CreditsCommand(
             [],
             [],
-            new StdOutput($color, $this->getMock(TerminalInterface::class)),
+            new StdOutput($color, $this->createMock(TerminalInterface::class)),
             $color
         );
 

test/Command/HelpCommandTest.php

@@ -24,7 +24,7 @@ public function testInvoke()
 
         $command = new HelpCommand(
             'learnyouphp',
-            new StdOutput($color, $this->getMock(TerminalInterface::class)),
+            new StdOutput($color, $this->createMock(TerminalInterface::class)),
             $color
         );
 

test/Command/MenuCommandInvokerTest.php

@@ -15,20 +15,20 @@ class MenuCommandInvokerTest extends PHPUnit_Framework_TestCase
 {
     public function testInvoker()
     {
-        $menu = $this->getMockBuilder(CliMenu::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
+        $menu = $this->createMock(CliMenu::class);
         $menu
             ->expects($this->once())
             ->method('close');
 
-        $command = $this->getMock('stdClass', ['myCallBack']);
+        $command = $this->getMockBuilder('stdClass')
+            ->setMethods(['__invoke'])
+            ->getMock();
+
         $command
             ->expects($this->once())
-            ->method('myCallBack');
-        
-        $invoker = new MenuCommandInvoker([$command, 'myCallBack']);
+            ->method('__invoke');
+
+        $invoker = new MenuCommandInvoker($command);
         $invoker->__invoke($menu);
     }
 }

test/Command/MenuCommandTest.php

@@ -16,10 +16,7 @@ class MenuCommandTest extends PHPUnit_Framework_TestCase
 {
     public function testInvoke()
     {
-        $menu = $this->getMockBuilder(CliMenu::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
+        $menu = $this->createMock(CliMenu::class);
         $menu
             ->expects($this->once())
             ->method('open');

test/Command/PrintCommandTest.php

@@ -21,12 +21,8 @@ public function testErrorIsPrintedIfNoExerciseAssigned()
     {
         $repo = new ExerciseRepository([]);
         $state = new UserState;
-        $output = $this->getMockBuilder(OutputInterface::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $renderer = $this->getMockBuilder(MarkdownRenderer::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $output = $this->createMock(OutputInterface::class);
+        $renderer = $this->createMock(MarkdownRenderer::class);
 
         $output
             ->expects($this->once())
@@ -42,7 +38,7 @@ public function testExerciseIsPrintedIfAssigned()
         $file = tempnam(sys_get_temp_dir(), 'pws');
         file_put_contents($file, '### Exercise 1');
 
-        $exercise = $this->getMock(ExerciseInterface::class);
+        $exercise = $this->createMock(ExerciseInterface::class);
         $exercise
             ->expects($this->once())
             ->method('getProblem')
@@ -58,12 +54,8 @@ public function testExerciseIsPrintedIfAssigned()
         $state = new UserState;
         $state->setCurrentExercise('current-exercise');
 
-        $output = $this->getMockBuilder(OutputInterface::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $renderer = $this->getMockBuilder(MarkdownRenderer::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $output = $this->createMock(OutputInterface::class);
+        $renderer = $this->createMock(MarkdownRenderer::class);
 
         $renderer
             ->expects($this->once())