Merge pull request #266 from elifesciences/upgrade-phpunit

Update to a later version of PHPUnit
elifesciences · Nov 7, 2024 · d9ea575 · d9ea575
2 parents 6b257cd + aa6763e
commit d9ea575
Show file tree

Hide file tree

Showing 108 changed files with 216 additions and 213 deletions.
diff --git a/composer.json b/composer.json
@@ -32,7 +32,7 @@
         "mtdowling/jmespath.php": "^2.0",
         "phpspec/phpspec": "^5.1 || ^6.3 || ^7.5",
         "phpspec/prophecy": "^1.10",
-        "phpunit/phpunit": "^5.2",
+        "phpunit/phpunit": "^7.5",
         "psr/http-message": "^1.0",
         "squizlabs/php_codesniffer": "^3.5"
     },

diff --git a/test/Collection/ArraySequenceTest.php b/test/Collection/ArraySequenceTest.php
@@ -5,9 +5,9 @@
 use BadMethodCallException;
 use eLife\ApiSdk\Collection\ArraySequence;
 use eLife\ApiSdk\Collection\Sequence;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
-final class ArraySequenceTest extends PHPUnit_Framework_TestCase
+final class ArraySequenceTest extends TestCase
 {
     /**
      * @test

diff --git a/test/Collection/EmptySequenceTest.php b/test/Collection/EmptySequenceTest.php
@@ -6,9 +6,9 @@
 use eLife\ApiSdk\Collection\EmptySequence;
 use eLife\ApiSdk\Collection\Sequence;
 use Exception;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
-final class EmptySequenceTest extends PHPUnit_Framework_TestCase
+final class EmptySequenceTest extends TestCase
 {
     /**
      * @test

diff --git a/test/Collection/PromiseSequenceTest.php b/test/Collection/PromiseSequenceTest.php
@@ -13,9 +13,9 @@
 use GuzzleHttp\Promise\PromiseInterface;
 use function GuzzleHttp\Promise\rejection_for;
 use LogicException;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
-final class PromiseSequenceTest extends PHPUnit_Framework_TestCase
+final class PromiseSequenceTest extends TestCase
 {
     /**
      * @test

diff --git a/test/Model/AccessControlTest.php b/test/Model/AccessControlTest.php
@@ -3,10 +3,10 @@
 namespace test\eLife\ApiSdk\Model;
 
 use eLife\ApiSdk\Model\AccessControl;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use test\eLife\ApiSdk\Builder;
 
-final class AccessControlTest extends PHPUnit_Framework_TestCase
+final class AccessControlTest extends TestCase
 {
     /**
      * @test

diff --git a/test/Model/AddressTest.php b/test/Model/AddressTest.php
@@ -5,10 +5,10 @@
 use eLife\ApiSdk\Collection\ArraySequence;
 use eLife\ApiSdk\Collection\EmptySequence;
 use eLife\ApiSdk\Model\Address;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use test\eLife\ApiSdk\Builder;
 
-final class AddressTest extends PHPUnit_Framework_TestCase
+final class AddressTest extends TestCase
 {
     /**
      * @test

diff --git a/test/Model/AnnotationDocumentTest.php b/test/Model/AnnotationDocumentTest.php
@@ -3,9 +3,9 @@
 namespace test\eLife\ApiSdk\Model;
 
 use eLife\ApiSdk\Model\AnnotationDocument;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
-final class AnnotationDocumentTest extends PHPUnit_Framework_TestCase
+final class AnnotationDocumentTest extends TestCase
 {
     /**
      * @test

diff --git a/test/Model/AnnotationTest.php b/test/Model/AnnotationTest.php
@@ -18,9 +18,9 @@
 use eLife\ApiSdk\Model\Identifier;
 use eLife\ApiSdk\Model\Model;
 use function GuzzleHttp\Promise\rejection_for;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
-final class AnnotationTest extends PHPUnit_Framework_TestCase
+final class AnnotationTest extends TestCase
 {
     /**
      * @test

diff --git a/test/Model/AnnualReportTest.php b/test/Model/AnnualReportTest.php
@@ -7,9 +7,9 @@
 use eLife\ApiSdk\Model\HasImpactStatement;
 use eLife\ApiSdk\Model\HasPdf;
 use eLife\ApiSdk\Model\Identifier;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
-final class AnnualReportTest extends PHPUnit_Framework_TestCase
+final class AnnualReportTest extends TestCase
 {
     /**
      * @test

diff --git a/test/Model/AppendixTest.php b/test/Model/AppendixTest.php
@@ -8,9 +8,9 @@
 use eLife\ApiSdk\Model\Block\Section;
 use eLife\ApiSdk\Model\HasDoi;
 use eLife\ApiSdk\Model\HasId;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
-final class AppendixTest extends PHPUnit_Framework_TestCase
+final class AppendixTest extends TestCase
 {
     /**
      * @test

diff --git a/test/Model/ArticleHistoryTest.php b/test/Model/ArticleHistoryTest.php
@@ -8,10 +8,10 @@
 use eLife\ApiSdk\Model\ArticlePoA;
 use eLife\ApiSdk\Model\ArticlePreprint;
 use eLife\ApiSdk\Model\Date;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use test\eLife\ApiSdk\Builder;
 
-final class ArticleHistoryTest extends PHPUnit_Framework_TestCase
+final class ArticleHistoryTest extends TestCase
 {
     /**
      * @test

diff --git a/test/Model/ArticlePreprintTest.php b/test/Model/ArticlePreprintTest.php
@@ -25,10 +25,10 @@
 use eLife\ApiSdk\Model\Subject;
 use function GuzzleHttp\Promise\promise_for;
 use function GuzzleHttp\Promise\rejection_for;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use test\eLife\ApiSdk\Builder;
 
-final class ArticlePreprintTest extends PHPUnit_Framework_TestCase
+final class ArticlePreprintTest extends TestCase
 {
     /**
      * @test

diff --git a/test/Model/ArticleSectionTest.php b/test/Model/ArticleSectionTest.php
@@ -8,9 +8,9 @@
 use eLife\ApiSdk\Model\Block\Paragraph;
 use eLife\ApiSdk\Model\HasDoi;
 use eLife\ApiSdk\Model\HasId;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
-final class ArticleSectionTest extends PHPUnit_Framework_TestCase
+final class ArticleSectionTest extends TestCase
 {
     /**
      * @test

diff --git a/test/Model/ArticleVersionTest.php b/test/Model/ArticleVersionTest.php
@@ -31,10 +31,10 @@
 use eLife\ApiSdk\Model\PersonDetails;
 use eLife\ApiSdk\Model\Place;
 use eLife\ApiSdk\Model\Subject;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use test\eLife\ApiSdk\Builder;
 
-abstract class ArticleVersionTest extends PHPUnit_Framework_TestCase
+abstract class ArticleVersionTest extends TestCase
 {
     /** @var Builder */
     protected $builder;

diff --git a/test/Model/AssetFileTest.php b/test/Model/AssetFileTest.php
@@ -9,9 +9,9 @@
 use eLife\ApiSdk\Model\File;
 use eLife\ApiSdk\Model\HasAttribution;
 use eLife\ApiSdk\Model\HasCaption;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
-final class AssetFileTest extends PHPUnit_Framework_TestCase
+final class AssetFileTest extends TestCase
 {
     /**
      * @test

diff --git a/test/Model/AuthorTest.php b/test/Model/AuthorTest.php
@@ -6,10 +6,10 @@
 use eLife\ApiSdk\Model\Author;
 use eLife\ApiSdk\Model\AuthorEntry;
 use eLife\ApiSdk\Model\Place;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use test\eLife\ApiSdk\Builder;
 
-abstract class AuthorTest extends PHPUnit_Framework_TestCase
+abstract class AuthorTest extends TestCase
 {
     /**
      * @test

diff --git a/test/Model/BioprotocolTest.php b/test/Model/BioprotocolTest.php
@@ -3,10 +3,10 @@
 namespace test\eLife\ApiSdk\Model;
 
 use eLife\ApiSdk\Model\Bioprotocol;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use test\eLife\ApiSdk\Builder;
 
-final class BioprotocolTest extends PHPUnit_Framework_TestCase
+final class BioprotocolTest extends TestCase
 {
     /**
      * @test

diff --git a/test/Model/Block/BoxTest.php b/test/Model/Block/BoxTest.php
@@ -9,9 +9,9 @@
 use eLife\ApiSdk\Model\HasContent;
 use eLife\ApiSdk\Model\HasDoi;
 use eLife\ApiSdk\Model\HasId;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
-final class BoxTest extends PHPUnit_Framework_TestCase
+final class BoxTest extends TestCase
 {
     /**
      * @test

diff --git a/test/Model/Block/ButtonTest.php b/test/Model/Block/ButtonTest.php
@@ -4,9 +4,9 @@
 
 use eLife\ApiSdk\Model\Block;
 use eLife\ApiSdk\Model\Block\Button;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
-final class ButtonTest extends PHPUnit_Framework_TestCase
+final class ButtonTest extends TestCase
 {
     /**
      * @test

diff --git a/test/Model/Block/CodeTest.php b/test/Model/Block/CodeTest.php
@@ -4,9 +4,9 @@
 
 use eLife\ApiSdk\Model\Block;
 use eLife\ApiSdk\Model\Block\Code;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
-final class CodeTest extends PHPUnit_Framework_TestCase
+final class CodeTest extends TestCase
 {
     /**
      * @test

diff --git a/test/Model/Block/ExcerptTest.php b/test/Model/Block/ExcerptTest.php
@@ -6,9 +6,9 @@
 use eLife\ApiSdk\Model\Block;
 use eLife\ApiSdk\Model\Block\Excerpt;
 use eLife\ApiSdk\Model\Block\Paragraph;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
-final class ExcerptTest extends PHPUnit_Framework_TestCase
+final class ExcerptTest extends TestCase
 {
     /**
      * @test

diff --git a/test/Model/Block/FigshareTest.php b/test/Model/Block/FigshareTest.php
@@ -5,9 +5,9 @@
 use eLife\ApiSdk\Model\Block;
 use eLife\ApiSdk\Model\Block\Figshare;
 use eLife\ApiSdk\Model\HasId;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
-final class FigshareTest extends PHPUnit_Framework_TestCase
+final class FigshareTest extends TestCase
 {
     /**
      * @test

diff --git a/test/Model/Block/FigureAssetTest.php b/test/Model/Block/FigureAssetTest.php
@@ -9,9 +9,9 @@
 use eLife\ApiSdk\Model\Block\Table;
 use eLife\ApiSdk\Model\File;
 use eLife\ApiSdk\Model\HasDoi;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
-final class FigureAssetTest extends PHPUnit_Framework_TestCase
+final class FigureAssetTest extends TestCase
 {
     /**
      * @test

diff --git a/test/Model/Block/FigureTest.php b/test/Model/Block/FigureTest.php
@@ -9,10 +9,10 @@
 use eLife\ApiSdk\Model\Block\FigureAsset;
 use eLife\ApiSdk\Model\Block\Image;
 use eLife\ApiSdk\Model\Image as ImageFile;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use test\eLife\ApiSdk\Builder;
 
-final class FigureTest extends PHPUnit_Framework_TestCase
+final class FigureTest extends TestCase
 {
     /**
      * @test

diff --git a/test/Model/Block/GoogleMapTest.php b/test/Model/Block/GoogleMapTest.php
@@ -5,9 +5,9 @@
 use eLife\ApiSdk\Model\Block;
 use eLife\ApiSdk\Model\Block\GoogleMap;
 use eLife\ApiSdk\Model\HasId;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
-final class GoogleMapTest extends PHPUnit_Framework_TestCase
+final class GoogleMapTest extends TestCase
 {
     /**
      * @test

diff --git a/test/Model/Block/ImageTest.php b/test/Model/Block/ImageTest.php
@@ -8,10 +8,10 @@
 use eLife\ApiSdk\Model\Block\Paragraph;
 use eLife\ApiSdk\Model\BlockWithCaption;
 use eLife\ApiSdk\Model\Image as ImageFile;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use test\eLife\ApiSdk\Builder;
 
-final class ImageTest extends PHPUnit_Framework_TestCase
+final class ImageTest extends TestCase
 {
     /**
      * @test

diff --git a/test/Model/Block/ListingTest.php b/test/Model/Block/ListingTest.php
@@ -5,9 +5,9 @@
 use eLife\ApiSdk\Collection\ArraySequence;
 use eLife\ApiSdk\Model\Block;
 use eLife\ApiSdk\Model\Block\Listing;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
-final class ListingTest extends PHPUnit_Framework_TestCase
+final class ListingTest extends TestCase
 {
     /**
      * @test

diff --git a/test/Model/Block/MathMLTest.php b/test/Model/Block/MathMLTest.php
@@ -5,9 +5,9 @@
 use eLife\ApiSdk\Model\Block;
 use eLife\ApiSdk\Model\Block\MathML;
 use eLife\ApiSdk\Model\HasId;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
-final class MathMLTest extends PHPUnit_Framework_TestCase
+final class MathMLTest extends TestCase
 {
     /**
      * @test

diff --git a/test/Model/Block/ParagraphTest.php b/test/Model/Block/ParagraphTest.php
@@ -4,9 +4,9 @@
 
 use eLife\ApiSdk\Model\Block;
 use eLife\ApiSdk\Model\Block\Paragraph;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
-final class ParagraphTest extends PHPUnit_Framework_TestCase
+final class ParagraphTest extends TestCase
 {
     /**
      * @test

diff --git a/test/Model/Block/ProfileTest.php b/test/Model/Block/ProfileTest.php
@@ -9,10 +9,10 @@
 use eLife\ApiSdk\Model\Block\Profile;
 use eLife\ApiSdk\Model\HasContent;
 use eLife\ApiSdk\Model\Image;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use test\eLife\ApiSdk\Builder;
 
-final class ProfileTest extends PHPUnit_Framework_TestCase
+final class ProfileTest extends TestCase
 {
     /**
      * @test

diff --git a/test/Model/Block/QuestionTest.php b/test/Model/Block/QuestionTest.php
@@ -5,9 +5,9 @@
 use eLife\ApiSdk\Model\Block;
 use eLife\ApiSdk\Model\Block\Paragraph;
 use eLife\ApiSdk\Model\Block\Question;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
-final class QuestionTest extends PHPUnit_Framework_TestCase
+final class QuestionTest extends TestCase
 {
     /**
      * @test

diff --git a/test/Model/Block/QuoteTest.php b/test/Model/Block/QuoteTest.php
@@ -5,9 +5,9 @@
 use eLife\ApiSdk\Model\Block;
 use eLife\ApiSdk\Model\Block\Paragraph;
 use eLife\ApiSdk\Model\Block\Quote;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
-final class QuoteTest extends PHPUnit_Framework_TestCase
+final class QuoteTest extends TestCase
 {
     /**
      * @test