tonyair/silverstripe-environmentcheck
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-environmentcheck synced 2024-10-22 17:05:40 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #76 from creative-commoners/pulls/2/php81

Browse Source 
ENH PHP 8.1 compatibility
This commit is contained in:
Guy Sartorelli 2022-04-26 17:58:17 +12:00 committed by GitHub
commit d3d20e5539
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Checks/CacheHeadersCheck.php
View File

@ -109,9 +109,9 @@ class CacheHeadersCheck implements EnvironmentCheck
// Filter good messages
$goodTypes = [ValidationResult::TYPE_GOOD, ValidationResult::TYPE_INFO];
$good = array_filter(
$this->result->getMessages(),
$this->result->getMessages() ?? [],
function ($val, $key) use ($goodTypes) {
if (in_array($val['messageType'], $goodTypes)) {
if (in_array($val['messageType'], $goodTypes ?? [])) {
return true;
}
return false;
@ -119,15 +119,15 @@ class CacheHeadersCheck implements EnvironmentCheck
ARRAY_FILTER_USE_BOTH
);
if (!empty($good)) {
$ret .= "GOOD: " . implode('; ', array_column($good, 'message')) . " ";
$ret .= "GOOD: " . implode('; ', array_column($good ?? [], 'message')) . " ";
}
// Filter bad messages
$badTypes = [ValidationResult::TYPE_ERROR, ValidationResult::TYPE_WARNING];
$bad = array_filter(
$this->result->getMessages(),
$this->result->getMessages() ?? [],
function ($val, $key) use ($badTypes) {
if (in_array($val['messageType'], $badTypes)) {
if (in_array($val['messageType'], $badTypes ?? [])) {
return true;
}
return false;
@ -135,7 +135,7 @@ class CacheHeadersCheck implements EnvironmentCheck
ARRAY_FILTER_USE_BOTH
);
if (!empty($bad)) {
$ret .= "BAD: " . implode('; ', array_column($bad, 'message'));
$ret .= "BAD: " . implode('; ', array_column($bad ?? [], 'message'));
}
return $ret;
}
@ -173,32 +173,32 @@ class CacheHeadersCheck implements EnvironmentCheck
private function checkCacheControl(ResponseInterface $response)
{
$cacheControl = $response->getHeaderLine('Cache-Control');
$vals = array_map('trim', explode(',', $cacheControl));
$vals = array_map('trim', explode(',', $cacheControl ?? ''));
$fullURL = Controller::join_links(Director::absoluteBaseURL(), $this->url);
// All entries from must contain should be present
if ($this->mustInclude == array_intersect($this->mustInclude, $vals)) {
if ($this->mustInclude == array_intersect($this->mustInclude ?? [], $vals)) {
$matched = implode(",", $this->mustInclude);
$this->result->addMessage(
"$fullURL includes all settings: {$matched}",
ValidationResult::TYPE_GOOD
);
} else {
$missing = implode(",", array_diff($this->mustInclude, $vals));
$missing = implode(",", array_diff($this->mustInclude ?? [], $vals));
$this->result->addError(
"$fullURL is excluding some settings: {$missing}"
);
}
// All entries from must exclude should not be present
if (empty(array_intersect($this->mustExclude, $vals))) {
if (empty(array_intersect($this->mustExclude ?? [], $vals))) {
$missing = implode(",", $this->mustExclude);
$this->result->addMessage(
"$fullURL excludes all settings: {$missing}",
ValidationResult::TYPE_GOOD
);
} else {
$matched = implode(",", array_intersect($this->mustExclude, $vals));
$matched = implode(",", array_intersect($this->mustExclude ?? [], $vals));
$this->result->addError(
"$fullURL is including some settings: {$matched}"
);

4
src/Checks/ExternalURLCheck.php
View File

@ -37,7 +37,7 @@ class ExternalURLCheck implements EnvironmentCheck
public function __construct($urls, $timeout = 15)
{
if ($urls) {
$this->urls = explode(' ', $urls);
$this->urls = explode(' ', $urls ?? '');
}
$this->timeout = $timeout;
}
@ -55,7 +55,7 @@ class ExternalURLCheck implements EnvironmentCheck
foreach ($urls as $url) {
$ch = curl_init();
$chs[] = $ch;
curl_setopt_array($ch, $this->getCurlOpts($url));
curl_setopt_array($ch, $this->getCurlOpts($url) ?? []);
}
// Parallel execution for faster performance
$mh = curl_multi_init();

10
src/Checks/FileAccessibilityAndValidationCheck.php
View File

@ -96,7 +96,7 @@ class FileAccessibilityAndValidationCheck implements EnvironmentCheck
$files = $this->getFiles();
if ($files) {
$fileTypeValidateFunc = $this->fileTypeValidateFunc;
if (method_exists($this, $fileTypeValidateFunc)) {
if (method_exists($this, $fileTypeValidateFunc ?? '')) {
$invalidFiles = [];
$validFiles = [];
@ -109,7 +109,7 @@ class FileAccessibilityAndValidationCheck implements EnvironmentCheck
}
// If at least one file was valid, count as passed
if ($this->checkType == self::CHECK_SINGLE && count($invalidFiles) < count($files)) {
if ($this->checkType == self::CHECK_SINGLE && count($invalidFiles ?? []) < count($files ?? [])) {
$validFileList = PHP_EOL;
foreach ($validFiles as $vf) {
$validFileList .= $vf . PHP_EOL;
@ -130,7 +130,7 @@ class FileAccessibilityAndValidationCheck implements EnvironmentCheck
];
}
} else {
if (count($invalidFiles) == 0) {
if (count($invalidFiles ?? []) == 0) {
$checkReturn = [EnvironmentCheck::OK, 'All files valideted'];
} else {
$invalidFileList = PHP_EOL;
@ -180,7 +180,7 @@ class FileAccessibilityAndValidationCheck implements EnvironmentCheck
*/
private function jsonValidate($file)
{
$json = json_decode(file_get_contents($file));
$json = json_decode(file_get_contents($file ?? '') ?? '');
if (!$json) {
return false;
}
@ -204,6 +204,6 @@ class FileAccessibilityAndValidationCheck implements EnvironmentCheck
*/
protected function getFiles()
{
return glob($this->path);
return glob($this->path ?? '');
}
}

8
src/Checks/FileAgeCheck.php
View File

@ -96,7 +96,7 @@ class FileAgeCheck implements EnvironmentCheck
*/
public function check()
{
$cutoffTime = strtotime($this->relativeAge, DBDatetime::now()->Format('U'));
$cutoffTime = strtotime($this->relativeAge ?? '', DBDatetime::now()->Format('U'));
$files = $this->getFiles();
$invalidFiles = [];
$validFiles = [];
@ -127,10 +127,10 @@ class FileAgeCheck implements EnvironmentCheck
}
// If at least one file was valid, count as passed
if ($this->checkType == self::CHECK_SINGLE && count($invalidFiles) < count($files)) {
if ($this->checkType == self::CHECK_SINGLE && count($invalidFiles ?? []) < count($files ?? [])) {
return [EnvironmentCheck::OK, ''];
}
if (count($invalidFiles) == 0) {
if (count($invalidFiles ?? []) == 0) {
return [EnvironmentCheck::OK, ''];
}
return [
@ -146,6 +146,6 @@ class FileAgeCheck implements EnvironmentCheck
*/
protected function getFiles()
{
return glob($this->path);
return glob($this->path ?? '');
}
}

18
src/Checks/FileWriteableCheck.php
View File

@ -34,22 +34,22 @@ class FileWriteableCheck implements EnvironmentCheck
if ($this->path[0] == '/') {
$filename = $this->path;
} else {
$filename = BASE_PATH . DIRECTORY_SEPARATOR . str_replace('/', DIRECTORY_SEPARATOR, $this->path);
$filename = BASE_PATH . DIRECTORY_SEPARATOR . str_replace('/', DIRECTORY_SEPARATOR, $this->path ?? '');
}
if (file_exists($filename)) {
$isWriteable = is_writeable($filename);
if (file_exists($filename ?? '')) {
$isWriteable = is_writeable($filename ?? '');
} else {
$isWriteable = is_writeable(dirname($filename));
$isWriteable = is_writeable(dirname($filename ?? ''));
}
if (!$isWriteable) {
if (function_exists('posix_getgroups')) {
$userID = posix_geteuid();
$user = posix_getpwuid($userID);
$user = posix_getpwuid($userID ?? 0);
$currentOwnerID = fileowner(file_exists($filename) ? $filename : dirname($filename));
$currentOwner = posix_getpwuid($currentOwnerID);
$currentOwnerID = fileowner(file_exists($filename ?? '') ? $filename : dirname($filename ?? ''));
$currentOwner = posix_getpwuid($currentOwnerID ?? 0);
$message = "User '$user[name]' needs to be able to write to this file:\n$filename\n\nThe file is "
. "currently owned by '$currentOwner[name]'. ";
@ -60,8 +60,8 @@ class FileWriteableCheck implements EnvironmentCheck
$groups = posix_getgroups();
$groupList = [];
foreach ($groups as $group) {
$groupInfo = posix_getgrgid($group);
if (in_array($currentOwner['name'], $groupInfo['members'])) {
$groupInfo = posix_getgrgid($group ?? 0);
if (in_array($currentOwner['name'], $groupInfo['members'] ?? [])) {
$groupList[] = $groupInfo['name'];
}
}

2
src/Checks/HasClassCheck.php
View File

@ -31,7 +31,7 @@ class HasClassCheck implements EnvironmentCheck
*/
public function check()
{
if (class_exists($this->className)) {
if (class_exists($this->className ?? '')) {
return [EnvironmentCheck::OK, 'Class ' . $this->className.' exists'];
}
return [EnvironmentCheck::ERROR, 'Class ' . $this->className.' doesn\'t exist'];

2
src/Checks/HasFunctionCheck.php
View File

@ -31,7 +31,7 @@ class HasFunctionCheck implements EnvironmentCheck
*/
public function check()
{
if (function_exists($this->functionName)) {
if (function_exists($this->functionName ?? '')) {
return [EnvironmentCheck::OK, $this->functionName . '() exists'];
}
return [EnvironmentCheck::ERROR, $this->functionName . '() doesn\'t exist'];

4
src/Checks/SMTPConnectCheck.php
View File

@ -57,7 +57,7 @@ class SMTPConnectCheck implements EnvironmentCheck
*/
public function check()
{
$f = @fsockopen($this->host, $this->port, $errno, $errstr, $this->timeout);
$f = @fsockopen($this->host ?? '', $this->port ?? 0, $errno, $errstr, $this->timeout);
if (!$f) {
return [
EnvironmentCheck::ERROR,
@ -67,7 +67,7 @@ class SMTPConnectCheck implements EnvironmentCheck
fwrite($f, "HELO its_me\r\n");
$response = fread($f, 26);
if (substr($response, 0, 3) != '220') {
if (substr($response ?? '', 0, 3) != '220') {
return [
EnvironmentCheck::ERROR,
sprintf('Invalid mail server response: %s', $response)

2
src/Checks/SessionCheck.php
View File

@ -62,7 +62,7 @@ class SessionCheck implements EnvironmentCheck
$cookies = $response->getHeader('Set-Cookie');
foreach ($cookies as $cookie) {
if (strpos($cookie, 'SESSID') !== false) {
if (strpos($cookie ?? '', 'SESSID') !== false) {
$result = $cookie;
}
}

2
src/Checks/SolrIndexCheck.php
View File

@ -43,7 +43,7 @@ class SolrIndexCheck implements EnvironmentCheck
if (!empty($brokenCores)) {
return [
EnvironmentCheck::ERROR,
'The following indexes are unavailable: ' . implode($brokenCores, ', ')
'The following indexes are unavailable: ' . implode($brokenCores ?? '', ', ')
];
}

2
src/Checks/URLCheck.php
View File

@ -49,7 +49,7 @@ class URLCheck implements EnvironmentCheck
EnvironmentCheck::ERROR,
sprintf('Error retrieving "%s" (Code: %d)', $this->url, $response->getStatusCode())
];
} elseif ($this->testString && (strpos($response->getBody(), $this->testString) === false)) {
} elseif ($this->testString && (strpos($response->getBody() ?? '', $this->testString ?? '') === false)) {
return [
EnvironmentCheck::WARNING,
sprintf('Success retrieving "%s", but string "%s" not found', $this->url, $this->testString)

2
src/EnvironmentChecker.php
View File

@ -206,7 +206,7 @@ class EnvironmentChecker extends RequestHandler
// output the result as JSON if requested
if ($this->getRequest()->getExtension() == 'json'
|| strpos($this->getRequest()->getHeader('Accept'), 'application/json') !== false
|| strpos($this->getRequest()->getHeader('Accept') ?? '', 'application/json') !== false
) {
$response->setBody($result->toJSON());
$response->addHeader('Content-Type', 'application/json');