Merge pull request #36 from stevegrunwell/release/v1.4.0

Version 1.4.0

Author: stevegrunwell

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+github: [stevegrunwell]

.github/dependabot.yml

@@ -0,0 +1,12 @@
+version: 2
+updates:
+- package-ecosystem: composer
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "10:00"
+  open-pull-requests-limit: 10
+  ignore:
+  - dependency-name: phpunit/phpunit
+    versions:
+    - "> 6.0"

.github/workflows/unit-tests.yml

@@ -1,39 +1,26 @@
 name: Unit Tests
 
-on: [push, pull_request]
+on: [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

.gitignore

@@ -1,6 +1,7 @@
 tests/coverage
 vendor
 .phpunit.result.cache
+.vscode
 
 # The composer.lock file is not needed, as this is a library whose dependencies
 # will depend on the version of PHP being used.

CHANGELOG.md

@@ -5,6 +5,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.4.0] – 2022-12-28
+
+* Force UTF-8 encoding for better support for non-Latin character sets ([#35])
+* Move away from deprecated classes in laminas/laminas-dom ([#32])
+
 ## [1.3.1] — 2020-01-14
 
 * Fix PHPUnit warnings regarding `assertContains()` and `assertRegExp()`. Props [@jakobbuis](https://github.com/jakobbuis) ([#20], [#27], [#28])
@@ -35,7 +40,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 * Initial release of the PHPUnit Markup Assertions Composer package.
 
 
-[Unreleased]: https://github.com/stevegrunwell/phpunit-markup-assertions/compare/master...develop
+[Unreleased]: https://github.com/stevegrunwell/phpunit-markup-assertions/compare/main...develop
+[1.4.0]: https://github.com/stevegrunwell/phpunit-markup-assertions/releases/tag/v1.4.0
 [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
@@ -53,3 +59,5 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 [#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
+[#32]: https://github.com/stevegrunwell/phpunit-markup-assertions/pull/32
+[#35]: https://github.com/stevegrunwell/phpunit-markup-assertions/pull/35

README.md

@@ -5,7 +5,7 @@
 
 This library introduces the `MarkupAssertionsTrait` trait for use in [PHPUnit](https://phpunit.de) tests.
 
-These assertions enable you to inspect generated markup without having to muddy tests with [`DOMDocument`](http://php.net/manual/en/class.domdocument.php) or nasty regular expressions. If you're generating markup at all with PHP, the PHPUnit Markup Assertions trait aims to make the output testable.
+These assertions enable you to inspect generated markup without having to muddy tests with [`DOMDocument`](http://php.net/manual/en/class.domdocument.php) or nasty regular expressions. If you're generating markup at all with PHP, the PHPUnit Markup Assertions trait aims to make the output testable without making your tests fragile.
 
 ## Example
 
@@ -22,10 +22,10 @@ class MyUnitTest extends TestCase
      */
     public function testRenderFormContainsInputs()
     {
-        $output = render_form();
+        $markup = render_form();
 
-        $this->assertContainsSelector('#first-name', $output);
-        $this->assertContainsSelector('#last-name', $output);
+        $this->assertContainsSelector('#first-name', $markup);
+        $this->assertContainsSelector('#last-name', $markup);
     }
 }
 ```
@@ -104,8 +104,8 @@ Assert that the given string contains an element matching the given selector.
 <dl>
     <dt>(string) $selector</dt>
     <dd>A query selector for the element to find.</dd>
-    <dt>(string) $output</dt>
-    <dd>The output that should contain the <code>$selector</code>.</dd>
+    <dt>(string) $markup</dt>
+    <dd>The markup that should contain the <code>$selector</code>.</dd>
     <dt>(string) $message</dt>
     <dd>A message to display if the assertion fails.</dd>
 </dl>
@@ -130,8 +130,8 @@ This method is the inverse of [`assertContainsSelector()`](#assertcontainsselect
 <dl>
     <dt>(string) $selector</dt>
     <dd>A query selector for the element to find.</dd>
-    <dt>(string) $output</dt>
-    <dd>The output that should not contain the <code>$selector</code>.</dd>
+    <dt>(string) $markup</dt>
+    <dd>The markup that should not contain the <code>$selector</code>.</dd>
     <dt>(string) $message</dt>
     <dd>A message to display if the assertion fails.</dd>
 </dl>
@@ -145,7 +145,7 @@ Assert the number of times an element matching the given selector is found.
     <dd>The number of matching elements expected.</dd>
     <dt>(string) $selector</dt>
     <dd>A query selector for the element to find.</dd>
-    <dt>(string) $output</dt>
+    <dt>(string) $markup</dt>
     <dd>The markup to run the assertion against.</dd>
     <dt>(string) $message</dt>
     <dd>A message to display if the assertion fails.</dd>
@@ -171,8 +171,8 @@ Assert that an element with the given attributes exists in the given markup.
 <dl>
     <dt>(array) $attributes</dt>
     <dd>An array of HTML attributes that should be found on the element.</dd>
-    <dt>(string) $output</dt>
-    <dd>The output that should contain an element with the provided <code>$attributes</code>.</dd>
+    <dt>(string) $markup</dt>
+    <dd>The markup that should contain an element with the provided <code>$attributes</code>.</dd>
     <dt>(string) $message</dt>
     <dd>A message to display if the assertion fails.</dd>
 </dl>
@@ -203,8 +203,8 @@ Assert that an element with the given attributes does not exist in the given mar
 <dl>
     <dt>(array) $attributes</dt>
     <dd>An array of HTML attributes that should not be found on the element.</dd>
-    <dt>(string) $output</dt>
-    <dd>The output that should not contain an element with the provided <code>$attributes</code>.</dd>
+    <dt>(string) $markup</dt>
+    <dd>The markup that should not contain an element with the provided <code>$attributes</code>.</dd>
     <dt>(string) $message</dt>
     <dd>A message to display if the assertion fails.</dd>
 </dl>
@@ -218,8 +218,8 @@ Assert that the element with the given selector contains a string.
     <dd>The string to look for within the DOM node's contents.</dd>
     <dt>(string) $selector</dt>
     <dd>A query selector for the element to find.</dd>
-    <dt>(string) $output</dt>
-    <dd>The output that should contain the <code>$selector</code>.</dd>
+    <dt>(string) $markup</dt>
+    <dd>The markup that should contain the <code>$selector</code>.</dd>
     <dt>(string) $message</dt>
     <dd>A message to display if the assertion fails.</dd>
 </dl>
@@ -252,8 +252,8 @@ This method is the inverse of [`assertElementContains()`](#assertelementcontains
     <dd>The string to look for within the DOM node's contents.</dd>
     <dt>(string) $selector</dt>
     <dd>A query selector for the element to find.</dd>
-    <dt>(string) $output</dt>
-    <dd>The output that should contain the <code>$selector</code>.</dd>
+    <dt>(string) $markup</dt>
+    <dd>The markup that should contain the <code>$selector</code>.</dd>
     <dt>(string) $message</dt>
     <dd>A message to display if the assertion fails.</dd>
 </dl>
@@ -269,8 +269,8 @@ This method works just like [`assertElementContains()`](#assertelementcontains),
     <dd>The regular expression pattern to look for within the DOM node.</dd>
     <dt>(string) $selector</dt>
     <dd>A query selector for the element to find.</dd>
-    <dt>(string) $output</dt>
-    <dd>The output that should contain the <code>$selector</code>.</dd>
+    <dt>(string) $markup</dt>
+    <dd>The markup that should contain the <code>$selector</code>.</dd>
     <dt>(string) $message</dt>
     <dd>A message to display if the assertion fails.</dd>
 </dl>
@@ -286,8 +286,8 @@ This method is the inverse of [`assertElementRegExp()`](#assertelementregexp) an
     <dd>The regular expression pattern to look for within the DOM node.</dd>
     <dt>(string) $selector</dt>
     <dd>A query selector for the element to find.</dd>
-    <dt>(string) $output</dt>
-    <dd>The output that should contain the <code>$selector</code>.</dd>
+    <dt>(string) $markup</dt>
+    <dd>The markup that should contain the <code>$selector</code>.</dd>
     <dt>(string) $message</dt>
     <dd>A message to display if the assertion fails.</dd>
 </dl>

composer.json

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