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.

Sign up for GitHub

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

Jump to bottom

Fix php ini parsing from the CLI #63

Merged
merged 6 commits into from Apr 3, 2022
Merged

Fix php ini parsing from the CLI #63

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
89f2036
Add modification to the getCurrentSettings
dingo-d Apr 2, 2022
098a56c
Add tests
dingo-d Apr 2, 2022
fd81e8a
Fix indentation
dingo-d Apr 2, 2022
9ac9125
Merge branch '5.1' into fix-get-current-settings
dingo-d Apr 3, 2022
3a39958
Add strict checking
dingo-d Apr 3, 2022
8c79688
Remove test that is not related to the feature
dingo-d Apr 3, 2022
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
8 changes: 6 additions & 2 deletions src/Runtime.php
View file
Open in desktop
Expand Up @@ -289,8 +289,12 @@ public function getCurrentSettings(array $values): array
foreach ($values as $value) {
$set = ini_get($value);

if (isset($config[$value]) && $set != $config[$value]) {
sebastianbergmann marked this conversation as resolved.
Show resolved Hide resolved
$diff[] = sprintf('%s=%s', $value, $set);
if ($set == null) {
sebastianbergmann marked this conversation as resolved.
Show resolved Hide resolved
continue;
}

if ((!isset($config[$value]) || ($set != $config[$value]))) {
sebastianbergmann marked this conversation as resolved.
Show resolved Hide resolved
$diff[$value] = sprintf('%s=%s', $value, $set);
}
}
}
Expand Down
24 changes: 24 additions & 0 deletions tests/RuntimeTest.php
View file
Open in desktop
Expand Up @@ -142,6 +142,30 @@ public function testGetVendorUrlReturnsPhpDotNetWhenRunningPhp(): void
$this->assertSame('https://secure.php.net/', $this->env->getVendorUrl());
}

public function testDiscardingCommentsReturnsFalseIfOpcacheIsNotActive(): void
sebastianbergmann marked this conversation as resolved.
Show resolved Hide resolved
{
$this->assertFalse((new Runtime)->discardsComments());
}

public function testGetCurrentSettingsReturnsEmptyDiffIfNoValuesArePassed()
{
$this->assertSame([], (new Runtime)->getCurrentSettings([]));
}

/**
* @requires extension xdebug
*/
public function testGetCurrentSettingsReturnsCorrectDiffIfXdebugValuesArePassed()
{
$this->assertIsArray((new Runtime)->getCurrentSettings(['xdebug.mode']));
$this->assertArrayHasKey('xdebug.mode', (new Runtime)->getCurrentSettings(['xdebug.mode']));
}

public function testGetCurrentSettingsWillSkipSettingsThatIsNotSet()
{
$this->assertSame([], (new Runtime)->getCurrentSettings(['allow_url_include']));
}

private function markTestSkippedWhenNotRunningOnPhpdbg(): void
{
if ($this->isRunningOnPhpdbg()) {
Expand Down