Skip to content

[4.0] Constant usage #18504

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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Aug 8, 2018
Merged

[4.0] Constant usage #18504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dafcf61
CONSTANT usage
frankmayer Nov 4, 2017
b7b6cb6
Merge branch '4.0-dev' into constant_usage
frankmayer Nov 5, 2017
97ba44e
Revert change in one case, as it might be useful to have the extra in…
frankmayer Nov 5, 2017
6005b8e
U Can't Touch This!
frankmayer Nov 8, 2017
5281cfb
Merge branch '4.0-dev' into constant_usage
frankmayer Aug 8, 2018
a09ab4e
Fix conflicts and remove some replacements due to possible b/c break
frankmayer Aug 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions administrator/components/com_admin/Model/SysinfoModel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,9 +313,9 @@ public function &getInfo()
'dbversion' => $db->getVersion(),
'dbcollation' => $db->getCollation(),
'dbconnectioncollation' => $db->getConnectionCollation(),
'phpversion' => phpversion(),
'phpversion' => PHP_VERSION,
'server' => $_SERVER['SERVER_SOFTWARE'] ?? getenv('SERVER_SOFTWARE'),
'sapi_name' => php_sapi_name(),
'sapi_name' => PHP_SAPI,
'version' => (new Version)->getLongVersion(),
'useragent' => $_SERVER['HTTP_USER_AGENT'] ?? '',
);
Expand Down
2 changes: 1 addition & 1 deletion administrator/modules/mod_stats_admin/Helper/StatsAdminHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public static function getStats(&$params)
$rows[$i] = new \stdClass;
$rows[$i]->title = Text::_('MOD_STATS_PHP');
$rows[$i]->icon = 'cogs';
$rows[$i]->data = phpversion();
$rows[$i]->data = PHP_VERSION;
$i++;

$rows[$i] = new \stdClass;
Expand Down
2 changes: 1 addition & 1 deletion libraries/src/Application/WebApplication.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ protected function loadSystemUris($requestUri = null)
$uri = Uri::getInstance($this->get('uri.request'));

// If we are working from a CGI SAPI with the 'cgi.fix_pathinfo' directive disabled we use PHP_SELF.
if (strpos(php_sapi_name(), 'cgi') !== false && !ini_get('cgi.fix_pathinfo') && !empty($_SERVER['REQUEST_URI']))
if (strpos(PHP_SAPI, 'cgi') !== false && !ini_get('cgi.fix_pathinfo') && !empty($_SERVER['REQUEST_URI']))
{
// We aren't expecting PATH_INFO within PHP_SELF so this should work.
$path = dirname($_SERVER['PHP_SELF']);
Expand Down
2 changes: 1 addition & 1 deletion libraries/src/Cache/Storage/ApcuStorage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ public static function isSupported()
$supported = extension_loaded('apcu') && ini_get('apc.enabled');

// If on the CLI interface, the `apc.enable_cli` option must also be enabled
if ($supported && php_sapi_name() === 'cli')
if ($supported && PHP_SAPI === 'cli')
{
$supported = ini_get('apc.enable_cli');
}
Expand Down
2 changes: 1 addition & 1 deletion libraries/src/Uri/Uri.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ public static function base($pathonly = false)
{
static::$base['prefix'] = $uri->toString(array('scheme', 'host', 'port'));

if (strpos(php_sapi_name(), 'cgi') !== false && !ini_get('cgi.fix_pathinfo') && !empty($_SERVER['REQUEST_URI']))
if (strpos(PHP_SAPI, 'cgi') !== false && !ini_get('cgi.fix_pathinfo') && !empty($_SERVER['REQUEST_URI']))
{
// PHP-CGI on Apache with "cgi.fix_pathinfo = 0"

Expand Down
2 changes: 1 addition & 1 deletion modules/mod_stats/Helper/StatsHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public static function &getList(&$params)

$rows[$i] = new \stdClass;
$rows[$i]->title = Text::_('MOD_STATS_PHP');
$rows[$i]->data = phpversion();
$rows[$i]->data = PHP_VERSION;
$i++;

$rows[$i] = new \stdClass;
Expand Down