Skip to content

Adding compatibility with PHPStan 0.11 #7

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Jan 18, 2019
Merged

Adding compatibility with PHPStan 0.11 #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
57a1444
Adding compatibility with PHPStan 0.11
moufmouf Jan 18, 2019
dc551c1
Fixing PHPStan rule
moufmouf Jan 18, 2019
1e9a23b
Fixing PHPStan rule
moufmouf Jan 18, 2019
bc9696f
Fixing PHPStan rule
moufmouf Jan 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ sudo: false
php:
- 7.1
- 7.2
- 7.3
env:
global:
# We need to prefer source to get PHPStan test directory. Otherwise, it is removed from ZIP
Expand Down
8 changes: 4 additions & 4 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
],
"require": {
"php": "^7.1",
"phpstan/phpstan": "^0.10",
"thecodingmachine/safe": "^0.1"
"phpstan/phpstan": "^0.10 | v0.11",
"thecodingmachine/safe": "^0.1.11"
},
"require-dev": {
"phpunit/phpunit": "^7.1",
"phpunit/phpunit": "^7.5.2",
"php-coveralls/php-coveralls": "^2.1",
"squizlabs/php_codesniffer": "^3.2"
"squizlabs/php_codesniffer": "^3.4"
},
"autoload": {
"psr-4": {
Expand Down
2 changes: 1 addition & 1 deletion src/Utils/FunctionListLoader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public static function getFunctionList(): array
throw new \RuntimeException('Could not find thecodingmachine/safe\'s functionsList.php file.');
}
// Let's index these functions by their name
self::$functions = \array_combine($functions, $functions);
self::$functions = \Safe\array_combine($functions, $functions);
}
return self::$functions;
}
Expand Down