diff --git a/.travis.yml b/.travis.yml index 103845a..af2584a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,8 @@ php: - 7.0 - 7.1 - 7.2 + - 7.3 + - 7.4 sudo: false @@ -23,6 +25,3 @@ script: after_success: - travis_retry php coveralls.phar - -notifications: - email: false diff --git a/CHANGELOG.md b/CHANGELOG.md index b45ad5d..042a879 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## [1.3.0] — 2020-01-27 + +* Replace `zendframework/zend-dom` with `laminas/laminas-dom` ([#16]). +* Update Composer dependencies, add a `composer test` script ([#15]). + ## [1.2.0] - 2018-03-27 * Bumped the minimum version of zendframework/zend-dom to 2.7, which includes a fix for attribute values that include spaces ([#13]). @@ -21,6 +26,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. [Unreleased]: https://github.com/stevegrunwell/phpunit-markup-assertions/compare/master...develop +[1.3.0]: https://github.com/stevegrunwell/phpunit-markup-assertions/releases/tag/v1.3.0 [1.2.0]: https://github.com/stevegrunwell/phpunit-markup-assertions/releases/tag/v1.2.0 [1.1.0]: https://github.com/stevegrunwell/phpunit-markup-assertions/releases/tag/v1.1.0 [1.0.0]: https://github.com/stevegrunwell/phpunit-markup-assertions/releases/tag/v1.0.0 @@ -29,3 +35,5 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. [#8]: https://github.com/stevegrunwell/phpunit-markup-assertions/issues/8 [#9]: https://github.com/stevegrunwell/phpunit-markup-assertions/issues/9 [#13]: https://github.com/stevegrunwell/phpunit-markup-assertions/issues/13 +[#15]: https://github.com/stevegrunwell/phpunit-markup-assertions/pull/15 +[#16]: https://github.com/stevegrunwell/phpunit-markup-assertions/issues/16 diff --git a/composer.json b/composer.json index 768eb0c..c30d59c 100644 --- a/composer.json +++ b/composer.json @@ -15,15 +15,10 @@ "source": "https://github.com/stevegrunwell/phpunit-markup-assertions/" }, "require": { - "zendframework/zend-dom": "^2.7" + "laminas/laminas-dom": "^2.7" }, "require-dev": { - "phpunit/phpunit": ">=6.0" - }, - "scripts": { - "test-coverage": [ - "phpunit --coverage-html=tests/coverage" - ] + "phpunit/phpunit": "^6.0" }, "autoload": { "psr-4": { @@ -34,5 +29,22 @@ "psr-4": { "Tests\\": "tests/" } + }, + "scripts": { + "test": [ + "phpunit" + ], + "test-coverage": [ + "phpunit --coverage-html=tests/coverage" + ] + }, + "scripts-descriptions": { + "test": "Run all test suites.", + "test-coverage": "Generate code coverage reports in tests/coverage." + }, + "config": { + "preferred-install": "dist", + "sort-packages": true, + "optimize-autoloader": true } } diff --git a/phpunit.xml b/phpunit.xml.dist similarity index 100% rename from phpunit.xml rename to phpunit.xml.dist diff --git a/src/MarkupAssertionsTrait.php b/src/MarkupAssertionsTrait.php index 58cc8ff..14767a7 100644 --- a/src/MarkupAssertionsTrait.php +++ b/src/MarkupAssertionsTrait.php @@ -9,8 +9,8 @@ namespace SteveGrunwell\PHPUnit_Markup_Assertions; use DOMDocument; +use Laminas\Dom\Query; use PHPUnit\Framework\RiskyTestError; -use Zend\Dom\Query; trait MarkupAssertionsTrait {