icedream
/
php-language-server
1
0
Fork 0
Code Releases Activity

Merge branch 'master' into patch-1

pull/618/head
Markus Staab 2018-05-13 10:21:50 +02:00 committed by GitHub
parent 86f3192991 fe33c8cd7f
commit bed2110c5b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored
View File

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

6
.travis.yml
View File

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