Skip to content

Commit

Permalink
fix build
Browse files Browse the repository at this point in the history
  • Loading branch information
azjezz committed May 19, 2021
1 parent 064cc91 commit d2156d0
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 14 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"doctrine/coding-standard": "^8.2.0",
"infection/infection": "^0.16.4",
"php-standard-library/psalm-plugin": "^1.1",
"phpunit/phpunit": "^9.2.6",
"phpunit/phpunit": "^9.5",
"roave/security-advisories": "dev-master",
"squizlabs/php_codesniffer": "^3.6.0",
"vimeo/psalm": "^4.7"
Expand Down
2 changes: 1 addition & 1 deletion composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 11 additions & 9 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
bootstrap="vendor/autoload.php"
colors="true"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
bootstrap="vendor/autoload.php"
colors="true"
>
<testsuites>
<testsuite name="unit">
Expand All @@ -13,12 +13,14 @@
<directory>./test/e2e</directory>
</testsuite>
</testsuites>
<filter>
<whitelist processUncoveredFilesFromWhitelist="true">

<coverage processUncoveredFiles="true">
<include>
<directory suffix=".php">./src</directory>
</whitelist>
</filter>
</include>
</coverage>

<php>
<ini name="error_reporting" value="E_ALL"/>
<ini name="error_reporting" value="E_ALL"/>
</php>
</phpunit>
6 changes: 5 additions & 1 deletion src/Command/AssertBackwardsCompatible.php
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,11 @@ public function execute(InputInterface $input, OutputInterface $output): int

$toRevision = $this->parseRevision->fromStringForRepository($to, $sourceRepo);

$stdErr->writeln(Str\format('Comparing from %s to %s...', (string) $fromRevision, (string) $toRevision));
$stdErr->writeln(Str\format(
'Comparing from %s to %s...',
Type\string()->coerce($fromRevision),
Type\string()->coerce($toRevision)
));

$fromPath = $this->git->checkout($sourceRepo, $fromRevision);
$toPath = $this->git->checkout($sourceRepo, $toRevision);
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/Command/AssertBackwardsCompatibleTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ public function testWillAllowSpecifyingGitRevision() : void
EXPECTED
,
$exception->getOutput() // @TODO https://github.com/Roave/BackwardCompatibilityCheck/issues/79 this looks like a symfony bug - we shouldn't check STDERR, but STDOUT
$exception->getErrorOutput() // @TODO https://github.com/Roave/BackwardCompatibilityCheck/issues/79 this looks like a symfony bug - we shouldn't check STDERR, but STDOUT
);
}
}
Expand All @@ -199,7 +199,7 @@ public function testWillRunSuccessfullyOnNoBcBreaks() : void
'-vvv',
], $this->sourcesRepository);

self::assertStringContainsString('No backwards-incompatible changes detected', $output);
self::assertEmpty($output);
}

public function testWillPickTaggedVersionOnNoGivenFrom() : void
Expand Down

0 comments on commit d2156d0

Please sign in to comment.