Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix reverse order test failures #3402

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion tests/unit/Framework/MockObject/MockObjectTest.php
Expand Up @@ -947,7 +947,7 @@ public function testCreateTwoMocksOfOneWsdlFile(): void
*/
public function testCreateMockOfWsdlFileWithSpecialChars(): void
{
$mock = $this->getMockFromWsdl(__DIR__ . '/_fixture/Go ogle-Sea.rch.wsdl');
$mock = $this->getMockFromWsdl(TEST_FILES_PATH . 'Go ogle-Sea.rch.wsdl');

$this->assertStringStartsWith('Mock_GoogleSearch_', \get_class($mock));
}
Expand Down
8 changes: 8 additions & 0 deletions tests/unit/Util/ConfigurationTest.php
Expand Up @@ -428,11 +428,19 @@ public function testHandlePHPConfigurationDoesForceOverwrittenExistingEnvArrayVa
*/
public function testHandlePHPConfigurationDoesNotOverriteVariablesFromPutEnv(): void
{
$backupFoo = \getenv('foo');

\putenv('foo=putenv');
$this->configuration->handlePHPConfiguration();

$this->assertEquals('putenv', $_ENV['foo']);
$this->assertEquals('putenv', \getenv('foo'));

if ($backupFoo === false) {
\putenv('foo'); // delete variable from environment
} else {
\putenv("foo=$backupFoo");
}
}

/**
Expand Down