Merge pull request #7 from thecodingmachine/phpstan0.11

Adding compatibility with PHPStan 0.11
thecodingmachine · Jan 18, 2019 · 8fbca4b · 8fbca4b
2 parents ba8eea4 + bc9696f
commit 8fbca4b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -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

diff --git a/composer.json b/composer.json
@@ -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": {

diff --git a/src/Utils/FunctionListLoader.php b/src/Utils/FunctionListLoader.php
@@ -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;
     }