Skip to content

Commit 7fde23c

Browse files
committed
PhpExtension: simplification, uses only ini_set
1 parent 70f9e96 commit 7fde23c

File tree

2 files changed

+5
-19
lines changed

2 files changed

+5
-19
lines changed

src/Bootstrap/Extensions/PhpExtension.php

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -27,26 +27,12 @@ public function getConfigSchema(): Nette\Schema\Schema
2727
public function loadConfiguration()
2828
{
2929
foreach ($this->getConfig() as $name => $value) {
30-
if ($value === null) {
31-
continue;
32-
33-
} elseif ($name === 'include_path') {
34-
$this->initialization->addBody('set_include_path(?);', [str_replace(';', PATH_SEPARATOR, $value)]);
35-
36-
} elseif ($name === 'ignore_user_abort') {
37-
$this->initialization->addBody('ignore_user_abort(?);', [$value]);
38-
39-
} elseif ($name === 'max_execution_time') {
40-
$this->initialization->addBody('set_time_limit(?);', [$value]);
41-
42-
} elseif ($name === 'date.timezone') {
43-
$this->initialization->addBody('date_default_timezone_set(?);', [$value]);
30+
if (!function_exists('ini_set')) {
31+
throw new Nette\NotSupportedException('Required function ini_set() is disabled.');
32+
}
4433

45-
} elseif (function_exists('ini_set')) {
34+
if ($value !== null) {
4635
$this->initialization->addBody('ini_set(?, (string) (?));', [$name, $value]);
47-
48-
} elseif (ini_get($name) !== (string) $value) {
49-
throw new Nette\NotSupportedException('Required function ini_set() is disabled.');
5036
}
5137
}
5238
}

tests/Bootstrap/Configurator.basic.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Assert::same('%foo%', $container->parameters['foo2']);
3131
Assert::same('%foo%', $container->parameters['foo3']);
3232
Assert::same('hello', $container->parameters['bar']);
3333
Assert::same('hello world', constant('BAR'));
34-
Assert::same('Europe/Prague', date_default_timezone_get());
34+
Assert::same('Europe/Prague', ini_get('date.timezone'));
3535

3636
Assert::same([
3737
'dsn' => 'sqlite2::memory:',

0 commit comments

Comments
 (0)