diff --git a/.appveyor.yml b/.appveyor.yml index e25b457e4..914d6356e 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -14,7 +14,7 @@ init: environment: SSL_CERT_FILE: "C:\\tools\\php\\cacert.pem" matrix: - - php_ver_target: 7.4 + - php_ver_target: 8.0 DEPS: 'high' cache: diff --git a/composer.json b/composer.json index bbc442baa..3e7431a93 100644 --- a/composer.json +++ b/composer.json @@ -44,16 +44,16 @@ "ext-curl": "*", "amphp/amp": "^2.4.2", "bamarni/composer-bin-plugin": "^1.2", - "brianium/paratest": "^4.0.0", + "brianium/paratest": "^4.0||^6.0", "phpdocumentor/reflection-docblock": "^5", - "phpmyadmin/sql-parser": "5.1.0", + "phpmyadmin/sql-parser": "5.1.0||dev-master", "phpspec/prophecy": ">=1.9.0", "phpunit/phpunit": "^9.0", "psalm/plugin-phpunit": "^0.13", - "weirdan/prophecy-shim": "^1.0 || ^2.0", - "slevomat/coding-standard": "^5.0", + "slevomat/coding-standard": "^6.3.11", "squizlabs/php_codesniffer": "^3.5", - "symfony/process": "^4.3" + "symfony/process": "^4.3", + "weirdan/prophecy-shim": "^1.0 || ^2.0" }, "suggest": { "ext-igbinary": "^2.0.5" diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 9b6c1736a..657597fbe 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -38,8 +38,8 @@ src/Psalm/Internal/Provider/ParserCacheProvider.php - - + + diff --git a/tests/fixtures/DummyProjectWithErrors/composer.json b/tests/fixtures/DummyProjectWithErrors/composer.json index 0e3aa839f..94b372ebc 100644 --- a/tests/fixtures/DummyProjectWithErrors/composer.json +++ b/tests/fixtures/DummyProjectWithErrors/composer.json @@ -3,7 +3,7 @@ "description": "A sample project to be used when testing Psalm", "type": "project", "require": { - "vimeo/psalm": "^3.11" + "vimeo/psalm": "^4.3" }, "autoload": { "psr-4": {