pkp/pkp-lib#10292 removed PHPUnit deprecations

pkp · Jan 4, 2025 · efae8c7 · efae8c7
1 parent 71f3202
commit efae8c7
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 62 deletions.
diff --git a/tests/functional/ArticleBackTest.php b/tests/functional/ArticleBackTest.php
@@ -12,21 +12,23 @@
 
 namespace functional;
 
-use APP\author\Author;
-use APP\facades\Repo;
+use PKP\doi\Doi;
 use APP\issue\Issue;
+use APP\facades\Repo;
+use APP\author\Author;
+use PKP\galley\Galley;
+use PKP\oai\OAIRecord;
 use APP\journal\Journal;
-use APP\plugins\generic\jatsTemplate\classes\Article;
-use APP\plugins\generic\jatsTemplate\classes\ArticleBack;
-use APP\publication\Publication;
 use APP\section\Section;
+use PKP\tests\PKPTestCase;
 use APP\submission\Submission;
+use APP\publication\Publication;
 use PHPUnit\Framework\MockObject\MockObject;
-use PKP\doi\Doi;
-use PKP\galley\Galley;
-use PKP\oai\OAIRecord;
-use PKP\tests\PKPTestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
+use APP\plugins\generic\jatsTemplate\classes\Article;
+use APP\plugins\generic\jatsTemplate\classes\ArticleBack;
 
+#[CoversClass(ArticleBack::class)]
 class ArticleBackTest extends PKPTestCase
 {
     private string $xmlFilePath = 'plugins/generic/jatsTemplate/tests/data/';
@@ -98,7 +100,6 @@ private function createOAIRecordMockObject(): OAIRecord
         /** @var Galley|MockObject */
         $galley = $this->getMockBuilder(Galley::class)
             ->onlyMethods(['getFileType', 'getBestGalleyId'])
-            ->setProxyTarget($galley)
             ->getMock();
         $galley->expects(self::any())
             ->method('getFileType')

diff --git a/tests/functional/ArticleBodyTest.php b/tests/functional/ArticleBodyTest.php
@@ -12,25 +12,27 @@
 
 namespace functional;
 
-use APP\author\Author;
-use APP\facades\Repo;
+use PKP\doi\Doi;
 use APP\issue\Issue;
+use APP\facades\Repo;
+use APP\author\Author;
+use PKP\galley\Galley;
+use PKP\oai\OAIRecord;
 use APP\journal\Journal;
-use APP\plugins\generic\jatsTemplate\classes\Article;
-use APP\plugins\generic\jatsTemplate\classes\ArticleBody;
-use APP\publication\Publication;
 use APP\section\Section;
+use PKP\tests\PKPTestCase;
 use APP\submission\Submission;
+use APP\publication\Publication;
 use PHPUnit\Framework\MockObject\MockObject;
-use PKP\doi\Doi;
-use PKP\galley\Galley;
-use PKP\oai\OAIRecord;
-use PKP\tests\PKPTestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
+use APP\plugins\generic\jatsTemplate\classes\Article;
+use APP\plugins\generic\jatsTemplate\classes\ArticleBody;
 
+#[CoversClass(ArticleBody::class)]
 class ArticleBodyTest extends PKPTestCase
 {
-
     private string $xmlFilePath = 'plugins/generic/jatsTemplate/tests/data/';
+
     /**
      * @throws \DOMException
      */
@@ -97,7 +99,6 @@ private function createOAIRecordMockObject(): OAIRecord
         /** @var Galley|MockObject */
         $galley = $this->getMockBuilder(Galley::class)
             ->onlyMethods(['getFileType', 'getBestGalleyId'])
-            ->setProxyTarget($galley)
             ->getMock();
         $galley->expects(self::any())
             ->method('getFileType')

diff --git a/tests/functional/ArticleFrontTest.php b/tests/functional/ArticleFrontTest.php
@@ -12,24 +12,23 @@
 
 namespace functional;
 
-use APP\author\Author;
-use APP\core\Application;
+use PKP\doi\Doi;
+use APP\issue\Issue;
 use APP\core\Request;
 use APP\facades\Repo;
-use APP\issue\Issue;
+use APP\author\Author;
+use PKP\galley\Galley;
+use PKP\oai\OAIRecord;
 use APP\journal\Journal;
-use APP\plugins\generic\jatsTemplate\classes\Article;
-use APP\plugins\generic\jatsTemplate\classes\ArticleFront;
-use APP\publication\Publication;
 use APP\section\Section;
 use APP\submission\Submission;
+use APP\publication\Publication;
 use PHPUnit\Framework\MockObject\MockObject;
-use PKP\core\PKPRouter;
-use PKP\core\Dispatcher;
-use PKP\doi\Doi;
-use PKP\galley\Galley;
-use PKP\oai\OAIRecord;
+use PHPUnit\Framework\Attributes\CoversClass;
+use APP\plugins\generic\jatsTemplate\classes\Article;
+use APP\plugins\generic\jatsTemplate\classes\ArticleFront;
 
+#[CoversClass(ArticleFront::class)]
 class ArticleFrontTest extends \PKP\tests\PKPTestCase
 {
     use \APP\plugins\generic\jatsTemplate\tests\functional\UsesRequestMock;
@@ -125,7 +124,6 @@ private function createOAIRecordMockObject(): OAIRecord
         /** @var Galley|MockObject */
         $galley = $this->getMockBuilder(Galley::class)
             ->onlyMethods(['getFileType', 'getBestGalleyId'])
-            ->setProxyTarget($galley)
             ->getMock();
         $galley->expects(self::any())
             ->method('getFileType')

diff --git a/tests/functional/ArticleTest.php b/tests/functional/ArticleTest.php
@@ -12,23 +12,24 @@
 
 namespace functional;
 
-use APP\core\Application;
-use APP\author\Author;
-use APP\facades\Repo;
+use PKP\doi\Doi;
 use APP\issue\Issue;
+use APP\facades\Repo;
+use APP\author\Author;
+use PKP\galley\Galley;
+use PKP\oai\OAIRecord;
 use APP\journal\Journal;
-use APP\plugins\generic\jatsTemplate\classes\Article;
-use APP\publication\Publication;
 use APP\section\Section;
+use PKP\tests\PKPTestCase;
 use APP\submission\Submission;
+use APP\publication\Publication;
 use PHPUnit\Framework\MockObject\MockObject;
-use PKP\author\Repository as AuthorRepository;
-use PKP\doi\Doi;
 use PKP\galley\Collector as GalleyCollector;
-use PKP\galley\Galley;
-use PKP\oai\OAIRecord;
-use PKP\tests\PKPTestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PKP\author\Repository as AuthorRepository;
+use APP\plugins\generic\jatsTemplate\classes\Article;
 
+#[CoversClass(Article::class)]
 class ArticleTest extends PKPTestCase
 {
     use \APP\plugins\generic\jatsTemplate\tests\functional\UsesRequestMock;
@@ -110,7 +111,6 @@ private function createOAIRecordMockObject(): OAIRecord
         /** @var Galley|MockObject */
         $galley = $this->getMockBuilder(Galley::class)
             ->onlyMethods(['getFileType', 'getBestGalleyId'])
-            ->setProxyTarget($galley)
             ->getMock();
         $galley->expects(self::any())
             ->method('getFileType')
@@ -205,9 +205,6 @@ private function createOAIRecordMockObject(): OAIRecord
         return $record;
     }
 
-    /**
-     * @covers \APP\plugins\generic\jatsTemplate\classes\Article::convertOAIToXml
-     */
     public function testConvertToXml()
     {
         $request = $this->createRequestMockInstance();
@@ -217,9 +214,6 @@ public function testConvertToXml()
         self::assertXmlStringEqualsXmlFile($this->xmlFilePath.'ie1.xml', $article->saveXml());
     }
 
-    /**
-     * @covers \APP\plugins\generic\jatsTemplate\classes\Article::mapHtmlTagsForTitle
-     */
     public function testMapHtmlTagsForTitle(){
         $request = $this->createRequestMockInstance();
         $expected = '<bold>test</bold>';

diff --git a/tests/functional/UsesRequestMock.php b/tests/functional/UsesRequestMock.php
@@ -12,22 +12,10 @@
 
 namespace APP\plugins\generic\jatsTemplate\tests\functional;
 
-use APP\core\Application;
 use APP\core\Request;
-use APP\facades\Repo;
-use APP\issue\Issue;
-use APP\journal\Journal;
-use APP\plugins\generic\jatsTemplate\classes\Article;
-use APP\plugins\generic\jatsTemplate\classes\ArticleFront;
-use APP\publication\Publication;
-use APP\section\Section;
-use APP\submission\Submission;
 use PHPUnit\Framework\MockObject\MockObject;
 use PKP\core\PKPRouter;
 use PKP\core\Dispatcher;
-use PKP\doi\Doi;
-use PKP\galley\Galley;
-use PKP\oai\OAIRecord;
 
 trait UsesRequestMock
 {