Merge "Add dev dependency on HTML matchers"

diff --combined composer.json
index 71338a4,d8c3dd4..d41492e
--- 1/composer.json
--- 2/composer.json
+++ b/composer.json
@@@ -17,7 -17,7 +17,7 @@@
        },
        "require": {
                "composer/semver": "1.4.2",
 -              "cssjanus/cssjanus": "1.1.2",
 +              "cssjanus/cssjanus": "1.1.3",
                "ext-ctype": "*",
                "ext-iconv": "*",
                "ext-json": "*",
@@@ -25,10 -25,10 +25,10 @@@
                "ext-xml": "*",
                "liuggio/statsd-php-client": "1.0.18",
                "mediawiki/at-ease": "1.1.0",
 -              "oojs/oojs-ui": "0.19.0",
 +              "oojs/oojs-ui": "0.19.1",
                "oyejorge/less.php": "1.7.0.10",
                "php": ">=5.5.9",
 -              "psr/log": "1.0.0",
 +              "psr/log": "1.0.2",
                "wikimedia/assert": "0.2.2",
                "wikimedia/base-convert": "1.0.1",
                "wikimedia/cdb": "1.4.1",
@@@ -55,7 -55,9 +55,9 @@@
                "nikic/php-parser": "2.1.0",
                "nmred/kafka-php": "0.1.5",
                "phpunit/phpunit": "4.8.31",
-               "wikimedia/avro": "1.7.7"
+               "wikimedia/avro": "1.7.7",
+               "hamcrest/hamcrest-php": "^2.0",
+               "wmde/hamcrest-html-matchers": "^0.1.0"
        },
        "suggest": {
                "ext-apc": "Local data and opcode cache",
@@@ -74,6 -76,12 +76,12 @@@
                        "ComposerHookHandler": "includes/composer"
                }
        },
+       "autoload-dev": {
+               "files": [
+                       "vendor/hamcrest/hamcrest-php/hamcrest/Hamcrest.php",
+                       "vendor/wmde/hamcrest-html-matchers/src/functions.php"
+               ]
+       },
        "scripts": {
                "lint": "parallel-lint --exclude vendor",
                "phpcs": "phpcs -p -s",