Skip to content

Commit 8612486

Browse files
committed
refactor: unwrap/split long complex methods
1 parent d577593 commit 8612486

File tree

2 files changed

+39
-21
lines changed

2 files changed

+39
-21
lines changed

src/Loader.php

+24-15
Original file line numberDiff line numberDiff line change
@@ -70,31 +70,40 @@ public function load($file, $override = false, $mode = self::PUTENV)
7070
* @param bool $override
7171
* @param int $mode
7272
*/
73-
protected function setEnv(array $vars, $override, $mode)
73+
protected function setEnv(array $vars, $override, $mode = self::PUTENV)
7474
{
75-
if ($mode < self::PUTENV || $mode > self::ALL) {
76-
$mode = self::PUTENV;
77-
}
78-
79-
$default = microtime(1);
75+
$default = \microtime(1);
8076

8177
foreach ($vars as $key => $value) {
8278
// Skip if we already have value and cant override.
8379
if (!$override && $default !== Retriever::getEnv($key, $default)) {
8480
continue;
8581
}
8682

87-
if ($mode & self::ENV) {
88-
$_ENV[$key] = $value;
89-
}
83+
$this->toEnv($key, $value, $mode);
84+
$this->toServer($key, $value, $mode);
85+
$this->toPutenv($key, $value, $mode);
86+
}
87+
}
9088

91-
if ($mode & self::PUTENV) {
92-
\putenv("$key=$value");
93-
}
89+
private function toEnv($key, $value, $mode)
90+
{
91+
if ($mode & self::ENV) {
92+
$_ENV[$key] = $value;
93+
}
94+
}
9495

95-
if ($mode & self::SERVER) {
96-
$_SERVER[$key] = $value;
97-
}
96+
private function toServer($key, $value, $mode)
97+
{
98+
if ($mode & self::SERVER) {
99+
$_SERVER[$key] = $value;
100+
}
101+
}
102+
103+
private function toPutenv($key, $value, $mode)
104+
{
105+
if ($mode & self::PUTENV) {
106+
\putenv("$key=$value");
98107
}
99108
}
100109
}

src/Retriever.php

+15-6
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,24 @@ class Retriever
2424
*/
2525
public static function getEnv($key, $default = null, $filter = null, $options = null)
2626
{
27+
if (false !== $env = \getenv($key)) {
28+
return static::prepareValue($env, $filter, $options);
29+
}
30+
31+
if (isset($_ENV[$key])) {
32+
return static::prepareValue($_ENV[$key], $filter, $options);
33+
}
34+
2735
if (isset($_SERVER[$key])) {
28-
$env = $_SERVER[$key];
29-
} elseif (isset($_ENV[$key])) {
30-
$env = $_ENV[$key];
31-
} elseif (false === $env = \getenv($key)) {
32-
// Default is not passed through filter!
33-
return $default;
36+
return static::prepareValue($_SERVER[$key], $filter, $options);
3437
}
3538

39+
// Default is not passed through filter!
40+
return $default;
41+
}
42+
43+
protected static function prepareValue($env, $filter, $options)
44+
{
3645
static $special = [
3746
'true' => true, 'false' => false, 'null' => null,
3847
'TRUE' => true, 'FALSE' => false, 'NULL' => null,

0 commit comments

Comments
 (0)