Merge pull request #115 from weirdan/allow-upgrades

Fix issues that prevent dependabot updates
Roave · Mar 17, 2021 · 83a9bfc · 83a9bfc
2 parents be5b4c4 + 0479d8a
commit 83a9bfc
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 14 deletions.
diff --git a/composer.json b/composer.json
@@ -16,6 +16,9 @@
         "ocramius/package-versions": "^2.3.0",
         "vimeo/psalm":               "^4.4.1"
     },
+    "conflict": {
+        "vimeo/psalm": "4.6.3"
+    },
     "require-dev": {
         "composer/composer":        "^2.0.9",
         "doctrine/coding-standard": "^8.2.0",

diff --git a/composer.lock b/composer.lock
diff --git a/test/e2e/SimulatedInstallationTest.php b/test/e2e/SimulatedInstallationTest.php
@@ -56,16 +56,16 @@ public function testRepositoryReportsIssuesWhenDependingOnPackageThatEnforcesStr
 
         $command->run();
 
-        self::assertSame(1, $command->getExitCode());
+        self::assertGreaterThan(0, $command->getExitCode());
 
         $output = $command->getOutput();
 
         self::assertStringContainsString('checking strictly type-checked packages...', $output);
         self::assertStringContainsString(' - test/repository-depending-on-type-checks', $output);
         self::assertStringContainsString(' - - Test\\RepositoryDependingOnTypeChecks\\', $output);
         self::assertStringContainsString('1 errors', $output);
-        self::assertStringContainsString(
-            'Argument 1 of Test\\RepositoryDependingOnTypeChecks\\SomeClass::aMethod expects string, int(123) provided',
+        self::assertMatchesRegularExpression(
+            '@Argument 1 of Test\\\\RepositoryDependingOnTypeChecks\\\\SomeClass::aMethod expects string, (int\(123\)|123) provided@',
             $output
         );
 
@@ -81,16 +81,16 @@ public function testRepositoryReportsIssuesWhenDependingIndirectlyOnPackageThatE
 
         $command->run();
 
-        self::assertSame(1, $command->getExitCode());
+        self::assertGreaterThan(0, $command->getExitCode());
 
         $output = $command->getOutput();
 
         self::assertStringContainsString('checking strictly type-checked packages...', $output);
         self::assertStringContainsString(' - test/repository-depending-on-type-checks', $output);
         self::assertStringContainsString(' - - Test\\RepositoryDependingOnTypeChecks\\', $output);
         self::assertStringContainsString('1 errors', $output);
-        self::assertStringContainsString(
-            'Argument 1 of Test\\RepositoryDependingOnTypeChecks\\SomeClass::aMethod expects string, int(123) provided',
+        self::assertMatchesRegularExpression(
+            '@Argument 1 of Test\\\\RepositoryDependingOnTypeChecks\\\\SomeClass::aMethod expects string, (int\(123\)|123) provided@',
             $output
         );
 
@@ -111,16 +111,16 @@ public function testRepositoryOnlyReportsIssuesOnDependencyUsagesThatEnforceStri
 
         $command->run();
 
-        self::assertSame(1, $command->getExitCode());
+        self::assertGreaterThan(0, $command->getExitCode());
 
         $output = $command->getOutput();
 
         self::assertStringContainsString('checking strictly type-checked packages...', $output);
         self::assertStringContainsString(' - test/repository-depending-on-type-checks', $output);
         self::assertStringContainsString(' - - Test\\RepositoryDependingOnTypeChecks\\', $output);
         self::assertStringContainsString('1 errors', $output);
-        self::assertStringContainsString(
-            'Argument 1 of Test\\RepositoryDependingOnTypeChecks\\SomeClass::aMethod expects string, int(123) provided',
+        self::assertMatchesRegularExpression(
+            '@Argument 1 of Test\\\\RepositoryDependingOnTypeChecks\\\\SomeClass::aMethod expects string, (int\(123\)|123) provided@',
             $output
         );