Skip to content

Commit e3f170c

Browse files
committed
Update reflection-docblock for broken handling of phpstorm-stubs.
1 parent 9dc1656 commit e3f170c

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

.travis.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
language: php
22

33
php:
4-
- '7.0'
5-
- '7.2'
4+
- '7.4'
65

76
git:
87
depth: 10
@@ -33,9 +32,9 @@ jobs:
3332
before_install:
3433
# Fix ruby error https://github.com/Homebrew/brew/issues/3299
3534
- brew update
36-
- brew install php@7.1
37-
- brew link --force --overwrite php@7.1
38-
- pecl install xdebug-2.6.0
35+
- brew install php@7.4
36+
- brew link --force --overwrite php@7.4
37+
- pecl install xdebug-2.9.8
3938
- php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
4039
- php composer-setup.php
4140
- ln -s "`pwd`/composer.phar" /usr/local/bin/composer

appveyor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ cache:
1616
environment:
1717
ANSICON: 121x90 (121x90)
1818
matrix:
19-
- { PHP_VERSION: '7.1.11', VC_VERSION: '14', XDEBUG_VERSION: '2.5.5' }
19+
- { PHP_VERSION: '7.4.23', VC_VERSION: '15', XDEBUG_VERSION: '2.9.8' }
2020

2121
install:
2222
# Enable Windows Update service, needed to install vcredist2015 (dependency of php)
@@ -30,7 +30,7 @@ install:
3030
- ps: |
3131
$client = New-Object System.Net.WebClient
3232
$phpMinorVersion = $env:PHP_VERSION -replace '\.\d+$'
33-
$xdebugUrl = "https://xdebug.org/files/php_xdebug-$env:XDEBUG_VERSION-$phpMinorVersion-vc14-nts-x86_64.dll"
33+
$xdebugUrl = "https://xdebug.org/files/php_xdebug-$env:XDEBUG_VERSION-$phpMinorVersion-vc15-nts-x86_64.dll"
3434
$phpDir = (Get-Item (Get-Command php).Source).Directory.FullName
3535
$xdebugPath = Join-Path $phpDir ext\xdebug.dll
3636
$client.DownloadFile($xdebugUrl, $xdebugPath)

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"jetbrains/phpstorm-stubs": "dev-master",
2929
"microsoft/tolerant-php-parser": "0.0.*",
3030
"netresearch/jsonmapper": "^1.0",
31-
"phpdocumentor/reflection-docblock": "^4.0.0",
31+
"phpdocumentor/reflection-docblock": "^5.2.2",
3232
"psr/log": "^1.0",
3333
"sabre/event": "^5.0",
3434
"sabre/uri": "^2.0",

0 commit comments

Comments
 (0)