Skip to content

Commit

Permalink
Merge pull request #17 from stevegrunwell/release/v1.3.0
Browse files Browse the repository at this point in the history
Version 1.3.0
  • Loading branch information
stevegrunwell committed Jan 27, 2020
2 parents 41d5064 + 6494867 commit 2f8890b
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 11 deletions.
5 changes: 2 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ php:
- 7.0
- 7.1
- 7.2
- 7.3
- 7.4

sudo: false

Expand All @@ -23,6 +25,3 @@ script:

after_success:
- travis_retry php coveralls.phar

notifications:
email: false
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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]).
Expand All @@ -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
Expand All @@ -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
26 changes: 19 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand All @@ -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
}
}
File renamed without changes.
2 changes: 1 addition & 1 deletion src/MarkupAssertionsTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down

0 comments on commit 2f8890b

Please sign in to comment.