Merge branch 'master' into composer

.gitattributes

@@ -0,0 +1,19 @@
+* text=auto
+
+/.vscode export-ignore
+/fixtures export-ignore
+/tests export-ignore
+/images export-ignore
+/validation export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore
+/.gitmodules export-ignore
+/.dockerignore export-ignore
+/.travis.yml export-ignore
+/codecov.yml export-ignore
+/Dockerfile export-ignore
+/Performance.php export-ignore
+/php.ini export-ignore
+/phpcs.xml.dist export-ignore
+/phpunit.xml.dist export-ignore
+/README.md export-ignore

phpunit.xml.dist

@@ -1,14 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="vendor/autoload.php">
+<phpunit backupGlobals="false"
+         backupStaticAttributes="false"
+         beStrictAboutTestsThatDoNotTestAnything="true"
+         beStrictAboutOutputDuringTests="true"
+         bootstrap="vendor/autoload.php"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         failOnWarning="true"
+         processIsolation="false"
+         stopOnError="false"
+         stopOnFailure="false"
+         verbose="true"
+>
     <testsuites>
         <testsuite name="PHP Language Server Test Suite">
-            <directory>./tests</directory>
+            <directory suffix="Test.php">./tests</directory>
         </testsuite>
     </testsuites>
-
     <filter>
-        <whitelist>
-            <directory>./src</directory>
+        <whitelist processUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">./src</directory>
         </whitelist>
     </filter>
     <php>

src/Protocol/DocumentHighlight.php

@@ -7,7 +7,7 @@ namespace LanguageServer\Protocol;
  * special attention. Usually a document highlight is visualized by changing
  * the background color of its range.
  */
-class DocumentHighlightKind
+class DocumentHighlight
 {
     /**
      * The range this highlight applies to.