add support for latest phpunit versions (fixes #36, via #37)

Author: tvanrijn

README.md

@@ -31,7 +31,7 @@ In order to use this adapter you need to add a new dependency to your **composer
 ```
 {
     "require": {
-	    "php": ">=5.4.0",
+	    "php": ">=7.0.0",
 	    "allure-framework/allure-phpunit": "~1.2.0"
     }
 }
@@ -62,13 +62,13 @@ In order to add such title to any test class or [test case](https://github.com/a
 ```php
 namespace Example\Tests;
 
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use Yandex\Allure\Adapter\Annotation\Title;
 
 /**
  * @Title("Human-readable test class title")
  */
-class SomeTest extends PHPUnit_Framework_TestCase
+class SomeTest extends TestCase
 {
     /**
      * @Title("Human-readable test method title")
@@ -85,14 +85,14 @@ Similarly you can add detailed description for each test class and [test method]
 ```php
 namespace Example\Tests;
 
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use Yandex\Allure\Adapter\Annotation\Description;
 use Yandex\Allure\Adapter\Model\DescriptionType;
 
 /**
  * @Description("Detailed description for test class")
  */
-class SomeTest extends PHPUnit_Framework_TestCase
+class SomeTest extends TestCase
 {
     /**
      * @Description(value = "Detailed description for <b>test class</b>.", type = DescriptionType::HTML)
@@ -110,11 +110,11 @@ Description can be added in plain text, HTML or Markdown format - simply assign
 ```php
 namespace Example\Tests;
 
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use Yandex\Allure\Adapter\Annotation\Severity;
 use Yandex\Allure\Adapter\Model\SeverityLevel;
 
-class SomeTest extends PHPUnit_Framework_TestCase
+class SomeTest extends TestCase
 {
     /**
      * @Severity(level = SeverityLevel::MINOR)
@@ -131,11 +131,11 @@ In order to add information about test method [parameters](https://github.com/al
 ```php
 namespace Example\Tests;
 
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use Yandex\Allure\Adapter\Annotation\Parameter;
 use Yandex\Allure\Adapter\Model\ParameterKind;
 
-class SomeTest extends PHPUnit_Framework_TestCase
+class SomeTest extends TestCase
 {
     /**
      * @Parameter(name = "param1", value = "value1")
@@ -153,15 +153,15 @@ In some development approaches tests are classified by [stories](https://github.
 ```php
 namespace Example\Tests;
 
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use Yandex\Allure\Adapter\Annotation\Features;
 use Yandex\Allure\Adapter\Annotation\Stories;
 
 /**
  * @Stories({"story1", "story2"})
  * @Features({"feature1", "feature2", "feature3"})
  */
-class SomeTest extends PHPUnit_Framework_TestCase
+class SomeTest extends TestCase
 {
     /**
      * @Features({"feature2"})
@@ -180,10 +180,10 @@ If you wish to [attach some files](https://github.com/allure-framework/allure-co
 ```php
 namespace Example\Tests;
 
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use Yandex\Allure\Adapter\Support\AttachmentSupport;
 
-class SomeTest extends PHPUnit_Framework_TestCase
+class SomeTest extends TestCase
 {
 
     use AttachmentSupport;
@@ -212,10 +212,10 @@ Allure framework also supports very useful feature called [steps](https://github
 ```php
 namespace Example\Tests;
 
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use Yandex\Allure\Adapter\Support\StepSupport;
 
-class SomeTest extends PHPUnit_Framework_TestCase
+class SomeTest extends TestCase
 {
 
     use StepSupport;

composer.json

@@ -16,8 +16,8 @@
         "source": "https://github.com/allure-framework/allure-phpunit"
     },
     "require": {
-	    "php": ">=5.4.0",
-        "phpunit/phpunit": ">=4.0.0",
+	    "php": ">=7.0.0",
+        "phpunit/phpunit": ">=6.0.0",
         "mikey179/vfsStream": "1.*",
         "allure-framework/allure-php-api": "~1.1.0"
     },

src/Yandex/Allure/Adapter/AllureAdapter.php

@@ -3,11 +3,14 @@
 namespace Yandex\Allure\Adapter;
 
 use Exception;
-use PHPUnit_Framework_AssertionFailedError;
-use PHPUnit_Framework_ExpectationFailedException;
-use PHPUnit_Framework_Test;
-use PHPUnit_Framework_TestListener;
-use PHPUnit_Framework_TestSuite;
+use PHPUnit\Framework\AssertionFailedError;
+use PHPUnit\Framework\ExpectationFailedException;
+use PHPUnit\Framework\Test;
+use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\TestListener;
+use PHPUnit\Framework\TestSuite;
+use PHPUnit\Framework\DataProviderTestSuite;
+use PHPUnit\Framework\Warning;
 use Yandex\Allure\Adapter\Annotation;
 use Yandex\Allure\Adapter\Event\TestCaseBrokenEvent;
 use Yandex\Allure\Adapter\Event\TestCaseCanceledEvent;
@@ -19,7 +22,7 @@
 use Yandex\Allure\Adapter\Event\TestSuiteStartedEvent;
 use Yandex\Allure\Adapter\Model;
 
-class AllureAdapter implements PHPUnit_Framework_TestListener
+class AllureAdapter implements TestListener
 {
 
     //NOTE: here we implicitly assume that PHPUnit runs in single-threaded mode
@@ -28,7 +31,7 @@ class AllureAdapter implements PHPUnit_Framework_TestListener
     private $methodName;
 
     /**
-     * Annotations that should be ignored by the annotaions parser (especially PHPUnit annotations)
+     * Annotations that should be ignored by the annotations parser (especially PHPUnit annotations)
      * @var array
      */
     private $ignoredAnnotations = [
@@ -43,7 +46,7 @@ class AllureAdapter implements PHPUnit_Framework_TestListener
     /**
      * @param string $outputDirectory XML files output directory
      * @param bool $deletePreviousResults Whether to delete previous results on return
-     * @param array $ignoredAnnotations Extra annotaions to ignore in addition to standard PHPUnit annotations
+     * @param array $ignoredAnnotations Extra annotations to ignore in addition to standard PHPUnit annotations
      */
     public function __construct(
         $outputDirectory,
@@ -83,32 +86,44 @@ public function prepareOutputDirectory($outputDirectory, $deletePreviousResults)
     /**
      * An error occurred.
      *
-     * @param PHPUnit_Framework_Test $test
+     * @param Test $test
      * @param Exception $e
      * @param float $time
      */
-    public function addError(PHPUnit_Framework_Test $test, Exception $e, $time)
+    public function addError(Test $test, Exception $e, $time)
     {
         $event = new TestCaseBrokenEvent();
         Allure::lifecycle()->fire($event->withException($e)->withMessage($e->getMessage()));
     }
 
+    /**
+     * A warning occurred.
+     *
+     * @param \PHPUnit\Framework\Test $test
+     * @param \PHPUnit\Framework\Warning $e
+     * @param float $time
+     */
+    public function addWarning(Test $test, Warning $e, $time)
+    {
+        // TODO: Implement addWarning() method.
+    }
+
     /**
      * A failure occurred.
      *
-     * @param PHPUnit_Framework_Test $test
-     * @param PHPUnit_Framework_AssertionFailedError $e
+     * @param Test $test
+     * @param AssertionFailedError $e
      * @param float $time
      */
-    public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_AssertionFailedError $e, $time)
+    public function addFailure(Test $test, AssertionFailedError $e, $time)
     {
         $event = new TestCaseFailedEvent();
 
         $message = $e->getMessage();
 
         // Append comparison diff for errors of type ExpectationFailedException (and is subclasses)
-        if (($e instanceof PHPUnit_Framework_ExpectationFailedException
-            || is_subclass_of($e, '\PHPUnit_Framework_ExpectationFailedException'))
+        if (($e instanceof ExpectationFailedException
+            || is_subclass_of($e, 'PHPUnit\Framework\ExpectationFailedException'))
             && $e->getComparisonFailure()
         ) {
             $message .= $e->getComparisonFailure()->getDiff();
@@ -120,11 +135,11 @@ public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_Asser
     /**
      * Incomplete test.
      *
-     * @param PHPUnit_Framework_Test $test
+     * @param Test $test
      * @param Exception $e
      * @param float $time
      */
-    public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $time)
+    public function addIncompleteTest(Test $test, Exception $e, $time)
     {
         $event = new TestCasePendingEvent();
         Allure::lifecycle()->fire($event->withException($e));
@@ -133,28 +148,28 @@ public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $t
     /**
      * Risky test.
      *
-     * @param PHPUnit_Framework_Test $test
+     * @param Test $test
      * @param Exception $e
      * @param float $time
      * @since  Method available since Release 4.0.0
      */
-    public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time)
+    public function addRiskyTest(Test $test, Exception $e, $time)
     {
         $this->addIncompleteTest($test, $e, $time);
     }
 
     /**
      * Skipped test.
      *
-     * @param PHPUnit_Framework_Test $test
+     * @param Test $test
      * @param Exception $e
      * @param float $time
      * @since  Method available since Release 3.0.0
      */
-    public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time)
+    public function addSkippedTest(Test $test, Exception $e, $time)
     {
         $shouldCreateStartStopEvents = false;
-        if ($test instanceof \PHPUnit_Framework_TestCase){
+        if ($test instanceof TestCase){
             $methodName = $test->getName();
             if ($methodName !== $this->methodName){
                 $shouldCreateStartStopEvents = true;
@@ -165,20 +180,20 @@ public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time
         $event = new TestCaseCanceledEvent();
         Allure::lifecycle()->fire($event->withException($e)->withMessage($e->getMessage()));
 
-        if ($shouldCreateStartStopEvents && $test instanceof \PHPUnit_Framework_TestCase){
+        if ($shouldCreateStartStopEvents && $test instanceof TestCase){
             $this->endTest($test, 0);
         }
     }
 
     /**
      * A test suite started.
      *
-     * @param PHPUnit_Framework_TestSuite $suite
+     * @param TestSuite $suite
      * @since  Method available since Release 2.2.0
      */
-    public function startTestSuite(PHPUnit_Framework_TestSuite $suite)
+    public function startTestSuite(TestSuite $suite)
     {
-        if ($suite instanceof \PHPUnit_Framework_TestSuite_DataProvider) {
+        if ($suite instanceof DataProviderTestSuite) {
             return;
         }
 
@@ -200,12 +215,12 @@ public function startTestSuite(PHPUnit_Framework_TestSuite $suite)
     /**
      * A test suite ended.
      *
-     * @param PHPUnit_Framework_TestSuite $suite
+     * @param TestSuite $suite
      * @since  Method available since Release 2.2.0
      */
-    public function endTestSuite(PHPUnit_Framework_TestSuite $suite)
+    public function endTestSuite(TestSuite $suite)
     {
-        if ($suite instanceof \PHPUnit_Framework_TestSuite_DataProvider) {
+        if ($suite instanceof DataProviderTestSuite) {
             return;
         }
 
@@ -215,11 +230,11 @@ public function endTestSuite(PHPUnit_Framework_TestSuite $suite)
     /**
      * A test started.
      *
-     * @param PHPUnit_Framework_Test $test
+     * @param Test $test
      */
-    public function startTest(PHPUnit_Framework_Test $test)
+    public function startTest(Test $test)
     {
-        if ($test instanceof \PHPUnit_Framework_TestCase) {
+        if ($test instanceof TestCase) {
             $testName = $test->getName();
             $methodName = $this->methodName = $test->getName(false);
 
@@ -237,13 +252,13 @@ public function startTest(PHPUnit_Framework_Test $test)
     /**
      * A test ended.
      *
-     * @param PHPUnit_Framework_Test $test
+     * @param Test $test
      * @param float $time
      * @throws \Exception
      */
-    public function endTest(PHPUnit_Framework_Test $test, $time)
+    public function endTest(Test $test, $time)
     {
-        if ($test instanceof \PHPUnit_Framework_TestCase) {
+        if ($test instanceof TestCase) {
             Allure::lifecycle()->fire(new TestCaseFinishedEvent());
         }
     }

test/Yandex/Allure/Adapter/AllureAdapterTest.php

@@ -2,7 +2,9 @@
 
 namespace Yandex\Allure\Adapter;
 
-
+use PHPUnit\Framework\AssertionFailedError;
+use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\TestSuite;
 use Exception;
 use org\bovigo\vfs\vfsStream;
 use Yandex\Allure\Adapter\Event\TestCaseBrokenEvent;
@@ -15,7 +17,7 @@
 const ROOT_DIRECTORY = 'test-root-directory';
 const TEST_DIRECTORY = 'test-directory';
 
-class AllureAdapterTest extends \PHPUnit_Framework_TestCase
+class AllureAdapterTest extends TestCase
 {
 
     /**
@@ -62,7 +64,7 @@ public function testAddError()
 
     public function testAddFailure()
     {
-        $exception = new \PHPUnit_Framework_AssertionFailedError(EXCEPTION_MESSAGE);
+        $exception = new AssertionFailedError(EXCEPTION_MESSAGE);
         $time = $this->getTime();
         $this->getAllureAdapter()->addFailure($this, $exception, $time);
         $events = $this->getMockedLifecycle()->getEvents();
@@ -170,7 +172,7 @@ private function getTime()
 
     private function getTestSuite()
     {
-        return new \PHPUnit_Framework_TestSuite(__CLASS__);
+        return new TestSuite(__CLASS__);
     }
 
-} 
+}