danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-11-30 04:39:00 +01:00
Code Issues Projects Releases Wiki Activity

Upgrade mockery plugin

Browse Source 
and other assorted fixes for PHP 8.2
This commit is contained in:
Bruce Weirdan 2022-11-25 03:33:10 -04:00
parent 1183476089
commit 6c77daf1f4
No known key found for this signature in database
GPG Key ID: CFC3AAB181751B0D
5 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -34,7 +34,7 @@
"netresearch/jsonmapper": "^1.0 || ^2.0 || ^3.0 || ^4.0",
"nikic/php-parser": "^4.13",
"openlss/lib-array2xml": "^1.0",
"psalm/plugin-mockery": "^0.10.0",
"psalm/plugin-mockery": "^1.1",
"sebastian/diff": "^4.0",
"symfony/console": "^3.4.17 || ^4.1.6 || ^5.0 || ^6.0",
"symfony/filesystem": "^5.4 || ^6.0",

1
psalm.xml.dist
View File

@ -38,6 +38,7 @@
<file name="vendor/felixfbecker/advanced-json-rpc/lib/Dispatcher.php" />
<directory name="vendor/netresearch/jsonmapper" />
<directory name="vendor/phpunit" />
<directory name="vendor/mockery/mockery"/>
<file name="vendor/nikic/php-parser/lib/PhpParser/Node/UnionType.php" />
</ignoreFiles>
</projectFiles>

2
src/Psalm/Config.php
View File

@ -2176,7 +2176,7 @@ class Config
}
if (extension_loaded('random')) {
$ext_random_path = $dir_lvl_2 . DIRECTORY_SEPARATOR . 'stubs' . DIRECTORY_SEPARATOR . 'ext-random.phpstub';
$ext_random_path = $dir_lvl_2 . DIRECTORY_SEPARATOR . 'stubs' . DIRECTORY_SEPARATOR . 'extensions' . DIRECTORY_SEPARATOR . 'ext-random.phpstub';
$this->internal_stubs[] = $ext_random_path;
}

3
src/Psalm/Type/MutableUnion.php
View File

@ -212,6 +212,9 @@ final class MutableUnion implements TypeNode, Stringable
*/
public $different = false;
/** @psalm-suppress PossiblyUnusedProperty */
public bool $propagate_parent_nodes = false;
/**
* @psalm-external-mutation-free
* @param non-empty-array<Atomic> $types

2
tests/PsalmPluginTest.php
View File

@ -234,7 +234,7 @@ class PsalmPluginTest extends TestCase
*/
public function disableComplainsWhenPassedUnresolvablePlugin(): void
{
$this->plugin_list->expects()->resolvePluginClass(Mockery::any())->andThrows(new InvalidArgumentException);
$this->plugin_list->expects()->resolvePluginClass(Mockery::any())->andThrows(new InvalidArgumentException());
$disable_command = new CommandTester($this->app->find('disable'));
$disable_command->execute(['pluginName' => 'vendor/package']);