From 1448ab8c2e39029522f0cc6088648efb104c9953 Mon Sep 17 00:00:00 2001 From: Beatrycze Volk Date: Fri, 19 Jun 2026 16:28:12 +0200 Subject: [PATCH 1/3] [MAINTENANCE] Raise minimum PHP version and update dev tools Drop support for PHP 7.4, making PHP 8.2 the new minimum requirement for the project. This update also includes bumping PHPStan and PHPUnit to their latest major versions, ensuring compatibility with modern PHP environments and leveraging new features from these development tools. --- .github/workflows/phpstan.yml | 2 +- .github/workflows/phpunit.yml | 14 ++++++++------ composer.json | 6 +++--- phpunit.xml | 24 ++++++++++++++++++------ 4 files changed, 30 insertions(+), 16 deletions(-) diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml index 7d5e13d..2ccb45d 100644 --- a/.github/workflows/phpstan.yml +++ b/.github/workflows/phpstan.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - variants: [{ php: 7.4 }, { php: 8.2 }, { php: 8.4 } ] + variants: [ { php: 8.2 }, { php: 8.4 } ] steps: - name: Checkout code uses: actions/checkout@v6 diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index e202431..027012b 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -11,17 +11,19 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - name: Checkout code + uses: actions/checkout@v4 - - uses: php-actions/composer@v6 + - name: Install dependencies + uses: php-actions/composer@v6 - - name: Tests - uses: php-actions/phpunit@v3 + - name: Run tests + uses: php-actions/phpunit@v4 env: TEST_NAME: Scarlett with: bootstrap: vendor/autoload.php configuration: phpunit.xml args: --coverage-text - version: 9 - php_version: "7.4" + version: 11 + php_version: "8.2" diff --git a/composer.json b/composer.json index 0ae4bf5..20bc632 100644 --- a/composer.json +++ b/composer.json @@ -8,11 +8,11 @@ "mods-reader" ], "require": { - "php": ">=7.4" + "php": ">=8.2" }, "require-dev": { - "phpstan/phpstan": "^1.12", - "phpunit/phpunit": "~9.6" + "phpstan/phpstan": "^2.2", + "phpunit/phpunit": "^11.5" }, "autoload": { "psr-4": { diff --git a/phpunit.xml b/phpunit.xml index 577ca64..3226c00 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -1,13 +1,25 @@ - + ./tests/Mods/ - - - src - - + + + + + + \ No newline at end of file From aa44c372fee5a120a82e71920fd3e756e65deaa0 Mon Sep 17 00:00:00 2001 From: Beatrycze Volk Date: Mon, 22 Jun 2026 14:15:12 +0200 Subject: [PATCH 2/3] [TEST] Update PHPUnit @test annotations to #[Test] attributes Migrate PHPUnit test method annotations from the legacy `@test` docblock tag to the native PHP 8 `#[Test]` attribute syntax. This aligns the test suite with modern PHP practices as part of the ongoing PHP version update. --- tests/Mods/Reader/AbstractReaderTest.php | 25 ++--- .../Mods/Reader/AccessConditionReaderTest.php | 57 +++-------- .../Mods/Reader/ClassificationReaderTest.php | 49 +++------- tests/Mods/Reader/ExtensionReaderTest.php | 9 +- tests/Mods/Reader/GenreReaderTest.php | 73 ++++---------- tests/Mods/Reader/IdentifierReaderTest.php | 97 +++++-------------- tests/Mods/Reader/LanguageReaderTest.php | 61 +++--------- tests/Mods/Reader/LocationReaderTest.php | 61 +++--------- tests/Mods/Reader/NameReaderTest.php | 61 +++--------- tests/Mods/Reader/NoteReaderTest.php | 73 ++++---------- tests/Mods/Reader/OriginInfoReaderTest.php | 49 +++------- tests/Mods/Reader/PartReaderTest.php | 41 +++----- .../Reader/PhysicalDescriptionReaderTest.php | 53 +++------- tests/Mods/Reader/RecordInfoReaderTest.php | 41 +++++--- tests/Mods/Reader/RelatedItemReaderTest.php | 41 +++----- tests/Mods/Reader/SubjectReaderTest.php | 61 +++--------- .../Mods/Reader/TableOfContentsReaderTest.php | 53 +++------- tests/Mods/Reader/TitleInfoReaderTest.php | 31 +++--- tests/Mods/Reader/TypeOfResourceTest.php | 21 ++-- tests/Mods/Utility/QueryTest.php | 5 +- 20 files changed, 275 insertions(+), 687 deletions(-) diff --git a/tests/Mods/Reader/AbstractReaderTest.php b/tests/Mods/Reader/AbstractReaderTest.php index 8ebfd6f..2c5e41e 100644 --- a/tests/Mods/Reader/AbstractReaderTest.php +++ b/tests/Mods/Reader/AbstractReaderTest.php @@ -12,6 +12,7 @@ namespace Slub\Mods\Reader; +use PHPUnit\Framework\Attributes\Test; use Slub\Mods\ModsReaderTest; /** @@ -20,9 +21,7 @@ class AbstractReaderTest extends ModsReaderTest { - /** - * @test - */ + #[Test] public function getAbstractForBookDocument() { $abstract = $this->bookReader->getAbstract(); @@ -34,9 +33,7 @@ public function getAbstractForBookDocument() self::assertTrue($abstract->isShareable()); } - /** - * @test - */ + #[Test] public function getAbstractByQueryForBookDocument() { $abstract = $this->bookReader->getAbstract('[@displayLabel="Content description"]'); @@ -48,18 +45,14 @@ public function getAbstractByQueryForBookDocument() self::assertTrue($abstract->isShareable()); } - /** - * @test - */ + #[Test] public function getNoAbstractByQueryForBookDocument() { $abstract = $this->bookReader->getAbstract('[@displayLabel="Random"]'); self::assertNull($abstract); } - /** - * @test - */ + #[Test] public function getAbstractForSerialDocument() { $abstract = $this->serialReader->getAbstract(); @@ -70,9 +63,7 @@ public function getAbstractForSerialDocument() self::assertFalse($abstract->isShareable()); } - /** - * @test - */ + #[Test] public function getAbstractByQueryForSerialDocument() { $abstract = $this->serialReader->getAbstract('[@shareable="no"]'); @@ -83,9 +74,7 @@ public function getAbstractByQueryForSerialDocument() self::assertFalse($abstract->isShareable()); } - /** - * @test - */ + #[Test] public function getNoAbstractByQueryForSerialDocument() { $abstract = $this->serialReader->getAbstract('[@shareable="yes"]'); diff --git a/tests/Mods/Reader/AccessConditionReaderTest.php b/tests/Mods/Reader/AccessConditionReaderTest.php index f77573c..38095e9 100644 --- a/tests/Mods/Reader/AccessConditionReaderTest.php +++ b/tests/Mods/Reader/AccessConditionReaderTest.php @@ -12,6 +12,7 @@ namespace Slub\Mods\Reader; +use PHPUnit\Framework\Attributes\Test; use Slub\Mods\Element\AccessCondition; use Slub\Mods\ModsReaderTest; @@ -21,9 +22,7 @@ class AccessConditionReaderTest extends ModsReaderTest { - /** - * @test - */ + #[Test] public function getAccessConditionsForBookDocument() { $accessConditions = $this->bookReader->getAccessConditions(); @@ -32,36 +31,28 @@ public function getAccessConditionsForBookDocument() self::assertAccessConditionForBookDocument($accessConditions[0]); } - /** - * @test - */ + #[Test] public function getAccessConditionForBookDocument() { $accessCondition = $this->bookReader->getAccessCondition(0); self::assertAccessConditionForBookDocument($accessCondition); } - /** - * @test - */ + #[Test] public function getFirstAccessConditionForBookDocument() { $accessCondition = $this->bookReader->getFirstAccessCondition(); self::assertAccessConditionForBookDocument($accessCondition); } - /** - * @test - */ + #[Test] public function getLastAccessConditionForBookDocument() { $accessCondition = $this->bookReader->getLastAccessCondition(); self::assertAccessConditionForBookDocument($accessCondition); } - /** - * @test - */ + #[Test] public function getAccessConditionsByQueryForBookDocument() { $accessConditions = $this->bookReader->getAccessConditions('[@type="use and reproduction"]'); @@ -70,63 +61,49 @@ public function getAccessConditionsByQueryForBookDocument() self::assertAccessConditionForBookDocument($accessConditions[0]); } - /** - * @test - */ + #[Test] public function getFirstAccessConditionByQueryForBookDocument() { $accessCondition = $this->bookReader->getFirstAccessCondition('[@type="use and reproduction"]'); self::assertAccessConditionForBookDocument($accessCondition); } - /** - * @test - */ + #[Test] public function getLastAccessConditionByQueryForBookDocument() { $accessCondition = $this->bookReader->getLastAccessCondition('[@type="use and reproduction"]'); self::assertAccessConditionForBookDocument($accessCondition); } - /** - * @test - */ + #[Test] public function getNoAccessConditionsByQueryForBookDocument() { $accessConditions = $this->bookReader->getAccessConditions('[@type="restriction on access"]'); self::assertEmpty($accessConditions); } - /** - * @test - */ + #[Test] public function getNoAccessConditionByQueryForBookDocument() { $accessCondition = $this->bookReader->getAccessCondition(1, '[@type="restriction on access"]'); self::assertNull($accessCondition); } - /** - * @test - */ + #[Test] public function getNoFirstAccessConditionsByQueryForBookDocument() { $accessCondition = $this->bookReader->getFirstAccessCondition('[@type="restriction on access"]'); self::assertNull($accessCondition); } - /** - * @test - */ + #[Test] public function getNoLastAccessConditionsByQueryForBookDocument() { $accessCondition = $this->bookReader->getLastAccessCondition('[@type="restriction on access"]'); self::assertNull($accessCondition); } - /** - * @test - */ + #[Test] public function getAccessConditionsForSerialDocument() { $accessConditions = $this->serialReader->getAccessConditions(); @@ -135,9 +112,7 @@ public function getAccessConditionsForSerialDocument() self::assertAccessConditionForSerialDocument($accessConditions[0]); } - /** - * @test - */ + #[Test] public function getAccessConditionsByQueryForSerialDocument() { $accessConditions = $this->serialReader->getAccessConditions('[@type="restriction on access"]'); @@ -146,9 +121,7 @@ public function getAccessConditionsByQueryForSerialDocument() self::assertAccessConditionForSerialDocument($accessConditions[0]); } - /** - * @test - */ + #[Test] public function getNoAccessConditionsByQueryForSerialDocument() { $accessConditions = $this->serialReader->getAccessConditions('[@type="use and reproduction"]'); diff --git a/tests/Mods/Reader/ClassificationReaderTest.php b/tests/Mods/Reader/ClassificationReaderTest.php index 1a10ebd..3d90352 100644 --- a/tests/Mods/Reader/ClassificationReaderTest.php +++ b/tests/Mods/Reader/ClassificationReaderTest.php @@ -12,6 +12,7 @@ namespace Slub\Mods\Reader; +use PHPUnit\Framework\Attributes\Test; use Slub\Mods\Element\Classification; use Slub\Mods\ModsReaderTest; @@ -21,9 +22,7 @@ class ClassificationReaderTest extends ModsReaderTest { - /** - * @test - */ + #[Test] public function getClassificationsForBookDocument() { $classifications = $this->bookReader->getClassifications(); @@ -32,36 +31,28 @@ public function getClassificationsForBookDocument() self::assertFirstClassificationForBookDocument($classifications[0]); } - /** - * @test - */ + #[Test] public function getClassificationForBookDocument() { $classification = $this->bookReader->getClassification(0); self::assertFirstClassificationForBookDocument($classification); } - /** - * @test - */ + #[Test] public function getFirstClassificationForBookDocument() { $classification = $this->bookReader->getFirstClassification(); self::assertFirstClassificationForBookDocument($classification); } - /** - * @test - */ + #[Test] public function getLastClassificationForBookDocument() { $classification = $this->bookReader->getLastClassification(); self::assertSecondClassificationForBookDocument($classification); } - /** - * @test - */ + #[Test] public function getClassificationsByQueryForBookDocument() { $classifications = $this->bookReader->getClassifications('[@authority="ddc"]'); @@ -70,27 +61,21 @@ public function getClassificationsByQueryForBookDocument() self::assertSecondClassificationForBookDocument($classifications[0]); } - /** - * @test - */ + #[Test] public function getNoClassificationsByQueryForBookDocument() { $classifications = $this->bookReader->getClassifications('[@generator="xyz"]'); self::assertEmpty($classifications); } - /** - * @test - */ + #[Test] public function getNoClassificationByQueryForBookDocument() { $classification = $this->bookReader->getClassification(1, '[@generator="xyz"]'); self::assertNull($classification); } - /** - * @test - */ + #[Test] public function getNoFirstClassificationByQueryForBookDocument() { $classification = $this->bookReader->getFirstClassification('[@generator="xyz"]'); @@ -100,18 +85,14 @@ public function getNoFirstClassificationByQueryForBookDocument() self::assertNull($lastClassification); } - /** - * @test - */ + #[Test] public function getNoLastClassificationByQueryForBookDocument() { $classification = $this->bookReader->getLastClassification('[@generator="xyz"]'); self::assertNull($classification); } - /** - * @test - */ + #[Test] public function getClassificationsForSerialDocument() { $classifications = $this->serialReader->getClassifications(); @@ -120,9 +101,7 @@ public function getClassificationsForSerialDocument() self::assertClassificationForSerialDocument($classifications[0]); } - /** - * @test - */ + #[Test] public function getClassificationsByQueryForSerialDocument() { $classifications = $this->serialReader->getClassifications('[@authority="ddc"]'); @@ -131,9 +110,7 @@ public function getClassificationsByQueryForSerialDocument() self::assertClassificationForSerialDocument($classifications[0]); } - /** - * @test - */ + #[Test] public function getNoClassificationsByQueryForSerialDocument() { $classifications = $this->serialReader->getClassifications('[@edition="22"]'); diff --git a/tests/Mods/Reader/ExtensionReaderTest.php b/tests/Mods/Reader/ExtensionReaderTest.php index 0149773..28cd516 100644 --- a/tests/Mods/Reader/ExtensionReaderTest.php +++ b/tests/Mods/Reader/ExtensionReaderTest.php @@ -12,6 +12,7 @@ namespace Slub\Mods\Reader; +use PHPUnit\Framework\Attributes\Test; use Slub\Mods\ModsReaderTest; /** @@ -20,18 +21,14 @@ class ExtensionReaderTest extends ModsReaderTest { - /** - * @test - */ + #[Test] public function getExtensionsForBookDocument() { // $extensions = $this->bookReader->getExtensions(); $this->assertTrue(true, 'WIP'); } - /** - * @test - */ + #[Test] public function getExtensionsForSerialDocument() { // $extensions = $this->serialReader->getExtensions(); diff --git a/tests/Mods/Reader/GenreReaderTest.php b/tests/Mods/Reader/GenreReaderTest.php index f4385b6..e18787b 100644 --- a/tests/Mods/Reader/GenreReaderTest.php +++ b/tests/Mods/Reader/GenreReaderTest.php @@ -12,6 +12,7 @@ namespace Slub\Mods\Reader; +use PHPUnit\Framework\Attributes\Test; use Slub\Mods\Element\Genre; use Slub\Mods\ModsReaderTest; @@ -21,9 +22,7 @@ class GenreReaderTest extends ModsReaderTest { - /** - * @test - */ + #[Test] public function getGenresForBookDocument() { $genres = $this->bookReader->getGenres(); @@ -32,36 +31,28 @@ public function getGenresForBookDocument() self::assertGenreForBookDocument($genres[0]); } - /** - * @test - */ + #[Test] public function getGenreForBookDocument() { $genre = $this->bookReader->getGenre(0); self::assertGenreForBookDocument($genre); } - /** - * @test - */ + #[Test] public function getFirstGenreForBookDocument() { $genre = $this->bookReader->getFirstGenre(); self::assertGenreForBookDocument($genre); } - /** - * @test - */ + #[Test] public function getLastGenreForBookDocument() { $genre = $this->bookReader->getLastGenre(); self::assertGenreForBookDocument($genre); } - /** - * @test - */ + #[Test] public function getGenresByQueryForBookDocument() { $genres = $this->bookReader->getGenres('[@authority="marcgt"]'); @@ -70,72 +61,56 @@ public function getGenresByQueryForBookDocument() self::assertGenreForBookDocument($genres[0]); } - /** - * @test - */ + #[Test] public function getGenreByQueryForBookDocument() { $genre = $this->bookReader->getGenre(0, '[@authority="marcgt"]'); self::assertGenreForBookDocument($genre); } - /** - * @test - */ + #[Test] public function getFirstGenreByQueryForBookDocument() { $genre = $this->bookReader->getFirstGenre('[@authority="marcgt"]'); self::assertGenreForBookDocument($genre); } - /** - * @test - */ + #[Test] public function getLastGenreByQueryForBookDocument() { $genre = $this->bookReader->getLastGenre('[@authority="marcgt"]'); self::assertGenreForBookDocument($genre); } - /** - * @test - */ + #[Test] public function getNoGenresByQueryForBookDocument() { $genres = $this->bookReader->getGenres('[@authority="merc"]'); self::assertEmpty($genres); } - /** - * @test - */ + #[Test] public function getNoGenreByQueryForBookDocument() { $genre = $this->bookReader->getGenre(0, '[@authority="merc"]'); self::assertNull($genre); } - /** - * @test - */ + #[Test] public function getNoFirstGenreByQueryForBookDocument() { $genre = $this->bookReader->getFirstGenre('[@authority="merc"]'); self::assertNull($genre); } - /** - * @test - */ + #[Test] public function getNoLastGenreByQueryForBookDocument() { $genre = $this->bookReader->getLastGenre('[@authority="merc"]'); self::assertNull($genre); } - /** - * @test - */ + #[Test] public function getGenresForSerialDocument() { $genres = $this->serialReader->getGenres(); @@ -144,36 +119,28 @@ public function getGenresForSerialDocument() self::assertFirstGenreForSerialDocument($genres[0]); } - /** - * @test - */ + #[Test] public function getGenreForSerialDocument() { $genre = $this->serialReader->getGenre(0); self::assertFirstGenreForSerialDocument($genre); } - /** - * @test - */ + #[Test] public function getFirstGenreForSerialDocument() { $genre = $this->serialReader->getFirstGenre(); self::assertFirstGenreForSerialDocument($genre); } - /** - * @test - */ + #[Test] public function getLastGenreForSerialDocument() { $genre = $this->serialReader->getLastGenre(); self::assertSecondGenreForSerialDocument($genre); } - /** - * @test - */ + #[Test] public function getGenresByQueryForSerialDocument() { $genres = $this->serialReader->getGenres('[@usage="primary"]'); @@ -182,9 +149,7 @@ public function getGenresByQueryForSerialDocument() self::assertFirstGenreForSerialDocument($genres[0]); } - /** - * @test - */ + #[Test] public function getNoGenresByQueryForSerialDocument() { $genres = $this->serialReader->getGenres('[@type="xyz"]'); diff --git a/tests/Mods/Reader/IdentifierReaderTest.php b/tests/Mods/Reader/IdentifierReaderTest.php index a1f83ae..7f98f43 100644 --- a/tests/Mods/Reader/IdentifierReaderTest.php +++ b/tests/Mods/Reader/IdentifierReaderTest.php @@ -12,6 +12,7 @@ namespace Slub\Mods\Reader; +use PHPUnit\Framework\Attributes\Test; use Slub\Mods\Element\Identifier; use Slub\Mods\ModsReaderTest; @@ -21,9 +22,7 @@ class IdentifierReaderTest extends ModsReaderTest { - /** - * @test - */ + #[Test] public function getIdentifiersForBookDocument() { $identifiers = $this->bookReader->getIdentifiers(); @@ -32,36 +31,28 @@ public function getIdentifiersForBookDocument() self::assertFirstIdentifierForBookDocument($identifiers[0]); } - /** - * @test - */ + #[Test] public function getIdentifierForBookDocument() { $identifier = $this->bookReader->getIdentifier(0); self::assertFirstIdentifierForBookDocument($identifier); } - /** - * @test - */ + #[Test] public function getFirstIdentifierForBookDocument() { $identifier = $this->bookReader->getFirstIdentifier(); self::assertFirstIdentifierForBookDocument($identifier); } - /** - * @test - */ + #[Test] public function getLastIdentifierForBookDocument() { $identifier = $this->bookReader->getLastIdentifier(); self::assertSecondIdentifierForBookDocument($identifier); } - /** - * @test - */ + #[Test] public function getIdentifiersByQueryForBookDocument() { $identifiers = $this->bookReader->getIdentifiers('[@type="lccn"]'); @@ -70,72 +61,56 @@ public function getIdentifiersByQueryForBookDocument() self::assertSecondIdentifierForBookDocument($identifiers[0]); } - /** - * @test - */ + #[Test] public function getIdentifierByQueryForBookDocument() { $identifier = $this->bookReader->getIdentifier(0, '[@type="lccn"]'); self::assertSecondIdentifierForBookDocument($identifier); } - /** - * @test - */ + #[Test] public function getFirstIdentifierByQueryForBookDocument() { $identifier = $this->bookReader->getFirstIdentifier('[@type="lccn"]'); self::assertSecondIdentifierForBookDocument($identifier); } - /** - * @test - */ + #[Test] public function getLastIdentifierByQueryForBookDocument() { $identifier = $this->bookReader->getLastIdentifier('[@type="lccn"]'); self::assertSecondIdentifierForBookDocument($identifier); } - /** - * @test - */ + #[Test] public function getNoIdentifiersByQueryForBookDocument() { $identifiers = $this->bookReader->getIdentifiers('[@type="xyz"]'); self::assertEmpty($identifiers); } - /** - * @test - */ + #[Test] public function getNoIdentifierByQueryForBookDocument() { $identifier = $this->bookReader->getIdentifier(5, '[@type="lccn"]'); self::assertNull($identifier); } - /** - * @test - */ + #[Test] public function getNoFirstIdentifierByQueryForBookDocument() { $identifier = $this->bookReader->getFirstIdentifier('[@type="xyz"]'); self::assertNull($identifier); } - /** - * @test - */ + #[Test] public function getNoLastIdentifierByQueryForBookDocument() { $identifier = $this->bookReader->getLastIdentifier('[@type="xyz"]'); self::assertNull($identifier); } - /** - * @test - */ + #[Test] public function getIdentifiersForSerialDocument() { $identifiers = $this->serialReader->getIdentifiers(); @@ -144,36 +119,28 @@ public function getIdentifiersForSerialDocument() self::assertFirstIdentifierForSerialDocument($identifiers[0]); } - /** - * @test - */ + #[Test] public function getIdentifierForSerialDocument() { $identifier = $this->serialReader->getIdentifier(2); self::assertThirdIdentifierForSerialDocument($identifier); } - /** - * @test - */ + #[Test] public function getFirstIdentifierForSerialDocument() { $identifier = $this->serialReader->getFirstIdentifier(); self::assertFirstIdentifierForSerialDocument($identifier); } - /** - * @test - */ + #[Test] public function getLastIdentifierForSerialDocument() { $identifier = $this->serialReader->getLastIdentifier(); self::assertFourthIdentifierForSerialDocument($identifier); } - /** - * @test - */ + #[Test] public function getIdentifiersByQueryForSerialDocument() { $identifiers = $this->serialReader->getIdentifiers('[@type="issn"]'); @@ -182,63 +149,49 @@ public function getIdentifiersByQueryForSerialDocument() self::assertSecondIdentifierForSerialDocument($identifiers[1]); } - /** - * @test - */ + #[Test] public function getIdentifierByQueryForSerialDocument() { $identifier = $this->serialReader->getIdentifier(0, '[@type="issn"]'); self::assertFirstIdentifierForSerialDocument($identifier); } - /** - * @test - */ + #[Test] public function getFirstIdentifierByQueryForSerialDocument() { $identifier = $this->serialReader->getFirstIdentifier('[@type="lccn"]'); self::assertThirdIdentifierForSerialDocument($identifier); } - /** - * @test - */ + #[Test] public function getLastIdentifierByQueryForSerialDocument() { $identifier = $this->serialReader->getLastIdentifier('[@type="lccn"]'); self::assertThirdIdentifierForSerialDocument($identifier); } - /** - * @test - */ + #[Test] public function getNoIdentifiersByQueryForSerialDocument() { $identifiers = $this->serialReader->getIdentifiers('[@type="xyz"]'); self::assertEmpty($identifiers); } - /** - * @test - */ + #[Test] public function getNoIdentifierByQueryForSerialDocument() { $identifier = $this->serialReader->getIdentifier(2, '[@type="xyz"]'); self::assertNull($identifier); } - /** - * @test - */ + #[Test] public function getNoFirstIdentifierByQueryForSerialDocument() { $identifier = $this->serialReader->getFirstIdentifier('[@type="xyz"]'); self::assertNull($identifier); } - /** - * @test - */ + #[Test] public function getNoLastIdentifierByQueryForSerialDocument() { $identifier = $this->serialReader->getLastIdentifier('[@type="xyz"]'); diff --git a/tests/Mods/Reader/LanguageReaderTest.php b/tests/Mods/Reader/LanguageReaderTest.php index 34767db..50153f6 100644 --- a/tests/Mods/Reader/LanguageReaderTest.php +++ b/tests/Mods/Reader/LanguageReaderTest.php @@ -12,6 +12,7 @@ namespace Slub\Mods\Reader; +use PHPUnit\Framework\Attributes\Test; use Slub\Mods\Element\Language; use Slub\Mods\ModsReaderTest; @@ -21,9 +22,7 @@ class LanguageReaderTest extends ModsReaderTest { - /** - * @test - */ + #[Test] public function getLanguagesForBookDocument() { $languages = $this->bookReader->getLanguages(); @@ -32,36 +31,28 @@ public function getLanguagesForBookDocument() self::assertFirstLanguageForBookDocument($languages[0]); } - /** - * @test - */ + #[Test] public function getLanguageForBookDocument() { $language = $this->bookReader->getLanguage(0); self::assertFirstLanguageForBookDocument($language); } - /** - * @test - */ + #[Test] public function getFirstLanguageForBookDocument() { $language = $this->bookReader->getFirstLanguage(); self::assertFirstLanguageForBookDocument($language); } - /** - * @test - */ + #[Test] public function getLastLanguageForBookDocument() { $language = $this->bookReader->getLastLanguage(); self::assertSecondLanguageForBookDocument($language); } - /** - * @test - */ + #[Test] public function getLanguagesByQueryForBookDocument() { $languages = $this->bookReader->getLanguages('[@objectPart="summary"]'); @@ -70,72 +61,56 @@ public function getLanguagesByQueryForBookDocument() self::assertSecondLanguageForBookDocument($languages[0]); } - /** - * @test - */ + #[Test] public function getLanguageByQueryForBookDocument() { $language = $this->bookReader->getLanguage(0, '[@objectPart="summary"]'); self::assertSecondLanguageForBookDocument($language); } - /** - * @test - */ + #[Test] public function getFirstLanguageByQueryForBookDocument() { $language = $this->bookReader->getFirstLanguage('[@objectPart="summary"]'); self::assertSecondLanguageForBookDocument($language); } - /** - * @test - */ + #[Test] public function getLastLanguageByQueryForBookDocument() { $language = $this->bookReader->getLastLanguage('[@objectPart="summary"]'); self::assertSecondLanguageForBookDocument($language); } - /** - * @test - */ + #[Test] public function getNoLanguagesByQueryForBookDocument() { $languages = $this->bookReader->getLanguages('[@objectPart="abstract"]'); self::assertEmpty($languages); } - /** - * @test - */ + #[Test] public function getNoLanguageByQueryForBookDocument() { $language = $this->bookReader->getLanguage(0, '[@objectPart="abstract"]'); self::assertNull($language); } - /** - * @test - */ + #[Test] public function getNoFirstLanguageByQueryForBookDocument() { $language = $this->bookReader->getFirstLanguage('[@objectPart="abstract"]'); self::assertNull($language); } - /** - * @test - */ + #[Test] public function getNoLastLanguageByQueryForBookDocument() { $language = $this->bookReader->getLastLanguage('[@objectPart="abstract"]'); self::assertNull($language); } - /** - * @test - */ + #[Test] public function getLanguagesForSerialDocument() { $languages = $this->serialReader->getLanguages(); @@ -144,9 +119,7 @@ public function getLanguagesForSerialDocument() self::assertLanguageForSerialDocument($languages[0]); } - /** - * @test - */ + #[Test] public function getLanguagesByQueryForSerialDocument() { $languages = $this->serialReader->getLanguages('[./mods:languageTerm[@type="code"]]'); @@ -155,9 +128,7 @@ public function getLanguagesByQueryForSerialDocument() self::assertLanguageForSerialDocument($languages[0]); } - /** - * @test - */ + #[Test] public function getNoLanguagesByQueryForSerialDocument() { $languages = $this->serialReader->getLanguages('[@objectPart="summary"]'); diff --git a/tests/Mods/Reader/LocationReaderTest.php b/tests/Mods/Reader/LocationReaderTest.php index 25946f9..d59c8c4 100644 --- a/tests/Mods/Reader/LocationReaderTest.php +++ b/tests/Mods/Reader/LocationReaderTest.php @@ -12,6 +12,7 @@ namespace Slub\Mods\Reader; +use PHPUnit\Framework\Attributes\Test; use Slub\Mods\Element\Location; use Slub\Mods\Exception\IncorrectValueInAttributeException; use Slub\Mods\ModsReaderTest; @@ -22,9 +23,7 @@ class LocationReaderTest extends ModsReaderTest { - /** - * @test - */ + #[Test] public function getLocationsForBookDocument() { $locations = $this->bookReader->getLocations(); @@ -33,36 +32,28 @@ public function getLocationsForBookDocument() self::assertFirstLocationForBookDocument($locations[0]); } - /** - * @test - */ + #[Test] public function getLocationForBookDocument() { $location = $this->bookReader->getLocation(1); self::assertSecondLocationForBookDocument($location); } - /** - * @test - */ + #[Test] public function getFirstLocationForBookDocument() { $location = $this->bookReader->getFirstLocation(); self::assertFirstLocationForBookDocument($location); } - /** - * @test - */ + #[Test] public function getLastLocationForBookDocument() { $location = $this->bookReader->getLastLocation(); self::assertSecondLocationForBookDocument($location); } - /** - * @test - */ + #[Test] public function getLocationsByQueryForBookDocument() { $locations = $this->bookReader->getLocations('[@displayLabel="links"]'); @@ -74,72 +65,56 @@ public function getLocationsByQueryForBookDocument() $locations[0]->getUrls()[3]->getAccess(); } - /** - * @test - */ + #[Test] public function getLocationByQueryForBookDocument() { $location = $this->bookReader->getLocation(0, '[@displayLabel="links"]'); self::assertSecondLocationForBookDocument($location); } - /** - * @test - */ + #[Test] public function testGetFirstLocationByQueryForBookDocument() { $location = $this->bookReader->getFirstLocation('[@displayLabel="links"]'); self::assertSecondLocationForBookDocument($location); } - /** - * @test - */ + #[Test] public function getLastLocationForByQueryBookDocument() { $location = $this->bookReader->getLastLocation('[@displayLabel="links"]'); self::assertSecondLocationForBookDocument($location); } - /** - * @test - */ + #[Test] public function getNoLocationsByQueryForBookDocument() { $locations = $this->bookReader->getLocations('[@displayLabel="random"]'); self::assertEmpty($locations); } - /** - * @test - */ + #[Test] public function getNoLocationByQueryForBookDocument() { $location = $this->bookReader->getLocation(6, '[@displayLabel="links"]'); self::assertNull($location); } - /** - * @test - */ + #[Test] public function getNoFirstLocationByQueryForBookDocument() { $location = $this->bookReader->getFirstLocation('[@displayLabel="random"]'); self::assertNull($location); } - /** - * @test - */ + #[Test] public function getNoLastLocationByQueryForBookDocument() { $location = $this->bookReader->getLastLocation('[@displayLabel="random"]'); self::assertNull($location); } - /** - * @test - */ + #[Test] public function getLocationsForSerialDocument() { $locations = $this->serialReader->getLocations(); @@ -148,9 +123,7 @@ public function getLocationsForSerialDocument() self::assertLocationForSerialDocument($locations[0]); } - /** - * @test - */ + #[Test] public function getLocationsByQueryForSerialDocument() { $locations = $this->serialReader->getLocations('[./mods:url[@usage="primaryDisplay"]]'); @@ -159,9 +132,7 @@ public function getLocationsByQueryForSerialDocument() self::assertLocationForSerialDocument($locations[0]); } - /** - * @test - */ + #[Test] public function getNoLocationsByQueryForSerialDocument() { $locations = $this->serialReader->getLocations('[@usage="rad"]'); diff --git a/tests/Mods/Reader/NameReaderTest.php b/tests/Mods/Reader/NameReaderTest.php index b0c6716..84a4bef 100644 --- a/tests/Mods/Reader/NameReaderTest.php +++ b/tests/Mods/Reader/NameReaderTest.php @@ -12,6 +12,7 @@ namespace Slub\Mods\Reader; +use PHPUnit\Framework\Attributes\Test; use Slub\Mods\Element\Name; use Slub\Mods\ModsReaderTest; @@ -21,9 +22,7 @@ class NameReaderTest extends ModsReaderTest { - /** - * @test - */ + #[Test] public function getNamesForBookDocument() { $names = $this->bookReader->getNames(); @@ -32,36 +31,28 @@ public function getNamesForBookDocument() self::assertFirstNameForBookDocument($names[0]); } - /** - * @test - */ + #[Test] public function getNameForBookDocument() { $name = $this->bookReader->getName(1); self::assertSecondNameForBookDocument($name); } - /** - * @test - */ + #[Test] public function getFirstNameForBookDocument() { $name = $this->bookReader->getFirstName(); self::assertFirstNameForBookDocument($name); } - /** - * @test - */ + #[Test] public function getLastNameForBookDocument() { $name = $this->bookReader->getLastName(); self::assertSecondNameForBookDocument($name); } - /** - * @test - */ + #[Test] public function getNamesByQueryForBookDocument() { $names = $this->bookReader->getNames('[@type="personal" and not(@usage="primary")]'); @@ -70,72 +61,56 @@ public function getNamesByQueryForBookDocument() self::assertSecondNameForBookDocument($names[0]); } - /** - * @test - */ + #[Test] public function getNameByQueryForBookDocument() { $name = $this->bookReader->getName(0, '[@type="personal" and not(@usage="primary")]'); self::assertSecondNameForBookDocument($name); } - /** - * @test - */ + #[Test] public function getFirstNameByQueryForBookDocument() { $name = $this->bookReader->getFirstName('[@type="personal" and not(@usage="primary")]'); self::assertSecondNameForBookDocument($name); } - /** - * @test - */ + #[Test] public function getLastNameByQueryForBookDocument() { $name = $this->bookReader->getLastName('[@type="personal" and not(@usage="primary")]'); self::assertSecondNameForBookDocument($name); } - /** - * @test - */ + #[Test] public function getNoNamesByQueryForBookDocument() { $names = $this->bookReader->getNames('[@type="corporate"]'); self::assertEmpty($names); } - /** - * @test - */ + #[Test] public function getNoNameByQueryForBookDocument() { $name = $this->bookReader->getName(3, '[@type="corporate"]'); self::assertNull($name); } - /** - * @test - */ + #[Test] public function getNoFirstNameByQueryForBookDocument() { $name = $this->bookReader->getFirstName('[@type="corporate"]'); self::assertNull($name); } - /** - * @test - */ + #[Test] public function getNoLastNameByQueryForBookDocument() { $name = $this->bookReader->getLastName('[@type="corporate"]'); self::assertNull($name); } - /** - * @test - */ + #[Test] public function getNamesForSerialDocument() { $names = $this->serialReader->getNames(); @@ -144,9 +119,7 @@ public function getNamesForSerialDocument() self::assertNameForSerialDocument($names[0]); } - /** - * @test - */ + #[Test] public function getNamesByQueryForSerialDocument() { $names = $this->serialReader->getNames('[@type="corporate"]'); @@ -155,9 +128,7 @@ public function getNamesByQueryForSerialDocument() self::assertNameForSerialDocument($names[0]); } - /** - * @test - */ + #[Test] public function getNoNamesByQueryForSerialDocument() { $names = $this->serialReader->getNames('[@type="personal"]'); diff --git a/tests/Mods/Reader/NoteReaderTest.php b/tests/Mods/Reader/NoteReaderTest.php index 10197b9..0ec0471 100644 --- a/tests/Mods/Reader/NoteReaderTest.php +++ b/tests/Mods/Reader/NoteReaderTest.php @@ -12,6 +12,7 @@ namespace Slub\Mods\Reader; +use PHPUnit\Framework\Attributes\Test; use Slub\Mods\Element\Note; use Slub\Mods\ModsReaderTest; @@ -21,9 +22,7 @@ class NoteReaderTest extends ModsReaderTest { - /** - * @test - */ + #[Test] public function getNotesForBookDocument() { $notes = $this->bookReader->getNotes(); @@ -32,36 +31,28 @@ public function getNotesForBookDocument() self::assertFirstNoteForBookDocument($notes[0]); } - /** - * @test - */ + #[Test] public function getNoteForBookDocument() { $note = $this->bookReader->getNote(1); self::assertSecondNoteForBookDocument($note); } - /** - * @test - */ + #[Test] public function getFirstNoteForBookDocument() { $note = $this->bookReader->getFirstNote(); self::assertFirstNoteForBookDocument($note); } - /** - * @test - */ + #[Test] public function getLastNoteForBookDocument() { $note = $this->bookReader->getLastNote(); self::assertSecondNoteForBookDocument($note); } - /** - * @test - */ + #[Test] public function getNotesByQueryForBookDocument() { $notes = $this->bookReader->getNotes('[@type="bibliography"]'); @@ -70,72 +61,56 @@ public function getNotesByQueryForBookDocument() self::assertSecondNoteForBookDocument($notes[0]); } - /** - * @test - */ + #[Test] public function getNoteByQueryForBookDocument() { $note = $this->bookReader->getNote(0, '[@type="bibliography"]'); self::assertSecondNoteForBookDocument($note); } - /** - * @test - */ + #[Test] public function getFirstNoteByQueryForBookDocument() { $note = $this->bookReader->getFirstNote('[@type="bibliography"]'); self::assertSecondNoteForBookDocument($note); } - /** - * @test - */ + #[Test] public function getLastNoteByQueryForBookDocument() { $note = $this->bookReader->getLastNote('[@type="bibliography"]'); self::assertSecondNoteForBookDocument($note); } - /** - * @test - */ + #[Test] public function getNoNotesByQueryForBookDocument() { $notes = $this->bookReader->getNotes('[@type="xyz"]'); self::assertEmpty($notes); } - /** - * @test - */ + #[Test] public function getNoNoteByQueryForBookDocument() { $note = $this->bookReader->getNote(0, '[@type="xyz"]'); self::assertNull($note); } - /** - * @test - */ + #[Test] public function getNoFirstNoteByQueryForBookDocument() { $note = $this->bookReader->getFirstNote('[@type="xyz"]'); self::assertNull($note); } - /** - * @test - */ + #[Test] public function getNoLastNoteByQueryForBookDocument() { $note = $this->bookReader->getLastNote('[@type="xyz"]'); self::assertNull($note); } - /** - * @test - */ + #[Test] public function getNotesForSerialDocument() { $notes = $this->serialReader->getNotes(); @@ -144,36 +119,28 @@ public function getNotesForSerialDocument() self::assertFirstNoteForSerialDocument($notes[0]); } - /** - * @test - */ + #[Test] public function getNoteForSerialDocument() { $note = $this->serialReader->getNote(5); self::assertSixthNoteForSerialDocument($note); } - /** - * @test - */ + #[Test] public function getFirstNoteForSerialDocument() { $note = $this->serialReader->getFirstNote(); self::assertFirstNoteForSerialDocument($note); } - /** - * @test - */ + #[Test] public function getLastNoteForSerialDocument() { $note = $this->serialReader->getLastNote(); self::assertSixthNoteForSerialDocument($note); } - /** - * @test - */ + #[Test] public function getNotesByQueryForSerialDocument() { $notes = $this->serialReader->getNotes('[@type="system details"]'); @@ -182,9 +149,7 @@ public function getNotesByQueryForSerialDocument() self::assertFifthNoteForSerialDocument($notes[0]); } - /** - * @test - */ + #[Test] public function getNoNotesByQueryForSerialDocument() { $notes = $this->serialReader->getNotes('[@type="xyz"]'); diff --git a/tests/Mods/Reader/OriginInfoReaderTest.php b/tests/Mods/Reader/OriginInfoReaderTest.php index e949a46..5aaddf1 100644 --- a/tests/Mods/Reader/OriginInfoReaderTest.php +++ b/tests/Mods/Reader/OriginInfoReaderTest.php @@ -12,6 +12,7 @@ namespace Slub\Mods\Reader; +use PHPUnit\Framework\Attributes\Test; use Slub\Mods\Element\OriginInfo; use Slub\Mods\ModsReaderTest; @@ -21,9 +22,7 @@ class OriginInfoReaderTest extends ModsReaderTest { - /** - * @test - */ + #[Test] public function getOriginInfosForBookDocument() { $originInfos = $this->bookReader->getOriginInfos(); @@ -32,36 +31,28 @@ public function getOriginInfosForBookDocument() self::assertFirstOriginInfoForBookDocument($originInfos[0]); } - /** - * @test - */ + #[Test] public function getOriginInfoForBookDocument() { $originInfo = $this->bookReader->getOriginInfo(1); self::assertSecondOriginInfoForBookDocument($originInfo); } - /** - * @test - */ + #[Test] public function getFirstOriginInfoForBookDocument() { $originInfo = $this->bookReader->getFirstOriginInfo(); self::assertFirstOriginInfoForBookDocument($originInfo); } - /** - * @test - */ + #[Test] public function getLastOriginInfoForBookDocument() { $originInfo = $this->bookReader->getLastOriginInfo(); self::assertSecondOriginInfoForBookDocument($originInfo); } - /** - * @test - */ + #[Test] public function getOriginInfosByQueryForBookDocument() { $originInfos = $this->bookReader->getOriginInfos('[@eventType="redaction"]'); @@ -70,9 +61,7 @@ public function getOriginInfosByQueryForBookDocument() self::assertSecondOriginInfoForBookDocument($originInfos[0]); } - /** - * @test - */ + #[Test] public function getNoOriginInfosByQueryForBookDocument() { $originInfos = $this->bookReader->getOriginInfos('[@eventType="xyz"]'); @@ -85,36 +74,28 @@ public function getNoOriginInfosByQueryForBookDocument() self::assertNull($lastOriginInfo); } - /** - * @test - */ + #[Test] public function getNoOriginInfoByQueryForBookDocument() { $originInfo = $this->bookReader->getOriginInfo(4, '[@eventType="xyz"]'); self::assertNull($originInfo); } - /** - * @test - */ + #[Test] public function getNoFirstOriginInfoByQueryForBookDocument() { $originInfo = $this->bookReader->getFirstOriginInfo('[@eventType="xyz"]'); self::assertNull($originInfo); } - /** - * @test - */ + #[Test] public function getNoLastOriginInfoByQueryForBookDocument() { $originInfo = $this->bookReader->getLastOriginInfo('[@eventType="xyz"]'); self::assertNull($originInfo); } - /** - * @test - */ + #[Test] public function getOriginInfosForSerialDocument() { $originInfos = $this->serialReader->getOriginInfos(); @@ -123,9 +104,7 @@ public function getOriginInfosForSerialDocument() self::assertOriginInfoForSerialDocument($originInfos[0]); } - /** - * @test - */ + #[Test] public function getOriginInfosByQueryForSerialDocument() { $originInfos = $this->serialReader->getOriginInfos('[@eventType="publication"]'); @@ -134,9 +113,7 @@ public function getOriginInfosByQueryForSerialDocument() self::assertOriginInfoForSerialDocument($originInfos[0]); } - /** - * @test - */ + #[Test] public function getNoOriginInfosByQueryForSerialDocument() { $originInfos = $this->serialReader->getOriginInfos('[@eventType="xyz"]'); diff --git a/tests/Mods/Reader/PartReaderTest.php b/tests/Mods/Reader/PartReaderTest.php index 2d00b14..b60734e 100644 --- a/tests/Mods/Reader/PartReaderTest.php +++ b/tests/Mods/Reader/PartReaderTest.php @@ -12,6 +12,7 @@ namespace Slub\Mods\Reader; +use PHPUnit\Framework\Attributes\Test; use Slub\Mods\Element\Part; use Slub\Mods\ModsReaderTest; @@ -21,9 +22,7 @@ class PartReaderTest extends ModsReaderTest { - /** - * @test - */ + #[Test] public function getPartsForBookDocument() { $parts = $this->bookReader->getParts(); @@ -32,36 +31,28 @@ public function getPartsForBookDocument() self::assertFirstPartForBookDocument($parts[0]); } - /** - * @test - */ + #[Test] public function getPartForBookDocument() { $part = $this->bookReader->getPart(1); self::assertSecondPartForBookDocument($part); } - /** - * @test - */ + #[Test] public function getFirstPartForBookDocument() { $part = $this->bookReader->getFirstPart(); self::assertFirstPartForBookDocument($part); } - /** - * @test - */ + #[Test] public function getLastPartForBookDocument() { $part = $this->bookReader->getLastPart(); self::assertSecondPartForBookDocument($part); } - /** - * @test - */ + #[Test] public function getPartsByQueryForBookDocument() { $parts = $this->bookReader->getParts('[@order="2"]'); @@ -70,45 +61,35 @@ public function getPartsByQueryForBookDocument() self::assertSecondPartForBookDocument($parts[0]); } - /** - * @test - */ + #[Test] public function getNoPartsByQueryForBookDocument() { $parts = $this->bookReader->getParts('[@order="3"]'); self::assertEmpty($parts); } - /** - * @test - */ + #[Test] public function getNoPartByQueryForBookDocument() { $part = $this->bookReader->getPart(0, '[@order="3"]'); self::assertNull($part); } - /** - * @test - */ + #[Test] public function getNoFirstPartByQueryForBookDocument() { $part = $this->bookReader->getFirstPart('[@order="3"]'); self::assertNull($part); } - /** - * @test - */ + #[Test] public function getNoLastPartByQueryForBookDocument() { $part = $this->bookReader->getLastPart('[@order="3"]'); self::assertNull($part); } - /** - * @test - */ + #[Test] public function getNoPartsForSerialDocument() { $parts = $this->serialReader->getParts(); diff --git a/tests/Mods/Reader/PhysicalDescriptionReaderTest.php b/tests/Mods/Reader/PhysicalDescriptionReaderTest.php index 7833bd3..c166382 100644 --- a/tests/Mods/Reader/PhysicalDescriptionReaderTest.php +++ b/tests/Mods/Reader/PhysicalDescriptionReaderTest.php @@ -12,6 +12,7 @@ namespace Slub\Mods\Reader; +use PHPUnit\Framework\Attributes\Test; use Slub\Mods\Element\PhysicalDescription; use Slub\Mods\ModsReaderTest; @@ -21,9 +22,7 @@ class PhysicalDescriptionReaderTest extends ModsReaderTest { - /** - * @test - */ + #[Test] public function getPhysicalDescriptionsForBookDocument() { $physicalDescriptions = $this->bookReader->getPhysicalDescriptions(); @@ -32,36 +31,28 @@ public function getPhysicalDescriptionsForBookDocument() self::assertPhysicalDescriptionForBookDocument($physicalDescriptions[0]); } - /** - * @test - */ + #[Test] public function getPhysicalDescriptionForBookDocument() { $physicalDescription = $this->bookReader->getPhysicalDescription(0); self::assertPhysicalDescriptionForBookDocument($physicalDescription); } - /** - * @test - */ + #[Test] public function getFirstPhysicalDescriptionForBookDocument() { $physicalDescription = $this->bookReader->getFirstPhysicalDescription(); self::assertPhysicalDescriptionForBookDocument($physicalDescription); } - /** - * @test - */ + #[Test] public function getLastPhysicalDescriptionForBookDocument() { $physicalDescription = $this->bookReader->getLastPhysicalDescription(); self::assertPhysicalDescriptionForBookDocument($physicalDescription); } - /** - * @test - */ + #[Test] public function gtPhysicalDescriptionsByParametersForBookDocument() { $physicalDescriptions = $this->bookReader->getPhysicalDescriptionsByParameters('./mods:form', ['authority' => 'marcform'], 'print'); @@ -70,9 +61,7 @@ public function gtPhysicalDescriptionsByParametersForBookDocument() self::assertPhysicalDescriptionForBookDocument($physicalDescriptions[0]); } - /** - * @test - */ + #[Test] public function getPhysicalDescriptionsByQueryForBookDocument() { $physicalDescriptions = $this->bookReader->getPhysicalDescriptions('[./mods:form[@authority="marcform"]="print"]'); @@ -81,45 +70,35 @@ public function getPhysicalDescriptionsByQueryForBookDocument() self::assertPhysicalDescriptionForBookDocument($physicalDescriptions[0]); } - /** - * @test - */ + #[Test] public function getNoPhysicalDescriptionsByQueryForBookDocument() { $physicalDescriptions = $this->bookReader->getPhysicalDescriptions('[./mods:form[@authority="marcform"]="electronic"]'); self::assertEmpty($physicalDescriptions); } - /** - * @test - */ + #[Test] public function getNoPhysicalDescriptionByQueryForBookDocument() { $physicalDescription = $this->bookReader->getPhysicalDescription(0, '[./mods:form[@authority="marcform"]="electronic"]'); self::assertNull($physicalDescription); } - /** - * @test - */ + #[Test] public function getNoFirstPhysicalDescriptionByQueryForBookDocument() { $physicalDescription = $this->bookReader->getFirstPhysicalDescription('[./mods:form[@authority="marcform"]="electronic"]'); self::assertNull($physicalDescription); } - /** - * @test - */ + #[Test] public function getNoLastPhysicalDescriptionByQueryForBookDocument() { $physicalDescription = $this->bookReader->getLastPhysicalDescription('[./mods:form[@authority="marcform"]="electronic"]'); self::assertNull($physicalDescription); } - /** - * @test - */ + #[Test] public function getPhysicalDescriptionsForSerialDocument() { $physicalDescriptions = $this->serialReader->getPhysicalDescriptions(); @@ -128,9 +107,7 @@ public function getPhysicalDescriptionsForSerialDocument() self::assertPhysicalDescriptionForSerialDocument($physicalDescriptions[0]); } - /** - * @test - */ + #[Test] public function getPhysicalDescriptionsByQueryForSerialDocument() { $physicalDescriptions = $this->serialReader->getPhysicalDescriptions('[./mods:form[@authority="marcform"]="electronic"]'); @@ -139,9 +116,7 @@ public function getPhysicalDescriptionsByQueryForSerialDocument() self::assertPhysicalDescriptionForSerialDocument($physicalDescriptions[0]); } - /** - * @test - */ + #[Test] public function getNoPhysicalDescriptionsByQueryForSerialDocument() { $physicalDescriptions = $this->serialReader->getPhysicalDescriptions('[./mods:form[@authority="marcform"]="print"]'); diff --git a/tests/Mods/Reader/RecordInfoReaderTest.php b/tests/Mods/Reader/RecordInfoReaderTest.php index 6ce6483..9cbf80e 100644 --- a/tests/Mods/Reader/RecordInfoReaderTest.php +++ b/tests/Mods/Reader/RecordInfoReaderTest.php @@ -12,6 +12,7 @@ namespace Slub\Mods\Reader; +use PHPUnit\Framework\Attributes\Test; use Slub\Mods\Element\RecordInfo; use Slub\Mods\Exception\IncorrectValueInAttributeException; use Slub\Mods\ModsReaderTest; @@ -22,7 +23,8 @@ class RecordInfoReaderTest extends ModsReaderTest { - public function testGetRecordInfosForBookDocument() + #[Test] + public function getRecordInfosForBookDocument() { $recordInfos = $this->bookReader->getRecordInfos(); self::assertNotEmpty($recordInfos); @@ -30,25 +32,29 @@ public function testGetRecordInfosForBookDocument() self::assertRecordInfoForBookDocument($recordInfos[0]); } - public function testGetRecordInfoForBookDocument() + #[Test] + public function getRecordInfoForBookDocument() { $recordInfo = $this->bookReader->getRecordInfo(0); self::assertRecordInfoForBookDocument($recordInfo); } - public function testGetFirstRecordInfoForBookDocument() + #[Test] + public function getFirstRecordInfoForBookDocument() { $recordInfo = $this->bookReader->getFirstRecordInfo(); self::assertRecordInfoForBookDocument($recordInfo); } - public function testGetLastRecordInfoForBookDocument() + #[Test] + public function getLastRecordInfoForBookDocument() { $recordInfo = $this->bookReader->getLastRecordInfo(); self::assertRecordInfoForBookDocument($recordInfo); } - public function testGetRecordInfosByQueryForBookDocument() + #[Test] + public function getRecordInfosByQueryForBookDocument() { $recordInfos = $this->bookReader->getRecordInfos('[./mods:descriptionStandard="aacr"]'); self::assertNotEmpty($recordInfos); @@ -56,31 +62,36 @@ public function testGetRecordInfosByQueryForBookDocument() self::assertRecordInfoForBookDocument($recordInfos[0]); } - public function testGetRecordInfoByQueryForBookDocument() + #[Test] + public function getRecordInfoByQueryForBookDocument() { $recordInfo = $this->bookReader->getRecordInfo(0, '[./mods:descriptionStandard="aacr"]'); self::assertRecordInfoForBookDocument($recordInfo); } - public function testGetFirstRecordInfoByQueryForBookDocument() + #[Test] + public function getFirstRecordInfoByQueryForBookDocument() { $recordInfo = $this->bookReader->getFirstRecordInfo('[./mods:descriptionStandard="aacr"]'); self::assertRecordInfoForBookDocument($recordInfo); } - public function testGetLastRecordInfoByQueryForBookDocument() + #[Test] + public function getLastRecordInfoByQueryForBookDocument() { $recordInfo = $this->bookReader->getLastRecordInfo('[./mods:descriptionStandard="aacr"]'); self::assertRecordInfoForBookDocument($recordInfo); } - public function testGetNoRecordInfosByQueryForBookDocument() + #[Test] + public function getNoRecordInfosByQueryForBookDocument() { $recordInfos = $this->bookReader->getRecordInfos('[./mods:descriptionStandard="xyz"]'); self::assertEmpty($recordInfos); } - public function testGetNoRecordInfoByQueryForBookDocument() + #[Test] + public function getNoRecordInfoByQueryForBookDocument() { $recordInfo = $this->bookReader->getRecordInfo(5, '[./mods:descriptionStandard="xyz"]'); self::assertNull($recordInfo); @@ -92,7 +103,8 @@ public function testGetNoRecordInfoByQueryForBookDocument() self::assertNull($lastRecordInfo); } - public function testGetRecordInfosForSerialDocument() + #[Test] + public function getRecordInfosForSerialDocument() { $recordInfos = $this->serialReader->getRecordInfos(); self::assertNotEmpty($recordInfos); @@ -103,7 +115,9 @@ public function testGetRecordInfosForSerialDocument() $recordInfos[0]->getRecordCreationDates()[0]->getEncoding(); } - public function testGetRecordInfosByQueryForSerialDocument() + + #[Test] + public function getRecordInfosByQueryForSerialDocument() { $recordInfos = $this->serialReader->getRecordInfos('[./mods:descriptionStandard="aacr"]'); self::assertNotEmpty($recordInfos); @@ -114,7 +128,8 @@ public function testGetRecordInfosByQueryForSerialDocument() $recordInfos[0]->getRecordCreationDates()[0]->getEncoding(); } - public function testGetNoRecordInfosByQueryForSerialDocument() + #[Test] + public function getNoRecordInfosByQueryForSerialDocument() { $recordInfos = $this->serialReader->getRecordInfos('[./mods:descriptionStandard="xyz"]'); self::assertEmpty($recordInfos); diff --git a/tests/Mods/Reader/RelatedItemReaderTest.php b/tests/Mods/Reader/RelatedItemReaderTest.php index c190422..3403695 100644 --- a/tests/Mods/Reader/RelatedItemReaderTest.php +++ b/tests/Mods/Reader/RelatedItemReaderTest.php @@ -12,6 +12,7 @@ namespace Slub\Mods\Reader; +use PHPUnit\Framework\Attributes\Test; use Slub\Mods\Element\RelatedItem; use Slub\Mods\ModsReaderTest; @@ -21,45 +22,35 @@ class RelatedItemReaderTest extends ModsReaderTest { - /** - * @test - */ + #[Test] public function getNoRelatedItemsForBookDocument() { $relatedItems = $this->bookReader->getRelatedItems(); self::assertEmpty($relatedItems); } - /** - * @test - */ + #[Test] public function getNoRelatedItemForBookDocument() { $relatedItem = $this->bookReader->getRelatedItem(0); self::assertNull($relatedItem); } - /** - * @test - */ + #[Test] public function getNoFirstRelatedItemForBookDocument() { $relatedItem = $this->bookReader->getFirstRelatedItem(); self::assertNull($relatedItem); } - /** - * @test - */ + #[Test] public function getNoLastRelatedItemForBookDocument() { $relatedItem = $this->bookReader->getLastRelatedItem(); self::assertNull($relatedItem); } - /** - * @test - */ + #[Test] public function getRelatedItemsForSerialDocument() { $relatedItems = $this->serialReader->getRelatedItems(); @@ -68,36 +59,28 @@ public function getRelatedItemsForSerialDocument() self::assertRelatedItemForSerialDocument($relatedItems[0]); } - /** - * @test - */ + #[Test] public function getRelatedItemForSerialDocument() { $relatedItem = $this->serialReader->getRelatedItem(0); self::assertRelatedItemForSerialDocument($relatedItem); } - /** - * @test - */ + #[Test] public function getFirstRelatedItemForSerialDocument() { $relatedItem = $this->serialReader->getFirstRelatedItem(); self::assertRelatedItemForSerialDocument($relatedItem); } - /** - * @test - */ + #[Test] public function getLastRelatedItemForSerialDocument() { $relatedItem = $this->serialReader->getLastRelatedItem(); self::assertRelatedItemForSerialDocument($relatedItem); } - /** - * @test - */ + #[Test] public function getRelatedItemsByQueryForSerialDocument() { $relatedItems = $this->serialReader->getRelatedItems('[./mods:identifier="1525-321X"]'); @@ -106,9 +89,7 @@ public function getRelatedItemsByQueryForSerialDocument() self::assertRelatedItemForSerialDocument($relatedItems[0]); } - /** - * @test - */ + #[Test] public function getNoRelatedItemsByQueryForSerialDocument() { $relatedItems = $this->serialReader->getRelatedItems('[./mods:identifier="15-32"]'); diff --git a/tests/Mods/Reader/SubjectReaderTest.php b/tests/Mods/Reader/SubjectReaderTest.php index 18426da..5d98dd8 100644 --- a/tests/Mods/Reader/SubjectReaderTest.php +++ b/tests/Mods/Reader/SubjectReaderTest.php @@ -12,6 +12,7 @@ namespace Slub\Mods\Reader; +use PHPUnit\Framework\Attributes\Test; use Slub\Mods\Element\Subject; use Slub\Mods\ModsReaderTest; @@ -21,9 +22,7 @@ class SubjectReaderTest extends ModsReaderTest { - /** - * @test - */ + #[Test] public function getSubjectsForBookDocument() { $subjects = $this->bookReader->getSubjects(); @@ -32,36 +31,28 @@ public function getSubjectsForBookDocument() self::assertFirstSubjectForBookDocument($subjects[0]); } - /** - * @test - */ + #[Test] public function getSubjectForBookDocument() { $subjects = $this->bookReader->getSubject(1); self::assertSecondSubjectForBookDocument($subjects); } - /** - * @test - */ + #[Test] public function getFirstSubjectForBookDocument() { $subjects = $this->bookReader->getFirstSubject(); self::assertFirstSubjectForBookDocument($subjects); } - /** - * @test - */ + #[Test] public function getLastSubjectForBookDocument() { $subjects = $this->bookReader->getLastSubject(); self::assertEightSubjectForBookDocument($subjects); } - /** - * @test - */ + #[Test] public function getSubjectsByQueryForBookDocument() { $subjects = $this->bookReader->getSubjects('[./mods:topic="Mass media"]'); @@ -70,72 +61,56 @@ public function getSubjectsByQueryForBookDocument() self::assertFourthSubjectForBookDocument($subjects[0]); } - /** - * @test - */ + #[Test] public function getSubjectByQueryForBookDocument() { $subject = $this->bookReader->getSubject(0, '[./mods:topic="Mass media"]'); self::assertFourthSubjectForBookDocument($subject); } - /** - * @test - */ + #[Test] public function getFirstSubjectByQueryForBookDocument() { $subject = $this->bookReader->getFirstSubject('[./mods:topic="Mass media"]'); self::assertFourthSubjectForBookDocument($subject); } - /** - * @test - */ + #[Test] public function getLastSubjectByQueryForBookDocument() { $subject = $this->bookReader->getLastSubject('[./mods:topic="Mass media"]'); self::assertFourthSubjectForBookDocument($subject); } - /** - * @test - */ + #[Test] public function getNoSubjectsByQueryForBookDocument() { $subjects = $this->bookReader->getSubjects('[./mods:topic="Unknown"]'); self::assertEmpty($subjects); } - /** - * @test - */ + #[Test] public function getNoSubjectByQueryForBookDocument() { $subject = $this->bookReader->getSubject(5, '[./mods:topic="Unknown"]'); self::assertNull($subject); } - /** - * @test - */ + #[Test] public function getNoFirstSubjectByQueryForBookDocument() { $subject = $this->bookReader->getFirstSubject(5, '[./mods:topic="Unknown"]'); self::assertNull($subject); } - /** - * @test - */ + #[Test] public function getNoLastSubjectByQueryForBookDocument() { $subject = $this->bookReader->getLastSubject('[./mods:topic="Unknown"]'); self::assertNull($subject); } - /** - * @test - */ + #[Test] public function getSubjectsForSerialDocument() { $subjects = $this->serialReader->getSubjects(); @@ -153,9 +128,7 @@ public function getSubjectsForSerialDocument() */ } - /** - * @test - */ + #[Test] public function getSubjectsByQueryForSerialDocument() { $subjects = $this->serialReader->getSubjects('[./mods:genre="Directories"]'); @@ -168,9 +141,7 @@ public function getSubjectsByQueryForSerialDocument() self::assertEquals('Directories', $subjects[0]->getGenres()[0]->getValue()); } - /** - * @test - */ + #[Test] public function getNoSubjectsByQueryForSerialDocument() { $subjects = $this->serialReader->getSubjects('[./mods:topic="Unknown"]'); diff --git a/tests/Mods/Reader/TableOfContentsReaderTest.php b/tests/Mods/Reader/TableOfContentsReaderTest.php index c50b268..985618e 100644 --- a/tests/Mods/Reader/TableOfContentsReaderTest.php +++ b/tests/Mods/Reader/TableOfContentsReaderTest.php @@ -12,6 +12,7 @@ namespace Slub\Mods\Reader; +use PHPUnit\Framework\Attributes\Test; use Slub\Mods\Element\TableOfContents; use Slub\Mods\ModsReaderTest; @@ -21,9 +22,7 @@ class TableOfContentsReaderTest extends ModsReaderTest { - /** - * @test - */ + #[Test] public function getTablesOfContentsForBookDocument() { $tablesOfContents = $this->bookReader->getTablesOfContents(); @@ -32,36 +31,28 @@ public function getTablesOfContentsForBookDocument() self::assertTableOfContentsForBookDocument($tablesOfContents[0]); } - /** - * @test - */ + #[Test] public function getTableOfContentsForBookDocument() { $tableOfContents = $this->bookReader->getTableOfContents(0); self::assertTableOfContentsForBookDocument($tableOfContents); } - /** - * @test - */ + #[Test] public function getFirstTableOfContentsForBookDocument() { $tableOfContents = $this->bookReader->getFirstTableOfContents(); self::assertTableOfContentsForBookDocument($tableOfContents); } - /** - * @test - */ + #[Test] public function getLastTableOfContentsForBookDocument() { $tableOfContents = $this->bookReader->getLastTableOfContents(); self::assertTableOfContentsForBookDocument($tableOfContents); } - /** - * @test - */ + #[Test] public function getTablesOfContentsByQueryForBookDocument() { $tablesOfContents = $this->bookReader->getTablesOfContents('[@displayLabel="Chapters"]'); @@ -70,72 +61,56 @@ public function getTablesOfContentsByQueryForBookDocument() self::assertTableOfContentsForBookDocument($tablesOfContents[0]); } - /** - * @test - */ + #[Test] public function getTableOfContentsByQueryForBookDocument() { $tableOfContents = $this->bookReader->getTableOfContents(0, '[@displayLabel="Chapters"]'); self::assertTableOfContentsForBookDocument($tableOfContents); } - /** - * @test - */ + #[Test] public function getFirstTableOfContentsByQueryForBookDocument() { $tableOfContents = $this->bookReader->getFirstTableOfContents('[@displayLabel="Chapters"]'); self::assertTableOfContentsForBookDocument($tableOfContents); } - /** - * @test - */ + #[Test] public function getLastTableOfContentsByQueryForBookDocument() { $tableOfContents = $this->bookReader->getLastTableOfContents('[@displayLabel="Chapters"]'); self::assertTableOfContentsForBookDocument($tableOfContents); } - /** - * @test - */ + #[Test] public function getNoTablesOfContentsByQueryForBookDocument() { $tablesOfContents = $this->bookReader->getTablesOfContents('[@displayLabel="Pages"]'); self::assertEmpty($tablesOfContents); } - /** - * @test - */ + #[Test] public function getNoTableOfContentsByQueryForBookDocument() { $tableOfContents = $this->bookReader->getTableOfContents(0, '[@displayLabel="Pages"]'); self::assertNull($tableOfContents); } - /** - * @test - */ + #[Test] public function getNoFirstTableOfContentsByQueryForBookDocument() { $tableOfContents = $this->bookReader->getFirstTableOfContents('[@displayLabel="Pages"]'); self::assertNull($tableOfContents); } - /** - * @test - */ + #[Test] public function getNoLastTableOfContentsByQueryForBookDocument() { $tableOfContents = $this->bookReader->getLastTableOfContents('[@displayLabel="Pages"]'); self::assertNull($tableOfContents); } - /** - * @test - */ + #[Test] public function getNoTablesOfContentsForSerialDocument() { $tablesOfContents = $this->serialReader->getTablesOfContents(); diff --git a/tests/Mods/Reader/TitleInfoReaderTest.php b/tests/Mods/Reader/TitleInfoReaderTest.php index 4fc33c7..4a33969 100644 --- a/tests/Mods/Reader/TitleInfoReaderTest.php +++ b/tests/Mods/Reader/TitleInfoReaderTest.php @@ -12,6 +12,7 @@ namespace Slub\Mods\Reader; +use PHPUnit\Framework\Attributes\Test; use Slub\Mods\ModsReaderTest; /** @@ -20,10 +21,8 @@ class TitleInfoReaderTest extends ModsReaderTest { - /** - * @test - */ - public function testGetTitleInfosForBookDocument() + #[Test] + public function getTitleInfosForBookDocument() { $titleInfos = $this->bookReader->getTitleInfos(); self::assertNotEmpty($titleInfos); @@ -33,10 +32,8 @@ public function testGetTitleInfosForBookDocument() self::assertEquals('the making of the punditocracy', $titleInfos[0]->getSubTitle()->getValue()); } - /** - * @test - */ - public function testGetTitleInfosByQueryForBookDocument() + #[Test] + public function getTitleInfosByQueryForBookDocument() { $titleInfos = $this->bookReader->getTitleInfos('[@xml:lang="fr"]'); self::assertNotEmpty($titleInfos); @@ -52,10 +49,8 @@ public function testGetTitleInfosByQueryForBookDocument() self::assertEquals('la création de la punditocratie', $titleInfos[0]->getSubTitle()->getValue()); } - /** - * @test - */ - public function testGetTitleInfosForSerialDocument() + #[Test] + public function getTitleInfosForSerialDocument() { $titleInfos = $this->serialReader->getTitleInfos(); self::assertNotEmpty($titleInfos); @@ -67,10 +62,8 @@ public function testGetTitleInfosForSerialDocument() self::assertEquals('the electronic journal of academic and special librarianship', $titleInfos[0]->getSubTitle()->getValue()); } - /** - * @test - */ - public function testGetTitleInfosByQueryForSerialDocument() + #[Test] + public function getTitleInfosByQueryForSerialDocument() { $titleInfos = $this->serialReader->getTitleInfos('[@type="abbreviated"]'); self::assertNotEmpty($titleInfos); @@ -81,10 +74,8 @@ public function testGetTitleInfosByQueryForSerialDocument() self::assertEquals('(Athabasca)', $titleInfos[0]->getSubTitle()->getValue()); } - /** - * @test - */ - public function testGetNoTitleInfosByQueryForSerialDocument() + #[Test] + public function getNoTitleInfosByQueryForSerialDocument() { $titleInfos = $this->serialReader->getTitleInfos('[@type="uniform"]'); self::assertEmpty($titleInfos); diff --git a/tests/Mods/Reader/TypeOfResourceTest.php b/tests/Mods/Reader/TypeOfResourceTest.php index 6b5627c..7404374 100644 --- a/tests/Mods/Reader/TypeOfResourceTest.php +++ b/tests/Mods/Reader/TypeOfResourceTest.php @@ -12,6 +12,7 @@ namespace Slub\Mods\Reader; +use PHPUnit\Framework\Attributes\Test; use Slub\Mods\Element\TypeOfResource; use Slub\Mods\ModsReaderTest; @@ -21,36 +22,28 @@ class TypeOfResourceReaderTest extends ModsReaderTest { - /** - * @test - */ + #[Test] public function getTypeOfResourceForBookDocument() { $typeOfResource = $this->bookReader->getTypeOfResource(); self::assertTypeOfResourceForBookDocument($typeOfResource); } - /** - * @test - */ + #[Test] public function getTypeOfResourceByQueryForBookDocument() { $typeOfResource = $this->bookReader->getTypeOfResource('[@displayLabel="format"]'); self::assertTypeOfResourceForBookDocument($typeOfResource); } - /** - * @test - */ + #[Test] public function getNoTypeOfResourceByQueryForBookDocument() { $typeOfResource = $this->bookReader->getTypeOfResource('[@displayLabel="random"]'); self::assertNull($typeOfResource); } - /** - * @test - */ + #[Test] public function getTypeOfResourceForSerialDocument() { $typeOfResource = $this->serialReader->getTypeOfResource(); @@ -60,9 +53,7 @@ public function getTypeOfResourceForSerialDocument() self::assertEquals('text', $typeOfResource->getValue()); } - /** - * @test - */ + #[Test] public function getNoTypeOfResourceByQueryForSerialDocument() { $abstract = $this->serialReader->getAbstract('[@displayForm="format"]'); diff --git a/tests/Mods/Utility/QueryTest.php b/tests/Mods/Utility/QueryTest.php index 19f928c..46ace69 100644 --- a/tests/Mods/Utility/QueryTest.php +++ b/tests/Mods/Utility/QueryTest.php @@ -11,6 +11,7 @@ */ namespace Slub\Mods\Utility; +use PHPUnit\Framework\Attributes\Test; use PHPUnit\Framework\TestCase; class QueryTest extends TestCase @@ -76,9 +77,7 @@ class QueryTest extends TestCase ] ]; - /** - * @test - */ + #[Test] public function testConstructorAppendsCorrectXpath() { $initialXPath = '/initial/xpath'; From 8674e8b74167fd0d4402df4993d35a8db6d99bf2 Mon Sep 17 00:00:00 2001 From: Beatrycze Volk Date: Mon, 22 Jun 2026 16:08:34 +0200 Subject: [PATCH 3/3] [TEST] Add void return type declarations to test helpers Explicitly declare the 'void' return type for private static helper methods across the test suite. This enhances type safety and code clarity, aligning with modern PHP type-hinting standards. --- tests/Mods/Reader/AccessConditionReaderTest.php | 4 ++-- tests/Mods/Reader/ClassificationReaderTest.php | 6 +++--- tests/Mods/Reader/GenreReaderTest.php | 6 +++--- tests/Mods/Reader/IdentifierReaderTest.php | 12 ++++++------ tests/Mods/Reader/LanguageReaderTest.php | 8 ++++---- tests/Mods/Reader/LocationReaderTest.php | 6 +++--- tests/Mods/Reader/NameReaderTest.php | 6 +++--- tests/Mods/Reader/NoteReaderTest.php | 10 +++++----- tests/Mods/Reader/OriginInfoReaderTest.php | 6 +++--- tests/Mods/Reader/PartReaderTest.php | 4 ++-- tests/Mods/Reader/PhysicalDescriptionReaderTest.php | 4 ++-- tests/Mods/Reader/RecordInfoReaderTest.php | 4 ++-- tests/Mods/Reader/RelatedItemReaderTest.php | 2 +- tests/Mods/Reader/SubjectReaderTest.php | 8 ++++---- tests/Mods/Reader/TableOfContentsReaderTest.php | 2 +- tests/Mods/Reader/TypeOfResourceTest.php | 2 +- 16 files changed, 45 insertions(+), 45 deletions(-) diff --git a/tests/Mods/Reader/AccessConditionReaderTest.php b/tests/Mods/Reader/AccessConditionReaderTest.php index 38095e9..c9f8aa5 100644 --- a/tests/Mods/Reader/AccessConditionReaderTest.php +++ b/tests/Mods/Reader/AccessConditionReaderTest.php @@ -128,7 +128,7 @@ public function getNoAccessConditionsByQueryForSerialDocument() self::assertEmpty($accessConditions); } - private static function assertAccessConditionForBookDocument(AccessCondition $accessCondition) + private static function assertAccessConditionForBookDocument(AccessCondition $accessCondition): void { self::assertNotEmpty($accessCondition->getValue()); self::assertEquals('Use of this public-domain resource is unrestricted.', $accessCondition->getValue()); @@ -138,7 +138,7 @@ private static function assertAccessConditionForBookDocument(AccessCondition $ac self::assertEmpty($accessCondition->getXlinkHref()); } - private static function assertAccessConditionForSerialDocument(AccessCondition $accessCondition) + private static function assertAccessConditionForSerialDocument(AccessCondition $accessCondition): void { self::assertNotEmpty($accessCondition->getValue()); self::assertEquals('Open Access', $accessCondition->getValue()); diff --git a/tests/Mods/Reader/ClassificationReaderTest.php b/tests/Mods/Reader/ClassificationReaderTest.php index 3d90352..1d39162 100644 --- a/tests/Mods/Reader/ClassificationReaderTest.php +++ b/tests/Mods/Reader/ClassificationReaderTest.php @@ -117,7 +117,7 @@ public function getNoClassificationsByQueryForSerialDocument() self::assertEmpty($classifications); } - private static function assertFirstClassificationForBookDocument(Classification $classification) + private static function assertFirstClassificationForBookDocument(Classification $classification): void { self::assertNotEmpty($classification->getValue()); self::assertEquals('PN4888.P6 A48 1999', $classification->getValue()); @@ -127,7 +127,7 @@ private static function assertFirstClassificationForBookDocument(Classification self::assertEmpty($classification->getUsage()); } - private static function assertSecondClassificationForBookDocument(Classification $classification) + private static function assertSecondClassificationForBookDocument(Classification $classification): void { self::assertNotEmpty($classification->getValue()); self::assertEquals('071/.3', $classification->getValue()); @@ -137,7 +137,7 @@ private static function assertSecondClassificationForBookDocument(Classification self::assertEmpty($classification->getGenerator()); } - private static function assertClassificationForSerialDocument(Classification $classification) + private static function assertClassificationForSerialDocument(Classification $classification): void { self::assertNotEmpty($classification->getValue()); self::assertEquals('027.7/05', $classification->getValue()); diff --git a/tests/Mods/Reader/GenreReaderTest.php b/tests/Mods/Reader/GenreReaderTest.php index e18787b..c4bd20f 100644 --- a/tests/Mods/Reader/GenreReaderTest.php +++ b/tests/Mods/Reader/GenreReaderTest.php @@ -156,7 +156,7 @@ public function getNoGenresByQueryForSerialDocument() self::assertEmpty($genres); } - private static function assertGenreForBookDocument(Genre $genre) + private static function assertGenreForBookDocument(Genre $genre): void { self::assertNotEmpty($genre->getValue()); self::assertEquals('bibliography', $genre->getValue()); @@ -166,7 +166,7 @@ private static function assertGenreForBookDocument(Genre $genre) self::assertEmpty($genre->getScript()); } - private static function assertFirstGenreForSerialDocument(Genre $genre) + private static function assertFirstGenreForSerialDocument(Genre $genre): void { self::assertNotEmpty($genre->getValue()); self::assertEquals('periodical', $genre->getValue()); @@ -176,7 +176,7 @@ private static function assertFirstGenreForSerialDocument(Genre $genre) self::assertEmpty($genre->getTransliteration()); } - private static function assertSecondGenreForSerialDocument(Genre $genre) + private static function assertSecondGenreForSerialDocument(Genre $genre): void { self::assertNotEmpty($genre->getValue()); self::assertEquals('series', $genre->getValue()); diff --git a/tests/Mods/Reader/IdentifierReaderTest.php b/tests/Mods/Reader/IdentifierReaderTest.php index 7f98f43..a8353b7 100644 --- a/tests/Mods/Reader/IdentifierReaderTest.php +++ b/tests/Mods/Reader/IdentifierReaderTest.php @@ -198,7 +198,7 @@ public function getNoLastIdentifierByQueryForSerialDocument() self::assertNull($identifier); } - private static function assertFirstIdentifierForBookDocument(Identifier $identifier) + private static function assertFirstIdentifierForBookDocument(Identifier $identifier): void { self::assertNotEmpty($identifier->getValue()); self::assertEquals('0801486394 (pbk. : acid-free, recycled paper)', $identifier->getValue()); @@ -209,7 +209,7 @@ private static function assertFirstIdentifierForBookDocument(Identifier $identif self::assertFalse($identifier->isInvalid()); } - private static function assertSecondIdentifierForBookDocument(Identifier $identifier) + private static function assertSecondIdentifierForBookDocument(Identifier $identifier): void { self::assertNotEmpty($identifier->getValue()); self::assertEquals('99042030', $identifier->getValue()); @@ -220,7 +220,7 @@ private static function assertSecondIdentifierForBookDocument(Identifier $identi self::assertFalse($identifier->isInvalid()); } - private static function assertFirstIdentifierForSerialDocument(Identifier $identifier) + private static function assertFirstIdentifierForSerialDocument(Identifier $identifier): void { self::assertNotEmpty($identifier->getValue()); self::assertEquals('1704-8532', $identifier->getValue()); @@ -231,7 +231,7 @@ private static function assertFirstIdentifierForSerialDocument(Identifier $ident self::assertFalse($identifier->isInvalid()); } - private static function assertSecondIdentifierForSerialDocument(Identifier $identifier) + private static function assertSecondIdentifierForSerialDocument(Identifier $identifier): void { self::assertNotEmpty($identifier->getValue()); self::assertEquals('1525-321X', $identifier->getValue()); @@ -242,7 +242,7 @@ private static function assertSecondIdentifierForSerialDocument(Identifier $iden self::assertTrue($identifier->isInvalid()); } - private static function assertThirdIdentifierForSerialDocument(Identifier $identifier) + private static function assertThirdIdentifierForSerialDocument(Identifier $identifier): void { self::assertNotEmpty($identifier->getValue()); self::assertEquals('cn2002301668', $identifier->getValue()); @@ -253,7 +253,7 @@ private static function assertThirdIdentifierForSerialDocument(Identifier $ident self::assertFalse($identifier->isInvalid()); } - private static function assertFourthIdentifierForSerialDocument(Identifier $identifier) + private static function assertFourthIdentifierForSerialDocument(Identifier $identifier): void { self::assertNotEmpty($identifier->getValue()); self::assertEquals('ocm51090366', $identifier->getValue()); diff --git a/tests/Mods/Reader/LanguageReaderTest.php b/tests/Mods/Reader/LanguageReaderTest.php index 50153f6..50b9704 100644 --- a/tests/Mods/Reader/LanguageReaderTest.php +++ b/tests/Mods/Reader/LanguageReaderTest.php @@ -135,7 +135,7 @@ public function getNoLanguagesByQueryForSerialDocument() self::assertEmpty($languages); } - private static function assertFirstLanguageForBookDocument(Language $language) + private static function assertFirstLanguageForBookDocument(Language $language): void { self::assertEmpty($language->getObjectPart()); self::assertNotEmpty($language->getValue()); @@ -154,7 +154,7 @@ private static function assertFirstLanguageForBookDocument(Language $language) self::assertEquals('Latn', $scriptTerms[0]->getValue()); } - private static function assertSecondLanguageForBookDocument(Language $language) + private static function assertSecondLanguageForBookDocument(Language $language): void { self::assertNotEmpty($language->getObjectPart()); self::assertEquals('summary', $language->getObjectPart()); @@ -168,13 +168,13 @@ private static function assertSecondLanguageForBookDocument(Language $language) self::assertEquals('spa', $languageTerms[0]->getValue()); $scriptTerms = $language->getScriptTerms(); - self::assertNotEmpty($language->getScriptTerms()); + self::assertNotEmpty($scriptTerms); self::assertEquals('code', $scriptTerms[0]->getType()); self::assertEquals('iso15924', $scriptTerms[0]->getAuthority()); self::assertEquals('Latn', $scriptTerms[0]->getValue()); } - private static function assertLanguageForSerialDocument(Language $language) + private static function assertLanguageForSerialDocument(Language $language): void { self::assertEmpty($language->getObjectPart()); self::assertNotEmpty($language->getValue()); diff --git a/tests/Mods/Reader/LocationReaderTest.php b/tests/Mods/Reader/LocationReaderTest.php index d59c8c4..7fe0d10 100644 --- a/tests/Mods/Reader/LocationReaderTest.php +++ b/tests/Mods/Reader/LocationReaderTest.php @@ -139,7 +139,7 @@ public function getNoLocationsByQueryForSerialDocument() self::assertEmpty($locations); } - private static function assertFirstLocationForBookDocument(Location $location) + private static function assertFirstLocationForBookDocument(Location $location): void { self::assertNotEmpty($location->getValue()); @@ -161,7 +161,7 @@ private static function assertFirstLocationForBookDocument(Location $location) self::assertEquals('v.1-v.2 1999-2002', $copyInformation[0]->getEnumerationAndChronologies()[0]->getValue()); } - private static function assertSecondLocationForBookDocument(Location $location) + private static function assertSecondLocationForBookDocument(Location $location): void { self::assertNotEmpty($location->getValue()); @@ -174,7 +174,7 @@ private static function assertSecondLocationForBookDocument(Location $location) self::assertEquals('http://www.slub-dresden.de/some-url/SLO-0000', $urls[1]->getValue()); } - private static function assertLocationForSerialDocument(Location $location) + private static function assertLocationForSerialDocument(Location $location): void { $urls = $location->getUrls(); self::assertNotEmpty($urls); diff --git a/tests/Mods/Reader/NameReaderTest.php b/tests/Mods/Reader/NameReaderTest.php index 84a4bef..291985a 100644 --- a/tests/Mods/Reader/NameReaderTest.php +++ b/tests/Mods/Reader/NameReaderTest.php @@ -135,7 +135,7 @@ public function getNoNamesByQueryForSerialDocument() self::assertEmpty($names); } - private static function assertFirstNameForBookDocument(Name $name) + private static function assertFirstNameForBookDocument(Name $name): void { self::assertNotEmpty($name->getType()); self::assertEquals('personal', $name->getType()); @@ -157,7 +157,7 @@ private static function assertFirstNameForBookDocument(Name $name) self::assertEquals('creator', $roleTerms[0]->getValue()); } - private static function assertSecondNameForBookDocument(Name $name) + private static function assertSecondNameForBookDocument(Name $name): void { self::assertNotEmpty($name->getType()); self::assertEquals('personal', $name->getType()); @@ -180,7 +180,7 @@ private static function assertSecondNameForBookDocument(Name $name) self::assertEquals('author', $roleTerms[0]->getValue()); } - private static function assertNameForSerialDocument(Name $name) + private static function assertNameForSerialDocument(Name $name): void { self::assertNotEmpty($name->getValue()); diff --git a/tests/Mods/Reader/NoteReaderTest.php b/tests/Mods/Reader/NoteReaderTest.php index 0ec0471..80535ed 100644 --- a/tests/Mods/Reader/NoteReaderTest.php +++ b/tests/Mods/Reader/NoteReaderTest.php @@ -156,7 +156,7 @@ public function getNoNotesByQueryForSerialDocument() self::assertEmpty($notes); } - private static function assertFirstNoteForBookDocument(Note $note) + private static function assertFirstNoteForBookDocument(Note $note): void { self::assertNotEmpty($note->getValue()); self::assertEquals('Eric Alterman.', $note->getValue()); @@ -164,7 +164,7 @@ private static function assertFirstNoteForBookDocument(Note $note) self::assertEquals('statement of responsibility', $note->getType()); } - private static function assertSecondNoteForBookDocument(Note $note) + private static function assertSecondNoteForBookDocument(Note $note): void { self::assertNotEmpty($note->getValue()); self::assertEquals('Includes bibliographical references (p. 291-312) and index.', $note->getValue()); @@ -172,7 +172,7 @@ private static function assertSecondNoteForBookDocument(Note $note) self::assertEquals('bibliography', $note->getType()); } - private static function assertFirstNoteForSerialDocument(Note $note) + private static function assertFirstNoteForSerialDocument(Note $note): void { self::assertNotEmpty($note->getValue()); self::assertEquals('V. 3, no. 1/2 (winter 2002)-', $note->getValue()); @@ -180,7 +180,7 @@ private static function assertFirstNoteForSerialDocument(Note $note) self::assertEquals('date/sequential designation', $note->getType()); } - private static function assertFifthNoteForSerialDocument(Note $note) + private static function assertFifthNoteForSerialDocument(Note $note): void { self::assertNotEmpty($note->getValue()); self::assertEquals('Mode of access: World Wide Web.', $note->getValue()); @@ -188,7 +188,7 @@ private static function assertFifthNoteForSerialDocument(Note $note) self::assertEquals('system details', $note->getType()); } - private static function assertSixthNoteForSerialDocument(Note $note) + private static function assertSixthNoteForSerialDocument(Note $note): void { self::assertNotEmpty($note->getValue()); self::assertEquals('Electronic serial in HTML format.', $note->getValue()); diff --git a/tests/Mods/Reader/OriginInfoReaderTest.php b/tests/Mods/Reader/OriginInfoReaderTest.php index 5aaddf1..81f2453 100644 --- a/tests/Mods/Reader/OriginInfoReaderTest.php +++ b/tests/Mods/Reader/OriginInfoReaderTest.php @@ -120,7 +120,7 @@ public function getNoOriginInfosByQueryForSerialDocument() self::assertEmpty($originInfos); } - private static function assertFirstOriginInfoForBookDocument(OriginInfo $originInfo) + private static function assertFirstOriginInfoForBookDocument(OriginInfo $originInfo): void { self::assertNotEmpty($originInfo->getValue()); self::assertNotEmpty($originInfo->getEventType()); @@ -147,7 +147,7 @@ private static function assertFirstOriginInfoForBookDocument(OriginInfo $originI self::assertEquals('monographic', $issuances[0]->getValue()); } - private static function assertSecondOriginInfoForBookDocument(OriginInfo $originInfo) + private static function assertSecondOriginInfoForBookDocument(OriginInfo $originInfo): void { self::assertNotEmpty($originInfo->getValue()); self::assertNotEmpty($originInfo->getEventType()); @@ -171,7 +171,7 @@ private static function assertSecondOriginInfoForBookDocument(OriginInfo $origin self::assertEmpty($originInfo->getIssuances()); } - private static function assertOriginInfoForSerialDocument(OriginInfo $originInfo) + private static function assertOriginInfoForSerialDocument(OriginInfo $originInfo): void { self::assertNotEmpty($originInfo->getValue()); self::assertNotEmpty($originInfo->getEventType()); diff --git a/tests/Mods/Reader/PartReaderTest.php b/tests/Mods/Reader/PartReaderTest.php index b60734e..bc9c78a 100644 --- a/tests/Mods/Reader/PartReaderTest.php +++ b/tests/Mods/Reader/PartReaderTest.php @@ -96,7 +96,7 @@ public function getNoPartsForSerialDocument() self::assertEmpty($parts); } - private static function assertFirstPartForBookDocument(Part $part) + private static function assertFirstPartForBookDocument(Part $part): void { self::assertNotEmpty($part->getValue()); self::assertNotEmpty($part->getType()); @@ -127,7 +127,7 @@ private static function assertFirstPartForBookDocument(Part $part) self::assertEquals('Some random text', $texts[0]->getValue()); } - private static function assertSecondPartForBookDocument(Part $part) + private static function assertSecondPartForBookDocument(Part $part): void { self::assertNotEmpty($part->getValue()); self::assertNotEmpty($part->getType()); diff --git a/tests/Mods/Reader/PhysicalDescriptionReaderTest.php b/tests/Mods/Reader/PhysicalDescriptionReaderTest.php index c166382..2881309 100644 --- a/tests/Mods/Reader/PhysicalDescriptionReaderTest.php +++ b/tests/Mods/Reader/PhysicalDescriptionReaderTest.php @@ -123,7 +123,7 @@ public function getNoPhysicalDescriptionsByQueryForSerialDocument() self::assertEmpty($physicalDescriptions); } - private static function assertPhysicalDescriptionForBookDocument(PhysicalDescription $physicalDescription) + private static function assertPhysicalDescriptionForBookDocument(PhysicalDescription $physicalDescription): void { self::assertNotEmpty($physicalDescription->getValue()); @@ -140,7 +140,7 @@ private static function assertPhysicalDescriptionForBookDocument(PhysicalDescrip self::assertEmpty($physicalDescription->getNotes()); } - private static function assertPhysicalDescriptionForSerialDocument(PhysicalDescription $physicalDescription) + private static function assertPhysicalDescriptionForSerialDocument(PhysicalDescription $physicalDescription): void { self::assertNotEmpty($physicalDescription->getValue()); self::assertNotEmpty($physicalDescription->getForms()); diff --git a/tests/Mods/Reader/RecordInfoReaderTest.php b/tests/Mods/Reader/RecordInfoReaderTest.php index 9cbf80e..d4dc401 100644 --- a/tests/Mods/Reader/RecordInfoReaderTest.php +++ b/tests/Mods/Reader/RecordInfoReaderTest.php @@ -135,7 +135,7 @@ public function getNoRecordInfosByQueryForSerialDocument() self::assertEmpty($recordInfos); } - private static function assertRecordInfoForBookDocument(RecordInfo $recordInfo) + private static function assertRecordInfoForBookDocument(RecordInfo $recordInfo): void { self::assertNotEmpty($recordInfo->getValue()); self::assertNotEmpty($recordInfo->getDescriptionStandards()); @@ -164,7 +164,7 @@ private static function assertRecordInfoForBookDocument(RecordInfo $recordInfo) self::assertStringContainsString('Converted from MARCXML to MODS', $recordInfo->getRecordOrigins()[0]->getValue()); } - private static function assertRecordInfoForSerialDocument(RecordInfo $recordInfo) + private static function assertRecordInfoForSerialDocument(RecordInfo $recordInfo): void { self::assertNotEmpty($recordInfo->getValue()); self::assertNotEmpty($recordInfo->getDescriptionStandards()); diff --git a/tests/Mods/Reader/RelatedItemReaderTest.php b/tests/Mods/Reader/RelatedItemReaderTest.php index 3403695..91ebabb 100644 --- a/tests/Mods/Reader/RelatedItemReaderTest.php +++ b/tests/Mods/Reader/RelatedItemReaderTest.php @@ -96,7 +96,7 @@ public function getNoRelatedItemsByQueryForSerialDocument() self::assertEmpty($relatedItems); } - private static function assertRelatedItemForSerialDocument(RelatedItem $relatedItem) + private static function assertRelatedItemForSerialDocument(RelatedItem $relatedItem): void { self::assertNotEmpty($relatedItem->getType()); self::assertEquals('preceding', $relatedItem->getType()); diff --git a/tests/Mods/Reader/SubjectReaderTest.php b/tests/Mods/Reader/SubjectReaderTest.php index 5d98dd8..02cb2c1 100644 --- a/tests/Mods/Reader/SubjectReaderTest.php +++ b/tests/Mods/Reader/SubjectReaderTest.php @@ -148,7 +148,7 @@ public function getNoSubjectsByQueryForSerialDocument() self::assertEmpty($subjects); } - private static function assertFirstSubjectForBookDocument(Subject $subject) + private static function assertFirstSubjectForBookDocument(Subject $subject): void { self::assertNotEmpty($subject->getValue()); @@ -181,7 +181,7 @@ private static function assertFirstSubjectForBookDocument(Subject $subject) self::assertEquals('Lake District', $areas[0]->getValue()); } - private static function assertSecondSubjectForBookDocument(Subject $subject) + private static function assertSecondSubjectForBookDocument(Subject $subject): void { self::assertNotEmpty($subject->getValue()); @@ -191,7 +191,7 @@ private static function assertSecondSubjectForBookDocument(Subject $subject) self::assertEquals('n-us---', $geographicCodes[0]->getValue()); } - private static function assertFourthSubjectForBookDocument(Subject $subject) + private static function assertFourthSubjectForBookDocument(Subject $subject): void { self::assertNotEmpty($subject->getValue()); self::assertEquals('lcsh', $subject->getAuthority()); @@ -206,7 +206,7 @@ private static function assertFourthSubjectForBookDocument(Subject $subject) self::assertEquals('United States', $geographics[0]->getValue()); } - private static function assertEightSubjectForBookDocument(Subject $subject) + private static function assertEightSubjectForBookDocument(Subject $subject): void { self::assertNotEmpty($subject->getValue()); self::assertEquals('lcsh', $subject->getAuthority()); diff --git a/tests/Mods/Reader/TableOfContentsReaderTest.php b/tests/Mods/Reader/TableOfContentsReaderTest.php index 985618e..690c08d 100644 --- a/tests/Mods/Reader/TableOfContentsReaderTest.php +++ b/tests/Mods/Reader/TableOfContentsReaderTest.php @@ -117,7 +117,7 @@ public function getNoTablesOfContentsForSerialDocument() self::assertEmpty($tablesOfContents); } - private static function assertTableOfContentsForBookDocument(TableOfContents $tableOfContents) + private static function assertTableOfContentsForBookDocument(TableOfContents $tableOfContents): void { self::assertNotEmpty($tableOfContents->getValue()); self::assertEquals('Bluegrass odyssey -- Hills of Tennessee -- Sassafrass -- Muddy river -- Take your shoes off Moses -- Let Smokey Mountain smoke get in your eyes -- Farewell party -- Faded love', $tableOfContents->getValue()); diff --git a/tests/Mods/Reader/TypeOfResourceTest.php b/tests/Mods/Reader/TypeOfResourceTest.php index 7404374..47a29d9 100644 --- a/tests/Mods/Reader/TypeOfResourceTest.php +++ b/tests/Mods/Reader/TypeOfResourceTest.php @@ -60,7 +60,7 @@ public function getNoTypeOfResourceByQueryForSerialDocument() self::assertNull($abstract); } - private static function assertTypeOfResourceForBookDocument(TypeOfResource $typeOfResource) + private static function assertTypeOfResourceForBookDocument(TypeOfResource $typeOfResource): void { self::assertNotNull($typeOfResource); self::assertNotEmpty($typeOfResource->getDisplayLabel());