Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Update reflection-docblock for broken handling of phpstorm-stubs and deprecated method. #823

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
9 changes: 4 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
language: php

php:
- '7.0'
- '7.2'
- '7.4'

git:
depth: 10
Expand Down Expand Up @@ -33,9 +32,9 @@ jobs:
before_install:
# Fix ruby error https://github.com/Homebrew/brew/issues/3299
- brew update
- brew install php@7.1
- brew link --force --overwrite php@7.1
- pecl install xdebug-2.6.0
- brew install php@7.4
- brew link --force --overwrite php@7.4
- pecl install xdebug-2.9.8
- php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
- php composer-setup.php
- ln -s "`pwd`/composer.phar" /usr/local/bin/composer
Expand Down
6 changes: 3 additions & 3 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ cache:
environment:
ANSICON: 121x90 (121x90)
matrix:
- { PHP_VERSION: '7.1.11', VC_VERSION: '14', XDEBUG_VERSION: '2.5.5' }
- { PHP_VERSION: '7.4.23', VC_VERSION: '15', XDEBUG_VERSION: '2.9.8' }

install:
# Enable Windows Update service, needed to install vcredist2015 (dependency of php)
Expand All @@ -30,7 +30,7 @@ install:
- ps: |
$client = New-Object System.Net.WebClient
$phpMinorVersion = $env:PHP_VERSION -replace '\.\d+$'
$xdebugUrl = "https://xdebug.org/files/php_xdebug-$env:XDEBUG_VERSION-$phpMinorVersion-vc14-nts-x86_64.dll"
$xdebugUrl = "https://xdebug.org/files/php_xdebug-$env:XDEBUG_VERSION-$phpMinorVersion-vc15-nts-x86_64.dll"
$phpDir = (Get-Item (Get-Command php).Source).Directory.FullName
$xdebugPath = Join-Path $phpDir ext\xdebug.dll
$client.DownloadFile($xdebugUrl, $xdebugPath)
Expand All @@ -51,4 +51,4 @@ after_test:
Remove-Item -Recurse -Force vendor
$env:PATH = 'C:\msys64\usr\bin;' + $env:PATH
Invoke-WebRequest -Uri 'https://codecov.io/bash' -OutFile codecov.sh
bash codecov.sh -f 'coverage/coverage.xml'
bash codecov.sh -f 'coverage/coverage.xml' -U "-s" -A "-s"
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"jetbrains/phpstorm-stubs": "dev-master",
"microsoft/tolerant-php-parser": "0.0.*",
"netresearch/jsonmapper": "^1.0",
"phpdocumentor/reflection-docblock": "^4.0.0",
"phpdocumentor/reflection-docblock": "^5.2.2",
"psr/log": "^1.0",
"sabre/event": "^5.0",
"sabre/uri": "^2.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
},
"containerName": "A"
},
"type__tostring": "bool[]",
"type__tostring": "array<string,bool>",
"type": {},
"declarationLine": "protected $foo;",
"documentation": null,
Expand Down
2 changes: 1 addition & 1 deletion tests/Validation/cases/magicConsts.php.expected.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
},
"containerName": "A"
},
"type__tostring": "bool[]",
"type__tostring": "array<\\__CLASS__,bool>",
"type": {},
"declarationLine": "private static $deprecationsTriggered;",
"documentation": null,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@
"documentation": null,
"signatureInformation": null
},
"Foo->fn()": {
"fqn": "Foo->fn()",
"Foo->()": {
"fqn": "Foo->()",
"extends": [],
"isMember": true,
"roamed": false,
"isStatic": false,
"canBeInstantiated": false,
"symbolInformation": {
"name": "fn",
"name": "",
"kind": 6,
"location": {
"uri": "./multiplePreceedingComments.php"
Expand Down