Merge pull request #224 from aik099/prophecy-phpunit9-compat

Fixed Prophecy-related deprecations on PHPUnit 9.x
console-helpers · Jan 2, 2025 · 7c811b7 · 7c811b7
2 parents 78fc187 + 2767dc7
commit 7c811b7
Show file tree

Hide file tree

Showing 8 changed files with 74 additions and 12 deletions.
diff --git a/composer.json b/composer.json
@@ -18,7 +18,8 @@
         "aik099/coding-standard": "dev-master",
         "squizlabs/php_codesniffer": "^2.6",
         "yoast/phpunit-polyfills": "^1.0",
-        "phpspec/prophecy": "^1.10"
+        "phpspec/prophecy": "^1.10",
+        "console-helpers/prophecy-phpunit": "^3.0"
     },
     "autoload": {
         "psr-4" : {

diff --git a/composer.lock b/composer.lock
diff --git a/tests/Jira/AbstractTestCase.php b/tests/Jira/AbstractTestCase.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Tests\chobie\Jira;
+
+
+use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
+
+abstract class AbstractTestCase extends TestCase
+{
+
+	use ProphecyTrait;
+}
diff --git a/tests/Jira/Api/Authentication/BasicTest.php b/tests/Jira/Api/Authentication/BasicTest.php
@@ -4,9 +4,8 @@
 
 
 use chobie\Jira\Api\Authentication\Basic;
-use PHPUnit\Framework\TestCase;
 
-class BasicTest extends TestCase
+class BasicTest extends AbstractTestCase
 {
 
 	public function testBasicAuthentication()

diff --git a/tests/Jira/Api/Client/AbstractClientTestCase.php b/tests/Jira/Api/Client/AbstractClientTestCase.php
@@ -8,10 +8,10 @@
 use chobie\Jira\Api\Authentication\AuthenticationInterface;
 use chobie\Jira\Api\Authentication\Basic;
 use chobie\Jira\Api\Client\ClientInterface;
-use PHPUnit\Framework\TestCase;
+use Tests\chobie\Jira\AbstractTestCase;
 use Yoast\PHPUnitPolyfills\Polyfills\ExpectException;
 
-abstract class AbstractClientTestCase extends TestCase
+abstract class AbstractClientTestCase extends AbstractTestCase
 {
 
 	use ExpectException;

diff --git a/tests/Jira/ApiTest.php b/tests/Jira/ApiTest.php
@@ -7,15 +7,14 @@
 use chobie\Jira\Api\Authentication\AuthenticationInterface;
 use chobie\Jira\Api\Result;
 use chobie\Jira\IssueType;
-use PHPUnit\Framework\TestCase;
 use Prophecy\Prophecy\ObjectProphecy;
 
 /**
  * Class ApiTest
  *
  * @package Tests\chobie\Jira
  */
-class ApiTest extends TestCase
+class ApiTest extends AbstractTestCase
 {
 
 	const ENDPOINT = 'http://jira.company.com';

diff --git a/tests/Jira/IssueTypeTest.php b/tests/Jira/IssueTypeTest.php
@@ -4,10 +4,9 @@
 
 
 use chobie\Jira\IssueType;
-use PHPUnit\Framework\TestCase;
 use Yoast\PHPUnitPolyfills\Polyfills\ExpectException;
 
-class IssueTypeTest extends TestCase
+class IssueTypeTest extends AbstractTestCase
 {
 	use ExpectException;
 

diff --git a/tests/Jira/Issues/WalkerTest.php b/tests/Jira/Issues/WalkerTest.php
@@ -7,12 +7,12 @@
 use chobie\Jira\Api\UnauthorizedException;
 use chobie\Jira\Issue;
 use chobie\Jira\Issues\Walker;
-use PHPUnit\Framework\TestCase;
 use Prophecy\Prophecy\ObjectProphecy;
+use Tests\chobie\Jira\AbstractTestCase;
 use Yoast\PHPUnitPolyfills\Polyfills\AssertStringContains;
 use Yoast\PHPUnitPolyfills\Polyfills\ExpectException;
 
-class WalkerTest extends TestCase
+class WalkerTest extends AbstractTestCase
 {
 
 	use ExpectException, AssertStringContains;