Merge branch 'develop' into dependabot/add-v2-config-file

Author: stevegrunwell

.github/workflows/unit-tests.yml

@@ -3,37 +3,24 @@ name: Unit Tests
 on: [push, pull_request]
 
 jobs:
-  run:
-    runs-on: ${{ matrix.operating-system }}
+  phpunit:
+    name: PHP ${{ matrix.php-version }}
+    runs-on: ubuntu-latest
     strategy:
       matrix:
-        operating-system: [ubuntu-latest]
-        php-versions: ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0']
-    name: PHP ${{ matrix.php-versions }}
-
+        php-version: ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2']
     steps:
       - name: Checkout
-        uses: actions/checkout@v1
+        uses: actions/checkout@v2
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: ${{ matrix.php-versions }}
+          php-version: ${{ matrix.php-version }}
           coverage: none
 
-      - name: Get composer cache directory
-        id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-
-      - name: Cache dependencies
-        uses: actions/cache@v2
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
-          restore-keys: ${{ runner.os }}-composer-
-
-      - name: Install dependencies
-        run: composer install --no-interaction --prefer-dist --no-suggest --no-progress
+      - name: Install Composer dependencies
+        uses: ramsey/composer-install@v2
 
       - name: Run test suite
         run: composer test

CHANGELOG.md

@@ -1,31 +1,42 @@
 # Changelog
+
 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.1] — 2020-01-14
+
+* Fix PHPUnit warnings regarding `assertContains()` and `assertRegExp()`. Props [@jakobbuis](https://github.com/jakobbuis) ([#20], [#27], [#28])
+* Refactor the internal test scaffolding, including a move from Travis CI to GitHub Actions. Props [@peter279k](https://github.com/peter279k) for the assist with GitHub Actions ([#24])
+* Added PHP 8.0 support ([#26])
+
 ## [1.3.0] — 2020-01-27
 
-* Replace `zendframework/zend-dom` with `laminas/laminas-dom` ([#16]).
-* Update Composer dependencies, add a `composer test` script ([#15]).
+* 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]).
 
+
 ## [1.1.0] - 2018-01-14
 
-* Added the `assertElementContains()`, `assertElementNotContains()`, `assertElementRegExp()`, and `assertElementNotRegExp()` assertions, for verifying the contents of elements that match the given DOM query ([#6]).
-* Moved the `Tests` namespace into a development-only autoloader, to prevent them from potentially being included in projects using this library ([#7]).
-* [Based on this article by Martin Hujer](https://blog.martinhujer.cz/17-tips-for-using-composer-efficiently/#tip-%236%3A-put-%60composer.lock%60-into-%60.gitignore%60-in-libraries), remove the `composer.lock` file from the library ([#8]).
-* _Lower_ the minimum version of [zendframework/zend-dom](https://packagist.org/packages/zendframework/zend-dom) to 2.2.5 for maximum portability ([#9]).
+* Added the `assertElementContains()`, `assertElementNotContains()`, `assertElementRegExp()`, and `assertElementNotRegExp()` assertions, for verifying the contents of elements that match the given DOM query ([#6])
+* Moved the `Tests` namespace into a development-only autoloader, to prevent them from potentially being included in projects using this library ([#7])
+* [Based on this article by Martin Hujer](https://blog.martinhujer.cz/17-tips-for-using-composer-efficiently/#tip-%236%3A-put-%60composer.lock%60-into-%60.gitignore%60-in-libraries), remove the `composer.lock` file from the library ([#8])
+* _Lower_ the minimum version of [zendframework/zend-dom](https://packagist.org/packages/zendframework/zend-dom) to 2.2.5 for maximum portability ([#9])
+
 
 ## [1.0.0] - 2017-10-24
 
 * Initial release of the PHPUnit Markup Assertions Composer package.
 
 
 [Unreleased]: https://github.com/stevegrunwell/phpunit-markup-assertions/compare/master...develop
+[1.3.1]: https://github.com/stevegrunwell/phpunit-markup-assertions/releases/tag/v1.3.1
 [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
@@ -37,3 +48,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 [#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
+[#20]: https://github.com/stevegrunwell/phpunit-markup-assertions/pull/20
+[#24]: https://github.com/stevegrunwell/phpunit-markup-assertions/pull/24
+[#26]: https://github.com/stevegrunwell/phpunit-markup-assertions/pull/26
+[#27]: https://github.com/stevegrunwell/phpunit-markup-assertions/pull/27
+[#28]: https://github.com/stevegrunwell/phpunit-markup-assertions/pull/28

composer.json

@@ -19,7 +19,7 @@
         "laminas/laminas-dom": "~2.7.2 || ^2.8"
     },
     "require-dev": {
-        "symfony/phpunit-bridge": "^5.2"
+        "symfony/phpunit-bridge": "^6.2"
     },
     "autoload": {
         "psr-4": {