public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Report multiple inis in php.ini specific messages 

Where systems use multiple ini files it is perhaps more useful to
suggest running `php --ini` to see their locations, rather than showing
the loaded php.ini (if one exists).
pull/6728/merge
johnstevenson 2017-11-02 12:46:09 +00:00 committed by Jordi Boggiano
parent a691a179e5
commit b0922b95af
2 changed files with 42 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Composer/Util/IniHelper.php
View File

@ -33,7 +33,9 @@ class IniHelper
*/
public static function getAll()
{
if ($env = strval(getenv(self::ENV_ORIGINAL))) {
$env = getenv(self::ENV_ORIGINAL);
if (false !== $env) {
return explode(PATH_SEPARATOR, $env);
}
@ -47,7 +49,7 @@ class IniHelper
}
/**
* Describes the location of the loaded php.ini file
* Describes the location of the loaded php.ini file(s)
*
* @return string
*/
@ -56,9 +58,19 @@ class IniHelper
$paths = self::getAll();
if (empty($paths[0])) {
array_shift($paths);
}
$ini = array_shift($paths);
if (empty($ini)) {
return 'A php.ini file does not exist. You will have to create one.';
}
return 'The php.ini used by your command-line PHP is: '.$paths[0];
if (!empty($paths)) {
return 'Your command-line PHP is using multiple ini files. Run `php --ini` to show them.';
}
return 'The php.ini used by your command-line PHP is: '.$ini;
}
}

30
tests/Composer/Test/Util/IniHelperTest.php
View File

@ -21,7 +21,18 @@ class IniHelperTest extends \PHPUnit_Framework_TestCase
{
public static $envOriginal;
public function testWithLoadedIni()
public function testWithNoIni()
{
$paths = array(
'',
);
$this->setEnv($paths);
$this->assertContains('does not exist', IniHelper::getMessage());
$this->assertEquals($paths, IniHelper::getAll());
}
public function testWithLoadedIniOnly()
{
$paths = array(
'loaded.ini',
@ -32,7 +43,20 @@ class IniHelperTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($paths, IniHelper::getAll());
}
public function testWithoutLoadedIni()
public function testWithLoadedIniAndAdditional()
{
$paths = array(
'loaded.ini',
'one.ini',
'two.ini',
);
$this->setEnv($paths);
$this->assertContains('multiple ini files', IniHelper::getMessage());
$this->assertEquals($paths, IniHelper::getAll());
}
public function testWithoutLoadedIniAndAdditional()
{
$paths = array(
'',
@ -41,7 +65,7 @@ class IniHelperTest extends \PHPUnit_Framework_TestCase
);
$this->setEnv($paths);
$this->assertContains('does not exist', IniHelper::getMessage());
$this->assertContains('multiple ini files', IniHelper::getMessage());
$this->assertEquals($paths, IniHelper::getAll());
}