fixed testsetup

Author: wachterjohannes

composer.json

@@ -19,7 +19,7 @@
         "doctrine/orm": "^2.5"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8",
+        "phpunit/phpunit": "^4.8 || ^5.7",
         "symfony/framework-bundle": "^2.6",
         "symfony/finder": "^2.6",
         "doctrine/doctrine-bundle": "^1.5",

tests/Functional/Handler/TaskHandlerFactoryTest.php

@@ -12,7 +12,6 @@
 namespace Task\TaskBundle\Tests\Functional\Handler;
 
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
-use Task\Handler\TaskHandlerNotExistsException;
 use Task\TaskBundle\Handler\TaskHandlerFactory;
 use Task\TaskBundle\Tests\Functional\TestHandler;
 
@@ -39,10 +38,11 @@ public function testCreate()
         $this->assertInstanceOf(TestHandler::class, $this->taskHandlerFactory->create(TestHandler::class));
     }
 
+    /**
+     * @expectedException \Task\Handler\TaskHandlerNotExistsException
+     */
     public function testCreateNotExists()
     {
-        $this->setExpectedException(TaskHandlerNotExistsException::class);
-
         $this->taskHandlerFactory->create(\stdClass::class);
     }
 }

tests/Unit/Builder/TaskBuilderTest.php

@@ -3,7 +3,6 @@
 namespace Task\TaskBundle\Unit\Builder;
 
 use Task\Scheduler\TaskSchedulerInterface;
-use Task\TaskBundle\Builder\NotSupportedMethodException;
 use Task\TaskBundle\Builder\TaskBuilder;
 use Task\TaskBundle\Entity\Task;
 use Task\TaskInterface;
@@ -21,10 +20,11 @@ public function testSetSystemKey()
         $task->setSystemKey('test')->shouldBeCalled();
     }
 
+    /**
+     * @expectedException \Task\TaskBundle\Builder\NotSupportedMethodException
+     */
     public function testSetSystemKeyNotSupported()
     {
-        $this->setExpectedException(NotSupportedMethodException::class);
-
         $task = $this->prophesize(TaskInterface::class);
         $scheduler = $this->prophesize(TaskSchedulerInterface::class);
 

tests/Unit/Handler/TaskHandlerFactoryTest.php

@@ -11,7 +11,6 @@
 
 namespace Task\TaskBundle\Tests\Unit\Handler;
 
-use Task\Handler\TaskHandlerNotExistsException;
 use Task\TaskBundle\Handler\TaskHandlerFactory;
 use Task\TaskBundle\Tests\Functional\TestHandler;
 
@@ -28,19 +27,21 @@ public function testCreate()
         $this->assertEquals($handler, $taskHandlerFactory->create(TestHandler::class));
     }
 
+    /**
+     * @expectedException \Task\Handler\TaskHandlerNotExistsException
+     */
     public function testCreateNotExists()
     {
-        $this->setExpectedException(TaskHandlerNotExistsException::class);
-
         $taskHandlerFactory = new TaskHandlerFactory([TestHandler::class => new TestHandler()]);
 
         $taskHandlerFactory->create(\stdClass::class);
     }
 
+    /**
+     * @expectedException \Task\Handler\TaskHandlerNotExistsException
+     */
     public function testCreateNoHandler()
     {
-        $this->setExpectedException(TaskHandlerNotExistsException::class);
-
         $taskHandlerFactory = new TaskHandlerFactory([]);
 
         $taskHandlerFactory->create(\stdClass::class);