projects
/
yaffs-website
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Security update for Core, with self-updated composer
[yaffs-website]
/
vendor
/
psy
/
psysh
/
test
/
Psy
/
Test
/
ConfigurationTest.php
diff --git
a/vendor/psy/psysh/test/Psy/Test/ConfigurationTest.php
b/vendor/psy/psysh/test/Psy/Test/ConfigurationTest.php
index 99604a6ddfbe1e73270b29795cd5f69dd7c8ecd9..e4d9936d5eab96f9c68703561608659d1a115090 100644
(file)
--- a/
vendor/psy/psysh/test/Psy/Test/ConfigurationTest.php
+++ b/
vendor/psy/psysh/test/Psy/Test/ConfigurationTest.php
@@
-18,7
+18,7
@@
use Psy\Output\PassthruPager;
use Psy\VersionUpdater\GitHubChecker;
use Symfony\Component\Console\Output\ConsoleOutput;
use Psy\VersionUpdater\GitHubChecker;
use Symfony\Component\Console\Output\ConsoleOutput;
-class ConfigurationTest extends \PHPUnit
_Framework_
TestCase
+class ConfigurationTest extends \PHPUnit
\Framework\
TestCase
{
private function getConfig($configFile = null)
{
{
private function getConfig($configFile = null)
{
@@
-142,8
+142,8
@@
class ConfigurationTest extends \PHPUnit_Framework_TestCase
public function testLoadLocalConfigFile()
{
public function testLoadLocalConfigFile()
{
- $oldPwd = get
env('PWD'
);
-
putenv('PWD=' .
realpath(__DIR__ . '/../../fixtures/project/'));
+ $oldPwd = get
cwd(
);
+
chdir(
realpath(__DIR__ . '/../../fixtures/project/'));
$config = new Configuration();
$config = new Configuration();
@@
-157,7
+157,7
@@
class ConfigurationTest extends \PHPUnit_Framework_TestCase
$this->assertTrue($config->useReadline());
$this->assertFalse($config->usePcntl());
$this->assertTrue($config->useReadline());
$this->assertFalse($config->usePcntl());
-
putenv("PWD=$oldPwd"
);
+
chdir($oldPwd
);
}
/**
}
/**
@@
-238,21
+238,19
@@
class ConfigurationTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($colorMode, $config->colorMode());
}
$this->assertEquals($colorMode, $config->colorMode());
}
+ /**
+ * @expectedException \InvalidArgumentException
+ * @expectedExceptionMessage invalid color mode: some invalid mode
+ */
public function testSetColorModeInvalid()
{
$config = $this->getConfig();
public function testSetColorModeInvalid()
{
$config = $this->getConfig();
- $colorMode = 'some invalid mode';
-
- $this->setExpectedException(
- '\InvalidArgumentException',
- 'invalid color mode: some invalid mode'
- );
- $config->setColorMode($colorMode);
+ $config->setColorMode('some invalid mode');
}
public function testSetCheckerValid()
{
}
public function testSetCheckerValid()
{
- $config = $this->getConfig();
+ $config
= $this->getConfig();
$checker = new GitHubChecker();
$config->setChecker($checker);
$checker = new GitHubChecker();
$config->setChecker($checker);