Skip to content

Commit 96df1df

Browse files
committed
Fix: Conditions
1 parent 04947c4 commit 96df1df

File tree

2 files changed

+9
-13
lines changed

2 files changed

+9
-13
lines changed

psalm-baseline.xml

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<files psalm-version="4.16.1@aa7e400908833b10c0333861f86cd48c510b60eb">
2+
<files psalm-version="4.22.0@fc2c6ab4d5fa5d644d8617089f012f3bb84b8703">
33
<file src="src/Command/NormalizeCommand.php">
4-
<MixedArgument occurrences="9">
5-
<code>$composerFile</code>
6-
<code>$composerFile</code>
7-
<code>$composerFile</code>
8-
<code>$composerFile</code>
9-
<code>$composerFile</code>
10-
<code>$composerFile</code>
11-
<code>$composerFile</code>
12-
<code>$composerFile</code>
13-
<code>$composerFile</code>
14-
</MixedArgument>
154
<MixedAssignment occurrences="1">
165
<code>$composerFile</code>
176
</MixedAssignment>
7+
<RedundantCondition occurrences="1"/>
8+
<TypeDoesNotContainType occurrences="1"/>
189
</file>
1910
<file src="test/Integration/Command/NormalizeCommand/AbstractTestCase.php">
2011
<MixedArrayAccess occurrences="1">

src/Command/NormalizeCommand.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
namespace Ergebnis\Composer\Normalize\Command;
1515

1616
use Composer\Command;
17+
use Composer\Composer;
1718
use Composer\Console\Application;
1819
use Composer\Factory;
1920
use Composer\IO;
@@ -132,7 +133,7 @@ protected function execute(
132133

133134
$composerFile = $input->getArgument('file');
134135

135-
if (null === $composerFile) {
136+
if (!\is_string($composerFile)) {
136137
$composerFile = Factory::getComposerFile();
137138
}
138139

@@ -141,6 +142,10 @@ protected function execute(
141142
$composerFile,
142143
);
143144

145+
if (!$composer instanceof Composer) {
146+
throw Exception\ShouldNotHappen::create();
147+
}
148+
144149
try {
145150
$indentFromExtra = self::indentFromExtra($composer->getPackage()->getExtra());
146151
} catch (\RuntimeException $exception) {

0 commit comments

Comments
 (0)