Commit 37f61eb

authored

Merge v1.x into v2.x (#1656)

2 parents fc92768 + 9e6948d commit 37f61ebCopy full SHA for 37f61eb

File tree

-8

lines changed

-8

lines changed

Lines changed: 4 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@`
`17`	`17`	`use MongoDB\Operation\DatabaseCommand;`
`18`	`18`	`use MongoDB\Operation\ListCollections;`
`19`	`19`	`use stdClass;`
`20`		`-use Throwable;`
`21`	`20`	`use UnexpectedValueException;`
`22`	`21`
`23`	`22`	`use function array_intersect_key;`
`@@ -70,15 +69,12 @@ public function setUp(): void`
`70`	`69`	`$this->configuredFailPoints = [];`
`71`	`70`	`}`
`72`	`71`
`73`		`- protected function onNotSuccessfulTest(Throwable $t): never`
`74`		`- {`
`75`		`- $this->cleanupCollections();`
`76`		`-`
`77`		`- throw $t;`
`78`		`- }`
`79`		`-`
`80`	`72`	`public function tearDown(): void`
`81`	`73`	`{`
	`74`	`+ if ($this->status()->isSuccess()) {`
	`75`	`+ $this->cleanupCollections();`
	`76`	`+ }`
	`77`	`+`
`82`	`78`	`$this->disableFailPoints();`
`83`	`79`
`84`	`80`	`parent::tearDown();`

Comments

(0)