Skip to content

Commit 2ece10e

Browse files
tools(deps-dev): Update vimeo/psalm requirement from 6.5.1 to 6.7.1 in /tools/psalm (#531)
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>6.7.1</h2> <!-- raw HTML omitted --> <h2>What's Changed</h2> <h3>Internal changes</h3> <ul> <li>Require jsonmapper v5 by <a href="https://github.com/danog"><code>@​danog</code></a> in <a href="https://redirect.github.com/vimeo/psalm/pull/11300">vimeo/psalm#11300</a></li> </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/vimeo/psalm/compare/6.7.0...6.7.1">https://github.com/vimeo/psalm/compare/6.7.0...6.7.1</a></p> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/vimeo/psalm/commit/a2f190972555ea01b0cfcc1913924d6c5fc1a64e"><code>a2f1909</code></a> Merge pull request <a href="https://redirect.github.com/vimeo/psalm/issues/11300">#11300</a> from vimeo/jsonmapper_v5</li> <li><a href="https://github.com/vimeo/psalm/commit/0d749d74eef147c63dc3defe0e0ecc72d182f6ed"><code>0d749d7</code></a> Require jsonmapper v5</li> <li><a href="https://github.com/vimeo/psalm/commit/11a32693fb9e33d4f0505de17af41c8fcac698a7"><code>11a3269</code></a> Improve UndefinedMagicMethod docs</li> <li><a href="https://github.com/vimeo/psalm/commit/da61bdd9d919515f4dd4943b0519f137b505aab2"><code>da61bdd</code></a> Bump docs</li> <li><a href="https://github.com/vimeo/psalm/commit/376cd8612c07a915c3fc3c6e9bdd6b1dee3b8538"><code>376cd86</code></a> Merge remote-tracking branch 'origin/6.x'</li> <li><a href="https://github.com/vimeo/psalm/commit/5eb8b9d7e21031c12eab8c05d1c25685236ecc34"><code>5eb8b9d</code></a> Merge pull request <a href="https://redirect.github.com/vimeo/psalm/issues/11298">#11298</a> from vimeo/fix_PluginRegistrationSocket</li> <li><a href="https://github.com/vimeo/psalm/commit/951c9e0f77854eb12e2dd3c597f3aa2a351f02f0"><code>951c9e0</code></a> Change PluginEntryPointInterface to take a PluginRegistrationSocket</li> <li><a href="https://github.com/vimeo/psalm/commit/782756ea617c2c9be52f713507424e3f8d3e8aad"><code>782756e</code></a> Merge pull request <a href="https://redirect.github.com/vimeo/psalm/issues/11283">#11283</a> from vimeo/enable_more_features</li> <li><a href="https://github.com/vimeo/psalm/commit/a6e223b74617c6de7b2181b3ae832018696caf0e"><code>a6e223b</code></a> Merge pull request <a href="https://redirect.github.com/vimeo/psalm/issues/11297">#11297</a> from vimeo/expose_progress</li> <li><a href="https://github.com/vimeo/psalm/commit/8daae1db805b9baf21adf1e0ef7819fba832fc86"><code>8daae1d</code></a> Fix</li> <li>Additional commits viewable in <a href="https://github.com/vimeo/psalm/compare/6.5.1...6.7.1">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 28bcf43 commit 2ece10e

File tree

5 files changed

+20
-1
lines changed

5 files changed

+20
-1
lines changed

HISTORY.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@ All notable changes to this project will be documented in this file.
66

77
<!-- add unreleased items here -->
88

9+
* Misc
10+
* Added`Override` markers where needed (via [#531])
11+
See also: <https://wiki.php.net/rfc/marking_overriden_methods>
12+
13+
[#531]: https://github.com/CycloneDX/cyclonedx-php-composer/pull/531
14+
915
## 5.2.1 - 2025-01-27
1016

1117
* Added

psalm.xml.dist

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,8 @@
1515
<projectFiles>
1616
<directory name="src"/>
1717
</projectFiles>
18+
<issueHandlers>
19+
<ClassMustBeFinal errorLevel="suppress"/><!-- all is internal anyway... -->
20+
<ImplicitToStringCast errorLevel="info"/>
21+
</issueHandlers>
1822
</psalm>

src/Plugin.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
use Composer\Plugin\Capability\CommandProvider;
3030
use Composer\Plugin\Capable;
3131
use Composer\Plugin\PluginInterface;
32+
use Override;
3233

3334
/**
3435
* @author jkowalleck
@@ -37,21 +38,25 @@
3738
*/
3839
class Plugin implements PluginInterface, Capable, CommandProvider
3940
{
41+
#[Override]
4042
public function activate(Composer $composer, IOInterface $io): void
4143
{
4244
/* nothing to do, but required by the `PluginInterface` */
4345
}
4446

47+
#[Override]
4548
public function deactivate(Composer $composer, IOInterface $io): void
4649
{
4750
/* nothing to do, but required by the `PluginInterface` */
4851
}
4952

53+
#[Override]
5054
public function uninstall(Composer $composer, IOInterface $io): void
5155
{
5256
/* nothing to do, but required by the `PluginInterface` */
5357
}
5458

59+
#[Override]
5560
public function getCapabilities(): array
5661
{
5762
return [
@@ -62,6 +67,7 @@ public function getCapabilities(): array
6267
/**
6368
* @psalm-suppress MissingThrowsDocblock - Exceptions are handled by caller
6469
*/
70+
#[Override]
6571
public function getCommands(): array
6672
{
6773
return [

src/_internal/MakeBom/Command.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
use DateTime;
3636
use DomainException;
3737
use Exception;
38+
use Override;
3839
use Symfony\Component\Console\Exception\LogicException;
3940
use Symfony\Component\Console\Formatter\OutputFormatter;
4041
use Symfony\Component\Console\Input\InputInterface;
@@ -61,6 +62,7 @@ public function __construct(
6162
parent::__construct($name);
6263
}
6364

65+
#[Override]
6466
protected function configure(): void
6567
{
6668
$this
@@ -73,6 +75,7 @@ protected function configure(): void
7375
* ALL LOG OUTPUT MUST BE WRITTEN AS ERROR, SO OUTPUT REDIRECT/PIPE OF RESULT WORKS PROPERLY
7476
*/
7577

78+
#[Override]
7679
protected function execute(InputInterface $input, OutputInterface $output): int
7780
{
7881
$io = $this->getIO();

tools/psalm/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
},
88
"require-dev": {
99
"roave/security-advisories": "dev-latest",
10-
"vimeo/psalm": "6.5.1"
10+
"vimeo/psalm": "6.7.1"
1111
},
1212
"prefer-stable": true,
1313
"config": {

0 commit comments

Comments
 (0)