Merge branch 'master' into patch-1

.gitattributes

@@ -3,7 +3,6 @@
 /.vscode export-ignore
 /fixtures export-ignore
 /images export-ignore
-/tests export-ignore
 /validation export-ignore
 /.dockerignore export-ignore
 /.editorconfig export-ignore
@@ -12,6 +11,7 @@
 /.gitmodules export-ignore
 /.npmrc export-ignore
 /.travis.yml export-ignore
+/appveyor.yml export-ignore
 /codecov.yml export-ignore
 /dependencies.yml export-ignore
 /Dockerfile export-ignore

.travis.yml

@@ -30,9 +30,9 @@ jobs:
       before_install:
         # Fix ruby error https://github.com/Homebrew/brew/issues/3299
         - brew update
-        - brew tap homebrew/homebrew-php
-        - brew install php71
-        - brew install homebrew/php/php71-xdebug
+        - brew install php@7.1
+        - brew link --force --overwrite php@7.1
+        - pecl install xdebug-2.6.0
         - php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
         - php composer-setup.php
         - ln -s "`pwd`/composer.phar" /usr/local/bin/composer