Skip to content

Commit 4f32862

Browse files
tools(deps-dev): Update vimeo/psalm requirement from 5.16.0 to 6.0.0 in /tools/psalm (#519)
Updates the requirements on [vimeo/psalm](https://github.com/vimeo/psalm) to permit the latest version. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/vimeo/psalm/releases">vimeo/psalm's releases</a>.</em></p> <blockquote> <h2>Psalm v6</h2> <!-- raw HTML omitted --> <p>This is the first release of Psalm v6!</p> <p>Users are encouraged to switch to Psalm v6 right away, as v5 is not supported anymore.</p> <p>Also announcing Psalm's new <strong>support model</strong>: you can support Psalm development by requesting a support contract from <a href="https://daniil.it">Daniil Gentili</a>, the only active maintainer of Psalm.</p> <p>Support contracts can cover full integration of Psalm into existing codebases, support for Psalm issues and development of additional Psalm features.</p> <p>See <a href="https://daniil.it">here »</a> for info, pricing and contact information.</p> <p>Main highlights of Psalm v6:</p> <ul> <li>PHP 8.4 support</li> <li>Amp v3 support</li> <li>PHP-Parser v5 support</li> <li>Fully overhauled <a href="https://psalm.dev/docs/contributing/editing_callmaps/">dictionaries</a>, for much more accurate and always up to date signatures for PHP and extension functions and methods, and much simpler PHP version upgrades.</li> <li><code>ignoreInternalFunctionFalseReturn</code> and <code>ignoreInternalFunctionNullReturn</code> are now <code>false</code> by default: this means Psalm now warns when a false/null return type of a native function is not explicitly checked.</li> <li>Modernization of the codebase for higher performance.</li> <li>Many other bugfixes and performance improvements.</li> </ul> <p>Plugin authors should consult the <a href="https://github.com/vimeo/psalm/blob/6.x/UPGRADING.md">changelog</a> for info about BC-breaking changes.</p> <h2>What's Changed</h2> <h3>Features</h3> <ul> <li>Add --force-jit flag by <a href="https://github.com/danog"><code>@​danog</code></a> in <a href="https://redirect.github.com/vimeo/psalm/pull/11165">vimeo/psalm#11165</a></li> <li>Xpath injection detection <a href="https://redirect.github.com/vimeo/psalm/issues/10162">#10162</a> by <a href="https://github.com/cgocast"><code>@​cgocast</code></a> in <a href="https://redirect.github.com/vimeo/psalm/pull/10163">vimeo/psalm#10163</a></li> <li>Backed enum value changed to Atomic instead of scalar int or strings by <a href="https://github.com/tuqqu"><code>@​tuqqu</code></a> in <a href="https://redirect.github.com/vimeo/psalm/pull/10165">vimeo/psalm#10165</a></li> <li>Introduce NonVariableReferenceReturn issue by <a href="https://github.com/tuqqu"><code>@​tuqqu</code></a> in <a href="https://redirect.github.com/vimeo/psalm/pull/10227">vimeo/psalm#10227</a></li> <li>Detect DoS by sleep vimeo#10178 by <a href="https://github.com/cgocast"><code>@​cgocast</code></a> in <a href="https://redirect.github.com/vimeo/psalm/pull/10183">vimeo/psalm#10183</a></li> <li>Introduce <code>DuplicateProperty</code> issue by <a href="https://github.com/tuqqu"><code>@​tuqqu</code></a> in <a href="https://redirect.github.com/vimeo/psalm/pull/10265">vimeo/psalm#10265</a></li> <li>Disable ignoreInternalFunction(False|Null)Return by default by <a href="https://github.com/robchett"><code>@​robchett</code></a> in <a href="https://redirect.github.com/vimeo/psalm/pull/10211">vimeo/psalm#10211</a></li> <li>Add intl extension stub by <a href="https://github.com/braindawg"><code>@​braindawg</code></a> in <a href="https://redirect.github.com/vimeo/psalm/pull/10276">vimeo/psalm#10276</a></li> <li>Improved type of callable-array by <a href="https://github.com/robchett"><code>@​robchett</code></a> in <a href="https://redirect.github.com/vimeo/psalm/pull/9794">vimeo/psalm#9794</a></li> <li>Add progress for scanning stage by <a href="https://github.com/robchett"><code>@​robchett</code></a> in <a href="https://redirect.github.com/vimeo/psalm/pull/10345">vimeo/psalm#10345</a></li> <li>Allow enum cases to be global constants by <a href="https://github.com/robchett"><code>@​robchett</code></a> in <a href="https://redirect.github.com/vimeo/psalm/pull/10339">vimeo/psalm#10339</a></li> <li>Report unused issue handler suppressions by <a href="https://github.com/robchett"><code>@​robchett</code></a> in <a href="https://redirect.github.com/vimeo/psalm/pull/10341">vimeo/psalm#10341</a></li> <li>Support @(no-)seal-(properties|methods) annotations without prefix by <a href="https://github.com/robchett"><code>@​robchett</code></a> in <a href="https://redirect.github.com/vimeo/psalm/pull/10344">vimeo/psalm#10344</a></li> <li>Stub constants for ZipArchive from ext-zip by <a href="https://github.com/braindawg"><code>@​braindawg</code></a> in <a href="https://redirect.github.com/vimeo/psalm/pull/10332">vimeo/psalm#10332</a></li> <li>Allow type aliases for static variables by <a href="https://github.com/robchett"><code>@​robchett</code></a> in <a href="https://redirect.github.com/vimeo/psalm/pull/10362">vimeo/psalm#10362</a></li> <li>Inherit magic methods from <a href="https://github.com/mixin"><code>@​mixin</code></a> by <a href="https://github.com/robchett"><code>@​robchett</code></a> in <a href="https://redirect.github.com/vimeo/psalm/pull/10356">vimeo/psalm#10356</a></li> <li>TaintedExtract by <a href="https://github.com/cgocast"><code>@​cgocast</code></a> in <a href="https://redirect.github.com/vimeo/psalm/pull/10417">vimeo/psalm#10417</a></li> <li>feat: Default baseline file by <a href="https://github.com/jorgsowa"><code>@​jorgsowa</code></a> in <a href="https://redirect.github.com/vimeo/psalm/pull/10696">vimeo/psalm#10696</a></li> <li>Add phpstub for amqp extension (php-amqp) by <a href="https://github.com/mkilmanas"><code>@​mkilmanas</code></a> in <a href="https://redirect.github.com/vimeo/psalm/pull/11172">vimeo/psalm#11172</a></li> <li>Add phpstub for amqp extension (php-amqp) by <a href="https://github.com/mkilmanas"><code>@​mkilmanas</code></a> in <a href="https://redirect.github.com/vimeo/psalm/pull/11181">vimeo/psalm#11181</a></li> </ul> <h3>Fixes</h3> <ul> <li>Fix <a href="https://redirect.github.com/vimeo/psalm/issues/10047">#10047</a> by <a href="https://github.com/cgocast"><code>@​cgocast</code></a> in <a href="https://redirect.github.com/vimeo/psalm/pull/10048">vimeo/psalm#10048</a></li> <li>Respect stubs in all cases by <a href="https://github.com/mmcev106"><code>@​mmcev106</code></a> in <a href="https://redirect.github.com/vimeo/psalm/pull/10092">vimeo/psalm#10092</a></li> </ul> <!-- raw HTML omitted --> </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/vimeo/psalm/commit/b8e96bb617bf59382113b1b56cef751f648a7dc9"><code>b8e96bb</code></a> Merge branch '6.x'</li> <li><a href="https://github.com/vimeo/psalm/commit/d314c44f7438fae6d2d6c8698ede85e35e1d1381"><code>d314c44</code></a> Detect CIs via CI envvar (i.e. woodpecker)</li> <li><a href="https://github.com/vimeo/psalm/commit/201e3b6e8bdf48c4e4aa565da02753a307d9bc86"><code>201e3b6</code></a> Fix version regex</li> <li><a href="https://github.com/vimeo/psalm/commit/910af758a30e31c2e20d3811fc6078957ef208b3"><code>910af75</code></a> Cleanup</li> <li><a href="https://github.com/vimeo/psalm/commit/3a73ec112d4a35941a9b689f17a33be4b014b2f6"><code>3a73ec1</code></a> Update changelog</li> <li><a href="https://github.com/vimeo/psalm/commit/91e095bc6582fe46eea7de3583c7981f8d9ff0b9"><code>91e095b</code></a> Improve callmap docs</li> <li><a href="https://github.com/vimeo/psalm/commit/7d28bf37f95c2b31929e8c822b3bb8b7514b0d61"><code>7d28bf3</code></a> Improve callmap docs</li> <li><a href="https://github.com/vimeo/psalm/commit/539587833853345b13f9b6058a17ace11d6f6afc"><code>5395878</code></a> Merge branch '5.x' into 6.x</li> <li><a href="https://github.com/vimeo/psalm/commit/83057d375ddcaaca012935a6be08c4da979cdf8e"><code>83057d3</code></a> Add info about the new Psalm support model</li> <li><a href="https://github.com/vimeo/psalm/commit/7fc8db361cd5f7a591ffa277639ba06d004fb75b"><code>7fc8db3</code></a> Fix</li> <li>Additional commits viewable in <a href="https://github.com/vimeo/psalm/compare/5.16.0...6.0.0">compare view</a></li> </ul> </details> <br /> <details> <summary>Most Recent Ignore Conditions Applied to This Pull Request</summary> | Dependency Name | Ignore Conditions | | --- | --- | | vimeo/psalm | [>= 5.a, < 6] | </details> Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> --------- Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: Jan Kowalleck <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jan Kowalleck <[email protected]>
1 parent fe49b81 commit 4f32862

File tree

2 files changed

+10
-11
lines changed

2 files changed

+10
-11
lines changed

src/_internal/MakeBom/Builder.php

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -378,19 +378,18 @@ public static function createToolsFromComposer(
378378
);
379379
} catch (Throwable) {
380380
[$group, $name] = self::getGroupAndName($packageName);
381+
/** @psalm-suppress RiskyTruthyFalsyComparison -- false positive - see the `?: ''` */
382+
$version = $versionOverride ?? (trim(
383+
// Try sibling of (global) installation
384+
// !! Don't refer to the `vendor` dir, it is a configurable and might be called differently !!
385+
@file_get_contents(\dirname(__DIR__, 4)."/$group/$name/semver.txt")
386+
?: // fallback: empty string
387+
''
388+
) ?: null);
381389
yield (new Models\Tool())
382390
->setName($name)
383391
->setVendor($group)
384-
->setVersion(
385-
$versionOverride
386-
?? (trim(
387-
// try sibling of (global) installation
388-
// !! dont refer to the `vendor` dir, it is a configurable and might be called differently !!
389-
@file_get_contents(\dirname(__DIR__, 4)."/$group/$name/semver.txt")
390-
?: // fallback: empty string
391-
''
392-
) ?: null)
393-
);
392+
->setVersion($version);
394393
}
395394
}
396395
}

tools/psalm/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"type": "metapackage",
44
"description": "psalm and plugins",
55
"require-dev": {
6-
"vimeo/psalm": "5.16.0",
6+
"vimeo/psalm": "6.0.0",
77
"roave/security-advisories": "dev-latest"
88
},
99
"config": {

0 commit comments

Comments
 (0)