Skip to content

Commit d3b1a0c

Browse files
author
Tom Schlick
authored
commenting out function that is conflicting with Laravel native env()
/cc @sonnysavage
1 parent 1af7fb0 commit d3b1a0c

File tree

1 file changed

+66
-66
lines changed

1 file changed

+66
-66
lines changed

functions.php

Lines changed: 66 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -186,72 +186,72 @@ function pj($var)
186186

187187
}
188188

189-
if (!function_exists('env')) {
190-
/**
191-
* Gets an environment variable from available sources, and provides emulation
192-
* for unsupported or inconsistent environment variables (i.e. DOCUMENT_ROOT on
193-
* IIS, or SCRIPT_NAME in CGI mode). Also exposes some additional custom
194-
* environment information.
195-
*
196-
* @param string $key Environment variable name.
197-
* @param string|null $default Specify a default value in case the environment variable is not defined.
198-
* @return string|bool|null Environment variable setting.
199-
* @link https://book.cakephp.org/3.0/en/core-libraries/global-constants-and-functions.html#env
200-
*/
201-
function env($key, $default = null)
202-
{
203-
if ($key === 'HTTPS') {
204-
if (isset($_SERVER['HTTPS'])) {
205-
return (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off');
206-
}
207-
208-
return (strpos((string)env('SCRIPT_URI'), 'https://') === 0);
209-
}
210-
211-
if ($key === 'SCRIPT_NAME' && env('CGI_MODE') && isset($_ENV['SCRIPT_URL'])) {
212-
$key = 'SCRIPT_URL';
213-
}
214-
215-
$val = null;
216-
if (isset($_SERVER[$key])) {
217-
$val = $_SERVER[$key];
218-
} elseif (isset($_ENV[$key])) {
219-
$val = $_ENV[$key];
220-
} elseif (getenv($key) !== false) {
221-
$val = getenv($key);
222-
}
223-
224-
if ($key === 'REMOTE_ADDR' && $val === env('SERVER_ADDR')) {
225-
$addr = env('HTTP_PC_REMOTE_ADDR');
226-
if ($addr !== null) {
227-
$val = $addr;
228-
}
229-
}
230-
231-
if ($val !== null) {
232-
return $val;
233-
}
234-
235-
switch ($key) {
236-
case 'DOCUMENT_ROOT':
237-
$name = env('SCRIPT_NAME');
238-
$filename = env('SCRIPT_FILENAME');
239-
$offset = 0;
240-
if (!strpos($name, '.php')) {
241-
$offset = 4;
242-
}
243-
244-
return substr($filename, 0, -(strlen($name) + $offset));
245-
case 'PHP_SELF':
246-
return str_replace(env('DOCUMENT_ROOT'), '', env('SCRIPT_FILENAME'));
247-
case 'CGI_MODE':
248-
return (PHP_SAPI === 'cgi');
249-
}
250-
251-
return $default;
252-
}
253-
254-
}
189+
// if (!function_exists('env')) {
190+
// /**
191+
// * Gets an environment variable from available sources, and provides emulation
192+
// * for unsupported or inconsistent environment variables (i.e. DOCUMENT_ROOT on
193+
// * IIS, or SCRIPT_NAME in CGI mode). Also exposes some additional custom
194+
// * environment information.
195+
// *
196+
// * @param string $key Environment variable name.
197+
// * @param string|null $default Specify a default value in case the environment variable is not defined.
198+
// * @return string|bool|null Environment variable setting.
199+
// * @link https://book.cakephp.org/3.0/en/core-libraries/global-constants-and-functions.html#env
200+
// */
201+
// function env($key, $default = null)
202+
// {
203+
// if ($key === 'HTTPS') {
204+
// if (isset($_SERVER['HTTPS'])) {
205+
// return (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off');
206+
// }
207+
208+
// return (strpos((string)env('SCRIPT_URI'), 'https://') === 0);
209+
// }
210+
211+
// if ($key === 'SCRIPT_NAME' && env('CGI_MODE') && isset($_ENV['SCRIPT_URL'])) {
212+
// $key = 'SCRIPT_URL';
213+
// }
214+
215+
// $val = null;
216+
// if (isset($_SERVER[$key])) {
217+
// $val = $_SERVER[$key];
218+
// } elseif (isset($_ENV[$key])) {
219+
// $val = $_ENV[$key];
220+
// } elseif (getenv($key) !== false) {
221+
// $val = getenv($key);
222+
// }
223+
224+
// if ($key === 'REMOTE_ADDR' && $val === env('SERVER_ADDR')) {
225+
// $addr = env('HTTP_PC_REMOTE_ADDR');
226+
// if ($addr !== null) {
227+
// $val = $addr;
228+
// }
229+
// }
230+
231+
// if ($val !== null) {
232+
// return $val;
233+
// }
234+
235+
// switch ($key) {
236+
// case 'DOCUMENT_ROOT':
237+
// $name = env('SCRIPT_NAME');
238+
// $filename = env('SCRIPT_FILENAME');
239+
// $offset = 0;
240+
// if (!strpos($name, '.php')) {
241+
// $offset = 4;
242+
// }
243+
244+
// return substr($filename, 0, -(strlen($name) + $offset));
245+
// case 'PHP_SELF':
246+
// return str_replace(env('DOCUMENT_ROOT'), '', env('SCRIPT_FILENAME'));
247+
// case 'CGI_MODE':
248+
// return (PHP_SAPI === 'cgi');
249+
// }
250+
251+
// return $default;
252+
// }
253+
254+
// }
255255

256256
if (!function_exists('triggerWarning')) {
257257
/**

0 commit comments

Comments
 (0)